lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix food occasionally spawning inside the snake

Browse source
This commit is contained in:
Louis-Antoine 2020-06-01 15:21:16 +02:00
parent dc55ab9ae2
commit e6ffedbce8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/d_clisrv.c
View file

@ -1268,7 +1268,7 @@ static UINT8 Snake_GetOppositeDir(UINT8 dir)
return 12 + 5 - dir; return 12 + 5 - dir;
} }
static void Snake_FindFreeSlot(UINT8 *x, UINT8 *y) static void Snake_FindFreeSlot(UINT8 *x, UINT8 *y, UINT8 headx, UINT8 heady)
{ {
UINT16 i; UINT16 i;
@ -1280,7 +1280,7 @@ static void Snake_FindFreeSlot(UINT8 *x, UINT8 *y)
for (i = 0; i < snake->snakelength; i++) for (i = 0; i < snake->snakelength; i++)
if (*x == snake->snakex[i] && *y == snake->snakey[i]) if (*x == snake->snakex[i] && *y == snake->snakey[i])
break; break;
} while (i < snake->snakelength); } while (i < snake->snakelength || (*x == headx && *y == heady));
} }
static void Snake_Handle(void) static void Snake_Handle(void)
@ -1420,7 +1420,7 @@ static void Snake_Handle(void)
} }
// Spawn new apple // Spawn new apple
Snake_FindFreeSlot(&snake->applex, &snake->appley); Snake_FindFreeSlot(&snake->applex, &snake->appley, x, y);
// Spawn new bonus // Spawn new bonus
if (!(snake->snakelength % 5)) if (!(snake->snakelength % 5))
@ -1431,7 +1431,7 @@ static void Snake_Handle(void)
} while (snake->snakelength > SNAKE_NUM_BLOCKS_X * SNAKE_NUM_BLOCKS_Y * 3 / 4 } while (snake->snakelength > SNAKE_NUM_BLOCKS_X * SNAKE_NUM_BLOCKS_Y * 3 / 4
&& (snake->bonustype == SNAKE_BONUS_EGGMAN || snake->bonustype == SNAKE_BONUS_FAST || snake->bonustype == SNAKE_BONUS_REVERSE)); && (snake->bonustype == SNAKE_BONUS_EGGMAN || snake->bonustype == SNAKE_BONUS_FAST || snake->bonustype == SNAKE_BONUS_REVERSE));
Snake_FindFreeSlot(&snake->bonusx, &snake->bonusy); Snake_FindFreeSlot(&snake->bonusx, &snake->bonusy, x, y);
} }
S_StartSound(NULL, sfx_s3k6b); S_StartSound(NULL, sfx_s3k6b);