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

Rename Surface_Ids to SurfaceID

Browse source 
For code style consistency (this isn't a vanilla enum name - I don't
think there even was an enum for this in the original source code)
This commit is contained in:
Clownacy 2019-08-21 16:18:55 +00:00
parent 940034dc22
commit 64598dc2a5
6 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Draw.cpp
View file

@ -166,7 +166,7 @@ void ReleaseSurface(int s)
memset(&surface_metadata[s], 0, sizeof(surface_metadata[0])); memset(&surface_metadata[s], 0, sizeof(surface_metadata[0]));
} }
BOOL MakeSurface_Generic(int bxsize, int bysize, Surface_Ids surf_no, BOOL bSystem) BOOL MakeSurface_Generic(int bxsize, int bysize, SurfaceID surf_no, BOOL bSystem)
{ {
BOOL success = FALSE; BOOL success = FALSE;
@ -209,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, SurfaceType type) static BOOL LoadBitmap(SDL_RWops *fp, SurfaceID surf_no, BOOL create_surface, const char *name, SurfaceType type)
{ {
BOOL success = FALSE; BOOL success = FALSE;
@ -315,7 +315,7 @@ static BOOL LoadBitmap(SDL_RWops *fp, Surface_Ids surf_no, BOOL create_surface,
return success; return success;
} }
static BOOL LoadBitmap_File(const char *name, Surface_Ids surf_no, BOOL create_surface) static BOOL LoadBitmap_File(const char *name, SurfaceID surf_no, BOOL create_surface)
{ {
char path[PATH_LENGTH]; char path[PATH_LENGTH];
SDL_RWops *fp; SDL_RWops *fp;
@ -350,7 +350,7 @@ static BOOL LoadBitmap_File(const char *name, Surface_Ids surf_no, BOOL create_s
return FALSE; return FALSE;
} }
static BOOL LoadBitmap_Resource(const char *res, Surface_Ids surf_no, BOOL create_surface) static BOOL LoadBitmap_Resource(const char *res, SurfaceID surf_no, BOOL create_surface)
{ {
size_t size; size_t size;
const unsigned char *data = FindResource(res, "BITMAP", &size); const unsigned char *data = FindResource(res, "BITMAP", &size);
@ -370,22 +370,22 @@ static BOOL LoadBitmap_Resource(const char *res, Surface_Ids surf_no, BOOL creat
return FALSE; return FALSE;
} }
BOOL MakeSurface_File(const char *name, Surface_Ids surf_no) BOOL MakeSurface_File(const char *name, SurfaceID surf_no)
{ {
return LoadBitmap_File(name, surf_no, TRUE); return LoadBitmap_File(name, surf_no, TRUE);
} }
BOOL MakeSurface_Resource(const char *res, Surface_Ids surf_no) BOOL MakeSurface_Resource(const char *res, SurfaceID surf_no)
{ {
return LoadBitmap_Resource(res, surf_no, TRUE); return LoadBitmap_Resource(res, surf_no, TRUE);
} }
BOOL ReloadBitmap_File(const char *name, Surface_Ids surf_no) BOOL ReloadBitmap_File(const char *name, SurfaceID surf_no)
{ {
return LoadBitmap_File(name, surf_no, FALSE); return LoadBitmap_File(name, surf_no, FALSE);
} }
BOOL ReloadBitmap_Resource(const char *res, Surface_Ids surf_no) BOOL ReloadBitmap_Resource(const char *res, SurfaceID surf_no)
{ {
return LoadBitmap_Resource(res, surf_no, FALSE); return LoadBitmap_Resource(res, surf_no, FALSE);
} }
@ -398,7 +398,7 @@ static void ScaleRect(const RECT *source_rect, RECT *destination_rect)
destination_rect->bottom = source_rect->bottom * magnification; destination_rect->bottom = source_rect->bottom * magnification;
} }
void BackupSurface(Surface_Ids surf_no, const RECT *rect) void BackupSurface(SurfaceID surf_no, const RECT *rect)
{ {
RECT frameRect; RECT frameRect;
ScaleRect(rect, &frameRect); ScaleRect(rect, &frameRect);
@ -406,7 +406,7 @@ void BackupSurface(Surface_Ids surf_no, const RECT *rect)
Backend_Blit(framebuffer, &frameRect, surf[surf_no], frameRect.left, frameRect.top, FALSE); Backend_Blit(framebuffer, &frameRect, surf[surf_no], frameRect.left, frameRect.top, FALSE);
} }
static void DrawBitmap(const RECT *rcView, int x, int y, const RECT *rect, Surface_Ids surf_no, BOOL transparent) static void DrawBitmap(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no, BOOL transparent)
{ {
RECT frameRect; RECT frameRect;
@ -446,12 +446,12 @@ static void DrawBitmap(const RECT *rcView, int x, int y, const RECT *rect, Surfa
Backend_Blit(surf[surf_no], &frameRect, framebuffer, x * magnification, y * magnification, transparent); Backend_Blit(surf[surf_no], &frameRect, framebuffer, x * magnification, y * magnification, transparent);
} }
void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, Surface_Ids surf_no) // Transparency void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no) // Transparency
{ {
DrawBitmap(rcView, x, y, rect, surf_no, TRUE); DrawBitmap(rcView, x, y, rect, surf_no, TRUE);
} }
void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, Surface_Ids surf_no) // No Transparency void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no) // No Transparency
{ {
DrawBitmap(rcView, x, y, rect, surf_no, FALSE); DrawBitmap(rcView, x, y, rect, surf_no, FALSE);
} }
@ -486,7 +486,7 @@ void CortBox(const RECT *rect, unsigned long col)
Backend_ColourFill(framebuffer, &destRect, col_red, col_green, col_blue); Backend_ColourFill(framebuffer, &destRect, col_red, col_green, col_blue);
} }
void CortBox2(const RECT *rect, unsigned long col, Surface_Ids surf_no) void CortBox2(const RECT *rect, unsigned long col, SurfaceID surf_no)
{ {
// Get rect // Get rect
RECT destRect; RECT destRect;
@ -517,15 +517,15 @@ void RestoreSurfaces() // Guessed function name - this doesn't exist in the Linu
rect.top = 0; rect.top = 0;
rect.right = surface_metadata[i].width; rect.right = surface_metadata[i].width;
rect.bottom = surface_metadata[i].height; rect.bottom = surface_metadata[i].height;
CortBox2(&rect, 0, (Surface_Ids)i); CortBox2(&rect, 0, (SurfaceID)i);
break; break;
case SURFACE_SOURCE_RESOURCE: case SURFACE_SOURCE_RESOURCE:
ReloadBitmap_Resource(surface_metadata[i].name, (Surface_Ids)i); ReloadBitmap_Resource(surface_metadata[i].name, (SurfaceID)i);
break; break;
case SURFACE_SOURCE_FILE: case SURFACE_SOURCE_FILE:
ReloadBitmap_File(surface_metadata[i].name, (Surface_Ids)i); ReloadBitmap_File(surface_metadata[i].name, (SurfaceID)i);
break; break;
} }
} }
@ -636,7 +636,7 @@ void PutText(int x, int y, const char *text, unsigned long color)
DrawText(gFont, framebuffer, x * magnification, y * magnification, color, text, strlen(text)); DrawText(gFont, framebuffer, x * magnification, y * magnification, color, text, strlen(text));
} }
void PutText2(int x, int y, const char *text, unsigned long color, Surface_Ids surf_no) void PutText2(int x, int y, const char *text, unsigned long color, SurfaceID surf_no)
{ {
DrawText(gFont, surf[surf_no], x * magnification, y * magnification, color, text, strlen(text)); DrawText(gFont, surf[surf_no], x * magnification, y * magnification, color, text, strlen(text));
} }

