Merge 'Add basic source file format checks to CI' (OoTRandomizer#1795)

engineer124 · Dec 21, 2022 · bdba663 · bdba663
2 parents 7dfdf2e + 125bbba
commit bdba663
Show file tree

Hide file tree

Showing 93 changed files with 774 additions and 696 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,17 +2,20 @@
 
 *.txt  text
 *.json text
-*.c    text
-*.h    text
-*.py   text
+*.c    text eol=lf
+*.h    text eol=lf
+*.py   text eol=lf
 *.md   text
 *.html text
-*.asm  text
+*.asm  text eol=lf
 
 *.bin  binary
 *.o    binary
 
-/ASM/build/*.txt text -diff linguist-generated=true
+/ASM/build/*.txt  text -diff linguist-generated=true
 /data/generated/* text -diff linguist-generated=true
-/Decompress/* binary
-/Compress/*   binary
+
+/bin/Compress/Compress*     binary
+/bin/Decompress/Decompress* binary
+/bin/gzinject/gzinject*     binary
+/bin/minibsdiff/minibsdiff* binary
diff --git a/ASM/c/actor.c b/ASM/c/actor.c
@@ -35,7 +35,7 @@ void Actor_SetWorldToHome_End(z64_actor_t *actor) {
             actor->rot_world.y = 0;
         default:
             break;
-    } 
+    }
 }
 
 // Called from Actor_UpdateAll when spawning the actors in the scene's/room's actor list.
@@ -45,7 +45,7 @@ void Actor_SetWorldToHome_End(z64_actor_t *actor) {
 // Now that we resized pots/crates/beehives we could probably just store this info in new space in the actor. But this works for now.
 // Prior to being called, CURR_ACTOR_SPAWN_INDEX is set to the current position in the actor spawn list.
 void Actor_After_UpdateAll_Hack(z64_actor_t *actor, z64_game_t* game) {
-    
+
     Actor_StoreFlagInRotation(actor, game, CURR_ACTOR_SPAWN_INDEX);
     Actor_StoreChestType(actor, game);
 
@@ -62,7 +62,7 @@ void Actor_StoreFlagInRotation(z64_actor_t* actor, z64_game_t* game, uint16_t ac
         case OBJ_TSUBO:
         case EN_TUBO_TRAP:
         case OBJ_KIBAKO:
-        case OBJ_COMB: 
+        case OBJ_COMB:
         {
             actor->rot_init.z = flag;
             break;
@@ -90,7 +90,7 @@ void Actor_StoreChestType(z64_actor_t* actor, z64_game_t* game) {
 
     if(actor->actor_id == OBJ_TSUBO) //Pots
     {
-        override = get_pot_override(actor, game);    
+        override = get_pot_override(actor, game);
         pChestType = &(((ObjTsubo*)actor)->chest_type);
     }
     else if(actor->actor_id == EN_TUBO_TRAP) // Flying Pots
@@ -132,6 +132,6 @@ void Actor_StoreChestType(z64_actor_t* actor, z64_game_t* game) {
         {
             *pChestType = 0;
         }
-        
+
     }
 }
diff --git a/ASM/c/dungeon_info.c b/ASM/c/dungeon_info.c
@@ -81,7 +81,7 @@ void draw_background(z64_disp_buf_t *db, int bg_left, int bg_top, int bg_width,
 void draw_dungeon_info(z64_disp_buf_t *db) {
     pad_t pad_held = z64_ctxt.input[0].raw.pad;
     int draw = CAN_DRAW_DUNGEON_INFO && (
-        ((pad_held.dl || pad_held.dr || pad_held.dd) && CFG_DPAD_DUNGEON_INFO_ENABLE) || 
+        ((pad_held.dl || pad_held.dr || pad_held.dd) && CFG_DPAD_DUNGEON_INFO_ENABLE) ||
         ((pad_held.dl || pad_held.dr || pad_held.dd) && !CFG_DPAD_DUNGEON_INFO_ENABLE && pad_held.a) ||
         pad_held.a);
     if (!draw) {
@@ -134,7 +134,7 @@ void draw_dungeon_info(z64_disp_buf_t *db) {
                 0,
                 0, 0,
                 1<<10, 1<<10);
-        
+
         gDPPipeSync(db->p++);
         gDPSetCombineMode(db->p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
 
@@ -209,7 +209,7 @@ void draw_dungeon_info(z64_disp_buf_t *db) {
         left += (8 * font_width) + padding;
 
         // Draw keys
-        
+
         if (show_keys) {
             // Draw small key counts