From 1d8c2bf321ae0a461cc04bdaa085953c1bd9dcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Wed, 9 Oct 2024 16:37:37 +0200 Subject: [PATCH] Removed some unused externs --- src/common/map.cpp | 6 ++---- src/smw/GSMenu.cpp | 5 ----- src/smw/objects/moving/MO_CheepCheep.cpp | 6 ------ src/smw/world.cpp | 2 -- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/common/map.cpp b/src/common/map.cpp index c07e03a3..2bbf2ce7 100644 --- a/src/common/map.cpp +++ b/src/common/map.cpp @@ -40,11 +40,8 @@ using std::endl; #endif -extern gfxSprite spr_frontmap[2]; - short g_iCurrentDrawIndex = 0; - extern SDL_Surface* screen; extern SDL_Surface* blitdest; @@ -63,7 +60,8 @@ SDL_Rect g_rFlameRects[4][4] = { { {0, 0, 96, 32}, {0, 32, 96, 32}, {0, 64, 96, }; //[Type][Direction][Frame] -SDL_Rect g_rPirhanaRects[4][4][4] = { { { {0, 0, 32, 48}, {32, 0, 32, 48}, {64, 0, 32, 48}, {96, 0, 32, 48} }, +SDL_Rect g_rPirhanaRects[4][4][4] = { + { { {0, 0, 32, 48}, {32, 0, 32, 48}, {64, 0, 32, 48}, {96, 0, 32, 48} }, { {128, 0, 32, 48}, {160, 0, 32, 48}, {192, 0, 32, 48}, {224, 0, 32, 48} }, { {304, 0, 48, 32}, {304, 32, 48, 32}, {304, 64, 48, 32}, {304, 96, 48, 32} }, { {304, 128, 48, 32}, {304, 160, 48, 32}, {304, 192, 48, 32}, {304, 224, 48, 32} } diff --git a/src/smw/GSMenu.cpp b/src/smw/GSMenu.cpp index 90b7e56c..e63836c3 100644 --- a/src/smw/GSMenu.cpp +++ b/src/smw/GSMenu.cpp @@ -75,10 +75,7 @@ extern bool g_fRecordTest; extern void SetGameModeSettingsFromMenu(); extern void LoadMapObjects(bool fPreview); -extern bool LoadGameSounds(); - extern void UpdateScoreBoard(); - extern short LookupTeamID(short id); extern WorldMap g_worldmap; @@ -90,8 +87,6 @@ extern CMap* g_map; extern CScore *score[4]; extern short score_cnt; -extern std::string stripPathAndExtension(const std::string &path); - extern CGameMode * gamemodes[GAMEMODE_LAST]; extern CGM_Bonus * bonushousemode; extern CGM_Pipe_MiniGame * pipegamemode; diff --git a/src/smw/objects/moving/MO_CheepCheep.cpp b/src/smw/objects/moving/MO_CheepCheep.cpp index 52ab2fa5..9cddfbc9 100644 --- a/src/smw/objects/moving/MO_CheepCheep.cpp +++ b/src/smw/objects/moving/MO_CheepCheep.cpp @@ -196,9 +196,3 @@ void MO_CheepCheep::ShatterDie() game_values.unlocksecret2part2++; } - -///////////////////////DEBUG! REMOVE THIS WHEN DONE///////////////////////////// -#ifdef _DEBUG -extern bool fDebugShowBossSettings; -#endif -///////////////////////DEBUG! REMOVE THIS WHEN DONE///////////////////////////// diff --git a/src/smw/world.cpp b/src/smw/world.cpp index 97e6ebac..3e2a6bcc 100644 --- a/src/smw/world.cpp +++ b/src/smw/world.cpp @@ -23,8 +23,6 @@ WorldMap g_worldmap(0, 0); -extern std::string stripPathAndExtension(const std::string &path); - extern SDL_Surface* blitdest; extern CGameValues game_values;