OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed the remaining native parts of ABasicArmor.

Browse source 
- simplified some FindInventory calls using PClass::FindActor to call the variant taking a name directly.
This commit is contained in:
Christoph Oelckers 2017-01-18 22:57:47 +01:00
commit 2fcffd1fc1
18 changed files with 62 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/sbarinfo.cpp
View file

@ -1067,7 +1067,7 @@ public:
//prepare ammo counts
GetCurrentAmmo(ammo1, ammo2, ammocount1, ammocount2);
armor = CPlayer->mo->FindInventory<ABasicArmor>();
armor = CPlayer->mo->FindInventory(NAME_BasicArmor);
if(state != HUD_AltHud)
{
@ -1517,7 +1517,7 @@ public:
AInventory *ammo1, *ammo2;
int ammocount1, ammocount2;
ABasicArmor *armor;
AInventory *armor;
FImageCollection Images;
unsigned int invBarOffset;