-removed a few checks for emu nand on game boot since we already

checked if the NAND is valid
-removed some annoying debug prints
-fixed possible crashes with "force_cios_load" option
This commit is contained in:
fix94.1 2012-09-20 12:40:47 +00:00
parent 6cc8949523
commit d7f999a790
4 changed files with 14 additions and 14 deletions

View File

@ -635,7 +635,7 @@ void CCoverFlow::stopCoverLoader(bool empty)
m_items[i].state = CCoverFlow::STATE_Loading;
}
}
gprintf("Coverflow stopped!\n");
//gprintf("Coverflow stopped!\n");
}
}
@ -649,7 +649,7 @@ void CCoverFlow::startCoverLoader(void)
unsigned int stack_size = (unsigned int)8192;
LWP_CreateThread(&coverLoaderThread, (void *(*)(void *))CCoverFlow::_coverLoader, (void *)this, 0, stack_size, 20);
gprintf("Coverflow started!\n");
//gprintf("Coverflow started!\n");
}
void CCoverFlow::clear(void)

View File

@ -106,7 +106,7 @@ int main(int argc, char **argv)
{
iosOK = loadIOS(mainIOS, true) && CustomIOS(CurrentIOS.Type);
Open_Inputs();
mainMenu->init();
//mainMenu->init();
}
}
if(CurrentIOS.Version == mainIOS)

View File

@ -2458,8 +2458,8 @@ retry:
const u8 *font_file = u8_get_file_by_index(u8_font_archive, 1, &size); // There is only one file in that app
//gprintf("Extracted font: %d\n", size);
if(m_base_font)
MEM1_free(m_base_font);
m_base_font = (u8*)MEM1_alloc(size);
MEM1_lo_free(m_base_font);
m_base_font = (u8*)MEM1_lo_alloc(size);
memcpy(m_base_font, font_file, size);
DCFlushRange(m_base_font, size);
m_base_font_size = size;

View File

@ -1061,9 +1061,9 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
if(!forwarder && has_enabled_providers() && _initNetwork() == 0)
add_game_to_card(id.c_str());
string emuPath;
m_partRequest = m_cfg.getInt("NAND", "partition", 0);
int emuPartition = _FindEmuPart(&emuPath, m_partRequest, false);
string emuPath = m_cfg.getString("NAND", "path", STDEMU_DIR);;
//m_partRequest = m_cfg.getInt("NAND", "partition", 0);
//int emuPartition = _FindEmuPart(&emuPath, m_partRequest, false);
bool emu_disabled = (m_cfg.getBool("NAND", "disable", true) || neek2o());
int emulate_mode = min(max(0, m_cfg.getInt("NAND", "emulation", 1)), (int)ARRAY_SIZE(CMenu::_NandEmu) - 1);
@ -1078,7 +1078,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
m_cfg.save(true);
cleanup();
if(useNK2o && emuPartition != 1)
if(useNK2o && currentPartition != 1)
useNK2o = false;
if(useNK2o && !emu_disabled)
@ -1100,8 +1100,8 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
{
if(!emu_disabled)
{
DeviceHandler::Instance()->UnMount(emuPartition);
Nand::Instance()->Init(emuPath.c_str(), emuPartition, false);
DeviceHandler::Instance()->UnMount(currentPartition);
Nand::Instance()->Init(emuPath.c_str(), currentPartition, false);
Nand::Instance()->Enable_Emu();
}
gameIOS = channel.GetRequestedIOS(gameTitle);
@ -1126,7 +1126,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
}
if(!emu_disabled)
{
Nand::Instance()->Init(emuPath.c_str(), emuPartition, false);
Nand::Instance()->Init(emuPath.c_str(), currentPartition, false);
if(emulate_mode == 1)
Nand::Instance()->Set_FullMode(true);
else