- removed Interp_Sprite_Z.

This was redundant and interfered with the reworked automatic sprite interpolation.
ZDoom · Dec 5, 2021 · 01b7e6c · 01b7e6c
1 parent 232d4f9
commit 01b7e6c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 14 deletions.
diff --git a/source/core/interpolate.cpp b/source/core/interpolate.cpp
@@ -54,7 +54,6 @@ double Get(int index, int type)
 	case Interp_Wall_PanX:				return wall[index].xpan_;
 	case Interp_Wall_PanY:				return wall[index].ypan_;
 
-	case Interp_Sprite_Z:				return sprite[index].z;
 	default: return 0;
 	}
 }
@@ -77,8 +76,6 @@ void Set(int index, int type, double val)
 	case Interp_Wall_Y:                 old = wall[index].y; wall[index].y = xs_CRoundToInt(val); if (wall[index].y != old) sector[wall[index].sector].dirty = 255; break;
 	case Interp_Wall_PanX:              wall[index].xpan_ = float(val);  break;
 	case Interp_Wall_PanY:              wall[index].ypan_ = float(val);  break;
-
-	case Interp_Sprite_Z:               sprite[index].z = xs_CRoundToInt(val); break;
 	}
 }
 

diff --git a/source/core/interpolate.h b/source/core/interpolate.h
@@ -13,8 +13,6 @@ enum EInterpolationType
 	Interp_Wall_X,
 	Interp_Wall_Y,
 
-	Interp_Sprite_Z,
-
 	Interp_Pan_First,
 	Interp_Sect_FloorPanX = Interp_Pan_First,
 	Interp_Sect_FloorPanY,

diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
@@ -644,10 +644,6 @@ void KillActor(DSWActor* actor)
         // any Anims attached
         AnimDelete(ANIM_Userz, 0, actor);
         AnimDelete(ANIM_Spritez, 0, actor);
-        StopInterpolation(actor->GetSpriteIndex(), Interp_Sprite_Z);
-
-        //if (TEST(u->Flags2, SPR2_DONT_TARGET_OWNER))
-        //    Zombies--;
 
         // adjust sprites attached to sector objects
         if (TEST(u->Flags, SPR_SO_ATTACHED))

diff --git a/source/games/sw/src/vator.cpp b/source/games/sw/src/vator.cpp
@@ -286,11 +286,6 @@ void InterpSectorSprites(sectortype* sect, bool state)
             if (TEST(u->Flags, SPR_SKIP2) && sp->statnum <= STAT_SKIP2_INTERP_END)
                 continue;
         }
-
-        if (state)
-            StartInterpolation(actor->GetSpriteIndex(), Interp_Sprite_Z);
-        else
-            StopInterpolation(actor->GetSpriteIndex(), Interp_Sprite_Z);
     }
 }