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

C++11 compliant string literal concatenation

This commit is contained in:
xhainingx 2013-04-16 20:14:42 +00:00
parent 7abad425c5
commit 950d38e25d
3 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
trunk/src/config.cpp
View File

@ -16,33 +16,33 @@ static char *aboutString = 0;
///returns a string suitable for use in an aboutbox ///returns a string suitable for use in an aboutbox
char *FCEUI_GetAboutString() { char *FCEUI_GetAboutString() {
const char *aboutTemplate = const char *aboutTemplate =
FCEU_NAME_AND_VERSION "\n\n\ "FCEU_NAME_AND_VERSION \n\n"
Administrators:\n\ "Administrators:\n"
zeromus, adelikat, AnS\n\n\ "zeromus, adelikat, AnS\n\n"
Current Contributors:\n\ "Current Contributors:\n"
punkrockguy318 (Lukas Sabota)\n\ "punkrockguy318 (Lukas Sabota)\n"
Plombo (Bryan Cain)\n\ "Plombo (Bryan Cain)\n"
qeed, QFox, Shinydoofy, ugetab\n\ "qeed, QFox, Shinydoofy, ugetab\n"
CaH4e3, gocha, Acmlm, DWEdit\n\ "CaH4e3, gocha, Acmlm, DWEdit\n"
\n\ "\n"
FCEUX 2.0:\n\ "FCEUX 2.0:\n"
mz, nitsujrehtona, Lukas Sabota,\n\ "mz, nitsujrehtona, Lukas Sabota,\n"
SP, Ugly Joe\n\ "SP, Ugly Joe\n"
\n\ "\n"
Previous versions:\n\ "Previous versions:\n"
FCE - Bero\n\ "FCE - Bero\n"
FCEU - Xodnizel\n\ "FCEU - Xodnizel\n"
FCEU XD - Bbitmaster & Parasyte\n\ "FCEU XD - Bbitmaster & Parasyte\n"
FCEU XD SP - Sebastian Porst\n\ "FCEU XD SP - Sebastian Porst\n"
FCEU MM - CaH4e3\n\ "FCEU MM - CaH4e3\n"
FCEU TAS - blip & nitsuja\n\ "FCEU TAS - blip & nitsuja\n"
FCEU TAS+ - Luke Gustafson\n\ "FCEU TAS+ - Luke Gustafson\n"
\n\ "\n"
FCEUX is dedicated to the fallen heroes\n\ "FCEUX is dedicated to the fallen heroes\n"
of NES emulation. In Memoriam --\n\ "of NES emulation. In Memoriam --\n"
ugetab\n\ "ugetab\n"
\n\ "\n"
"__TIME__" "__DATE__"\n"; __TIME__ " " __DATE__ "\n";
if(aboutString) return aboutString; if(aboutString) return aboutString;

4
trunk/src/drivers/sdl/sdl.cpp
View File

@ -271,6 +271,10 @@ static void DoFun(int frameskip)
static int fskipc = 0; static int fskipc = 0;
static int opause = 0; static int opause = 0;
//TODO peroidic saves, working on it right now
//if (FCEUD_GetTime() % 5000 == 0){
// FCEUI_SaveState(NULL);
//}
#ifdef FRAMESKIP #ifdef FRAMESKIP
fskipc = (fskipc + 1) % (frameskip + 1); fskipc = (fskipc + 1) % (frameskip + 1);
#endif #endif