mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-26 14:38:30 +02:00
Code Issues Releases Wiki Activity

Add one-time OoB logs to tile-drawing functions

Browse Source 
These functions will only complain once if they receive an out-of-bounds
tile. And it's only once because these functions are called frequently
in rendering code.

A macro WHINE_ONCE() has been added in order to not duplicate code.
This commit is contained in:
Misa 2020-06-30 15:01:30 -07:00 committed by Ethan Lee
parent 5201f67909
commit 07028d47d5
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop_version/src/Graphics.cpp
View File

@ -634,6 +634,7 @@ void Graphics::drawtile( int x, int y, int t )
{
if (!INBOUNDS(t, tiles))
{
WHINE_ONCE("drawtile() out-of-bounds!")
return;
}
@ -657,6 +658,7 @@ void Graphics::drawtile2( int x, int y, int t )
{
if (!INBOUNDS(t, tiles2))
{
WHINE_ONCE("drawtile2() out-of-bounds!")
return;
}
@ -681,6 +683,7 @@ void Graphics::drawtile3( int x, int y, int t, int off )
{
if (!INBOUNDS(t, tiles3))
{
WHINE_ONCE("drawtile3() out-of-bounds!")
return;
}
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h };
@ -691,6 +694,7 @@ void Graphics::drawentcolours( int x, int y, int t)
{
if (!INBOUNDS(t, entcolours))
{
WHINE_ONCE("drawentcolours() out-of-bounds!")
return;
}
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h };
@ -701,6 +705,7 @@ void Graphics::drawtowertile( int x, int y, int t )
{
if (!INBOUNDS(t, tiles2))
{
WHINE_ONCE("drawtowertile() out-of-bounds!")
return;
}
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h };
@ -713,6 +718,7 @@ void Graphics::drawtowertile3( int x, int y, int t, int off )
t += off*30;
if (!INBOUNDS(t, tiles3))
{
WHINE_ONCE("drawtowertile3() out-of-bounds!")
return;
}
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h };
@ -3112,6 +3118,7 @@ void Graphics::drawforetile(int x, int y, int t)
{
if (!INBOUNDS(t, tiles))
{
WHINE_ONCE("drawforetile() out-of-bounds!")
return;
}
@ -3135,6 +3142,7 @@ void Graphics::drawforetile2(int x, int y, int t)
{
if (!INBOUNDS(t, tiles2))
{
WHINE_ONCE("drawforetile2() out-of-bounds!")
return;
}
@ -3159,6 +3167,7 @@ void Graphics::drawforetile3(int x, int y, int t, int off)
t += off * 30;
if (!INBOUNDS(t, tiles3))
{
WHINE_ONCE("drawforetile3() out-of-bounds!")
return;
}
SDL_Rect rect;

8
desktop_version/src/UtilityClass.h
View File

@ -17,6 +17,14 @@ bool endsWith(const std::string& str, const std::string& suffix);
#define INBOUNDS(index, vector) ((int) index >= 0 && (int) index < (int) vector.size())
#define WHINE_ONCE(message) \
static bool whine = true; \
if (whine) \
{ \
whine = false; \
puts(message); \
}
//helperClass
class UtilityClass