diff options
| author | GreYFoXGTi <GreYFoXGTi@GMaiL.CoM> | 2011-02-12 12:40:36 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-02-12 21:18:41 +0100 |
| commit | 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 (patch) | |
| tree | d4b94b98105c3af23c79bae02a132bfe66738392 /src/engine/client/graphics.cpp | |
| parent | e45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff) | |
| download | zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip | |
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/engine/client/graphics.cpp')
| -rw-r--r-- | src/engine/client/graphics.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp index 045d15d0..f313e6e3 100644 --- a/src/engine/client/graphics.cpp +++ b/src/engine/client/graphics.cpp @@ -357,7 +357,7 @@ int CGraphics_OpenGL::LoadTextureRaw(int Width, int Height, int Format, const vo int CGraphics_OpenGL::LoadTexture(const char *pFilename, int StorageType, int StoreFormat, int Flags) { int l = str_length(pFilename); - int Id; + int ID; CImageInfo Img; if(l < 3) @@ -367,9 +367,9 @@ int CGraphics_OpenGL::LoadTexture(const char *pFilename, int StorageType, int St if (StoreFormat == CImageInfo::FORMAT_AUTO) StoreFormat = Img.m_Format; - Id = LoadTextureRaw(Img.m_Width, Img.m_Height, Img.m_Format, Img.m_pData, StoreFormat, Flags); + ID = LoadTextureRaw(Img.m_Width, Img.m_Height, Img.m_Format, Img.m_pData, StoreFormat, Flags); mem_free(Img.m_pData); - return Id; + return ID; } return m_InvalidTexture; |