From 26d2d7402422eafe22579d84a7c9963b0f2b8c74 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 1 Jun 2013 02:51:14 +0000 Subject: [PATCH] - GetActorProperty now works with the string properties that were formerly restricted to CheckActorProperty. SVN r4307 (trunk) --- src/p_acs.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index a594d0179..6ccf7339d 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -3768,6 +3768,14 @@ int DLevelScript::GetActorProperty (int tid, int property) case APROP_ReactionTime:return actor->reactiontime; case APROP_MeleeRange: return actor->meleerange; + case APROP_SeeSound: return GlobalACSStrings.AddString(actor->SeeSound); + case APROP_AttackSound: return GlobalACSStrings.AddString(actor->AttackSound); + case APROP_PainSound: return GlobalACSStrings.AddString(actor->PainSound); + case APROP_DeathSound: return GlobalACSStrings.AddString(actor->DeathSound); + case APROP_ActiveSound: return GlobalACSStrings.AddString(actor->ActiveSound); + case APROP_Species: return GlobalACSStrings.AddString(actor->GetSpecies()); + case APROP_NameTag: return GlobalACSStrings.AddString(actor->GetTag()); + default: return 0; } } @@ -3825,7 +3833,8 @@ int DLevelScript::CheckActorProperty (int tid, int property, int value) case APROP_Dormant: return (GetActorProperty(tid, property) == (!!value)); - // Strings are not covered by GetActorProperty, so make the check here + // Strings are covered by GetActorProperty, but they're fairly + // heavy-duty, so make the check here. case APROP_SeeSound: string = actor->SeeSound; break; case APROP_AttackSound: string = actor->AttackSound; break; case APROP_PainSound: string = actor->PainSound; break;