zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-24 04:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: UseInventory from ACS should ignore the totally frozen property.

Browse source 
SVN r3415 (trunk)
This commit is contained in:
Randy Heit 2012-03-09 01:56:37 +00:00
parent 10eb15fab9
commit 5564b99d3a
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_acs.cpp
View file

@ -670,7 +670,22 @@ static bool DoUseInv (AActor *actor, const PClass *info)
AInventory *item = actor->FindInventory (info);
if (item != NULL)
{
return actor->UseInventory(item);
if (actor->player == NULL)
{
return actor->UseInventory(item);
}
else
{
int cheats;
bool res;
// Bypass CF_TOTALLYFROZEN
cheats = actor->player->cheats;
actor->player->cheats &= ~CF_TOTALLYFROZEN;
res = actor->UseInventory(item);
actor->player->cheats |= (cheats & CF_TOTALLYFROZEN);
return res;
}
}
return false;
}