OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit '125afcf3de' into scripting

Browse source 
Conflicts:
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/shared/inventory.txt
This commit is contained in:
Christoph Oelckers 2016-01-17 19:09:05 +01:00
commit 5207aa6cc0
51 changed files with 2596 additions and 2131 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/g_shared/a_pickups.cpp
View file

@ -896,6 +896,25 @@ fixed_t AInventory::GetSpeedFactor ()
}
}
//===========================================================================
//
// AInventory :: GetNoTeleportFreeze
//
//===========================================================================
bool AInventory::GetNoTeleportFreeze ()
{
// do not check the flag here because it's only active when used on PowerUps, not on PowerupGivers.
if (Inventory != NULL)
{
return Inventory->GetNoTeleportFreeze();
}
else
{
return false;
}
}
//===========================================================================
//
// AInventory :: AlterWeaponSprite