zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 11:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix respawn operation with monsters off, rewriting G_OperateRespawns().

Browse source 
BUILD_LUNATIC.

git-svn-id: https://svn.eduke32.com/eduke32@4276 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-01-29 18:32:51 +00:00
parent 63e0de5e3d
commit 1b3046d1c8
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/eduke32/source/lunatic/control.lua
View file

@ -1696,17 +1696,15 @@ function _G_OperateRespawns(tag)
local spr = sprite[i] local spr = sprite[i]
if (spr.lotag==tag and ispic(spr.picnum, "RESPAWN")) then if (spr.lotag==tag and ispic(spr.picnum, "RESPAWN")) then
if (ffiC.ud.monsters_off~=0 and isenemytile(spr.hitag)) then if (ffiC.ud.monsters_off==0 or not isenemytile(spr.hitag)) then
return if (D.TRANSPORTERSTAR) then
end local j = spawn(D.TRANSPORTERSTAR, i)
sprite[j].z = sprite[j].z - (32*256)
end
if (D.TRANSPORTERSTAR) then -- Just a way to killit (see G_MoveFX(): RESPAWN__STATIC)
local j = spawn(D.TRANSPORTERSTAR, i) spr.extra = 66-12
sprite[j].z = sprite[j].z - (32*256)
end end
-- Just a way to killit (see G_MoveFX(): RESPAWN__STATIC)
spr.extra = 66-12
end end
end end
end end

22
polymer/eduke32/source/sector.c
View file

@ -971,21 +971,23 @@ REDODOOR:
void G_OperateRespawns(int32_t low) void G_OperateRespawns(int32_t low)
{ {
int32_t j, nexti, i = headspritestat[STAT_FX]; int32_t i, nexti;
while (i >= 0) for (SPRITES_OF_STAT_SAFE(STAT_FX, i, nexti))
{ {
nexti = nextspritestat[i]; spritetype *respr = &sprite[i];
if ((SLT == low) && (PN == RESPAWN))
if (respr->lotag == low && respr->picnum == RESPAWN)
{ {
if (A_CheckEnemyTile(SHT) && ud.monsters_off) break; if (!ud.monsters_off || !A_CheckEnemyTile(respr->hitag))
{
int32_t j = A_Spawn(i, TRANSPORTERSTAR);
sprite[j].z -= (32<<8);
j = A_Spawn(i,TRANSPORTERSTAR); // Just a way to killit (see G_MoveFX(): RESPAWN__STATIC)
sprite[j].z -= (32<<8); respr->extra = 66-12;
}
sprite[i].extra = 66-12; // Just a way to killit
} }
i = nexti;
} }
} }