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

Merge branch 'emeraldfall' into 'master'

Browse source 
Fix emerald coordinate overflow in failed SS tally (resolves #421).

Closes #421

See merge request STJr/SRB2Internal!586
This commit is contained in:
MascaraSnake 2019-12-03 02:15:47 -05:00
parent ba0dc5c884 f662ef9454
commit ab400e926a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/y_inter.c
View file

@ -603,8 +603,7 @@ void Y_IntermissionDrawer(void)
{ {
if (emeraldbounces < 3) if (emeraldbounces < 3)
{ {
emeraldmomy += 1; emeraldy += (++emeraldmomy);
emeraldy += emeraldmomy;
if (emeraldy > 74) if (emeraldy > 74)
{ {
S_StartSound(NULL, sfx_tink); // tink S_StartSound(NULL, sfx_tink); // tink
@ -616,9 +615,11 @@ void Y_IntermissionDrawer(void)
} }
else else
{ {
emeraldmomy += 1; if (emeraldy < (vid.height/vid.dupy)+16)
emeraldy += emeraldmomy; {
emeraldx += intertic - 6; emeraldy += (++emeraldmomy);
emeraldx += intertic - 6;
}
if (emeraldbounces < 1 && emeraldy > 74) if (emeraldbounces < 1 && emeraldy > 74)
{ {
S_StartSound(NULL, sfx_shldls); // nope S_StartSound(NULL, sfx_shldls); // nope