zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Braden Obrzut 2013-07-22 02:10:20 -04:00
parent 531da15ac2 7723613293
commit 00f567e128
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_acs.cpp
View File

@ -5556,7 +5556,8 @@ int DLevelScript::RunScript ()
case PCD_PUSHFUNCTION: case PCD_PUSHFUNCTION:
{ {
int funcnum = NEXTBYTE; int funcnum = NEXTBYTE;
PushToStack(funcnum | activeBehavior->GetLibraryID()); // Not technically a string, but since we use the same tagging mechanism
PushToStack(TAGSTR(funcnum));
break; break;
} }
case PCD_CALL: case PCD_CALL:
@ -5572,7 +5573,7 @@ int DLevelScript::RunScript ()
if(pcd == PCD_CALLSTACK) if(pcd == PCD_CALLSTACK)
{ {
funcnum = STACK(1); funcnum = STACK(1);
module = FBehavior::StaticGetModule(funcnum>>16); module = FBehavior::StaticGetModule(funcnum>>LIBRARYID_SHIFT);
--sp; --sp;
funcnum &= 0xFFFF; // Clear out tag funcnum &= 0xFFFF; // Clear out tag
@ -8449,7 +8450,8 @@ scriptwait:
case PCD_SAVESTRING: case PCD_SAVESTRING:
// Saves the string // Saves the string
{ {
PushToStack(GlobalACSStrings.AddString(work, Stack, sp)); const int str = GlobalACSStrings.AddString(work, Stack, sp);
PushToStack(str);
STRINGBUILDER_FINISH(work); STRINGBUILDER_FINISH(work);
} }
break; break;