zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add SFLAG_QUEUEDFORDELETE, to handle detection and manipulation of things like decal sprites marked for deletion

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7604 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-18 17:25:30 +00:00 committed by Christoph Oelckers
parent 301ac48ccd
commit e9116bd23a
3 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/duke3d/src/actors.cpp
View file

@ -675,10 +675,13 @@ void A_AddToDeleteQueue(int spriteNum)
return; return;
} }
if (SpriteDeletionQueue[g_spriteDeleteQueuePos] >= 0) auto &deleteSpriteNum = SpriteDeletionQueue[g_spriteDeleteQueuePos];
A_DeleteSprite(SpriteDeletionQueue[g_spriteDeleteQueuePos]);
SpriteDeletionQueue[g_spriteDeleteQueuePos] = spriteNum; if (deleteSpriteNum >= 0 && actor[deleteSpriteNum].flags & SFLAG_QUEUEDFORDELETE)
A_DeleteSprite(deleteSpriteNum);
deleteSpriteNum = spriteNum;
actor[spriteNum].flags |= SFLAG_QUEUEDFORDELETE;
g_spriteDeleteQueuePos = (g_spriteDeleteQueuePos+1)%g_deleteQueueSize; g_spriteDeleteQueuePos = (g_spriteDeleteQueuePos+1)%g_deleteQueueSize;
} }

1
source/duke3d/src/actors.h
View file

@ -394,6 +394,7 @@ enum sflags_t
SFLAG_WAKEUPBADGUYS = 0x02000000, SFLAG_WAKEUPBADGUYS = 0x02000000,
SFLAG_DAMAGEEVENT = 0x04000000, SFLAG_DAMAGEEVENT = 0x04000000,
SFLAG_NOWATERSECTOR = 0x08000000, SFLAG_NOWATERSECTOR = 0x08000000,
SFLAG_QUEUEDFORDELETE = 0x10000000,
}; };
// Custom projectiles "workslike" flags. // Custom projectiles "workslike" flags.

39
source/duke3d/src/gamedef.cpp
View file

@ -6000,25 +6000,26 @@ static void C_AddDefaultDefinitions(void)
{ "PROJ_XREPEAT", PROJ_XREPEAT }, { "PROJ_XREPEAT", PROJ_XREPEAT },
{ "PROJ_YREPEAT", PROJ_YREPEAT }, { "PROJ_YREPEAT", PROJ_YREPEAT },
{ "SFLAG_BADGUY", SFLAG_BADGUY }, { "SFLAG_BADGUY", SFLAG_BADGUY },
{ "SFLAG_DAMAGEEVENT", SFLAG_DAMAGEEVENT }, { "SFLAG_DAMAGEEVENT", SFLAG_DAMAGEEVENT },
{ "SFLAG_GREENSLIMEFOOD", SFLAG_GREENSLIMEFOOD }, { "SFLAG_GREENSLIMEFOOD", SFLAG_GREENSLIMEFOOD },
{ "SFLAG_HURTSPAWNBLOOD", SFLAG_HURTSPAWNBLOOD }, { "SFLAG_HURTSPAWNBLOOD", SFLAG_HURTSPAWNBLOOD },
{ "SFLAG_NOCLIP", SFLAG_NOCLIP }, { "SFLAG_NOCLIP", SFLAG_NOCLIP },
{ "SFLAG_NODAMAGEPUSH", SFLAG_NODAMAGEPUSH }, { "SFLAG_NODAMAGEPUSH", SFLAG_NODAMAGEPUSH },
{ "SFLAG_NOEVENTS", SFLAG_NOEVENTCODE }, { "SFLAG_NOEVENTS", SFLAG_NOEVENTCODE },
{ "SFLAG_NOLIGHT", SFLAG_NOLIGHT }, { "SFLAG_NOLIGHT", SFLAG_NOLIGHT },
{ "SFLAG_NOPAL", SFLAG_NOPAL }, { "SFLAG_NOPAL", SFLAG_NOPAL },
{ "SFLAG_NOSHADE", SFLAG_NOSHADE }, { "SFLAG_NOSHADE", SFLAG_NOSHADE },
{ "SFLAG_NOTELEPORT", SFLAG_NOTELEPORT }, { "SFLAG_NOTELEPORT", SFLAG_NOTELEPORT },
{ "SFLAG_NOWATERDIP", SFLAG_NOWATERDIP }, { "SFLAG_NOWATERDIP", SFLAG_NOWATERDIP },
{ "SFLAG_NVG", SFLAG_NVG }, { "SFLAG_NVG", SFLAG_NVG },
{ "SFLAG_REALCLIPDIST", SFLAG_REALCLIPDIST }, { "SFLAG_REALCLIPDIST", SFLAG_REALCLIPDIST },
{ "SFLAG_SHADOW", SFLAG_SHADOW }, { "SFLAG_SHADOW", SFLAG_SHADOW },
{ "SFLAG_SMOOTHMOVE", SFLAG_SMOOTHMOVE }, { "SFLAG_SMOOTHMOVE", SFLAG_SMOOTHMOVE },
{ "SFLAG_USEACTIVATOR", SFLAG_USEACTIVATOR }, { "SFLAG_USEACTIVATOR", SFLAG_USEACTIVATOR },
{ "SFLAG_WAKEUPBADGUYS", SFLAG_WAKEUPBADGUYS }, { "SFLAG_WAKEUPBADGUYS", SFLAG_WAKEUPBADGUYS },
{ "SFLAG_NOWATERSECTOR", SFLAG_NOWATERSECTOR }, { "SFLAG_NOWATERSECTOR", SFLAG_NOWATERSECTOR },
{ "SFLAG_QUEUEDFORDELETE", SFLAG_QUEUEDFORDELETE },
{ "STAT_ACTIVATOR", STAT_ACTIVATOR }, { "STAT_ACTIVATOR", STAT_ACTIVATOR },
{ "STAT_ACTOR", STAT_ACTOR }, { "STAT_ACTOR", STAT_ACTOR },