zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-13 11:30:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move addammo into own function.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6321 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-05 05:38:05 +00:00
parent fb337a80b1
commit 980b2be584
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/duke3d/src/gameexec.cpp
View file

@ -889,12 +889,12 @@ static void P_AddWeaponAmmoCommon(DukePlayer_t * const pPlayer, int const weapon
P_AddWeaponMaybeSwitch(pPlayer, weaponNum); P_AddWeaponMaybeSwitch(pPlayer, weaponNum);
} }
static int VM_AddWeapon(DukePlayer_t * const pPlayer, int const weaponNum, int const nAmount) static void VM_AddWeapon(DukePlayer_t * const pPlayer, int const weaponNum, int const nAmount)
{ {
if (EDUKE32_PREDICT_FALSE((unsigned)weaponNum >= MAX_WEAPONS)) if (EDUKE32_PREDICT_FALSE((unsigned)weaponNum >= MAX_WEAPONS))
{ {
CON_ERRPRINTF("Invalid weapon ID %d\n", weaponNum); CON_ERRPRINTF("Invalid weapon ID %d\n", weaponNum);
return 1; return;
} }
if ((pPlayer->gotweapon & (1 << weaponNum)) == 0) if ((pPlayer->gotweapon & (1 << weaponNum)) == 0)
@ -904,12 +904,27 @@ static int VM_AddWeapon(DukePlayer_t * const pPlayer, int const weaponNum, int c
else if (pPlayer->ammo_amount[weaponNum] >= pPlayer->max_ammo_amount[weaponNum]) else if (pPlayer->ammo_amount[weaponNum] >= pPlayer->max_ammo_amount[weaponNum])
{ {
vm.flags |= VM_NOEXECUTE; vm.flags |= VM_NOEXECUTE;
return 2; return;
} }
P_AddWeaponAmmoCommon(pPlayer, weaponNum, nAmount); P_AddWeaponAmmoCommon(pPlayer, weaponNum, nAmount);
}
return 0; static void VM_AddAmmo(DukePlayer_t * const pPlayer, int const weaponNum, int const nAmount)
{
if (EDUKE32_PREDICT_FALSE((unsigned)weaponNum >= MAX_WEAPONS))
{
CON_ERRPRINTF("Invalid weapon ID %d\n", weaponNum);
return;
}
if (pPlayer->ammo_amount[weaponNum] >= pPlayer->max_ammo_amount[weaponNum])
{
vm.flags |= VM_NOEXECUTE;
return;
}
P_AddWeaponAmmoCommon(pPlayer, weaponNum, nAmount);
} }
static void VM_AddInventory(DukePlayer_t * const pPlayer, int const itemNum, int const nAmount) static void VM_AddInventory(DukePlayer_t * const pPlayer, int const itemNum, int const nAmount)
@ -1732,19 +1747,7 @@ skip_check:
int const weaponNum = *insptr++; int const weaponNum = *insptr++;
int const addAmount = *insptr++; int const addAmount = *insptr++;
if (EDUKE32_PREDICT_FALSE((unsigned)weaponNum >= MAX_WEAPONS)) VM_AddAmmo(pPlayer, weaponNum, addAmount);
{
CON_ERRPRINTF("Invalid weapon ID %d\n", weaponNum);
break;
}
if (pPlayer->ammo_amount[weaponNum] >= pPlayer->max_ammo_amount[weaponNum])
{
vm.flags |= VM_NOEXECUTE;
return;
}
P_AddWeaponAmmoCommon(pPlayer, weaponNum, addAmount);
continue; continue;
} }