ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

we are 2016, let's get with the times

This commit is contained in:
Zach Bacon 2016-07-08 20:46:04 -04:00
parent 5bf44d19be
commit 32a6d7b494
No known key found for this signature in database
GPG Key ID: 7D110798AFE84B3A
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/ConfigManager.cpp
View File

@ -236,9 +236,9 @@ int winGbBorderOn;
int winGbPrinterEnabled; int winGbPrinterEnabled;
int winPauseNextFrame; int winPauseNextFrame;
int* rewindSerials = NULL; int* rewindSerials = NULL;
u32 autoFrameSkipLastTime; uint32_t autoFrameSkipLastTime;
u32 movieLastJoypad; uint32_t movieLastJoypad;
u32 movieNextJoypad; uint32_t movieNextJoypad;
int throttle; int throttle;
const char* preparedCheatCodes[MAX_CHEATS]; const char* preparedCheatCodes[MAX_CHEATS];
@ -252,7 +252,7 @@ char *(patchNames[PATCH_MAX_NUM]) = { NULL }; // and so on
void(*dbgMain)() = remoteStubMain; void(*dbgMain)() = remoteStubMain;
void(*dbgSignal)(int, int) = remoteStubSignal; void(*dbgSignal)(int, int) = remoteStubSignal;
void(*dbgOutput)(const char *, u32) = debuggerOutput; void(*dbgOutput)(const char *, uint32_t) = debuggerOutput;
char* homeDir = NULL; char* homeDir = NULL;
char* arg0 = NULL; char* arg0 = NULL;
@ -388,20 +388,20 @@ struct option argOptions[] = {
}; };
u32 fromHex(const char *s) uint32_t fromHex(const char *s)
{ {
if (!s) if (!s)
return 0; return 0;
u32 value; uint32_t value;
sscanf(s, "%x", &value); sscanf(s, "%x", &value);
return value; return value;
} }
u32 fromDec(const char *s) uint32_t fromDec(const char *s)
{ {
if (!s) if (!s)
return 0; return 0;
u32 value = 0; uint32_t value = 0;
sscanf(s, "%u", &value); sscanf(s, "%u", &value);
return value; return value;
} }
@ -773,7 +773,7 @@ void SaveConfigFile()
} }
} }
u32 ReadPrefHex(const char* pref_key, int default_value) uint32_t ReadPrefHex(const char* pref_key, int default_value)
{ {
std::stringstream ss; std::stringstream ss;
std::string default_string; std::string default_string;
@ -786,7 +786,7 @@ u32 ReadPrefHex(const char* pref_key, int default_value)
return fromHex(iniparser_getstring(preferences, pref.c_str(), default_string.c_str())); return fromHex(iniparser_getstring(preferences, pref.c_str(), default_string.c_str()));
} }
u32 ReadPrefHex(const char* pref_key) uint32_t ReadPrefHex(const char* pref_key)
{ {
LoadConfigFile(); LoadConfigFile();
std::string pref = "preferences:"; std::string pref = "preferences:";
@ -794,7 +794,7 @@ u32 ReadPrefHex(const char* pref_key)
return fromHex(iniparser_getstring(preferences, pref.c_str(), 0)); return fromHex(iniparser_getstring(preferences, pref.c_str(), 0));
} }
u32 ReadPref(const char* pref_key, int default_value) uint32_t ReadPref(const char* pref_key, int default_value)
{ {
LoadConfigFile(); LoadConfigFile();
std::string pref = "preferences:"; std::string pref = "preferences:";
@ -802,7 +802,7 @@ u32 ReadPref(const char* pref_key, int default_value)
return iniparser_getint(preferences, pref.c_str(), default_value); return iniparser_getint(preferences, pref.c_str(), default_value);
} }
u32 ReadPref(const char* pref_key) uint32_t ReadPref(const char* pref_key)
{ {
return ReadPref(pref_key, 0); return ReadPref(pref_key, 0);
} }