OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added support for using named scripts with UDMF maps. On lines with ACS specials

Browse source 
(i.e. ACS_Execute, etc.), set the arg0str property to the name of the script to execute. The
  standard numeric arg0 property will be ignored in this case.

SVN r3372 (trunk)
This commit is contained in:
Randy Heit 2012-02-18 02:39:01 +00:00
commit d9b8b344ff
5 changed files with 76 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/namedef.h
View file

@ -292,6 +292,7 @@ xx(Arg1)
xx(Arg2)
xx(Arg3)
xx(Arg4)
xx(Arg0Str)
xx(Id)
xx(V1)
xx(V2)
@ -379,13 +380,13 @@ xx(Midtex3d)
xx(Checkswitchrange)
xx(Firstsideonly)
xx(Transparent)
xx(Passuse)
xx(Repeatspecial)
xx(Conversation)
xx(Locknumber)
xx(Playercross)
xx(Playeruse)
xx(Passuse)
xx(Repeatspecial)
xx(Conversation)
xx(Locknumber)
xx(Playercross)
xx(Playeruse)
xx(Playeruseback)
xx(Monstercross)
xx(Impact)

5
src/p_lnspec.h
View file

@ -198,6 +198,11 @@ typedef int (*lnSpecFunc)(struct line_t *line,
extern lnSpecFunc LineSpecials[256];
extern BYTE NamedACSToNormalACS[7];
static inline bool P_IsACSSpecial(int specnum)
{
return (specnum >= ACS_Execute && specnum <= ACS_LockedExecuteDoor) ||
specnum == ACS_ExecuteAlways;
}
int P_FindLineSpecial (const char *string, int *min_args=NULL, int *max_args=NULL);
bool P_ActivateThingSpecial(AActor * thing, AActor * trigger, bool death=false);

3
src/p_saveg.cpp
View file

@ -396,8 +396,7 @@ void P_SerializeWorld (FArchive &arc)
<< li->special
<< li->Alpha
<< li->id;
if ((li->special >= ACS_Execute && li->special <= ACS_LockedExecuteDoor) ||
li->special == ACS_ExecuteAlways)
if (P_IsACSSpecial(li->special))
{
P_SerializeACSScriptNumber(arc, li->args[0], false);
}

32
src/p_udmf.cpp
View file

@ -651,6 +651,7 @@ public:
{
bool passuse = false;
bool strifetrans = false;
FString arg0str;
memset(ld, 0, sizeof(*ld));
ld->Alpha = FRACUNIT;
@ -706,6 +707,11 @@ public:
ld->args[int(key)-int(NAME_Arg0)] = CheckInt(key);
continue;
case NAME_Arg0Str:
CHECK_N(Zd);
arg0str = CheckString(key);
continue;
case NAME_Blocking:
Flag(ld->flags, ML_BLOCKING, key);
continue;
@ -877,17 +883,17 @@ public:
Flag(ld->flags, ML_BLOCKUSE, key);
continue;
case NAME_blocksight:
Flag(ld->flags, ML_BLOCKSIGHT, key);
continue;
// [Dusk] lock number
case NAME_Locknumber:
ld->locknumber = CheckInt(key);
continue;
default:
break;
case NAME_blocksight:
Flag(ld->flags, ML_BLOCKSIGHT, key);
continue;
// [Dusk] lock number
case NAME_Locknumber:
ld->locknumber = CheckInt(key);
continue;
default:
break;
}
if (!strnicmp("user_", key.GetChars(), 5))
@ -920,6 +926,10 @@ public:
ld->sidedef[0] = (side_t*)(intptr_t)(1);
Printf("Line %d has no first side.\n", index);
}
if (arg0str.IsNotEmpty() && P_IsACSSpecial(ld->special))
{
ld->args[0] = -FName(arg0str);
}
}
//===========================================================================