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

Merge remote-tracking branch 'origin/head' 

Conflicts:
	Source/Project64/N64 System/Mips/FlashRam.cpp
This commit is contained in:
zilmar 2012-10-04 12:33:04 +10:00
parent 7ce2aded6d cf761b3f70
commit 2b24f49b84
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64/N64 System/Mips/System Events.cpp
View File

@ -37,7 +37,6 @@ void CSystemEvents::ExecuteEvents ( void )
EventList Events = m_Events; EventList Events = m_Events;
m_Events.clear(); m_Events.clear();
bool bPause = false, bLoadedSave = false; bool bPause = false, bLoadedSave = false;
for (EventList::const_iterator iter = Events.begin(); !bLoadedSave && iter != Events.end(); iter++ ) for (EventList::const_iterator iter = Events.begin(); !bLoadedSave && iter != Events.end(); iter++ )
{ {
switch (*iter) switch (*iter)

15
Source/Project64/User Interface/Main Menu Class.cpp
View File

@ -148,10 +148,10 @@ bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD FromAccelerator, DWORD Men
openfilename.nMaxFile = MAX_PATH; openfilename.nMaxFile = MAX_PATH;
openfilename.Flags = OFN_HIDEREADONLY; openfilename.Flags = OFN_HIDEREADONLY;
_BaseSystem->ExternalEvent(SysEvent_PauseCPU_SaveGame); _BaseSystem->ExternalEvent(SysEvent_PauseCPU_SaveGame);
if (GetSaveFileName (&openfilename)) if (GetSaveFileName (&openfilename))
{ {
_splitpath( SaveFile, drive, dir, fname, ext ); _splitpath( SaveFile, drive, dir, fname, ext );
if (_stricmp(ext, ".pj") == 0 || _stricmp(ext, ".zip") == 0) if (_stricmp(ext, ".pj") == 0 || _stricmp(ext, ".zip") == 0)
{ {
@ -167,10 +167,8 @@ bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD FromAccelerator, DWORD Men
char SaveDir[MAX_PATH]; char SaveDir[MAX_PATH];
_makepath( SaveDir, drive, dir, NULL, NULL ); _makepath( SaveDir, drive, dir, NULL, NULL );
_Settings->SaveString(Directory_LastSave,SaveDir); _Settings->SaveString(Directory_LastSave,SaveDir);
_System->SaveState();
_BaseSystem->ExternalEvent(SysEvent_SaveMachineState);
} }
_BaseSystem->ExternalEvent(SysEvent_ResumeCPU_SaveGame); _BaseSystem->ExternalEvent(SysEvent_ResumeCPU_SaveGame);
} }
break; break;
@ -193,17 +191,14 @@ bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD FromAccelerator, DWORD Men
openfilename.nMaxFile = MAX_PATH; openfilename.nMaxFile = MAX_PATH;
openfilename.Flags = OFN_HIDEREADONLY; openfilename.Flags = OFN_HIDEREADONLY;
_BaseSystem->ExternalEvent(SysEvent_PauseCPU_LoadGame); _BaseSystem->ExternalEvent(SysEvent_PauseCPU_LoadGame);
if (GetOpenFileName (&openfilename)) { if (GetOpenFileName (&openfilename)) {
_Settings->SaveString(GameRunning_InstantSaveFile,SaveFile); _Settings->SaveString(GameRunning_InstantSaveFile,SaveFile);
char SaveDir[MAX_PATH], drive[_MAX_DRIVE] ,dir[_MAX_DIR], fname[_MAX_FNAME],ext[_MAX_EXT]; char SaveDir[MAX_PATH], drive[_MAX_DRIVE] ,dir[_MAX_DIR], fname[_MAX_FNAME],ext[_MAX_EXT];
_splitpath( SaveFile, drive, dir, fname, ext ); _splitpath( SaveFile, drive, dir, fname, ext );
_makepath( SaveDir, drive, dir, NULL, NULL ); _makepath( SaveDir, drive, dir, NULL, NULL );
_Settings->SaveString(Directory_LastSave,SaveDir); _Settings->SaveString(Directory_LastSave,SaveDir);
_System->LoadState();
_BaseSystem->ExternalEvent(SysEvent_LoadMachineState);
} }
_BaseSystem->ExternalEvent(SysEvent_ResumeCPU_LoadGame); _BaseSystem->ExternalEvent(SysEvent_ResumeCPU_LoadGame);
} }