24
src/Draw.h
View file

@ -14,7 +14,7 @@ extern RECT grcFull;
extern int magnification; extern int magnification;
extern BOOL fullscreen; extern BOOL fullscreen;
typedef enum Surface_Ids typedef enum SurfaceID
{ {
SURFACE_ID_TITLE = 0, SURFACE_ID_TITLE = 0,
SURFACE_ID_PIXEL = 1, SURFACE_ID_PIXEL = 1,
@ -48,29 +48,29 @@ typedef enum Surface_Ids
SURFACE_ID_CREDITS_IMAGE = 36, SURFACE_ID_CREDITS_IMAGE = 36,
SURFACE_ID_CASTS = 37, SURFACE_ID_CASTS = 37,
SURFACE_ID_MAX = 40 SURFACE_ID_MAX = 40
} Surface_Ids; } SurfaceID;
BOOL Flip_SystemTask(HWND hWnd); BOOL Flip_SystemTask(HWND hWnd);
SDL_Window* CreateWindow(const char *title, int width, int height); SDL_Window* CreateWindow(const char *title, int width, int height);
BOOL StartDirectDraw(int lMagnification, int lColourDepth); BOOL StartDirectDraw(int lMagnification, int lColourDepth);
void EndDirectDraw(); void EndDirectDraw();
void ReleaseSurface(int s); void ReleaseSurface(int s);
BOOL MakeSurface_File(const char *name, Surface_Ids surf_no); BOOL MakeSurface_File(const char *name, SurfaceID surf_no);
BOOL MakeSurface_Resource(const char *res, Surface_Ids surf_no); BOOL MakeSurface_Resource(const char *res, SurfaceID surf_no);
BOOL ReloadBitmap_File(const char *name, Surface_Ids surf_no); BOOL ReloadBitmap_File(const char *name, SurfaceID surf_no);
BOOL ReloadBitmap_Resource(const char *res, Surface_Ids surf_no); BOOL ReloadBitmap_Resource(const char *res, SurfaceID surf_no);
BOOL MakeSurface_Generic(int bxsize, int bysize, Surface_Ids surf_no, BOOL bSystem); BOOL MakeSurface_Generic(int bxsize, int bysize, SurfaceID surf_no, BOOL bSystem);
void BackupSurface(Surface_Ids surf_no, const RECT *rect); void BackupSurface(SurfaceID surf_no, const RECT *rect);
void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, Surface_Ids surf_no); void PutBitmap3(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no);
void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, Surface_Ids surf_no); void PutBitmap4(const RECT *rcView, int x, int y, const RECT *rect, SurfaceID surf_no);
void Surface2Surface(int x, int y, const RECT *rect, int to, int from); void Surface2Surface(int x, int y, const RECT *rect, int to, int from);
unsigned long GetCortBoxColor(unsigned long col); unsigned long GetCortBoxColor(unsigned long col);
void CortBox(const RECT *rect, unsigned long col); void CortBox(const RECT *rect, unsigned long col);
void CortBox2(const RECT *rect, unsigned long col, Surface_Ids surf_no); void CortBox2(const RECT *rect, unsigned long col, SurfaceID surf_no);
void RestoreSurfaces(); void RestoreSurfaces();
void InitTextObject(const char *font_name); void InitTextObject(const char *font_name);
void PutText(int x, int y, const char *text, unsigned long color); void PutText(int x, int y, const char *text, unsigned long color);
void PutText2(int x, int y, const char *text, unsigned long color, Surface_Ids surf_no); void PutText2(int x, int y, const char *text, unsigned long color, SurfaceID surf_no);
void EndTextObject(); void EndTextObject();
void HandleDeviceLoss(); void HandleDeviceLoss();
void HandleWindowResize(); void HandleWindowResize();

