zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use a local variable to access the level in DLevelScript.

Browse source 
This was a relatively cheap change but removes a significant batch of references to the global variable, only making the entry points to the ACS interpreter relevant.
This commit is contained in:
Christoph Oelckers 2019-01-25 19:04:40 +01:00
parent 4e052f2857
commit 20989a0b41
3 changed files with 361 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_levellocals.h
View file

@ -228,6 +228,11 @@ public:
{ {
return NActorIterator(TIDHash, type, tid); return NActorIterator(TIDHash, type, tid);
} }
AActor *SingleActorFromTID(int tid, AActor *defactor)
{
return tid == 0 ? defactor : GetActorIterator(tid).Next();
}
bool SectorHasTags(sector_t *sector) bool SectorHasTags(sector_t *sector)
{ {
return tagManager.SectorHasTags(sector); return tagManager.SectorHasTags(sector);

699
src/p_acs.cpp
View file

File diff suppressed because it is too large Load diff

5
src/p_actionfunctions.cpp
View file

@ -70,9 +70,6 @@
#include "actorinlines.h" #include "actorinlines.h"
#include "types.h" #include "types.h"
AActor *SingleActorFromTID(int tid, AActor *defactor);
static FRandom pr_camissile ("CustomActorfire"); static FRandom pr_camissile ("CustomActorfire");
static FRandom pr_cabullet ("CustomBullet"); static FRandom pr_cabullet ("CustomBullet");
static FRandom pr_cwjump ("CustomWpJump"); static FRandom pr_cwjump ("CustomWpJump");
@ -3444,7 +3441,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Warp)
if ((flags & WARPF_USETID)) if ((flags & WARPF_USETID))
{ {
reference = SingleActorFromTID(destination_selector, self); reference = level.SingleActorFromTID(destination_selector, self);
} }
else else
{ {