zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-16 08:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added DamageType ACS actor property

Browse source
This commit is contained in:
Blue-Shadow 2016-07-19 03:16:12 +03:00
parent d4352dd1a7
commit d09ec5a930
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_acs.cpp
View file

@ -3719,6 +3719,7 @@ enum
APROP_DamageMultiplier=43, APROP_DamageMultiplier=43,
APROP_MaxStepHeight = 44, APROP_MaxStepHeight = 44,
APROP_MaxDropOffHeight= 45, APROP_MaxDropOffHeight= 45,
APROP_DamageType = 46,
}; };
// These are needed for ACS's APROP_RenderStyle // These are needed for ACS's APROP_RenderStyle
@ -3978,6 +3979,9 @@ void DLevelScript::DoSetActorProperty (AActor *actor, int property, int value)
actor->MaxDropOffHeight = ACSToDouble(value); actor->MaxDropOffHeight = ACSToDouble(value);
break; break;
case APROP_DamageType:
actor->DamageType = FBehavior::StaticLookupString(value);
break;
default: default:
// do nothing. // do nothing.
@ -4081,6 +4085,7 @@ int DLevelScript::GetActorProperty (int tid, int property)
case APROP_Friction: return DoubleToACS(actor->Friction); case APROP_Friction: return DoubleToACS(actor->Friction);
case APROP_MaxStepHeight: return DoubleToACS(actor->MaxStepHeight); case APROP_MaxStepHeight: return DoubleToACS(actor->MaxStepHeight);
case APROP_MaxDropOffHeight: return DoubleToACS(actor->MaxDropOffHeight); case APROP_MaxDropOffHeight: return DoubleToACS(actor->MaxDropOffHeight);
case APROP_DamageType: return GlobalACSStrings.AddString(actor->DamageType);
default: return 0; default: return 0;
} }
@ -4153,6 +4158,7 @@ int DLevelScript::CheckActorProperty (int tid, int property, int value)
case APROP_ActiveSound: string = actor->ActiveSound; break; case APROP_ActiveSound: string = actor->ActiveSound; break;
case APROP_Species: string = actor->GetSpecies(); break; case APROP_Species: string = actor->GetSpecies(); break;
case APROP_NameTag: string = actor->GetTag(); break; case APROP_NameTag: string = actor->GetTag(); break;
case APROP_DamageType: string = actor->DamageType; break;
} }
if (string == NULL) string = ""; if (string == NULL) string = "";
return (!stricmp(string, FBehavior::StaticLookupString(value))); return (!stricmp(string, FBehavior::StaticLookupString(value)));