Clang-format changes exist. Committing.

Z3DR · Jul 6, 2024 · bda0ab6 · bda0ab6
1 parent b433a5b
commit bda0ab6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/code/include/game/actor.h b/code/include/game/actor.h
@@ -354,7 +354,7 @@ namespace game::act {
     int field_0c;
     float field_10;
     float field_14;
-    z3d_nn_math_MTX34 * mtx;
+    z3d_nn_math_MTX34* mtx;
     u8 gap_1C[184];
   };
   static_assert(sizeof(sa_unk_d4) == 0xD4);

diff --git a/code/include/game/as.h b/code/include/game/as.h
@@ -52,7 +52,7 @@ namespace game::as {
     int field_28;
     int field_2C;
     int field_30;
-    void * field_34;
+    void* field_34;
     int field_38;
     State state;
     u8 gap_64[24];

diff --git a/code/include/rnd/actors/dm_char05.h b/code/include/rnd/actors/dm_char05.h
@@ -12,7 +12,7 @@ extern "C" {
 namespace rnd {
   struct Dm_Char05 : public game::act::Actor {
     game::as::ActorUtil actor_util;
-    void * skelAnimeModel;
+    void* skelAnimeModel;
     void* calc_fn;
     u16 field_28c;
     u8 field_28e;

diff --git a/code/source/rnd/actors/dm_char03.cpp b/code/source/rnd/actors/dm_char03.cpp
@@ -6,7 +6,7 @@ namespace rnd {
     util::GetPointer<void(game::act::Actor*, game::GlobalContext*)>(0x3C6A38)(actor, gctx);
     Model_SpawnByActor(actor, GetContext().gctx, 0x78);
     Model* model = Model_GetOverrideSaModel(actor);
-    
+
     // static_cast<Dm_Char03*>(actor)->skelAnimeModel = model->saModel;
     if (model != NULL) {
       static_cast<Dm_Char03*>(actor)->actor_util->field_34 = model->saModel;

diff --git a/code/source/rnd/actors/dm_char05.cpp b/code/source/rnd/actors/dm_char05.cpp
@@ -16,9 +16,9 @@ namespace rnd {
 
   void DMChar05_Init(game::act::Actor* actor, game::GlobalContext* gctx) {
     util::GetPointer<void(game::act::Actor*, game::GlobalContext*)>(0x3C6CD8)(actor, gctx);
-    if (actor->params == 0x00) // Goron
+    if (actor->params == 0x00)  // Goron
       Model_SpawnByActor(actor, GetContext().gctx, 0x79);
-    else if (actor->params == 0x01) // Zora
+    else if (actor->params == 0x01)  // Zora
       Model_SpawnByActor(actor, GetContext().gctx, 0x7A);
     else if (actor->params == 0x02)  // Gibdo
       Model_SpawnByActor(actor, GetContext().gctx, 0x87);
@@ -49,5 +49,4 @@ namespace rnd {
     DmChar05_SetScale(actor);
   }
 
-
 }  // namespace rnd
diff --git a/code/source/rnd/actors/dm_hina.cpp b/code/source/rnd/actors/dm_hina.cpp
@@ -18,6 +18,4 @@ namespace rnd {
     util::GetPointer<void(game::act::Actor*)>(0x34F864)(self);
   }
 
-
-
 }  // namespace rnd
diff --git a/code/source/rnd/models.cpp b/code/source/rnd/models.cpp
@@ -1,7 +1,7 @@
 #include "rnd/models.h"
-#include "rnd/actors/dm_hina.h"
 #include "rnd/actors/dm_char03.h"
 #include "rnd/actors/dm_char05.h"
+#include "rnd/actors/dm_hina.h"
 #include "rnd/actors/en_si.h"
 #include "rnd/actors/item00.h"
 #include "rnd/actors/item_b_heart.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,6 +18,4 @@ namespace rnd {
		util::GetPointer<void(game::act::Actor*)>(0x34F864)(self);
		}



		} // namespace rnd