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

Added enums for the surface types

Browse source
This commit is contained in:
Clownacy 2019-08-13 04:42:29 +00:00
parent d47f683491
commit 16b2f6a474
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Draw.cpp
View file

@ -17,6 +17,13 @@
#include "Tags.h" #include "Tags.h"
#include "Backends/Rendering.h" #include "Backends/Rendering.h"
typedef enum SurfaceType
{
SURFACE_SOURCE_NONE = 1,
SURFACE_SOURCE_RESOURCE,
SURFACE_SOURCE_FILE
} SurfaceType;
SDL_Window *gWindow; SDL_Window *gWindow;
static SDL_PixelFormat *rgb24_pixel_format; // Needed because SDL2 is stupid static SDL_PixelFormat *rgb24_pixel_format; // Needed because SDL2 is stupid
@ -35,7 +42,7 @@ static FontObject *gFont;
// This doesn't exist in the Linux port, so none of these symbol names are accurate // This doesn't exist in the Linux port, so none of these symbol names are accurate
static struct static struct
{ {
unsigned char type; SurfaceType type;
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
BOOL bSystem; // Basically a 'do not regenerate' flag BOOL bSystem; // Basically a 'do not regenerate' flag
@ -188,7 +195,7 @@ BOOL MakeSurface_Generic(int bxsize, int bysize, Surface_Ids surf_no, BOOL bSyst
} }
else else
{ {
surface_metadata[surf_no].type = 1; surface_metadata[surf_no].type = SURFACE_SOURCE_NONE;
surface_metadata[surf_no].width = bxsize; surface_metadata[surf_no].width = bxsize;
surface_metadata[surf_no].height = bysize; surface_metadata[surf_no].height = bysize;
surface_metadata[surf_no].bSystem = bSystem; surface_metadata[surf_no].bSystem = bSystem;
@ -202,7 +209,7 @@ BOOL MakeSurface_Generic(int bxsize, int bysize, Surface_Ids surf_no, BOOL bSyst
return success; return success;
} }
static BOOL LoadBitmap(SDL_RWops *fp, Surface_Ids surf_no, BOOL create_surface, const char *name, unsigned char type) static BOOL LoadBitmap(SDL_RWops *fp, Surface_Ids surf_no, BOOL create_surface, const char *name, SurfaceType type)
{ {
BOOL success = FALSE; BOOL success = FALSE;
@ -325,7 +332,7 @@ static BOOL LoadBitmap_File(const char *name, Surface_Ids surf_no, BOOL create_s
} }
else else
{ {
if (LoadBitmap(fp, surf_no, create_surface, name, 3)) if (LoadBitmap(fp, surf_no, create_surface, name, SURFACE_SOURCE_FILE))
return TRUE; return TRUE;
} }
} }
@ -335,7 +342,7 @@ static BOOL LoadBitmap_File(const char *name, Surface_Ids surf_no, BOOL create_s
fp = SDL_RWFromFile(path, "rb"); fp = SDL_RWFromFile(path, "rb");
if (fp) if (fp)
{ {
if (LoadBitmap(fp, surf_no, create_surface, name, 3)) if (LoadBitmap(fp, surf_no, create_surface, name, SURFACE_SOURCE_FILE))
return TRUE; return TRUE;
} }
@ -355,7 +362,7 @@ static BOOL LoadBitmap_Resource(const char *res, Surface_Ids surf_no, BOOL creat
// But hey, if I ever need to create an RWops from an array that's -32768 bytes long, they've got me covered! // But hey, if I ever need to create an RWops from an array that's -32768 bytes long, they've got me covered!
SDL_RWops *fp = SDL_RWFromConstMem(data, size); SDL_RWops *fp = SDL_RWFromConstMem(data, size);
if (LoadBitmap(fp, surf_no, create_surface, res, 2)) if (LoadBitmap(fp, surf_no, create_surface, res, SURFACE_SOURCE_RESOURCE))
return TRUE; return TRUE;
} }
@ -492,7 +499,7 @@ void CortBox2(const RECT *rect, unsigned long col, Surface_Ids surf_no)
Backend_ColourFill(surf[surf_no], &destRect, col_red, col_green, col_blue); Backend_ColourFill(surf[surf_no], &destRect, col_red, col_green, col_blue);
surface_metadata[surf_no].type = 1; surface_metadata[surf_no].type = SURFACE_SOURCE_NONE;
} }
void RestoreSurfaces() // Guessed function name - this doesn't exist in the Linux port void RestoreSurfaces() // Guessed function name - this doesn't exist in the Linux port
@ -505,7 +512,7 @@ void RestoreSurfaces() // Guessed function name - this doesn't exist in the Linu
{ {
switch (surface_metadata[i].type) switch (surface_metadata[i].type)
{ {
case 1: case SURFACE_SOURCE_NONE:
rect.left = 0; rect.left = 0;
rect.top = 0; rect.top = 0;
rect.right = surface_metadata[i].width; rect.right = surface_metadata[i].width;
@ -513,11 +520,11 @@ void RestoreSurfaces() // Guessed function name - this doesn't exist in the Linu
CortBox2(&rect, 0, (Surface_Ids)i); CortBox2(&rect, 0, (Surface_Ids)i);
break; break;
case 2: case SURFACE_SOURCE_RESOURCE:
ReloadBitmap_Resource(surface_metadata[i].name, (Surface_Ids)i); ReloadBitmap_Resource(surface_metadata[i].name, (Surface_Ids)i);
break; break;
case 3: case SURFACE_SOURCE_FILE:
ReloadBitmap_File(surface_metadata[i].name, (Surface_Ids)i); ReloadBitmap_File(surface_metadata[i].name, (Surface_Ids)i);
break; break;
} }