teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 21:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor branching fix in FuncPlayer

Browse source
This commit is contained in:
nukeykt 2019-12-03 09:23:09 +09:00 committed by Christoph Oelckers
parent 426570729e
commit 099a995495
1 changed files with 13 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
source/exhumed/src/player.cpp
View file

@ -2946,12 +2946,11 @@ do_default_b:
} }
else else
{ {
int nEyeLevel = eyelevel[nPlayer]; if (eyelevel[nPlayer] < -8320) {
eyelevel[nPlayer] += ((-8320 - eyelevel[nPlayer]) >> 1);
if (nEyeLevel < -8320) {
eyelevel[nPlayer] = ((-8320 - nEyeLevel) >> 1) + nEyeLevel;
} }
loc_1BD2E:
if (totalvel[nPlayer] < 1) { if (totalvel[nPlayer] < 1) {
nActionB = 6; nActionB = 6;
} }
@ -2981,13 +2980,7 @@ do_default_b:
// CHECKME - confirm branching in this area is OK // CHECKME - confirm branching in this area is OK
if (var_48) if (var_48)
{ {
// loc_1BD2E: goto loc_1BD2E;
if (totalvel[nPlayer] < 1) {
nActionB = 6;
}
else {
nActionB = 7;
}
} }
else else
{ {
@ -3003,7 +2996,7 @@ do_default_b:
} }
} }
} }
}
// loc_1BE30 // loc_1BE30
if (buttons & kButtonFire) // was var_38 if (buttons & kButtonFire) // was var_38
{ {
@ -3020,25 +3013,6 @@ do_default_b:
} }
} }
} }
else // player's health is 0
{
// loc_1BE30
if (buttons & kButtonFire) // was var_38
{
if (bUnderwater)
{
nActionB = 11;
}
else
{
if (nActionB != 2 && nActionB != 1)
{
nActionB = 5;
}
}
}
}
}
// loc_1BE70: // loc_1BE70:
// Handle player pressing number keys to change weapon // Handle player pressing number keys to change weapon