Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
vbam-libretro
Commits
32a6d7b4
Unverified
Commit
32a6d7b4
authored
Jul 08, 2016
by
Zach Bacon
Browse files
we are 2016, let's get with the times
parent
5bf44d19
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/common/ConfigManager.cpp
View file @
32a6d7b4
...
...
@@ -236,9 +236,9 @@ int winGbBorderOn;
int
winGbPrinterEnabled
;
int
winPauseNextFrame
;
int
*
rewindSerials
=
NULL
;
u
32
autoFrameSkipLastTime
;
u
32
movieLastJoypad
;
u
32
movieNextJoypad
;
u
int32_t
autoFrameSkipLastTime
;
u
int32_t
movieLastJoypad
;
u
int32_t
movieNextJoypad
;
int
throttle
;
const
char
*
preparedCheatCodes
[
MAX_CHEATS
];
...
...
@@ -252,7 +252,7 @@ char *(patchNames[PATCH_MAX_NUM]) = { NULL }; // and so on
void
(
*
dbgMain
)()
=
remoteStubMain
;
void
(
*
dbgSignal
)(
int
,
int
)
=
remoteStubSignal
;
void
(
*
dbgOutput
)(
const
char
*
,
u
32
)
=
debuggerOutput
;
void
(
*
dbgOutput
)(
const
char
*
,
u
int32_t
)
=
debuggerOutput
;
char
*
homeDir
=
NULL
;
char
*
arg0
=
NULL
;
...
...
@@ -388,20 +388,20 @@ struct option argOptions[] = {
};
u
32
fromHex
(
const
char
*
s
)
u
int32_t
fromHex
(
const
char
*
s
)
{
if
(
!
s
)
return
0
;
u
32
value
;
u
int32_t
value
;
sscanf
(
s
,
"%x"
,
&
value
);
return
value
;
}
u
32
fromDec
(
const
char
*
s
)
u
int32_t
fromDec
(
const
char
*
s
)
{
if
(
!
s
)
return
0
;
u
32
value
=
0
;
u
int32_t
value
=
0
;
sscanf
(
s
,
"%u"
,
&
value
);
return
value
;
}
...
...
@@ -773,7 +773,7 @@ void SaveConfigFile()
}
}
u
32
ReadPrefHex
(
const
char
*
pref_key
,
int
default_value
)
u
int32_t
ReadPrefHex
(
const
char
*
pref_key
,
int
default_value
)
{
std
::
stringstream
ss
;
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
()));
}
u
32
ReadPrefHex
(
const
char
*
pref_key
)
u
int32_t
ReadPrefHex
(
const
char
*
pref_key
)
{
LoadConfigFile
();
std
::
string
pref
=
"preferences:"
;
...
...
@@ -794,7 +794,7 @@ u32 ReadPrefHex(const char* pref_key)
return
fromHex
(
iniparser_getstring
(
preferences
,
pref
.
c_str
(),
0
));
}
u
32
ReadPref
(
const
char
*
pref_key
,
int
default_value
)
u
int32_t
ReadPref
(
const
char
*
pref_key
,
int
default_value
)
{
LoadConfigFile
();
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
);
}
u
32
ReadPref
(
const
char
*
pref_key
)
u
int32_t
ReadPref
(
const
char
*
pref_key
)
{
return
ReadPref
(
pref_key
,
0
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment