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

- Added GetActorClass and GetWeapon functions to ACS.

Browse source 
SVN r4316 (trunk)
This commit is contained in:
Randy Heit 2013-06-01 17:17:15 +00:00
parent e9702fc43d
commit 19eb09f9f7
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_acs.cpp
View file

@ -4132,6 +4132,8 @@ enum EACSFunctions
ACSF_StrLeft, ACSF_StrLeft,
ACSF_StrRight, ACSF_StrRight,
ACSF_StrMid, ACSF_StrMid,
ACSF_GetActorClass,
ACSF_GetWeapon,
// ZDaemon // ZDaemon
ACSF_GetTeamScore = 19620, // (int team) ACSF_GetTeamScore = 19620, // (int team)
@ -4653,6 +4655,12 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
return a == NULL ? false : a->GetClass()->TypeName == FName(FBehavior::StaticLookupString(args[1])); return a == NULL ? false : a->GetClass()->TypeName == FName(FBehavior::StaticLookupString(args[1]));
} }
case ACSF_GetActorClass:
{
AActor *a = SingleActorFromTID(args[0], activator);
return GlobalACSStrings.AddString(a == NULL ? "None" : a->GetClass()->TypeName.GetChars());
}
case ACSF_SoundSequenceOnActor: case ACSF_SoundSequenceOnActor:
{ {
const char *seqname = FBehavior::StaticLookupString(args[1]); const char *seqname = FBehavior::StaticLookupString(args[1]);
@ -5025,6 +5033,17 @@ doplaysound: if (!looping)
} }
break; break;
case ACSF_GetWeapon:
if (activator == NULL || activator->player == NULL || // Non-players do not have weapons
activator->player->ReadyWeapon == NULL)
{
return GlobalACSStrings.AddString("None");
}
else
{
return GlobalACSStrings.AddString(activator->player->ReadyWeapon->GetClass()->TypeName.GetChars());
}
default: default:
break; break;
} }