diff options
| author |  chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
| 2014-02-24 03:25:05 +0000 |
|---|---|---|
| committer | chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
| 2014-02-24 03:25:05 +0000 |
| commit | 172056e7598d3447c682a694d824041076f3255e (patch) | |
| tree | 3ba150866d6bbcc337932e3fc59a3af9715d0d85 /hge/graphics.cpp | |
| parent | 8cb1a0f4fcf8e7ecd54134e8d6f431b613c69091 (diff) | |
| download | bullet-lab-remix-172056e7598d3447c682a694d824041076f3255e.tar.xz | |
M trunk/CHANGELOG.TXT
M trunk/background.h
M trunk/effects.h
M trunk/global.h
M trunk/hge/CxImage/ximagif.cpp
M trunk/hge/CxImage/ximaint.cpp
M trunk/hge/CxImage/ximapng.cpp
M trunk/hge/graphics.cpp
M trunk/hge/input.cpp
M trunk/hge/resource.cpp
M trunk/hge/sound.cpp
M trunk/hge/system.cpp
M trunk/hgehelp/hgefont.cpp
M trunk/levels.h
M trunk/libcgh.h
M trunk/libcghEx.cpp
M trunk/menuitem.cpp
M trunk/menuitem.h
M trunk/menus.h
M trunk/music.h
M trunk/scorec.h
M trunk/scoresystem.h
M trunk/towernbullet.h
Diffstat (limited to 'hge/graphics.cpp')
| -rw-r--r-- | hge/graphics.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hge/graphics.cpp b/hge/graphics.cpp index 20fc634..0bab75a 100644 --- a/hge/graphics.cpp +++ b/hge/graphics.cpp @@ -589,7 +589,7 @@ static inline bool _IsPowerOfTwo(const GLuint x) static inline GLuint _NextPowerOfTwo(GLuint x) { x--; - for (int i = 1; i < (sizeof(GLuint) * 8); i *= 2) + for (unsigned i = 1; i < (sizeof(GLuint) * 8); i <<= 1) x |= x >> i; return x + 1; } @@ -859,7 +859,7 @@ DWORD * CALL HGE_Impl::Texture_Lock(HTEXTURE tex, bool bReadOnly, int left, int { int w, h; pTex->pixels = _DecodeImage(data, pTex->filename, size, w, h); - if ((w != pTex->width) || (h != pTex->height)) // yikes, file changed? + if ((w != (int)pTex->width) || (h != (int)pTex->height)) // yikes, file changed? { delete[] pTex->pixels; pTex->pixels = NULL; @@ -889,9 +889,9 @@ DWORD * CALL HGE_Impl::Texture_Lock(HTEXTURE tex, bool bReadOnly, int left, int // !!! FIXME: do something with this? assert(width > 0); - assert(width <= pTex->width); + assert(width <= (int)pTex->width); assert(height > 0); - assert(height <= pTex->height); + assert(height <= (int)pTex->height); assert(left >= 0); assert(left <= width); assert(top >= 0); @@ -1345,7 +1345,7 @@ void HGE_Impl::_Resize(int width, int height) void HGE_Impl::_GfxDone() { - CRenderTargetList *target=pTargets; + //CRenderTargetList *target=pTargets; while(textures) Texture_Free(textures->tex); while(pTargets) Target_Free((HTARGET) pTargets); |