OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- cleanup of the virtual function definitions for inventory items. Let's better use 'virtual' and 'override' everywhere to make sure that nothing gets overlooked.

Browse source 
- added call wrappers and script hooks for all relevant virtuals in AInventory.
- made GetSpeedFactor and GetNoTeleportFreeze entirely scripted because they are too trivial - also do them iteratively, just like HandlePickup, because it's just a better way to do this stuff.
This commit is contained in:
Christoph Oelckers 2016-11-30 15:54:01 +01:00
commit 8a50004f55
16 changed files with 390 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_inventory/a_weapons.cpp
View file

@ -275,7 +275,7 @@ void AWeapon::MarkPrecacheSounds() const
bool AWeapon::TryPickupRestricted (AActor *&toucher)
{
// Wrong class, but try to pick up for ammo
if (ShouldStay())
if (CallShouldStay())
{ // Can't pick up weapons for other classes in coop netplay
return false;
}
@ -398,7 +398,7 @@ bool AWeapon::PickupForAmmo (AWeapon *ownedWeapon)
bool gotstuff = false;
// Don't take ammo if the weapon sticks around.
if (!ShouldStay ())
if (!CallShouldStay ())
{
int oldamount1 = 0;
int oldamount2 = 0;