mirror of
https://github.com/zeldaret/mm.git
synced 2026-07-09 21:51:32 -04:00
Remove (ActorFunc) cast on InitVars (#1148)
* Remove ActorFunc cast * Format * Revert "Format" This reverts commita6e89b3969. * Messing with formatting * format header a bit * Revert "Messing with formatting" This reverts commitc8db520278. * comment * format * more comments * format * format * format * properly format
This commit is contained in:
@@ -14,15 +14,15 @@ void EnAObj_Idle(EnAObj* this, PlayState* play);
|
||||
void EnAObj_Talk(EnAObj* this, PlayState* play);
|
||||
|
||||
ActorInit En_A_Obj_InitVars = {
|
||||
ACTOR_EN_A_OBJ,
|
||||
ACTORCAT_PROP,
|
||||
FLAGS,
|
||||
GAMEPLAY_KEEP,
|
||||
sizeof(EnAObj),
|
||||
(ActorFunc)EnAObj_Init,
|
||||
(ActorFunc)EnAObj_Destroy,
|
||||
(ActorFunc)EnAObj_Update,
|
||||
(ActorFunc)EnAObj_Draw,
|
||||
/* */ ACTOR_EN_A_OBJ,
|
||||
/* */ ACTORCAT_PROP,
|
||||
/* */ FLAGS,
|
||||
/* */ GAMEPLAY_KEEP,
|
||||
/* */ sizeof(EnAObj),
|
||||
/* */ EnAObj_Init,
|
||||
/* */ EnAObj_Destroy,
|
||||
/* */ EnAObj_Update,
|
||||
/* */ EnAObj_Draw,
|
||||
};
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
|
||||
@@ -26,15 +26,15 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play);
|
||||
void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play);
|
||||
|
||||
ActorInit En_Item00_InitVars = {
|
||||
ACTOR_EN_ITEM00,
|
||||
ACTORCAT_MISC,
|
||||
FLAGS,
|
||||
GAMEPLAY_KEEP,
|
||||
sizeof(EnItem00),
|
||||
(ActorFunc)EnItem00_Init,
|
||||
(ActorFunc)EnItem00_Destroy,
|
||||
(ActorFunc)EnItem00_Update,
|
||||
(ActorFunc)EnItem00_Draw,
|
||||
/**/ ACTOR_EN_ITEM00,
|
||||
/**/ ACTORCAT_MISC,
|
||||
/**/ FLAGS,
|
||||
/**/ GAMEPLAY_KEEP,
|
||||
/**/ sizeof(EnItem00),
|
||||
/**/ EnItem00_Init,
|
||||
/**/ EnItem00_Destroy,
|
||||
/**/ EnItem00_Update,
|
||||
/**/ EnItem00_Draw,
|
||||
};
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
|
||||
@@ -16,15 +16,15 @@ void PlayerCall_Update(Actor* thisx, PlayState* play);
|
||||
void PlayerCall_Draw(Actor* thisx, PlayState* play);
|
||||
|
||||
ActorInit Player_InitVars = {
|
||||
ACTOR_PLAYER,
|
||||
ACTORCAT_PLAYER,
|
||||
FLAGS,
|
||||
GAMEPLAY_KEEP,
|
||||
sizeof(Player),
|
||||
(ActorFunc)PlayerCall_Init,
|
||||
(ActorFunc)PlayerCall_Destroy,
|
||||
(ActorFunc)PlayerCall_Update,
|
||||
(ActorFunc)PlayerCall_Draw,
|
||||
/**/ ACTOR_PLAYER,
|
||||
/**/ ACTORCAT_PLAYER,
|
||||
/**/ FLAGS,
|
||||
/**/ GAMEPLAY_KEEP,
|
||||
/**/ sizeof(Player),
|
||||
/**/ PlayerCall_Init,
|
||||
/**/ PlayerCall_Destroy,
|
||||
/**/ PlayerCall_Update,
|
||||
/**/ PlayerCall_Draw,
|
||||
};
|
||||
|
||||
void Player_Init(Actor* thisx, PlayState* play);
|
||||
|
||||
Reference in New Issue
Block a user