preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 02:29:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into TemporaryHackishBranch

Browse Source 
# Conflicts:
#	Core/Compatibility.cpp
#	Core/Compatibility.h
#	Core/Config.cpp
#	Core/Config.h
#	Core/CoreTiming.cpp
#	Core/HLE/sceDisplay.cpp
#	GPU/Common/DrawEngineCommon.h
#	GPU/Common/SplineCommon.cpp
#	GPU/D3D11/DrawEngineD3D11.cpp
#	GPU/D3D11/ShaderManagerD3D11.cpp
#	GPU/Directx9/ShaderManagerDX9.cpp
#	GPU/Directx9/VertexShaderGeneratorDX9.cpp
#	GPU/GLES/DrawEngineGLES.cpp
#	GPU/GPUCommon.cpp
#	GPU/Vulkan/DrawEngineVulkan.cpp
#	UI/CwCheatScreen.cpp
#	UI/EmuScreen.cpp
#	UI/GameSettingsScreen.cpp
#	UI/MainScreen.cpp
#	Windows/GEDebugger/VertexPreview.cpp
#	Windows/MainWindowMenu.cpp
#	Windows/ppsspp.rc
#	Windows/resource.h
#	assets/compat.ini
#	ext/native/thin3d/VulkanRenderManager.cpp
#	libretro/libretro.cpp
This commit is contained in:
LunaMoo committed 2019-02-14 02:50:01 +01:00
2 parents 1cc1a192d5 cbf735e2e2
commit c46de369bb
339 files changed
+8561 -6198
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/CwCheatScreen.cpp
+2 -2
View File
@@ -221,7 +221,7 @@ void CwCheatScreen::ParseCheatDB(std::string line, std::vector<std::string> titl
continue;
}
loop:;
} while (fs.good() && (line[0] == '_' && line[1] != 'S') || line[0] == '/' || line[0] == '#');
} while (fs.good() && ((line[0] == '_' && line[1] != 'S') || line[0] == '/' || line[0] == '#'));
finished = true;
}
if (finished == true)
@@ -236,7 +236,7 @@ void CwCheatScreen::ParseCheatDB(std::string line, std::vector<std::string> titl
File::OpenCPPFile(fs, activeCheatFile, std::ios::out | std::ios::app);
auto it = title.begin();
if ((title2[0] == '_' && title2[1] != 'S') || title2[0] == '/' || title2[0] == '#' && it != title.end() && (++it) != title.end()) {
if (((title2[0] == '_' && title2[1] != 'S') || title2[0] == '/' || title2[0] == '#') && it != title.end() && (++it) != title.end()) {
fs << title[0] << "\n" << title[1];
}