zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- changed ACS Checkweapon to compare names instead of strings. 

SVN r3107 (trunk)
This commit is contained in:
Christoph Oelckers 2011-01-17 00:33:20 +00:00
parent e4b236cbcc
commit b3a7c70c01
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/p_acs.cpp
View File

@ -6025,18 +6025,17 @@ int DLevelScript::RunScript ()
sp--; sp--;
break; break;
case PCD_CHECKWEAPON: case PCD_CHECKWEAPON:
if (activator == NULL || activator->player == NULL || // Non-players do not have weapons if (activator == NULL || activator->player == NULL || // Non-players do not have weapons
activator->player->ReadyWeapon == NULL) activator->player->ReadyWeapon == NULL)
{ {
STACK(1) = 0; STACK(1) = 0;
} }
else else
{ {
STACK(1) = 0 == stricmp (FBehavior::StaticLookupString (STACK(1)), STACK(1) = activator->player->ReadyWeapon->GetClass()->TypeName == FName(FBehavior::StaticLookupString (STACK(1)), true);
activator->player->ReadyWeapon->GetClass()->TypeName.GetChars()); }
} break;
break;
case PCD_SETWEAPON: case PCD_SETWEAPON:
if (activator == NULL || activator->player == NULL) if (activator == NULL || activator->player == NULL)