mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up unnecessary exports and add static keywords 

This patch cleans up unnecessary exports from header files (there were
only a few), as well as adds the static keyword to all symbols that
aren't exported and are specific to a file. This helps the linker out in
not doing any unnecessary work, speeding it up and avoiding silent
symbol conflicts (otherwise two symbols with the same name (and
type/signature in C++) would quietly resolve as okay by the linker).
This commit is contained in:
Misa 2021-01-10 09:14:37 -08:00 committed by Ethan Lee
parent fdee4007f7
commit e9c62ea9a3
13 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desktop_version/src/FileSystemUtils.cpp
View File

@ -28,12 +28,12 @@
#define MAX_PATH PATH_MAX #define MAX_PATH PATH_MAX
#endif #endif
char saveDir[MAX_PATH] = {'\0'}; static char saveDir[MAX_PATH] = {'\0'};
char levelDir[MAX_PATH] = {'\0'}; static char levelDir[MAX_PATH] = {'\0'};
void PLATFORM_getOSDirectory(char* output); static void PLATFORM_getOSDirectory(char* output);
void PLATFORM_migrateSaveData(char* output); static void PLATFORM_migrateSaveData(char* output);
void PLATFORM_copyFile(const char *oldLocation, const char *newLocation); static void PLATFORM_copyFile(const char *oldLocation, const char *newLocation);
int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath) int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath)
{ {
@ -345,7 +345,7 @@ std::vector<std::string> FILESYSTEM_getLevelDirFileNames()
return list; return list;
} }
void PLATFORM_getOSDirectory(char* output) static void PLATFORM_getOSDirectory(char* output)
{ {
#ifdef _WIN32 #ifdef _WIN32
/* This block is here for compatibility, do not touch it! */ /* This block is here for compatibility, do not touch it! */
@ -358,7 +358,7 @@ void PLATFORM_getOSDirectory(char* output)
#endif #endif
} }
void PLATFORM_migrateSaveData(char* output) static void PLATFORM_migrateSaveData(char* output)
{ {
char oldLocation[MAX_PATH]; char oldLocation[MAX_PATH];
char newLocation[MAX_PATH]; char newLocation[MAX_PATH];
@ -521,7 +521,7 @@ void PLATFORM_migrateSaveData(char* output)
#endif #endif
} }
void PLATFORM_copyFile(const char *oldLocation, const char *newLocation) static void PLATFORM_copyFile(const char *oldLocation, const char *newLocation)
{ {
char *data; char *data;
size_t length, bytes_read, bytes_written; size_t length, bytes_read, bytes_written;

2
desktop_version/src/Game.cpp
View File

@ -26,7 +26,7 @@
#define strcasecmp stricmp #define strcasecmp stricmp
#endif #endif
bool GetButtonFromString(const char *pText, SDL_GameControllerButton *button) static bool GetButtonFromString(const char *pText, SDL_GameControllerButton *button)
{ {
if (*pText == '0' || if (*pText == '0' ||
*pText == 'a' || *pText == 'a' ||

2
desktop_version/src/GraphicsResources.cpp
View File

@ -24,7 +24,7 @@ extern "C"
); );
} }
SDL_Surface* LoadImage(const char *filename, bool noBlend = true, bool noAlpha = false) static SDL_Surface* LoadImage(const char *filename, bool noBlend = true, bool noAlpha = false)
{ {
//Temporary storage for the image that's loaded //Temporary storage for the image that's loaded
SDL_Surface* loadedImage = NULL; SDL_Surface* loadedImage = NULL;

8
desktop_version/src/GraphicsUtil.cpp
View File

@ -42,7 +42,7 @@ SDL_Surface* GetSubSurface( SDL_Surface* metaSurface, int x, int y, int width, i
return preSurface; return preSurface;
} }
void DrawPixel( SDL_Surface *_surface, int x, int y, Uint32 pixel ) static void DrawPixel( SDL_Surface *_surface, int x, int y, Uint32 pixel )
{ {
int bpp = _surface->format->BytesPerPixel; int bpp = _surface->format->BytesPerPixel;
/* Here p is the address to the pixel we want to set */ /* Here p is the address to the pixel we want to set */
@ -294,9 +294,9 @@ void BlitSurfaceTinted(
} }
int oldscrollamount = 0; static int oldscrollamount = 0;
int scrollamount = 0; static int scrollamount = 0;
bool isscrolling = 0; static bool isscrolling = 0;
void UpdateFilter() void UpdateFilter()
{ {

2
desktop_version/src/GraphicsUtil.h
View File

@ -13,8 +13,6 @@ void setRect(SDL_Rect& _r, int x, int y, int w, int h);
SDL_Surface* GetSubSurface( SDL_Surface* metaSurface, int x, int y, int width, int height ); SDL_Surface* GetSubSurface( SDL_Surface* metaSurface, int x, int y, int width, int height );
void DrawPixel( SDL_Surface *surface, int x, int y, Uint32 pixel );
Uint32 ReadPixel( SDL_Surface *surface, int x, int y ); Uint32 ReadPixel( SDL_Surface *surface, int x, int y );
SDL_Surface * ScaleSurface( SDL_Surface *Surface, int Width, int Height, SDL_Surface * Dest = NULL ); SDL_Surface * ScaleSurface( SDL_Surface *Surface, int Width, int Height, SDL_Surface * Dest = NULL );

8
desktop_version/src/Input.cpp
View File

@ -15,7 +15,7 @@
#include "Script.h" #include "Script.h"
#include "UtilityClass.h" #include "UtilityClass.h"
void updatebuttonmappings(int bind) static void updatebuttonmappings(int bind)
{ {
for ( for (
SDL_GameControllerButton i = SDL_CONTROLLER_BUTTON_A; SDL_GameControllerButton i = SDL_CONTROLLER_BUTTON_A;
@ -173,7 +173,7 @@ void updatebuttonmappings(int bind)
} }
} }
void menuactionpress() static void menuactionpress()
{ {
switch (game.currentmenuname) switch (game.currentmenuname)
{ {
@ -2059,7 +2059,7 @@ void gameinput()
} }
} }
void mapmenuactionpress(); static void mapmenuactionpress();
void mapinput() void mapinput()
{ {
@ -2247,7 +2247,7 @@ void mapinput()
} }
} }
void mapmenuactionpress() static void mapmenuactionpress()
{ {
switch (game.menupage) switch (game.menupage)
{ {

4
desktop_version/src/Music.cpp
View File

@ -8,7 +8,7 @@
#include "Map.h" #include "Map.h"
#include "UtilityClass.h" #include "UtilityClass.h"
void songend(); static void songend();
musicclass::musicclass() musicclass::musicclass()
{ {
@ -158,7 +158,7 @@ void musicclass::init()
} }
} }
void songend() static void songend()
{ {
extern musicclass music; extern musicclass music;
music.songEnd = SDL_GetPerformanceCounter(); music.songEnd = SDL_GetPerformanceCounter();

10
desktop_version/src/Render.cpp
View File

@ -12,13 +12,13 @@
#include "UtilityClass.h" #include "UtilityClass.h"
#include "Version.h" #include "Version.h"
int tr; static int tr;
int tg; static int tg;
int tb; static int tb;
// Macro-like inline function used in maprender() // Macro-like inline function used in maprender()
// Used to keep some text positions the same in Flip Mode // Used to keep some text positions the same in Flip Mode
int inline FLIP(int ypos) static int inline FLIP(int ypos)
{ {
if (graphics.flipmode) if (graphics.flipmode)
{ {
@ -46,7 +46,7 @@ static inline void drawslowdowntext()
} }
} }
void menurender() static void menurender()
{ {
int temp = 50; int temp = 50;

2
desktop_version/src/UtilityClass.cpp
View File

@ -6,7 +6,7 @@
#include <sstream> #include <sstream>
/* Used by UtilityClass::GCString to generate a button list */ /* Used by UtilityClass::GCString to generate a button list */
const char *GCChar(SDL_GameControllerButton button) static const char *GCChar(SDL_GameControllerButton button)
{ {
if (button == SDL_CONTROLLER_BUTTON_A) if (button == SDL_CONTROLLER_BUTTON_A)
{ {

16
desktop_version/src/editor.cpp
View File

@ -60,7 +60,7 @@ editorclass::editorclass()
} }
// comparison, not case sensitive. // comparison, not case sensitive.
bool compare_nocase (std::string first, std::string second) static bool compare_nocase (std::string first, std::string second)
{ {
unsigned int i=0; unsigned int i=0;
while ( (i<first.length()) && (i<second.length()) ) while ( (i<first.length()) && (i<second.length()) )
@ -2084,7 +2084,7 @@ bool editorclass::save(std::string& _path)
} }
void addedentity( int xp, int yp, int tp, int p1/*=0*/, int p2/*=0*/, int p3/*=0*/, int p4/*=0*/, int p5/*=320*/, int p6/*=240*/) static void addedentity( int xp, int yp, int tp, int p1 = 0, int p2 = 0, int p3 = 0, int p4 = 0, int p5 = 320, int p6 = 240)
{ {
edentities entity; edentities entity;
@ -2102,12 +2102,12 @@ void addedentity( int xp, int yp, int tp, int p1/*=0*/, int p2/*=0*/, int p3/*=0
edentity.push_back(entity); edentity.push_back(entity);
} }
void removeedentity( int t ) static void removeedentity( int t )
{ {
edentity.erase(edentity.begin() + t); edentity.erase(edentity.begin() + t);
} }
int edentat( int xp, int yp ) static int edentat( int xp, int yp )
{ {
for(size_t i=0; i<edentity.size(); i++) for(size_t i=0; i<edentity.size(); i++)
{ {
@ -2116,7 +2116,7 @@ int edentat( int xp, int yp )
return -1; return -1;
} }
void fillbox( int x, int y, int x2, int y2, int c ) static void fillbox( int x, int y, int x2, int y2, int c )
{ {
FillRect(graphics.backBuffer, x, y, x2-x, 1, c); FillRect(graphics.backBuffer, x, y, x2-x, 1, c);
FillRect(graphics.backBuffer, x, y2-1, x2-x, 1, c); FillRect(graphics.backBuffer, x, y2-1, x2-x, 1, c);
@ -2124,7 +2124,7 @@ void fillbox( int x, int y, int x2, int y2, int c )
FillRect(graphics.backBuffer, x2-1, y, 1, y2-y, c); FillRect(graphics.backBuffer, x2-1, y, 1, y2-y, c);
} }
void fillboxabs( int x, int y, int x2, int y2, int c ) static void fillboxabs( int x, int y, int x2, int y2, int c )
{ {
FillRect(graphics.backBuffer, x, y, x2, 1, c); FillRect(graphics.backBuffer, x, y, x2, 1, c);
FillRect(graphics.backBuffer, x, y+y2-1, x2, 1, c); FillRect(graphics.backBuffer, x, y+y2-1, x2, 1, c);
@ -2253,7 +2253,7 @@ void editorclass::generatecustomminimap()
} }
#if !defined(NO_EDITOR) #if !defined(NO_EDITOR)
void editormenurender(int tr, int tg, int tb) static void editormenurender(int tr, int tg, int tb)
{ {
extern editorclass ed; extern editorclass ed;
switch (game.currentmenuname) switch (game.currentmenuname)
@ -3662,7 +3662,7 @@ void editorlogic()
} }
void editormenuactionpress() static void editormenuactionpress()
{ {
extern editorclass ed; extern editorclass ed;
switch (game.currentmenuname) switch (game.currentmenuname)

11
desktop_version/src/editor.h
View File

@ -265,17 +265,6 @@ class editorclass{
int currentghosts; int currentghosts;
}; };
void addedentity(int xp, int yp, int tp, int p1=0, int p2=0, int p3=0, int p4=0, int p5=320, int p6=240);
void removeedentity(int t);
int edentat(int xp, int yp);
void fillbox(int x, int y, int x2, int y2, int c);
void fillboxabs(int x, int y, int x2, int y2, int c);
#if !defined(NO_EDITOR) #if !defined(NO_EDITOR)
void editorrender(); void editorrender();

38
desktop_version/src/main.cpp
View File

@ -38,23 +38,23 @@ mapclass map;
entityclass obj; entityclass obj;
Screen gameScreen; Screen gameScreen;
bool startinplaytest = false; static bool startinplaytest = false;
bool savefileplaytest = false; static bool savefileplaytest = false;
int savex = 0; static int savex = 0;
int savey = 0; static int savey = 0;
int saverx = 0; static int saverx = 0;
int savery = 0; static int savery = 0;
int savegc = 0; static int savegc = 0;
int savemusic = 0; static int savemusic = 0;
std::string playassets; static std::string playassets;
std::string playtestname; static std::string playtestname;
volatile Uint32 time_ = 0; static volatile Uint32 time_ = 0;
volatile Uint32 timePrev = 0; static volatile Uint32 timePrev = 0;
volatile Uint32 accumulator = 0; static volatile Uint32 accumulator = 0;
volatile Uint32 f_time = 0; static volatile Uint32 f_time = 0;
volatile Uint32 f_timePrev = 0; static volatile Uint32 f_timePrev = 0;
static inline Uint32 get_framerate(const int slowdown) static inline Uint32 get_framerate(const int slowdown)
{ {
@ -73,8 +73,8 @@ static inline Uint32 get_framerate(const int slowdown)
return 34; return 34;
} }
void inline deltaloop(); static void inline deltaloop();
void inline fixedloop(); static void inline fixedloop();
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -414,7 +414,7 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
void inline deltaloop() static void inline deltaloop()
{ {
//timestep limit to 30 //timestep limit to 30
const float rawdeltatime = static_cast<float>(time_ - timePrev); const float rawdeltatime = static_cast<float>(time_ - timePrev);
@ -482,7 +482,7 @@ void inline deltaloop()
} }
} }
void inline fixedloop() static void inline fixedloop()
{ {
// Update network per frame. // Update network per frame.
NETWORK_update(); NETWORK_update();

10
desktop_version/src/preloader.cpp
View File

@ -4,12 +4,12 @@
#include "KeyPoll.h" #include "KeyPoll.h"
#include "UtilityClass.h" #include "UtilityClass.h"
int pre_fakepercent=0, pre_transition=30; static int pre_fakepercent=0, pre_transition=30;
bool pre_startgame=false; static bool pre_startgame=false;
int pre_darkcol=0, pre_lightcol=0, pre_curcol=0, pre_coltimer=0, pre_offset=0; static int pre_darkcol=0, pre_lightcol=0, pre_curcol=0, pre_coltimer=0, pre_offset=0;
int pre_frontrectx=30, pre_frontrecty=20, pre_frontrectw=260, pre_frontrecth=200; static int pre_frontrectx=30, pre_frontrecty=20, pre_frontrectw=260, pre_frontrecth=200;
int pre_temprectx=0, pre_temprecty=0, pre_temprectw=320, pre_temprecth=240; static int pre_temprectx=0, pre_temprecty=0, pre_temprectw=320, pre_temprecth=240;
void preloaderinput() void preloaderinput()
{ {