From 02e7c56c820d464286dbad216a987904c49d1b93 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 29 Jul 2014 20:22:45 -0500 Subject: [PATCH] Move SpriteFrames.Clear() from R_InitSprites to FTextureManager::Init - Fixed: Blood sprite rotations were overwritten by the Doom sprite rotations. --- src/r_data/sprites.cpp | 2 -- src/textures/texturemanager.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/r_data/sprites.cpp b/src/r_data/sprites.cpp index c1e59c415f..ebf4699da6 100644 --- a/src/r_data/sprites.cpp +++ b/src/r_data/sprites.cpp @@ -925,8 +925,6 @@ void R_InitSprites () numskins++; } - SpriteFrames.Clear(); - // [RH] Do some preliminary setup if (skins != NULL) delete [] skins; skins = new FPlayerSkin[numskins]; diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index a79769c3d9..b8256bc651 100644 --- a/src/textures/texturemanager.cpp +++ b/src/textures/texturemanager.cpp @@ -964,6 +964,7 @@ void FTextureManager::SortTexturesByType(int start, int end) void FTextureManager::Init() { DeleteAll(); + SpriteFrames.Clear(); // Init Build Tile data if it hasn't been done already if (BuildTileFiles.Size() == 0) CountBuildTiles (); FTexture::InitGrayMap();