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

Merge pull request #44 from death-droid/SaveEmulationFix 

Save emulation fix
This commit is contained in:
project64 2015-02-02 14:59:07 +11:00
parent 15e389cbe2 64e9135d19
commit 89db569322
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/Project64.vcxproj
View File

@ -56,6 +56,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
<ClCompile Include="Plugins\Plugin Base.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
@ -197,6 +198,7 @@
<ClInclude Include="Multilanguage.h" />
<ClInclude Include="N64 System.h" />
<ClInclude Include="Plugin.h" />
<ClInclude Include="Plugins\Plugin Base.h" />
<ClInclude Include="Settings.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="User Interface.h" />

6
Source/Project64/Project64.vcxproj.filters
View File

@ -417,6 +417,9 @@
<ClCompile Include="3rd Party\zlib\zip.c">
<Filter>Source Files\3rd Party Source\ZLib Source</Filter>
</ClCompile>
<ClCompile Include="Plugins\Plugin Base.cpp">
<Filter>Source Files\Plugin Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="User Interface\Bitmaps\AboutScreenBottom.bmp">
@ -839,5 +842,8 @@
<ClInclude Include="3rd Party\zlib\ZLIB.H">
<Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
</ClInclude>
<ClInclude Include="Plugins\Plugin Base.h">
<Filter>Header Files\Plugin Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

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

@ -167,12 +167,12 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
_makepath( SaveFile, drive, dir, fname, NULL );
}
}
g_Settings->SaveString(GameRunning_InstantSaveFile,SaveFile);
g_Settings->SaveString(GameRunning_InstantSaveFile, SaveFile);
char SaveDir[MAX_PATH];
_makepath( SaveDir, drive, dir, NULL, NULL );
g_Settings->SaveString(Directory_LastSave,SaveDir);
g_System->SaveState();
g_BaseSystem->ExternalEvent(SysEvent_SaveMachineState);
}
g_BaseSystem->ExternalEvent(SysEvent_ResumeCPU_SaveGame);
}