2
src/Game.cpp
View file

@ -279,7 +279,7 @@ int ModeTitle(HWND hWnd)
int char_type; int char_type;
int time_counter; int time_counter;
int char_y; int char_y;
Surface_Ids char_surf; SurfaceID char_surf;
unsigned long back_color; unsigned long back_color;
// Reset everything // Reset everything

4
src/NpChar.cpp
View file

@ -36,7 +36,7 @@ void InitNpChar()
void SetUniqueParameter(NPCHAR *npc) void SetUniqueParameter(NPCHAR *npc)
{ {
int code = npc->code_char; int code = npc->code_char;
npc->surf = (Surface_Ids)gNpcTable[code].surf; npc->surf = (SurfaceID)gNpcTable[code].surf;
npc->hit_voice = gNpcTable[code].hit_voice; npc->hit_voice = gNpcTable[code].hit_voice;
npc->destroy_voice = gNpcTable[code].destroy_voice; npc->destroy_voice = gNpcTable[code].destroy_voice;
npc->damage = gNpcTable[code].damage; npc->damage = gNpcTable[code].damage;
@ -364,7 +364,7 @@ void PutNpChar(int fx, int fy)
(gNPC[n].x - side) / 0x200 - fx / 0x200 + a, (gNPC[n].x - side) / 0x200 - fx / 0x200 + a,
(gNPC[n].y - gNPC[n].view.top) / 0x200 - fy / 0x200, (gNPC[n].y - gNPC[n].view.top) / 0x200 - fy / 0x200,
&gNPC[n].rect, &gNPC[n].rect,
(Surface_Ids)gNPC[n].surf); (SurfaceID)gNPC[n].surf);
} }
} }
} }

