- added the missing Level parameters to AActor::StaticSpawn and P_ExecuteSpecial.
I think these were the last two still missing it, all remaining uses of the global level variable are in code that doesn't get run through a level tick and are supposed to access the primary level.
This commit is contained in:
Christoph Oelckers
parent
bf665961cc
commit
6c006a5fbd
25 changed files with 124 additions and 233 deletions
|
|
@ -1909,7 +1909,7 @@ void DPlaneWatcher::Tick ()
|
|||
if ((LastD < WatchD && newd >= WatchD) ||
|
||||
(LastD > WatchD && newd <= WatchD))
|
||||
{
|
||||
P_ExecuteSpecial(Special, Line, Activator, LineSide, Args[0], Args[1], Args[2], Args[3], Args[4]);
|
||||
P_ExecuteSpecial(Level, Special, Line, Activator, LineSide, Args[0], Args[1], Args[2], Args[3], Args[4]);
|
||||
Destroy ();
|
||||
}
|
||||
|
||||
|
|
@ -3735,7 +3735,7 @@ int DLevelScript::DoSpawn (int type, const DVector3 &pos, int tid, DAngle angle,
|
|||
return 0;
|
||||
}
|
||||
|
||||
actor = Spawn (info, pos, ALLOW_REPLACE);
|
||||
actor = Spawn (Level, info, pos, ALLOW_REPLACE);
|
||||
if (actor != NULL)
|
||||
{
|
||||
ActorFlags2 oldFlags2 = actor->flags2;
|
||||
|
|
@ -5731,7 +5731,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, int32_t *args)
|
|||
int arg2 = argCount > 2 ? args[2] : 0;
|
||||
int arg3 = argCount > 3 ? args[3] : 0;
|
||||
int arg4 = argCount > 4 ? args[4] : 0;
|
||||
return P_ExecuteSpecial(NamedACSToNormalACS[funcIndex - ACSF_ACS_NamedExecute],
|
||||
return P_ExecuteSpecial(Level, NamedACSToNormalACS[funcIndex - ACSF_ACS_NamedExecute],
|
||||
activationline, activator, backSide,
|
||||
scriptnum, arg1, arg2, arg3, arg4);
|
||||
}
|
||||
|
|
@ -6950,20 +6950,20 @@ int DLevelScript::RunScript()
|
|||
break;
|
||||
|
||||
case PCD_LSPEC1:
|
||||
P_ExecuteSpecial(NEXTBYTE, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(1) & specialargmask, 0, 0, 0, 0);
|
||||
sp -= 1;
|
||||
break;
|
||||
|
||||
case PCD_LSPEC2:
|
||||
P_ExecuteSpecial(NEXTBYTE, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(2) & specialargmask,
|
||||
STACK(1) & specialargmask, 0, 0, 0);
|
||||
sp -= 2;
|
||||
break;
|
||||
|
||||
case PCD_LSPEC3:
|
||||
P_ExecuteSpecial(NEXTBYTE, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(3) & specialargmask,
|
||||
STACK(2) & specialargmask,
|
||||
STACK(1) & specialargmask, 0, 0);
|
||||
|
|
@ -6971,7 +6971,7 @@ int DLevelScript::RunScript()
|
|||
break;
|
||||
|
||||
case PCD_LSPEC4:
|
||||
P_ExecuteSpecial(NEXTBYTE, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(4) & specialargmask,
|
||||
STACK(3) & specialargmask,
|
||||
STACK(2) & specialargmask,
|
||||
|
|
@ -6980,7 +6980,7 @@ int DLevelScript::RunScript()
|
|||
break;
|
||||
|
||||
case PCD_LSPEC5:
|
||||
P_ExecuteSpecial(NEXTBYTE, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(5) & specialargmask,
|
||||
STACK(4) & specialargmask,
|
||||
STACK(3) & specialargmask,
|
||||
|
|
@ -6990,7 +6990,7 @@ int DLevelScript::RunScript()
|
|||
break;
|
||||
|
||||
case PCD_LSPEC5RESULT:
|
||||
STACK(5) = P_ExecuteSpecial(NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(5) = P_ExecuteSpecial(Level, NEXTBYTE, activationline, activator, backSide,
|
||||
STACK(5) & specialargmask,
|
||||
STACK(4) & specialargmask,
|
||||
STACK(3) & specialargmask,
|
||||
|
|
@ -7000,7 +7000,7 @@ int DLevelScript::RunScript()
|
|||
break;
|
||||
|
||||
case PCD_LSPEC5EX:
|
||||
P_ExecuteSpecial(NEXTWORD, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, NEXTWORD, activationline, activator, backSide,
|
||||
STACK(5) & specialargmask,
|
||||
STACK(4) & specialargmask,
|
||||
STACK(3) & specialargmask,
|
||||
|
|
@ -7010,7 +7010,7 @@ int DLevelScript::RunScript()
|
|||
break;
|
||||
|
||||
case PCD_LSPEC5EXRESULT:
|
||||
STACK(5) = P_ExecuteSpecial(NEXTWORD, activationline, activator, backSide,
|
||||
STACK(5) = P_ExecuteSpecial(Level, NEXTWORD, activationline, activator, backSide,
|
||||
STACK(5) & specialargmask,
|
||||
STACK(4) & specialargmask,
|
||||
STACK(3) & specialargmask,
|
||||
|
|
@ -7021,14 +7021,14 @@ int DLevelScript::RunScript()
|
|||
|
||||
case PCD_LSPEC1DIRECT:
|
||||
temp = NEXTBYTE;
|
||||
P_ExecuteSpecial(temp, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, temp, activationline, activator, backSide,
|
||||
uallong(pc[0]) & specialargmask ,0, 0, 0, 0);
|
||||
pc += 1;
|
||||
break;
|
||||
|
||||
case PCD_LSPEC2DIRECT:
|
||||
temp = NEXTBYTE;
|
||||
P_ExecuteSpecial(temp, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, temp, activationline, activator, backSide,
|
||||
uallong(pc[0]) & specialargmask,
|
||||
uallong(pc[1]) & specialargmask, 0, 0, 0);
|
||||
pc += 2;
|
||||
|
|
@ -7036,7 +7036,7 @@ int DLevelScript::RunScript()
|
|||
|
||||
case PCD_LSPEC3DIRECT:
|
||||
temp = NEXTBYTE;
|
||||
P_ExecuteSpecial(temp, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, temp, activationline, activator, backSide,
|
||||
uallong(pc[0]) & specialargmask,
|
||||
uallong(pc[1]) & specialargmask,
|
||||
uallong(pc[2]) & specialargmask, 0, 0);
|
||||
|
|
@ -7045,7 +7045,7 @@ int DLevelScript::RunScript()
|
|||
|
||||
case PCD_LSPEC4DIRECT:
|
||||
temp = NEXTBYTE;
|
||||
P_ExecuteSpecial(temp, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, temp, activationline, activator, backSide,
|
||||
uallong(pc[0]) & specialargmask,
|
||||
uallong(pc[1]) & specialargmask,
|
||||
uallong(pc[2]) & specialargmask,
|
||||
|
|
@ -7055,7 +7055,7 @@ int DLevelScript::RunScript()
|
|||
|
||||
case PCD_LSPEC5DIRECT:
|
||||
temp = NEXTBYTE;
|
||||
P_ExecuteSpecial(temp, activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, temp, activationline, activator, backSide,
|
||||
uallong(pc[0]) & specialargmask,
|
||||
uallong(pc[1]) & specialargmask,
|
||||
uallong(pc[2]) & specialargmask,
|
||||
|
|
@ -7066,32 +7066,32 @@ int DLevelScript::RunScript()
|
|||
|
||||
// Parameters for PCD_LSPEC?DIRECTB are by definition bytes so never need and-ing.
|
||||
case PCD_LSPEC1DIRECTB:
|
||||
P_ExecuteSpecial(((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, ((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
((uint8_t *)pc)[1], 0, 0, 0, 0);
|
||||
pc = (int *)((uint8_t *)pc + 2);
|
||||
break;
|
||||
|
||||
case PCD_LSPEC2DIRECTB:
|
||||
P_ExecuteSpecial(((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, ((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
((uint8_t *)pc)[1], ((uint8_t *)pc)[2], 0, 0, 0);
|
||||
pc = (int *)((uint8_t *)pc + 3);
|
||||
break;
|
||||
|
||||
case PCD_LSPEC3DIRECTB:
|
||||
P_ExecuteSpecial(((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, ((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
((uint8_t *)pc)[1], ((uint8_t *)pc)[2], ((uint8_t *)pc)[3], 0, 0);
|
||||
pc = (int *)((uint8_t *)pc + 4);
|
||||
break;
|
||||
|
||||
case PCD_LSPEC4DIRECTB:
|
||||
P_ExecuteSpecial(((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, ((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
((uint8_t *)pc)[1], ((uint8_t *)pc)[2], ((uint8_t *)pc)[3],
|
||||
((uint8_t *)pc)[4], 0);
|
||||
pc = (int *)((uint8_t *)pc + 5);
|
||||
break;
|
||||
|
||||
case PCD_LSPEC5DIRECTB:
|
||||
P_ExecuteSpecial(((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
P_ExecuteSpecial(Level, ((uint8_t *)pc)[0], activationline, activator, backSide,
|
||||
((uint8_t *)pc)[1], ((uint8_t *)pc)[2], ((uint8_t *)pc)[3],
|
||||
((uint8_t *)pc)[4], ((uint8_t *)pc)[5]);
|
||||
pc = (int *)((uint8_t *)pc + 6);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue