Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove some unused externs #349

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Remove some unused externs #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/common/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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} }
Expand Down
5 changes: 0 additions & 5 deletions src/smw/GSMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions src/smw/objects/moving/MO_CheepCheep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/////////////////////////////
2 changes: 0 additions & 2 deletions src/smw/world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading