zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 22:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Clean up excess code around a few calls to SingleActorFromTID(), since that function is already

Browse source 
designed specifically to handle the case where tid is 0.

SVN r4315 (trunk)
This commit is contained in:
Randy Heit 2013-06-01 17:13:15 +00:00
parent 037477a20b
commit e9702fc43d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_acs.cpp
View file

@ -4598,7 +4598,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
FName varname(FBehavior::StaticLookupString(args[1]), true); FName varname(FBehavior::StaticLookupString(args[1]), true);
if (varname != NAME_None) if (varname != NAME_None)
{ {
AActor *a = args[0] == 0 ? (AActor *)activator : SingleActorFromTID(args[0], NULL); AActor *a = SingleActorFromTID(args[0], activator);
return a != NULL ? GetUserVariable(a, varname, 0) : 0; return a != NULL ? GetUserVariable(a, varname, 0) : 0;
} }
return 0; return 0;
@ -4637,7 +4637,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
FName varname(FBehavior::StaticLookupString(args[1]), true); FName varname(FBehavior::StaticLookupString(args[1]), true);
if (varname != NAME_None) if (varname != NAME_None)
{ {
AActor *a = args[0] == 0 ? (AActor *)activator : SingleActorFromTID(args[0], NULL); AActor *a = SingleActorFromTID(args[0], activator);
return a != NULL ? GetUserVariable(a, varname, args[2]) : 0; return a != NULL ? GetUserVariable(a, varname, args[2]) : 0;
} }
return 0; return 0;
@ -4649,7 +4649,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
case ACSF_CheckActorClass: case ACSF_CheckActorClass:
{ {
AActor *a = args[0] == 0 ? (AActor *)activator : SingleActorFromTID(args[0], NULL); AActor *a = SingleActorFromTID(args[0], activator);
return a == NULL ? false : a->GetClass()->TypeName == FName(FBehavior::StaticLookupString(args[1])); return a == NULL ? false : a->GetClass()->TypeName == FName(FBehavior::StaticLookupString(args[1]));
} }