- fall command, also some safety work for npt deleting sprites prematurely.

source/games/duke/src/actors_r.cpp

@@ -4391,7 +4391,7 @@ static int fallspecial(int g_i, int g_p)
 			{
 				spawn(g_i, ROCK2);
 				spawn(g_i, ROCK2);
-				deletesprite(g_i);
+				addspritetodelete(g_i);
 			}
 			return 0;
 		}
@@ -4401,14 +4401,14 @@ static int fallspecial(int g_i, int g_p)
 			{
 				fi.guts(g_sp, JIBS6, 5, g_p);
 				spritesound(SQUISHED, g_i);
-				deletesprite(g_i);
+				addspritetodelete(g_i);
 			}
 			return 0;
 		}
 		else if (sector[g_sp->sectnum].lotag == 803)
 		{
 			if (g_sp->picnum == ROCK2)
-				deletesprite(g_i);
+				addspritetodelete(g_i);
 			return 0;
 		}
 	}
@@ -4416,7 +4416,7 @@ static int fallspecial(int g_i, int g_p)
 	{
 		if (g_sp->picnum == 40)
 		{
-			deletesprite(g_i);
+			addspritetodelete(g_i);
 			return 0;
 		}
 		if (g_sp->picnum != APLAYER && (badguy(g_sp) || g_sp->picnum == HEN || g_sp->picnum == COW || g_sp->picnum == PIG || g_sp->picnum == DOGRUN || g_sp->picnum == RABBIT) && (!isRRRA() || g_spriteExtra[g_i] < 128))
@@ -4430,7 +4430,7 @@ static int fallspecial(int g_i, int g_p)
 		else if (g_sp->picnum != APLAYER)
 		{
 			if (!g_spriteExtra[g_i])
-				deletesprite(g_i);
+				killit_flag = 4;
 			return 0;
 		}
 		hittype[g_i].picnum = SHOTSPARK1;

source/games/duke/src/game.h

@@ -448,6 +448,7 @@ static inline int G_GetMusicIdx(const char *str)
 
 extern void G_PrintCurrentMusic(void);
 
+void addspritetodelete(int spnum);
 
 struct Dispatcher
 {

source/games/duke/src/gameexec.cpp

@@ -56,6 +56,13 @@ void destroyit(int g_i);
 void mamaspawn(int g_i);
 void forceplayerangle(DukePlayer_t* p);
 
+TArray<int> spritesToDelete; // List of sprites to delete.
+
+void addspritetodelete(int spnum)
+{
+	if (spritesToDelete.Find(spnum) == spritesToDelete.Size()) spritesToDelete.Push(spnum);
+}
+
 //---------------------------------------------------------------------------
 //
 // 
@@ -1588,7 +1595,7 @@ void execute(short i,short p,int x)
 		// if player was set to squish, first stop that...
 		if(ps[g_p].actorsqu == g_i)
 			ps[g_p].actorsqu = -1;
-		deletesprite(g_i);
+		addspritetodelete(g_i);
 	}
 	else
 	{
@@ -1612,6 +1619,7 @@ void execute(short i,short p,int x)
 		else if (g_sp->statnum == STAT_STANDABLE)
 			fi.checktimetosleep(g_i);
 	}
+	for (auto i : spritesToDelete) deletesprite(i);
 }
 
 

source/games/duke/src/zz_gameexec.cpp

@@ -332,155 +332,6 @@ static int32_t A_GetWaterZOffset(int const spriteNum)
     return 0;
 }
 
