Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge

This commit is contained in:
Sally Coolatta 2020-08-16 03:45:51 -04:00
commit ac29aa86b0

View file

@ -169,11 +169,6 @@ void P_InitPicAnims(void)
INT32 w; // WAD INT32 w; // WAD
size_t i; size_t i;
#if 1
// SRB2Kart: NO ONE GETS ANIMATED TEXTURES UNTIL THE SHITTY BUG GETS FIXED.
(void)w;
(void)i;
#else
I_Assert(animdefs == NULL); I_Assert(animdefs == NULL);
maxanims = 0; maxanims = 0;
@ -245,7 +240,6 @@ void P_InitPicAnims(void)
// We'll only be using anims from now on. // We'll only be using anims from now on.
Z_Free(animdefs); Z_Free(animdefs);
animdefs = NULL; animdefs = NULL;
#endif
} }
void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum) void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum)
@ -522,15 +516,11 @@ static inline void P_FindAnimatedFlat(INT32 animnum)
*/ */
void P_SetupLevelFlatAnims(void) void P_SetupLevelFlatAnims(void)
{ {
#if 1
// SRB2Kart: NO ONE GETS ANIMATED TEXTURES UNTIL THE SHITTY BUG GETS FIXED.
return;
#else
INT32 i; INT32 i;
// the original game flat anim sequences // the original game flat anim sequences
for (i = 0; anims[i].istexture != -1; i++) for (i = 0; anims[i].istexture != -1; i++)
P_FindAnimatedFlat(i); P_FindAnimatedFlat(i);
#endif
} }
// //