OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed ACS's SetActorState so that it isn't limited to only one sublabel.

Browse source 
This change also enables the implicit mapping of the old special death
  state names.


SVN r515 (trunk)
This commit is contained in:
Christoph Oelckers 2007-04-22 09:06:29 +00:00
commit 8c7d4fb393
5 changed files with 63 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/p_acs.cpp
View file

@ -65,11 +65,13 @@
#include "gi.h"
#include "sc_man.h"
#include "c_bind.h"
#include "info.h"
extern FILE *Logfile;
FRandom pr_acs ("ACS");
// I imagine this much stack space is probably overkill, but it could
// potentially get used with recursive functions.
#define STACK_SIZE 4096
@ -4971,23 +4973,14 @@ int DLevelScript::RunScript ()
case PCD_SETACTORSTATE:
{
const char *statename = FBehavior::StaticLookupString (STACK(2));
const char *dot;
FName label1, label2;
TArray<FName> statelist;
FState *state;
dot = strchr (statename, '.');
if (dot != NULL)
{
label1 = FName(statename, dot - statename, true);
label2 = FName(dot + 1, true);
}
else
{
label1 = FName(statename, true);
}
MakeStateNameList(statename, &statelist);
if (STACK(3) == 0)
{
state = activator->FindState (label1, label2, !!STACK(1));
state = RUNTIME_TYPE(activator)->ActorInfo->FindState (statelist.Size(), &statelist[0], !!STACK(1));
if (state != NULL)
{
activator->SetState (state);
@ -5006,7 +4999,7 @@ int DLevelScript::RunScript ()
while ( (actor = iterator.Next ()) )
{
state = actor->FindState (label1, label2, !!STACK(1));
state = RUNTIME_TYPE(activator)->ActorInfo->FindState (statelist.Size(), &statelist[0], !!STACK(1));
if (state != NULL)
{
actor->SetState (state);