Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix

Browse source
This commit is contained in:
Steven Cherry 2013-09-01 18:11:41 -05:00
parent ddc8ab967f
commit 3d468e37ad
5 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
UI/CwCheatScreen.cpp
View file

@ -111,15 +111,9 @@ UI::EventReturn CwCheatScreen::OnEnableAll(UI::EventParams &params)
std::vector<std::string> temp = cheatList;
enableAll = !enableAll;
os.open(activeCheatFile.c_str());
<<<<<<< HEAD
for (int j = 0; j < cheatList.size(); j++) {
if (enableAll == 1 && cheatList[j].substr(0, 3) == "_C0"){
cheatList[j].replace(0, 3, "_C1");
=======
for (size_t j = 0; j < temp.size(); j++) {
if (enableAll == 1 && temp[j].substr(0, 3) == "_C0"){
temp[j].replace(0,3,"_C1");
>>>>>>> upstream2/master
}
else if (enableAll == 0 && cheatList[j].substr(0, 3) == "_C1") {
@ -131,15 +125,9 @@ UI::EventReturn CwCheatScreen::OnEnableAll(UI::EventParams &params)
for (int y = 0; y < 128; y++) {
enableCheat[y] = enableAll;
}
<<<<<<< HEAD
for (int i = 0; i < cheatList.size(); i++) {
os << cheatList[i];
if (i < cheatList.size() - 1) {
=======
for (int i = 0; i < (int)temp.size(); i++) {
os << temp[i];
if (i < temp.size() - 1) {
>>>>>>> upstream2/master
os << "\n";
}
}
@ -173,13 +161,6 @@ UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams &params)
getline(is, line);
title.push_back(line);
getline(is, line);
<<<<<<< HEAD
=======
>>>>>>> upstream2/master
do {
if (finished == false){
getline(is, line);
@ -210,7 +191,6 @@ UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams &params)
if (finished == true)
break;
}
<<<<<<< HEAD
is.close();
std::string title2;
is.open(activeCheatFile.c_str());
@ -220,8 +200,6 @@ UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams &params)
if (title2.substr(0, 2) != "_S") {
os << title[0] << "\n" << title[1];
}
=======
>>>>>>> upstream2/master
if (newList.size() != 0)
{
os << "\n";

2
ffmpeg

@ -1 +1 @@
Subproject commit 2a1acf86036e3ff159eca161b87c99a7048f6f95
Subproject commit c2b6c476b5feafb610f4db2c3918ab8f619f7d07

2
lang

@ -1 +1 @@
Subproject commit 1997dbc1ec67420e75f5f1d0dd4019a48007096f
Subproject commit 8651a82d8f85f261762c9961f96b525210844523

2
native

@ -1 +1 @@
Subproject commit 0da853e54c6e1cce9b438f8db4454322c4c930fe
Subproject commit faf9714b563fb6343fe6d17305330bc715d8e532

2
pspautotests

@ -1 +1 @@
Subproject commit f5fa205057dbbf80ec1e302c21d22c9ddd0ea03a
Subproject commit 30e70f0630542155cbc8ccf3508929be9a1d98d4