get rid of some CamelCase names

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@712 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-07-23 21:02:16 +00:00
parent c18c15aed7
commit a47dd66367
14 changed files with 121 additions and 127 deletions

View file

@ -164,32 +164,32 @@ void CPicolAppView::HandleCommandL(CQikCommand& aCommand)
case EEikCmdPicoFrameskipAuto:
currentConfig.Frameskip = -1;
emu_WriteConfig(0);
emu_write_config(0);
break;
case EEikCmdPicoFrameskip0:
currentConfig.Frameskip = 0;
emu_WriteConfig(0);
emu_write_config(0);
break;
case EEikCmdPicoFrameskip1:
currentConfig.Frameskip = 1;
emu_WriteConfig(0);
emu_write_config(0);
break;
case EEikCmdPicoFrameskip2:
currentConfig.Frameskip = 2;
emu_WriteConfig(0);
emu_write_config(0);
break;
case EEikCmdPicoFrameskip4:
currentConfig.Frameskip = 4;
emu_WriteConfig(0);
emu_write_config(0);
break;
case EEikCmdPicoFrameskip8:
currentConfig.Frameskip = 8;
emu_WriteConfig(0);
emu_write_config(0);
break;
case EEikCmdExit:
@ -285,10 +285,10 @@ void CPicolAppView::DisplayOpenROMDialogL()
void CPicolAppView::DisplayConfigDialogL()
{
CPicoConfigDialog* configDialog = new(ELeave)CPicoConfigDialog(currentConfig);
emu_packConfig();
emu_pack_config();
configDialog->ExecuteLD(R_PICO_CONFIG);
emu_unpackConfig();
emu_WriteConfig(0);
emu_unpack_config();
emu_write_config(0);
CPicoGameSession::Do(PicoMsgConfigChange, &currentConfig);
}

View file

@ -46,11 +46,11 @@ TInt CPicoGameSession::Do(const TPicoServRqst what, TAny *param)
{
case PicoMsgLoadState:
if(!rom_loaded) return -1; // no ROM
return emu_SaveLoadGame(1, 0);
return emu_save_load_game(1, 0);
case PicoMsgSaveState:
if(!rom_loaded) return -1;
return emu_SaveLoadGame(0, 0);
return emu_save_load_game(0, 0);
case PicoMsgLoadROM:
return loadROM((TPtrC16 *)param);
@ -188,7 +188,7 @@ TInt CPicoGameSession::loadROM(TPtrC16 *pptr)
if (loadrom_result == 0)
return PicoErrRomOpenFailed;
emu_getGameName(buff);
emu_get_game_name(buff);
TPtrC8 buff8((TUint8*) buff);
iRomInternalName.Copy(buff8);

View file

@ -34,7 +34,7 @@ void emu_Init(void)
emu_prepareDefaultConfig();
config_readlrom("D:\\other\\PicoDrive\\config.cfg");
emu_ReadConfig(0, 0);
emu_read_config(0, 0);
//PicoInit();
}
@ -68,6 +68,24 @@ void emu_prepareDefaultConfig(void)
defaultConfig.KeyBinds[0xd5] = 1<<26; // back
}
void emu_pack_config(void)
{
currentConfig.s_PicoOpt = PicoOpt;
currentConfig.s_PsndRate = PsndRate;
currentConfig.s_PicoRegion = PicoRegionOverride;
currentConfig.s_PicoAutoRgnOrder = PicoAutoRgnOrder;
currentConfig.s_PicoCDBuffers = PicoCDBuffers;
}
void emu_unpack_config(void)
{
PicoOpt = currentConfig.s_PicoOpt;
PsndRate = currentConfig.s_PsndRate;
PicoRegionOverride = currentConfig.s_PicoRegion;
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
PicoCDBuffers = currentConfig.s_PicoCDBuffers;
}
/* used by config engine only, not actual menus */
menu_entry opt_entries[] =
{

View file

@ -331,8 +331,8 @@ static void TargetEpocGameL()
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
// save SRAM
if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) {
emu_SaveLoadGame(0, 1);
if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
emu_save_load_game(0, 1);
SRam.changed = 0;
}
CPolledActiveScheduler::Instance()->Schedule();
@ -346,7 +346,7 @@ static void TargetEpocGameL()
}
else if(gamestate == PGS_ReloadRom)
{
loadrom_result = emu_ReloadRom(loadrom_fname);
loadrom_result = emu_reload_rom(loadrom_fname);
pico_was_reset = 1;
if (loadrom_result)
gamestate = PGS_Running;
@ -379,7 +379,7 @@ static void TargetEpocGameL()
User::After(150000);
}
emu_WriteConfig(0);
emu_write_config(0);
CGameWindow::FreeResources();
} else if(gamestate == PGS_Quit) {
break;
@ -853,7 +853,7 @@ void CGameWindow::RunEvents(TUint32 which)
if(PsndOut) gameAudio->Pause(); // this may take a while, so we pause sound output
vidDrawNotice((which & 0x1000) ? "LOADING@GAME" : "SAVING@GAME");
emu_SaveLoadGame(which & 0x1000, 0);
emu_save_load_game(which & 0x1000, 0);
if(PsndOut) PsndOut = gameAudio->ResumeL();
reset_timing = 1;