kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add FLAG_ID_MAKE macros to all flag function calls

Browse source
This commit is contained in:
Rainchus 2024-07-15 13:27:19 -05:00
parent 38085a347f
commit db89eb87be
32 changed files with 158 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/game/board/space.c
View file

@ -520,9 +520,19 @@ s32 BoardSpaceStarCheck(s32 index)
void BoardSpaceLandExec(s32 player, s32 space)
{
#define BLUE_SPACE 1
#define RED_SPACE 2
#define BOWSER_SPACE 3
#define MUSHROOM_SPACE 4
#define BATTLE_SPACE 5
#define HAPPENING_SPACE 6
#define FORTUNE_SPACE 7
#define STAR_SPACE 8
#define WARP_SPACE 9
BoardSpace *space_ptr = BoardSpaceGet(0, space);
switch(space_ptr->type) {
case 1:
case BLUE_SPACE:
GWPlayer[player].blue_count++;
if(GWPlayer[player].blue_count > 99) {
GWPlayer[player].blue_count = 99;
@ -530,7 +540,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardLandBlueExec(player, space);
break;
case 2:
case RED_SPACE:
GWPlayer[player].red_count++;
if(GWPlayer[player].red_count > 99) {
GWPlayer[player].red_count = 99;
@ -538,7 +548,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardLandRedExec(player, space);
break;
case 3:
case BOWSER_SPACE:
GWPlayer[player].bowser_count++;
if(GWPlayer[player].bowser_count > 99) {
GWPlayer[player].bowser_count = 99;
@ -546,7 +556,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardBowserExec(player, space);
break;
case 4:
case MUSHROOM_SPACE:
GWPlayer[player].mushroom_count++;
if(GWPlayer[player].mushroom_count > 99) {
GWPlayer[player].mushroom_count = 99;
@ -554,7 +564,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardMushroomExec(player, space);
break;
case 5:
case BATTLE_SPACE:
GWPlayer[player].battle_count++;
if(GWPlayer[player].battle_count > 99) {
GWPlayer[player].battle_count = 99;
@ -562,7 +572,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardBattleExec(player, space);
break;
case 6:
case HAPPENING_SPACE:
GWPlayer[player].question_count++;
if(GWPlayer[player].question_count > 99) {
GWPlayer[player].question_count = 99;
@ -586,7 +596,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
GWPlayer[player].color = 3;
break;
case 7:
case FORTUNE_SPACE:
GWPlayer[player].fortune_count++;
if(GWPlayer[player].fortune_count > 99) {
GWPlayer[player].fortune_count = 99;
@ -594,7 +604,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardFortuneExec(player, space);
break;
case 9:
case WARP_SPACE:
GWPlayer[player].warp_count++;
if(GWPlayer[player].warp_count > 99) {
GWPlayer[player].warp_count = 99;
@ -602,7 +612,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardWarpExec(player, space);
break;
case 8:
case STAR_SPACE:
BoardStarExec(player, space);
break;
}