falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

name unused parameters 

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
angie 2022-08-05 20:27:24 -04:00
parent 21ee01fa60
commit 14fe63313a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/segment_symbols.h
View File

@ -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"

4
include/z64actor.h
View File

@ -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 {

12
src/code/z_actor_dlftbls.c
View File

@ -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"