From c3906850f7af0e6011b5f2b17ef2cb62c3032a5e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 30 Nov 2008 13:42:30 +0000 Subject: [PATCH] - fixed: bucket in FTextureManager::AddTexture should be a signed int. SVN r1301 (trunk) --- src/textures/texturemanager.cpp | 4 ++-- src/textures/textures.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index c292233858..dcdaa80c5e 100644 --- a/src/textures/texturemanager.cpp +++ b/src/textures/texturemanager.cpp @@ -297,7 +297,7 @@ void FTextureManager::UnloadAll () FTextureID FTextureManager::AddTexture (FTexture *texture) { - size_t bucket; + int bucket; int hash; if (texture == NULL) return FTextureID(-1); @@ -307,7 +307,7 @@ FTextureID FTextureManager::AddTexture (FTexture *texture) // Textures without name can't be looked for if (texture->Name[0] != 0) { - bucket = MakeKey (texture->Name) % HASH_SIZE; + bucket = int(MakeKey (texture->Name) % HASH_SIZE); hash = HashFirst[bucket]; } else diff --git a/src/textures/textures.h b/src/textures/textures.h index 7081e347f7..28fecb5fe2 100644 --- a/src/textures/textures.h +++ b/src/textures/textures.h @@ -300,7 +300,6 @@ public: void LoadTextureDefs(int wadnum, const char *lumpname); void ParseXTexture(FScanner &sc, int usetype); void SortTexturesByType(int start, int end); - void RemoveTexture(); FTextureID CreateTexture (int lumpnum, int usetype=FTexture::TEX_Any); // Also calls AddTexture FTextureID AddTexture (FTexture *texture);