The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-22 10:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Palettes are working well now.

Browse Source
This commit is contained in:
Carl.Kenner 2009-05-30 18:11:59 +00:00
parent ba6a55d50c
commit 83a1f38626
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/ngc/menu.cpp
View File

@ -4236,13 +4236,13 @@ static int MenuPalette()
}
else if(importBtn.GetState() == STATE_CLICKED)
{
SavePalette(NOTSILENT, RomTitle);
SavePalette(SILENT, RomTitle);
menu = MENU_GAMESETTINGS_PALETTE;
}
else if(closeBtn.GetState() == STATE_CLICKED)
{
menu = MENU_EXIT;
SavePalette(NOTSILENT, RomTitle);
SavePalette(SILENT, RomTitle);
SavePrefs(NOTSILENT);
exitSound->Play();
@ -4259,6 +4259,7 @@ static int MenuPalette()
}
else if(backBtn.GetState() == STATE_CLICKED)
{
SavePalette(SILENT, RomTitle);
menu = MENU_GAMESETTINGS_VIDEO;
}
}

18
source/ngc/preferences.cpp
View File

@ -910,9 +910,6 @@ bool LoadPalette(const char *gameName)
prefFound = LoadPalFromMethod(METHOD_SMB, gameName);
if(!prefFound) {
char msg[1024];
sprintf(msg, "Failed to load palette");
InfoPrompt(msg);
return CreateAndLoadPalette(SILENT, gameName, true);
}
return true;
@ -934,9 +931,6 @@ bool LoadPalettes()
prefFound = LoadPalsFromMethod(METHOD_SMB);
if(!prefFound) {
char msg[1024];
sprintf(msg, "Failed to load palettes");
InfoPrompt(msg);
CreateAndLoadPalette(SILENT, "", false);
if(ChangeInterface(METHOD_SD, SILENT))
prefFound = LoadPalsFromMethod(METHOD_SD);
@ -960,36 +954,24 @@ static void AddPalette(gamePalette pal, const char *gameName) {
return;
}
}
char msg[1024];
sprintf(msg, "Adding new palette '%s'", gameName);
InfoPrompt(msg);
palettes[loadedPalettes] = pal;
strncpy(palettes[loadedPalettes].gameName, gameName, 17);
loadedPalettes++;
}
bool SavePalette(bool silent, const char *gameName) {
char msg[1024];
sprintf(msg, "Save palette '%s'", gameName);
InfoPrompt(msg);
bool prefFound = LoadPalettes();
if (!prefFound) {
delete[] palettes;
palettes = NULL;
return false;
}
sprintf(msg, "%d palettes loaded", loadedPalettes);
InfoPrompt(msg);
if(prefFound && palettes) {
for (int i=0; i<gamePalettesCount; i++)
AddPalette(gamePalettes[i], gamePalettes[i].gameName);
sprintf(msg, "Added more to make %d palettes", loadedPalettes);
InfoPrompt(msg);
if (!gameName) gameName = CurrentPalette.gameName;
AddPalette(CurrentPalette, gameName);
sprintf(msg, "Added %s to make %d palettes", gameName, loadedPalettes);
InfoPrompt(msg);
SavePalettes(silent);
delete[] palettes;
palettes = NULL;

2
vba-wii.pnproj
View File

File diff suppressed because one or more lines are too long