From 1e1d808db7a96f23825bebe580080e4664dbd44e Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Wed, 29 Jul 2009 15:38:04 +0000 Subject: [PATCH] Removed punes cursing crap from Prompts. --- source/menu.cpp | 11 ++++++----- source/prompts/PromptWindows.cpp | 14 +++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/source/menu.cpp b/source/menu.cpp index 9f02112c..eb9998be 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -239,7 +239,7 @@ void rockout(int f = 0) pointer[3] = new GuiImageData(imgPath, player4_point_png); } else{ - + for(int i = 0; i < 4; i++) delete pointer[i]; snprintf(imgPath, sizeof(imgPath), "%srplayer1_point.png", CFG.theme_path); @@ -721,7 +721,8 @@ int MenuDiscList() if (idiotFlag==1){ char idiotBuffer[200]; - snprintf(idiotBuffer, sizeof(idiotBuffer), "%s (%s). %s",tr("You have attempted to load a bad image"), idiotChar,tr("Most likely it has dimensions that are not evenly divisible by 4. Way to go dipshit.")); + snprintf(idiotBuffer, sizeof(idiotBuffer), "%s (%s). %s",tr("You have attempted to load a bad image"), + idiotChar,tr("Most likely it has dimensions that are not evenly divisible by 4.")); int deleteImg = WindowPrompt(0,idiotBuffer,tr("Ok"),tr("Delete")); if(deleteImg==0) @@ -1089,7 +1090,7 @@ int MenuDiscList() if (gameSelected > 0) //if click occured selectimg = gameSelected; - + if ((selectimg >= 0) && (selectimg < (s32) gameCnt)) { if (selectimg != selectedold) @@ -1191,7 +1192,7 @@ int MenuDiscList() } if ((gameSelected >= 0) && (gameSelected < (s32)gameCnt)) - { + { rockout(); struct discHdr *header = &gameList[gameSelected]; WBFS_GameSize(header->id, &size); @@ -1340,7 +1341,7 @@ int MenuDiscList() else if (Settings.gameDisplay==carousel) mainWindow->Remove(gameCarousel); mainWindow->Remove(&w); ResumeGui(); - + //re-evaluate header now in case they changed games while on the game prompt header = &gameList[gameSelected]; int settret = GameSettings(header); diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 82649253..be2a711e 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -1743,7 +1743,7 @@ void SearchMissingImages(int choice2) break; } } - + if (IsNetworkInit()) { msgTxt.SetTextf("IP: %s", GetNetworkIP()); cntMissFiles = 0; @@ -2763,7 +2763,7 @@ int ProgressUpdateWindow() if(!failed && ret >= 0) { FILE *wadFile = NULL; - s32 shit = 1; + s32 error = 1; int diarhea = 0; char nipple[100]; wadFile = fopen (dolpath ,"rb"); @@ -2775,20 +2775,20 @@ int ProgressUpdateWindow() else{ //sprintf(nipple, tr("The update wad has been saved as %s. Now let's try to install it."),dolpath); //WindowPrompt(0,nipple, tr("Ok")); - shit = Wad_Install(wadFile); + error = Wad_Install(wadFile); fclose(wadFile); - if (shit==0){ + if (error==0){ diarhea = remove(dolpath); if (diarhea) WindowPrompt(tr("Success"),tr("The wad file was installed. But It could not be deleted from the SD card."),tr("Ok")); }else{ - sprintf(nipple, tr("The wad installation failed with error %ld"),shit); + sprintf(nipple, tr("The wad installation failed with error %ld"),error); WindowPrompt(tr("Error"),nipple,tr("Ok")); } } - if (shit) - WindowPrompt(tr("Shit") , tr("there was an error"), tr("OK")); + if (error) + WindowPrompt(tr("ERROR") , tr("An Error accured"), tr("OK")); else WindowPrompt(tr("Successfully Updated") , tr("Restarting..."), 0,0,0,0,150); CloseXMLDatabase();