notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for recent /gp2x changes
[picodrive.git]
/
platform
/
uiq3
/
engine
/
main.cpp
diff --git
a/platform/uiq3/engine/main.cpp
b/platform/uiq3/engine/main.cpp
index
de5ac27
..
66fee33
100644
(file)
--- a/
platform/uiq3/engine/main.cpp
+++ b/
platform/uiq3/engine/main.cpp
@@
-331,8
+331,8
@@
static void TargetEpocGameL()
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
\r
\r
// save SRAM
\r
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
\r
\r
// save SRAM
\r
- if ((currentConfig.EmuOpt & EOPT_
USE
_SRAM) && SRam.changed) {
\r
- emu_
SaveLoadG
ame(0, 1);
\r
+ if ((currentConfig.EmuOpt & EOPT_
EN
_SRAM) && SRam.changed) {
\r
+ emu_
save_load_g
ame(0, 1);
\r
SRam.changed = 0;
\r
}
\r
CPolledActiveScheduler::Instance()->Schedule();
\r
SRam.changed = 0;
\r
}
\r
CPolledActiveScheduler::Instance()->Schedule();
\r
@@
-346,7
+346,7
@@
static void TargetEpocGameL()
}
\r
else if(gamestate == PGS_ReloadRom)
\r
{
\r
}
\r
else if(gamestate == PGS_ReloadRom)
\r
{
\r
- loadrom_result = emu_
ReloadR
om(loadrom_fname);
\r
+ loadrom_result = emu_
reload_r
om(loadrom_fname);
\r
pico_was_reset = 1;
\r
if (loadrom_result)
\r
gamestate = PGS_Running;
\r
pico_was_reset = 1;
\r
if (loadrom_result)
\r
gamestate = PGS_Running;
\r
@@
-379,7
+379,7
@@
static void TargetEpocGameL()
User::After(150000);
\r
}
\r
\r
User::After(150000);
\r
}
\r
\r
- emu_
WriteC
onfig(0);
\r
+ emu_
write_c
onfig(0);
\r
CGameWindow::FreeResources();
\r
} else if(gamestate == PGS_Quit) {
\r
break;
\r
CGameWindow::FreeResources();
\r
} else if(gamestate == PGS_Quit) {
\r
break;
\r
@@
-853,7
+853,7
@@
void CGameWindow::RunEvents(TUint32 which)
if(PsndOut) gameAudio->Pause(); // this may take a while, so we pause sound output
\r
\r
vidDrawNotice((which & 0x1000) ? "LOADING@GAME" : "SAVING@GAME");
\r
if(PsndOut) gameAudio->Pause(); // this may take a while, so we pause sound output
\r
\r
vidDrawNotice((which & 0x1000) ? "LOADING@GAME" : "SAVING@GAME");
\r
- emu_
SaveLoadG
ame(which & 0x1000, 0);
\r
+ emu_
save_load_g
ame(which & 0x1000, 0);
\r
\r
if(PsndOut) PsndOut = gameAudio->ResumeL();
\r
reset_timing = 1;
\r
\r
if(PsndOut) PsndOut = gameAudio->ResumeL();
\r
reset_timing = 1;
\r
@@
-889,9
+889,16
@@
void CGameWindow::RunEvents(TUint32 which)
}
\r
\r
\r
}
\r
\r
\r
-extern "C" void
emu_noticeMsgUpdated(void
)
\r
+extern "C" void
plat_status_msg(const char *format, ...
)
\r
{
\r
{
\r
- char *p = noticeMsg;
\r
+ va_list vl;
\r
+ char *p;
\r
+
\r
+ va_start(vl, format);
\r
+ vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);
\r
+ va_end(vl);
\r
+
\r
+ p = noticeMsg;
\r
while (*p) {
\r
if (*p == ' ') *p = '@';
\r
if (*p < '0' || *p > 'Z') { *p = 0; break; }
\r
while (*p) {
\r
if (*p == ' ') *p = '@';
\r
if (*p < '0' || *p > 'Z') { *p = 0; break; }
\r