2
src/NpChar.h
View file

@ -40,7 +40,7 @@ struct NPCHAR
int code_char; int code_char;
int code_flag; int code_flag;
int code_event; int code_event;
Surface_Ids surf; SurfaceID surf;
int hit_voice; int hit_voice;
int destroy_voice; int destroy_voice;
int life; int life;

24
src/TextScr.cpp
View file

@ -65,7 +65,7 @@ BOOL InitTextScript2()
//Create line surfaces //Create line surfaces
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
MakeSurface_Generic(gRect_line.right, gRect_line.bottom, (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1), FALSE); MakeSurface_Generic(gRect_line.right, gRect_line.bottom, (SurfaceID)(i + SURFACE_ID_TEXT_LINE1), FALSE);
//Clear text //Clear text
memset(text, 0, sizeof(text)); memset(text, 0, sizeof(text));
@ -230,7 +230,7 @@ BOOL StartTextScript(int no)
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
gTS.ypos_line[i] = 16 * i; gTS.ypos_line[i] = 16 * i;
CortBox2(&gRect_line, 0x000000, (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1)); CortBox2(&gRect_line, 0x000000, (SurfaceID)(i + SURFACE_ID_TEXT_LINE1));
memset(&text[i * 0x40], 0, 0x40); memset(&text[i * 0x40], 0, 0x40);
}*/ }*/
@ -279,7 +279,7 @@ BOOL JumpTextScript(int no)
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
gTS.ypos_line[i] = 16 * i; gTS.ypos_line[i] = 16 * i;
CortBox2(&gRect_line, 0x000000, (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1)); CortBox2(&gRect_line, 0x000000, (SurfaceID)(i + SURFACE_ID_TEXT_LINE1));
memset(&text[i * 0x40], 0, 0x40); memset(&text[i * 0x40], 0, 0x40);
} }
@ -331,7 +331,7 @@ void CheckNewLine()
{ {
gTS.mode = 3; gTS.mode = 3;
g_GameFlags |= 4; g_GameFlags |= 4;
CortBox2(&gRect_line, 0, (Surface_Ids)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1)); CortBox2(&gRect_line, 0, (SurfaceID)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1));
memset(&text[gTS.line % 4 * 0x40], 0, 0x40); memset(&text[gTS.line % 4 * 0x40], 0, 0x40);
} }
} }
@ -376,7 +376,7 @@ void SetNumberTextScript(int index)
str[offset + 1] = 0; str[offset + 1] = 0;
//Append number to line //Append number to line
PutText2(6 * gTS.p_write, 0, str, RGB(0xFF, 0xFF, 0xFE), (Surface_Ids)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1)); PutText2(6 * gTS.p_write, 0, str, RGB(0xFF, 0xFF, 0xFE), (SurfaceID)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1));
strcat(&text[gTS.line % 4 * 0x40], str); strcat(&text[gTS.line % 4 * 0x40], str);
//Play sound and reset blinking cursor //Play sound and reset blinking cursor
@ -404,7 +404,7 @@ void ClearTextLine()
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
gTS.ypos_line[i] = 16 * i; gTS.ypos_line[i] = 16 * i;
CortBox2(&gRect_line, 0x000000, (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1)); CortBox2(&gRect_line, 0x000000, (SurfaceID)(i + SURFACE_ID_TEXT_LINE1));
memset(&text[i * 0x40], 0, 0x40); memset(&text[i * 0x40], 0, 0x40);
} }
} }
@ -480,7 +480,7 @@ void PutTextScript()
text_offset = 0; text_offset = 0;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
PutBitmap3(&gTS.rcText, text_offset + TEXT_LEFT, gTS.offsetY + gTS.ypos_line[i] + gTS.rcText.top, &gRect_line, (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1)); PutBitmap3(&gTS.rcText, text_offset + TEXT_LEFT, gTS.offsetY + gTS.ypos_line[i] + gTS.rcText.top, &gRect_line, (SurfaceID)(i + SURFACE_ID_TEXT_LINE1));
//Draw NOD cursor //Draw NOD cursor
if ((gTS.wait_beam++ % 20 > 12) && gTS.mode == 2) if ((gTS.wait_beam++ % 20 > 12) && gTS.mode == 2)
@ -1327,7 +1327,7 @@ int TextScriptProc()
gTS.p_write = x; gTS.p_write = x;
//Print text //Print text
PutText2(0, 0, str, RGB(0xFF, 0xFF, 0xFE), (Surface_Ids)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1)); PutText2(0, 0, str, RGB(0xFF, 0xFF, 0xFE), (SurfaceID)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1));
#ifdef FIX_BUGS #ifdef FIX_BUGS
strcpy(&text[gTS.line % 4 * 0x40], str); strcpy(&text[gTS.line % 4 * 0x40], str);
#else #else
@ -1360,11 +1360,11 @@ int TextScriptProc()
//Print text //Print text
if (c[0] == '=') if (c[0] == '=')
{ {
Surface2Surface(6 * gTS.p_write, 2, &rcSymbol, (Surface_Ids)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1), SURFACE_ID_TEXT_BOX); Surface2Surface(6 * gTS.p_write, 2, &rcSymbol, (SurfaceID)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1), SURFACE_ID_TEXT_BOX);
} }
else else
{ {
PutText2(6 * gTS.p_write, 0, c, RGB(0xFF, 0xFF, 0xFE), (Surface_Ids)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1)); PutText2(6 * gTS.p_write, 0, c, RGB(0xFF, 0xFF, 0xFE), (SurfaceID)(gTS.line % 4 + SURFACE_ID_TEXT_LINE1));
} }
strcat(&text[gTS.line % 4 * 0x40], c); strcat(&text[gTS.line % 4 * 0x40], c);
@ -1492,7 +1492,7 @@ void RestoreTextScript()
{ {
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
CortBox2(&gRect_line, 0x000000, (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1)); CortBox2(&gRect_line, 0x000000, (SurfaceID)(i + SURFACE_ID_TEXT_LINE1));
PutText2(0, 0, &text[i * 0x40], RGB(0xFF, 0xFF, 0xFE), (Surface_Ids)(i + SURFACE_ID_TEXT_LINE1)); PutText2(0, 0, &text[i * 0x40], RGB(0xFF, 0xFF, 0xFE), (SurfaceID)(i + SURFACE_ID_TEXT_LINE1));
} }
} }