-static void VM_Fall(int const spriteNum, spritetype * const pSprite)
-{
-    int spriteGravity = g_spriteGravity;
-    int hitSprite = 0;
-
-    pSprite->xoffset = pSprite->yoffset = 0;
-
-    if (RR)
-    {
-        if (RRRA)
-        {
-            if (sector[vm.pSprite->sectnum].lotag == 801)
-            {
-                if (vm.pSprite->picnum == TILE_ROCK)
-                {
-                    A_Spawn(vm.spriteNum, TILE_ROCK2);
-                    A_Spawn(vm.spriteNum, TILE_ROCK2);
-                    vm.flags |= VM_SAFEDELETE;
-                }
-            }
-            else if (sector[vm.pSprite->sectnum].lotag == 802)
-            {
-                if (vm.pSprite->picnum != TILE_APLAYER && A_CheckEnemySprite(vm.pSprite) && vm.pSprite->z == vm.pActor->floorz - ZOFFSET)
-                {
-                    A_DoGuts(vm.spriteNum, TILE_JIBS6, 5);
-                    A_PlaySound(SQUISHED, vm.spriteNum);
-                    vm.flags |= VM_SAFEDELETE;
-                }
-            }
-            else if (sector[vm.pSprite->sectnum].lotag == 803)
-            {
-                if (vm.pSprite->picnum == TILE_ROCK2)
-                {
-                    vm.flags |= VM_SAFEDELETE;
-                }
-            }
-        }
-        if (sector[vm.pSprite->sectnum].lotag == 800)
-        {
-            if (vm.pSprite->picnum == TILE_AMMO)
-            {
-                vm.flags |= VM_SAFEDELETE;
-                return;
-            }
-            if (vm.pSprite->picnum != TILE_APLAYER && (A_CheckEnemySprite(vm.pSprite) || vm.pSprite->picnum == TILE_COW) && g_spriteExtra[vm.spriteNum] < 128)
-            {
-                vm.pSprite->z = vm.pActor->floorz-ZOFFSET;
-                vm.pSprite->zvel = 8000;
-                vm.pSprite->extra = 0;
-                g_spriteExtra[vm.spriteNum]++;
-                hitSprite = 1;
-            }
-            else if (vm.pSprite->picnum != TILE_APLAYER)
-            {
-                if (!g_spriteExtra[vm.spriteNum])
-                    vm.flags |= VM_SAFEDELETE;
-                return;
-            }
-            vm.pActor->picnum = TILE_SHOTSPARK1;
-            vm.pActor->extra = 1;
-        }
-        if (RRRA && EDUKE32_PREDICT_TRUE(sector[vm.pSprite->sectnum].lotag < 800 || sector[vm.pSprite->sectnum].lotag > 803)
-            && (sector[vm.pSprite->sectnum].floorpicnum == TILE_RRTILE7820 || sector[vm.pSprite->sectnum].floorpicnum == TILE_RRTILE7768))
-        {
-            if (vm.pSprite->picnum != TILE_MINION && vm.pSprite->pal != 19)
-            {
-                if ((krand2()&3) == 1)
-                {
-                    vm.pActor->picnum = TILE_SHOTSPARK1;
-                    vm.pActor->extra = 5;
-                }
-            }
-        }
-    }
-
-    if (sector[pSprite->sectnum].lotag == ST_2_UNDERWATER || EDUKE32_PREDICT_FALSE(fi.ceilingspace(pSprite->sectnum)))
-        spriteGravity = g_spriteGravity/6;
-    else if (EDUKE32_PREDICT_FALSE(fi.floorspace(pSprite->sectnum)))
-        spriteGravity = 0;
-
-    if (actor[spriteNum].cgg <= 0 || (sector[pSprite->sectnum].floorstat&2))
-    {
-        getglobalz(spriteNum);
-        actor[spriteNum].cgg = 6;
-    }
-    else actor[spriteNum].cgg--;
-
-    if (pSprite->z < actor[spriteNum].floorz-ZOFFSET)
-    {
-        // Free fi.fall.
-        pSprite->zvel += spriteGravity;
-        pSprite->z += pSprite->zvel;
-
-#ifdef YAX_ENABLE
-        if (yax_getbunch(pSprite->sectnum, YAX_FLOOR) >= 0 && (sector[pSprite->sectnum].floorstat & 512) == 0)
-            setspritez(spriteNum, (vec3_t *)pSprite);
-#endif
-
-        if (pSprite->zvel > 6144) pSprite->zvel = 6144;
-        return;
-    }
-
-    pSprite->z = actor[spriteNum].floorz - ZOFFSET;
-
-    if (A_CheckEnemySprite(pSprite) || (pSprite->picnum == TILE_APLAYER && pSprite->owner >= 0))
-    {
-        if (pSprite->zvel > 3084 && pSprite->extra <= 1)
-        {
-            // I'm guessing this TILE_DRONE check is from a beta version of the game
-            // where they crashed into the ground when killed
-            if (!(pSprite->picnum == TILE_APLAYER && pSprite->extra > 0) && pSprite->pal != 1 && pSprite->picnum != TILE_DRONE)
-            {
-                A_PlaySound(SQUISHED,spriteNum);
-                if (hitSprite)
-                {
-                    A_DoGuts(spriteNum,TILE_JIBS6,5);
-                }
-                else
-                {
-                    A_DoGuts(spriteNum,TILE_JIBS6,15);
-                    A_Spawn(spriteNum,TILE_BLOODPOOL);
-                }
-            }
-            actor[spriteNum].picnum = TILE_SHOTSPARK1;
-            actor[spriteNum].extra = 1;
-            pSprite->zvel = 0;
-        }
-        else if (pSprite->zvel > 2048 && sector[pSprite->sectnum].lotag != ST_1_ABOVE_WATER)
-        {
-            int16_t newsect = pSprite->sectnum;
-
-            pushmove((vec3_t *)pSprite, &newsect, 128, 4<<8, 4<<8, CLIPMASK0);
-            if ((unsigned)newsect < MAXSECTORS)
-                changespritesect(spriteNum, newsect);
-
-            if (!DEER)
-                A_PlaySound(THUD, spriteNum);
-        }
-    }
-
-    if (sector[pSprite->sectnum].lotag == ST_1_ABOVE_WATER)
-    {
-        pSprite->z += A_GetWaterZOffset(spriteNum);
-        return;
-    }
-
-    pSprite->zvel = 0;
-}
-
 
 extern uint8_t killit_flag;
 
@@ -749,10 +600,6 @@ void VM_Execute(native_t loop)
                 }
                 continue;
 
-            case concmd_fall:
-                insptr++;
-                VM_Fall(vm.spriteNum, vm.pSprite);
-                continue;
 
             case concmd_addammo:
                 insptr++;
@@ -1213,6 +1060,7 @@ void VM_Execute(native_t loop)
                 }
                 continue;
 
+            case concmd_fall:
             case concmd_ifpinventory:
             case concmd_ifinspace:
             case concmd_spritepal: