duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move sanity checks to Draw.cpp

Browse source 
There, no need to keep track of a bunch of duplicate sanity checks
This commit is contained in:
Clownacy 2020-09-15 00:07:10 +01:00
parent 611afe7417
commit 142db71cb9
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Draw.cpp
View file

@ -412,6 +412,9 @@ BOOL MakeSurface_Generic(int bxsize, int bysize, SurfaceID surf_no, BOOL bSystem
void BackupSurface(SurfaceID surf_no, const RECT *rect) void BackupSurface(SurfaceID surf_no, const RECT *rect)
{ {
if (surf[surf_no] == NULL)
return;
static RenderBackend_Rect rcSet; // TODO - Not the original variable name static RenderBackend_Rect rcSet; // TODO - Not the original variable name
rcSet.left = rect->left * mag; rcSet.left = rect->left * mag;
rcSet.top = rect->top * mag; rcSet.top = rect->top * mag;
@ -427,6 +430,9 @@ void BackupSurface(SurfaceID surf_no, const RECT *rect)
void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no) // Transparency void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no) // Transparency
{ {
if (surf[surf_no] == NULL)
return;
static RenderBackend_Rect rcWork; static RenderBackend_Rect rcWork;
rcWork.left = rect->left; rcWork.left = rect->left;
@ -466,6 +472,9 @@ void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID su
void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no) // No Transparency void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no) // No Transparency
{ {
if (surf[surf_no] == NULL)
return;
static RenderBackend_Rect rcWork; static RenderBackend_Rect rcWork;
rcWork.left = rect->left; rcWork.left = rect->left;
@ -505,6 +514,9 @@ void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID su
void Surface2Surface(int x, int y, const RECT *rect, SurfaceID to, SurfaceID from) void Surface2Surface(int x, int y, const RECT *rect, SurfaceID to, SurfaceID from)
{ {
if (surf[to] == NULL || surf[from] == NULL)
return;
static RenderBackend_Rect rcWork; static RenderBackend_Rect rcWork;
rcWork.left = rect->left * mag; rcWork.left = rect->left * mag;
@ -546,6 +558,9 @@ void CortBox(const RECT *rect, unsigned long col)
void CortBox2(const RECT *rect, unsigned long col, SurfaceID surf_no) void CortBox2(const RECT *rect, unsigned long col, SurfaceID surf_no)
{ {
if (surf[surf_no] == NULL)
return;
static RenderBackend_Rect rcSet; // TODO - Not the original variable name static RenderBackend_Rect rcSet; // TODO - Not the original variable name
rcSet.left = rect->left * mag; rcSet.left = rect->left * mag;
rcSet.top = rect->top * mag; rcSet.top = rect->top * mag;
@ -700,6 +715,9 @@ void PutText(int x, int y, const char *text, unsigned long color)
void PutText2(int x, int y, const char *text, unsigned long color, SurfaceID surf_no) void PutText2(int x, int y, const char *text, unsigned long color, SurfaceID surf_no)
{ {
if (surf[surf_no] == NULL)
return;
DrawText(font, surf[surf_no], x * mag, y * mag, color, text); DrawText(font, surf[surf_no], x * mag, y * mag, color, text);
} }