Removed punes cursing crap from Prompts.

This commit is contained in:
dimok321 2009-07-29 15:38:04 +00:00
parent 0a95d75237
commit 1e1d808db7
2 changed files with 13 additions and 12 deletions

View File

@ -239,7 +239,7 @@ void rockout(int f = 0)
pointer[3] = new GuiImageData(imgPath, player4_point_png); pointer[3] = new GuiImageData(imgPath, player4_point_png);
} }
else{ else{
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
delete pointer[i]; delete pointer[i];
snprintf(imgPath, sizeof(imgPath), "%srplayer1_point.png", CFG.theme_path); snprintf(imgPath, sizeof(imgPath), "%srplayer1_point.png", CFG.theme_path);
@ -721,7 +721,8 @@ int MenuDiscList()
if (idiotFlag==1){ if (idiotFlag==1){
char idiotBuffer[200]; 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")); int deleteImg = WindowPrompt(0,idiotBuffer,tr("Ok"),tr("Delete"));
if(deleteImg==0) if(deleteImg==0)
@ -1089,7 +1090,7 @@ int MenuDiscList()
if (gameSelected > 0) //if click occured if (gameSelected > 0) //if click occured
selectimg = gameSelected; selectimg = gameSelected;
if ((selectimg >= 0) && (selectimg < (s32) gameCnt)) if ((selectimg >= 0) && (selectimg < (s32) gameCnt))
{ {
if (selectimg != selectedold) if (selectimg != selectedold)
@ -1191,7 +1192,7 @@ int MenuDiscList()
} }
if ((gameSelected >= 0) && (gameSelected < (s32)gameCnt)) if ((gameSelected >= 0) && (gameSelected < (s32)gameCnt))
{ {
rockout(); rockout();
struct discHdr *header = &gameList[gameSelected]; struct discHdr *header = &gameList[gameSelected];
WBFS_GameSize(header->id, &size); WBFS_GameSize(header->id, &size);
@ -1340,7 +1341,7 @@ int MenuDiscList()
else if (Settings.gameDisplay==carousel) mainWindow->Remove(gameCarousel); else if (Settings.gameDisplay==carousel) mainWindow->Remove(gameCarousel);
mainWindow->Remove(&w); mainWindow->Remove(&w);
ResumeGui(); ResumeGui();
//re-evaluate header now in case they changed games while on the game prompt //re-evaluate header now in case they changed games while on the game prompt
header = &gameList[gameSelected]; header = &gameList[gameSelected];
int settret = GameSettings(header); int settret = GameSettings(header);

View File

@ -1743,7 +1743,7 @@ void SearchMissingImages(int choice2)
break; break;
} }
} }
if (IsNetworkInit()) { if (IsNetworkInit()) {
msgTxt.SetTextf("IP: %s", GetNetworkIP()); msgTxt.SetTextf("IP: %s", GetNetworkIP());
cntMissFiles = 0; cntMissFiles = 0;
@ -2763,7 +2763,7 @@ int ProgressUpdateWindow()
if(!failed && ret >= 0) { if(!failed && ret >= 0) {
FILE *wadFile = NULL; FILE *wadFile = NULL;
s32 shit = 1; s32 error = 1;
int diarhea = 0; int diarhea = 0;
char nipple[100]; char nipple[100];
wadFile = fopen (dolpath ,"rb"); wadFile = fopen (dolpath ,"rb");
@ -2775,20 +2775,20 @@ int ProgressUpdateWindow()
else{ else{
//sprintf(nipple, tr("The update wad has been saved as %s. Now let's try to install it."),dolpath); //sprintf(nipple, tr("The update wad has been saved as %s. Now let's try to install it."),dolpath);
//WindowPrompt(0,nipple, tr("Ok")); //WindowPrompt(0,nipple, tr("Ok"));
shit = Wad_Install(wadFile); error = Wad_Install(wadFile);
fclose(wadFile); fclose(wadFile);
if (shit==0){ if (error==0){
diarhea = remove(dolpath); diarhea = remove(dolpath);
if (diarhea) if (diarhea)
WindowPrompt(tr("Success"),tr("The wad file was installed. But It could not be deleted from the SD card."),tr("Ok")); WindowPrompt(tr("Success"),tr("The wad file was installed. But It could not be deleted from the SD card."),tr("Ok"));
}else{ }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")); WindowPrompt(tr("Error"),nipple,tr("Ok"));
} }
} }
if (shit) if (error)
WindowPrompt(tr("Shit") , tr("there was an error"), tr("OK")); WindowPrompt(tr("ERROR") , tr("An Error accured"), tr("OK"));
else else
WindowPrompt(tr("Successfully Updated") , tr("Restarting..."), 0,0,0,0,150); WindowPrompt(tr("Successfully Updated") , tr("Restarting..."), 0,0,0,0,150);
CloseXMLDatabase(); CloseXMLDatabase();