From fa162ee136f65dd4ceeb55a0a916cef11ad5a073 Mon Sep 17 00:00:00 2001 From: Arsinikk Date: Fri, 19 Jul 2024 07:11:23 -0500 Subject: [PATCH] Minor stab at fixing linux --- prboom2/src/dsda/animate.c | 119 +++++++++++++++++----------------- prboom2/src/dsda/animate.h | 74 ++++++++++----------- prboom2/src/dsda/widescreen.c | 32 ++++----- prboom2/src/dsda/widescreen.h | 32 ++++----- 4 files changed, 129 insertions(+), 128 deletions(-) diff --git a/prboom2/src/dsda/animate.c b/prboom2/src/dsda/animate.c index e27dae2ea..ab08dff3f 100644 --- a/prboom2/src/dsda/animate.c +++ b/prboom2/src/dsda/animate.c @@ -21,38 +21,38 @@ #include "animate.h" #include "v_video.h" -char* mskull_start = "S_SKULL"; -char* mskull_end = "E_SKULL"; -char* mdoom_start = "S_DOOM"; -char* mdoom_end = "E_DOOM"; -char* stbar_start = "S_STBAR"; -char* stbar_end = "E_STBAR"; -char* starms_start = "S_STARMS"; -char* starms_end = "E_STARMS"; -char* titlepic_start = "S_TITLEP"; -char* titlepic_end = "E_TITLEP"; -char* interpic_start = "S_INTERP"; -char* interpic_end = "E_INTERP"; -char* credit_start = "S_CREDIT"; -char* credit_end = "E_CREDIT"; -char* help0_start = "S_HELP"; -char* help0_end = "E_HELP"; -char* help1_start = "S_HELP1"; -char* help1_end = "E_HELP1"; -char* help2_start = "S_HELP2"; -char* help2_end = "E_HELP2"; -char* bossback_start = "S_BOSSBA"; -char* bossback_end = "E_BOSSBA"; -char* e1map_start = "S_WIMAP0"; -char* e1map_end = "E_WIMAP0"; -char* e2map_start = "S_WIMAP1"; -char* e2map_end = "E_WIMAP1"; -char* e3map_start = "S_WIMAP2"; -char* e3map_end = "E_WIMAP2"; -char* victory_start = "S_VICTOR"; -char* victory_end = "E_VICTOR"; -char* endpic_start = "S_ENDPIC"; -char* endpic_end = "E_ENDPIC"; +const char* mskull_start = "S_SKULL"; +const char* mskull_end = "E_SKULL"; +const char* mdoom_start = "S_DOOM"; +const char* mdoom_end = "E_DOOM"; +const char* stbar_start = "S_STBAR"; +const char* stbar_end = "E_STBAR"; +const char* starms_start = "S_STARMS"; +const char* starms_end = "E_STARMS"; +const char* titlepic_start = "S_TITLEP"; +const char* titlepic_end = "E_TITLEP"; +const char* interpic_start = "S_INTERP"; +const char* interpic_end = "E_INTERP"; +const char* credit_start = "S_CREDIT"; +const char* credit_end = "E_CREDIT"; +const char* help0_start = "S_HELP"; +const char* help0_end = "E_HELP"; +const char* help1_start = "S_HELP1"; +const char* help1_end = "E_HELP1"; +const char* help2_start = "S_HELP2"; +const char* help2_end = "E_HELP2"; +const char* bossback_start = "S_BOSSBA"; +const char* bossback_end = "E_BOSSBA"; +const char* e1map_start = "S_WIMAP0"; +const char* e1map_end = "E_WIMAP0"; +const char* e2map_start = "S_WIMAP1"; +const char* e2map_end = "E_WIMAP1"; +const char* e3map_start = "S_WIMAP2"; +const char* e3map_end = "E_WIMAP2"; +const char* victory_start = "S_VICTOR"; +const char* victory_end = "E_VICTOR"; +const char* endpic_start = "S_ENDPIC"; +const char* endpic_end = "E_ENDPIC"; extern int Check_Doom_Animate; extern int Check_Skull_Animate; @@ -71,28 +71,29 @@ extern int Check_E3map_Animate; extern int Check_Victory_Animate; extern int Check_Endpic_Animate; -extern int D_CheckAnimate(const char* lump_s, const char* lump_e) +extern int D_CheckAnimate(const char *lump_s, const char *lump_e) { - static int SCheck; - static int ECheck; - static int SLump; - static int ELump; - static int Animate; - Animate = 0; + static int SCheck = 0; + static int ECheck = 0; + static int SLump = 0; + static int ELump = 0; + static int Animate = 0; + SCheck = W_CheckNumForName(lump_s); ECheck = W_CheckNumForName(lump_e); + if ((SCheck != LUMP_NOT_FOUND) && (ECheck != LUMP_NOT_FOUND)) if ((W_GetNumForName(lump_s)) <= (W_GetNumForName(lump_e))) Animate = 1; return Animate; } -extern void D_DrawAnimate(const char* lump_s, const char* lump_e) +extern void D_DrawAnimate(const char *lump_s, const char *lump_e) { - int frameDiff; - int frame; - static int SLump; - static int ELump; + int frameDiff = 0; + int frame = 0; + static int SLump = 0; + static int ELump = 0; SLump = W_GetNumForName(lump_s); ELump = W_GetNumForName(lump_e); frameDiff = ELump - SLump; @@ -102,12 +103,12 @@ extern void D_DrawAnimate(const char* lump_s, const char* lump_e) // Arsinikk - Currently disabled due to Bunny sequence not working // -/* extern void D_DrawAnimateBunny(const char* lump_x, const char* lump_y, const char* lump_s, const char* lump_e) +/* extern void D_DrawAnimateBunny(const char *lump_x, const char *lump_y, const char *lump_s, const char *lump_e) { - int frameDiff; - int frame; - static int SLump; - static int ELump; + int frameDiff = 0; + int frame = 0; + static int SLump = 0; + static int ELump = 0; SLump = W_GetNumForName(lump_s); ELump = W_GetNumForName(lump_e); frameDiff = ELump - SLump; @@ -115,12 +116,12 @@ extern void D_DrawAnimate(const char* lump_s, const char* lump_e) V_DrawNumPatch(lump_x, lump_y, 0, SLump + frame, CR_DEFAULT, VPT_STRETCH); }*/ -extern void M_DrawMenuAnimate(const char* lump_x, const char* lump_y, const char* lump_s, const char* lump_e) +extern void M_DrawMenuAnimate(const char *lump_x, const char *lump_y, const char *lump_s, const char *lump_e) { - int frameDiff; - int frame; - static int SLump; - static int ELump; + int frameDiff = 0; + int frame = 0; + static int SLump = 0; + static int ELump = 0; SLump = W_GetNumForName(lump_s); ELump = W_GetNumForName(lump_e); frameDiff = ELump - SLump; @@ -128,12 +129,12 @@ extern void M_DrawMenuAnimate(const char* lump_x, const char* lump_y, const char V_DrawNumPatch(lump_x, lump_y, 0, SLump + frame, CR_DEFAULT, VPT_STRETCH); } -extern void M_DrawStbarAnimate(const char* lump_x, const char* lump_y, const char* lump_z, const char* lump_s, const char* lump_e) +extern void M_DrawStbarAnimate(const char *lump_x, const char *lump_y, const char *lump_z, const char *lump_s, const char *lump_e) { - int frameDiff; - int frame; - static int SLump; - static int ELump; + int frameDiff = 0; + int frame = 0; + static int SLump = 0; + static int ELump = 0; SLump = W_GetNumForName(lump_s); ELump = W_GetNumForName(lump_e); frameDiff = ELump - SLump; diff --git a/prboom2/src/dsda/animate.h b/prboom2/src/dsda/animate.h index 0052eabdc..1d2b16389 100644 --- a/prboom2/src/dsda/animate.h +++ b/prboom2/src/dsda/animate.h @@ -18,38 +18,38 @@ #ifndef __DSDA_ANIMATE__ #define __DSDA_ANIMATE__ -char* titlepic_start; -char* titlepic_end; -char* interpic_start; -char* interpic_end; -char* mdoom_start; -char* mdoom_end; -char* mskull_start; -char* mskull_end; -char* stbar_start; -char* stbar_end; -char* starms_start; -char* starms_end; -char* credit_start; -char* credit_end; -char* help0_start; -char* help0_end; -char* help1_start; -char* help1_end; -char* help2_start; -char* help2_end; -char* bossback_start; -char* bossback_end; -char* e1map_start; -char* e1map_end; -char* e2map_start; -char* e2map_end; -char* e3map_start; -char* e3map_end; -char* victory_start; -char* victory_end; -char* endpic_start; -char* endpic_end; +const char* titlepic_start; +const char* titlepic_end; +const char* interpic_start; +const char* interpic_end; +const char* mdoom_start; +const char* mdoom_end; +const char* mskull_start; +const char* mskull_end; +const char* stbar_start; +const char* stbar_end; +const char* starms_start; +const char* starms_end; +const char* credit_start; +const char* credit_end; +const char* help0_start; +const char* help0_end; +const char* help1_start; +const char* help1_end; +const char* help2_start; +const char* help2_end; +const char* bossback_start; +const char* bossback_end; +const char* e1map_start; +const char* e1map_end; +const char* e2map_start; +const char* e2map_end; +const char* e3map_start; +const char* e3map_end; +const char* victory_start; +const char* victory_end; +const char* endpic_start; +const char* endpic_end; int Check_Doom_Animate; int Check_Skull_Animate; @@ -69,11 +69,11 @@ int Check_Victory_Animate; int Check_Endpic_Animate; -int D_CheckAnimate(const char* lump_s, const char* lump_e); -void D_DrawAnimate(const char* lump_s, const char* lump_e); -//void D_DrawAnimateBunny(const char* lump_x, const char* lump_y, const char* lump_s, const char* lump_e); -void M_DrawMenuAnimate(const char* lump_x, const char* lump_y, const char* lump_s, const char* lump_e); -void M_DrawStbarAnimate(const char* lump_x, const char* lump_y, const char* lump_z, const char* lump_s, const char* lump_e); +int D_CheckAnimate(const char *lump_s, const char *lump_e); +void D_DrawAnimate(const char *lump_s, const char *lump_e); +//void D_DrawAnimateBunny(const char *lump_x, const char *lump_y, const char *lump_s, const char *lump_e); +void M_DrawMenuAnimate(const char *lump_x, const char *lump_y, const char *lump_s, const char *lump_e); +void M_DrawStbarAnimate(const char *lump_x, const char *lump_y, const char *lump_z, const char *lump_s, const char *lump_e); int dsda_AnimateExistCheck(void); #endif \ No newline at end of file diff --git a/prboom2/src/dsda/widescreen.c b/prboom2/src/dsda/widescreen.c index a8ca0fa4e..b71dfbb20 100644 --- a/prboom2/src/dsda/widescreen.c +++ b/prboom2/src/dsda/widescreen.c @@ -19,21 +19,21 @@ #include "widescreen.h" -char* stbar_wide = "STBAR_WS"; -char* titlepic_wide = "TITLE_WS"; -char* interpic_wide = "INTER_WS"; -char* credit_wide = "CREDI_WS"; -char* help0_wide = "HELP_WS"; -char* help1_wide = "HELP1_WS"; -char* help2_wide = "HELP2_WS"; -char* bossback_wide = "BOSSB_WS"; -char* e1map_wide = "WIMAP0WS"; -char* e2map_wide = "WIMAP1WS"; -char* e3map_wide = "WIMAP2WS"; -char* victory_wide = "VICTO_WS"; -char* bunny1_wide = "PFUB1_WS"; -char* bunny2_wide = "PFUB2_WS"; -char* endpic_wide = "ENDPI_WS"; +const char* stbar_wide = "STBAR_WS"; +const char* titlepic_wide = "TITLE_WS"; +const char* interpic_wide = "INTER_WS"; +const char* credit_wide = "CREDI_WS"; +const char* help0_wide = "HELP_WS"; +const char* help1_wide = "HELP1_WS"; +const char* help2_wide = "HELP2_WS"; +const char* bossback_wide = "BOSSB_WS"; +const char* e1map_wide = "WIMAP0WS"; +const char* e2map_wide = "WIMAP1WS"; +const char* e3map_wide = "WIMAP2WS"; +const char* victory_wide = "VICTO_WS"; +const char* bunny1_wide = "PFUB1_WS"; +const char* bunny2_wide = "PFUB2_WS"; +const char* endpic_wide = "ENDPI_WS"; extern int Check_Stbar_Wide; extern int Check_Titlepic_Wide; @@ -51,7 +51,7 @@ extern int Check_Bunny1_Wide; extern int Check_Bunny2_Wide; extern int Check_Endpic_Wide; -extern int D_CheckWide(const char* lump) { +extern int D_CheckWide(const char *lump) { static int ws = 0; static int last_numwadfiles = -1; diff --git a/prboom2/src/dsda/widescreen.h b/prboom2/src/dsda/widescreen.h index 0d5fda5a8..765d31d00 100644 --- a/prboom2/src/dsda/widescreen.h +++ b/prboom2/src/dsda/widescreen.h @@ -18,23 +18,23 @@ #ifndef __DSDA_WIDESCREEN__ #define __DSDA_WIDESCREEN__ -char* stbar_wide; -char* titlepic_wide; -char* interpic_wide; -char* credit_wide; -char* help0_wide; -char* help1_wide; -char* help2_wide; -char* bossback_wide; -char* e1map_wide; -char* e2map_wide; -char* e3map_wide; -char* victory_wide; -char* bunny1_wide; -char* bunny2_wide; -char* endpic_wide; +const char* stbar_wide; +const char* titlepic_wide; +const char* interpic_wide; +const char* credit_wide; +const char* help0_wide; +const char* help1_wide; +const char* help2_wide; +const char* bossback_wide; +const char* e1map_wide; +const char* e2map_wide; +const char* e3map_wide; +const char* victory_wide; +const char* bunny1_wide; +const char* bunny2_wide; +const char* endpic_wide; -int D_CheckWide(const char* lump); +int D_CheckWide(const char *lump); int dsda_WideExistCheck(void); int Check_Stbar_Wide;