zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: bucket in FTextureManager::AddTexture should be a signed int.

Browse source 
SVN r1301 (trunk)
This commit is contained in:
Christoph Oelckers 2008-11-30 13:42:30 +00:00
parent 3f2d5db348
commit c3906850f7
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/textures/texturemanager.cpp
View file

@ -297,7 +297,7 @@ void FTextureManager::UnloadAll ()
FTextureID FTextureManager::AddTexture (FTexture *texture) FTextureID FTextureManager::AddTexture (FTexture *texture)
{ {
size_t bucket; int bucket;
int hash; int hash;
if (texture == NULL) return FTextureID(-1); if (texture == NULL) return FTextureID(-1);
@ -307,7 +307,7 @@ FTextureID FTextureManager::AddTexture (FTexture *texture)
// Textures without name can't be looked for // Textures without name can't be looked for
if (texture->Name[0] != 0) if (texture->Name[0] != 0)
{ {
bucket = MakeKey (texture->Name) % HASH_SIZE; bucket = int(MakeKey (texture->Name) % HASH_SIZE);
hash = HashFirst[bucket]; hash = HashFirst[bucket];
} }
else else

1
src/textures/textures.h
View file

@ -300,7 +300,6 @@ public:
void LoadTextureDefs(int wadnum, const char *lumpname); void LoadTextureDefs(int wadnum, const char *lumpname);
void ParseXTexture(FScanner &sc, int usetype); void ParseXTexture(FScanner &sc, int usetype);
void SortTexturesByType(int start, int end); void SortTexturesByType(int start, int end);
void RemoveTexture();
FTextureID CreateTexture (int lumpnum, int usetype=FTexture::TEX_Any); // Also calls AddTexture FTextureID CreateTexture (int lumpnum, int usetype=FTexture::TEX_Any); // Also calls AddTexture
FTextureID AddTexture (FTexture *texture); FTextureID AddTexture (FTexture *texture);