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

Plugins: Change the order and where that reset/plugin reset is being called.

This commit is contained in:
zilmar 2012-12-29 07:31:10 +11:00
parent 54ef14bb7e
commit 746f1168d9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64/N64 System/N64 Class.cpp
View File

@ -487,7 +487,6 @@ void CN64System::GameReset (void)
void CN64System::Reset (bool bInitReg, bool ClearMenory) void CN64System::Reset (bool bInitReg, bool ClearMenory)
{ {
RefreshGameSettings(); RefreshGameSettings();
if (m_Plugins) { m_Plugins->GameReset(); }
m_Audio.Reset(); m_Audio.Reset();
m_MMU_VM.Reset(ClearMenory); m_MMU_VM.Reset(ClearMenory);
Debug_Reset(); Debug_Reset();
@ -533,6 +532,7 @@ void CN64System::Reset (bool bInitReg, bool ClearMenory)
bool CN64System::SetActiveSystem( bool bActive ) bool CN64System::SetActiveSystem( bool bActive )
{ {
bool bInitPlugin = false; bool bInitPlugin = false;
bool bReset = false;
bool bRes = true; bool bRes = true;
if (bActive) if (bActive)
@ -573,7 +573,7 @@ bool CN64System::SetActiveSystem( bool bActive )
{ {
return false; return false;
} }
Reset(true,true); bReset = true;
m_bInitilized = true; m_bInitilized = true;
bInitPlugin = true; bInitPlugin = true;
} }
@ -608,6 +608,11 @@ bool CN64System::SetActiveSystem( bool bActive )
WriteTrace(TraceError, __FUNCTION__ ": g_Plugins->Initiate Failed"); WriteTrace(TraceError, __FUNCTION__ ": g_Plugins->Initiate Failed");
} }
} }
if (bReset)
{
Reset(true,true);
}
return bRes; return bRes;
} }
@ -783,8 +788,6 @@ void CN64System::InitRegisters( bool bPostPif, CMipsMemory & MMU )
void CN64System::ExecuteCPU ( void ) void CN64System::ExecuteCPU ( void )
{ {
if (g_Plugins) { g_Plugins->GameReset(); }
//reset code //reset code
g_Settings->SaveBool(GameRunning_CPU_Running,true); g_Settings->SaveBool(GameRunning_CPU_Running,true);
g_Settings->SaveBool(GameRunning_CPU_Paused,false); g_Settings->SaveBool(GameRunning_CPU_Paused,false);