Sara/fencer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(warnings): added _DataType argument to DefineState to improve type checking

Browse source
This commit is contained in:
Sara 2023-11-22 15:58:59 +01:00
parent 2b1aa6236f
commit 3c647ccfc2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/state.h
View file

@ -11,11 +11,11 @@ struct State {
const State* (*const update)(void* data, float dt); const State* (*const update)(void* data, float dt);
}; };
#define DefineState(_StateName, enter_fn, exit_fn, update_fn)\ #define DefineState(_StateName, _DataType, enter_fn, exit_fn, update_fn)\
static inline const State* _StateName() {\ static inline const State* _StateName() {\
TC_FN_TYPECHECK(void, enter_fn, void*);\ TC_FN_TYPECHECK(void, enter_fn, _DataType*);\
TC_FN_TYPECHECK(void, exit_fn, void*);\ TC_FN_TYPECHECK(void, exit_fn, _DataType*);\
TC_FN_TYPECHECK(const State*, update_fn, void*, float);\ TC_FN_TYPECHECK(const State*, update_fn, _DataType*, float);\
static const State instance = {\ static const State instance = {\
.enter = (void(*const)(void*)) enter_fn,\ .enter = (void(*const)(void*)) enter_fn,\
.exit = (void(*const)(void*)) exit_fn,\ .exit = (void(*const)(void*)) exit_fn,\

2
game/src/player.h
View file

@ -67,7 +67,7 @@ extern void PlayerAnimationExit(Player* player);
extern void PlayerIdleEnter(Player* player); extern void PlayerIdleEnter(Player* player);
DefineState(PlayerIdle, DefineState(PlayerIdle, Player,
PlayerIdleEnter, PlayerIdleEnter,
PlayerAnimationExit, PlayerAnimationExit,
PlayerAnimationUpdate PlayerAnimationUpdate