From 14fe63313a32b4779ccfb6cf71cb227542a3958f Mon Sep 17 00:00:00 2001 From: angie Date: Fri, 5 Aug 2022 20:27:24 -0400 Subject: [PATCH] name unused parameters Co-authored-by: EllipticEllipsis --- include/segment_symbols.h | 6 +++--- include/z64actor.h | 4 ++-- src/code/z_actor_dlftbls.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/segment_symbols.h b/include/segment_symbols.h index c6d762c77f..311a8068c1 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -76,9 +76,9 @@ DECLARE_OVERLAY_SEGMENT(daytelop) DECLARE_OVERLAY_SEGMENT(kaleido_scope) DECLARE_OVERLAY_SEGMENT(player_actor) -#define DEFINE_ACTOR(name, _1, _2, _3) DECLARE_OVERLAY_SEGMENT(name) -#define DEFINE_ACTOR_INTERNAL(_0, _1, _2, _3) -#define DEFINE_ACTOR_UNSET(_0) +#define DEFINE_ACTOR(name, enumValue, allocType, nameString) DECLARE_OVERLAY_SEGMENT(name) +#define DEFINE_ACTOR_INTERNAL(name, enumValue, allocType, nameString) +#define DEFINE_ACTOR_UNSET(enumValue) #include "tables/actor_table.h" diff --git a/include/z64actor.h b/include/z64actor.h index 082c68a18f..6d2fb92cfe 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -410,8 +410,8 @@ typedef enum { } ActorDrawDamageEffectType; -#define DEFINE_ACTOR(_0, enumValue, _2, _3) enumValue, -#define DEFINE_ACTOR_INTERNAL(_0, enumValue, _2, _3) enumValue, +#define DEFINE_ACTOR(name, enumValue, allocType, nameString) enumValue, +#define DEFINE_ACTOR_INTERNAL(name, enumValue, allocType, nameString) enumValue, #define DEFINE_ACTOR_UNSET(enumValue) enumValue, typedef enum ActorID { diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index bdb1a4c324..c773d8c773 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -1,9 +1,9 @@ #include "global.h" // Init Vars declarations (also used in the table below) -#define DEFINE_ACTOR(name, _1, _2, _3) extern ActorInit name##_InitVars; -#define DEFINE_ACTOR_INTERNAL(name, _1, _2, _3) extern ActorInit name##_InitVars; -#define DEFINE_ACTOR_UNSET(_0) +#define DEFINE_ACTOR(name, enumValue, allocType, nameString) extern ActorInit name##_InitVars; +#define DEFINE_ACTOR_INTERNAL(name, enumValue, allocType, nameString) extern ActorInit name##_InitVars; +#define DEFINE_ACTOR_UNSET(enumValue) #include "tables/actor_table.h" @@ -12,7 +12,7 @@ #undef DEFINE_ACTOR_UNSET // Actor Overlay Table definition -#define DEFINE_ACTOR(name, _1, allocType, _3) \ +#define DEFINE_ACTOR(name, enumValue, allocType, nameString) \ { SEGMENT_ROM_START(ovl_##name), \ SEGMENT_ROM_END(ovl_##name), \ SEGMENT_START(ovl_##name), \ @@ -23,9 +23,9 @@ allocType, \ 0 }, -#define DEFINE_ACTOR_INTERNAL(name, _1, allocType, _3) { 0, 0, NULL, NULL, NULL, &name##_InitVars, NULL, allocType, 0 }, +#define DEFINE_ACTOR_INTERNAL(name, enumValue, allocType, nameString) { 0, 0, NULL, NULL, NULL, &name##_InitVars, NULL, allocType, 0 }, -#define DEFINE_ACTOR_UNSET(_1) { 0 }, +#define DEFINE_ACTOR_UNSET(enumValue) { 0 }, ActorOverlay gActorOverlayTable[] = { #include "tables/actor_table.h"