finalize 3.1.0

This commit is contained in:
dborth 2009-10-07 06:59:10 +00:00
parent 06576fa730
commit 0b52e54a7c
9 changed files with 86 additions and 29 deletions

View File

@ -2,8 +2,8 @@
<app version="1">
<name>FCE Ultra GX</name>
<coder>Tantric</coder>
<version>3.0.5</version>
<release_date>20090630</release_date>
<version>3.1.0</version>
<release_date>20091007</release_date>
<short_description>Nintendo Emulator</short_description>
<long_description>A port of FCE Ultra 0.98.12 to the Wii.</long_description>
<long_description>A port of FCE Ultra to the Wii.</long_description>
</app>

View File

@ -1,7 +1,7 @@
¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤
- FCE Ultra GX -
Version 3.0.9
Version 3.1.0
http://code.google.com/p/fceugc
(Under GPL License)
@ -26,13 +26,21 @@ Wii/GameCube.
* Turbo Mode - up to 2x the normal speed
* Cheat support (.CHT files and Game Genie)
* IPS/UPS/PPF automatic patching support
* NES Compatibility Based on FCEUX 2.1.0a
* NES Compatibility Based on FCEUX 2.1.1
* Open Source!
×—–­—–­—–­—–­ –­—–­—–­—–­—–­—–­—–­—–­—–­—–­— ­—–­—–­—–­—–­—–­—–­—–­—-­—–­-–•¬
|0O×øo· UPDATE HISTORY ·oø×O0|
`¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'
[3.1.0 - October 7, 2009]
* New default palette - more accurate colors!
* Revamped filebrowser and file I/O
* New timing and frameskip code - allows PAL gamers to play NTSC games
* Fixed FDS/Game Genie errors
* Many, many other bug fixes
[3.0.9 - September 16, 2009]
* Text rendering corrections

View File

@ -146,24 +146,20 @@ SetupCheats()
FreeSaveBuffer ();
}
void OpenGameGenie()
bool FindGameGenie()
{
if (GENIEROM) // already loaded
{
geniestage=1;
return;
}
if (GENIEROM)
return true;
size_t romSize = 0;
char * tmpbuffer = (char *) memalign(32, 512 * 1024);
if(!tmpbuffer)
return;
return false;
size_t romSize = 0;
char filepath[1024];
if (MakeFilePath(filepath, FILE_GGROM))
{
romSize = LoadFile(tmpbuffer, filepath, 0, SILENT);
}
if (romSize > 0)
{
@ -182,13 +178,19 @@ void OpenGameGenie()
/* Workaround for the FCE Ultra CHR page size only being 1KB */
for(int x=0; x<4; x++)
memcpy(GENIEROM+4096+(x<<8),GENIEROM+4096,256);
geniestage=1;
}
else
{
free(GENIEROM);
GENIEROM=0;
}
free(tmpbuffer);
if(romSize > 0)
return true;
return false;
}
void OpenGameGenie()
{
if(!GCSettings.gamegenie)
geniestage=0;
else if (FindGameGenie())
geniestage=1;
}

View File

@ -10,6 +10,7 @@
***************************************************************************/
void SetupCheats();
bool FindGameGenie();
void OpenGameGenie();
extern int numcheats;

View File

@ -59,13 +59,13 @@ DefaultSettings ()
{
ResetControls(); // controller button mappings
GCSettings.currpal = 0; // color palette
GCSettings.currpal = 1; // color palette
GCSettings.timing = 0; // 0 - NTSC, 1 - PAL
GCSettings.videomode = 0; // automatic video mode detection
GCSettings.Controller = CTRL_PAD2; // NES pad, Four Score, Zapper
GCSettings.crosshair = 1; // show zapper crosshair
GCSettings.spritelimit = 1; // enforce 8 sprite limit
GCSettings.currpal = 1;
GCSettings.gamegenie = 1;
GCSettings.ZoomLevel = 1.0; // zoom amount
GCSettings.render = 2; // Unfiltered

View File

@ -17,7 +17,7 @@
#include "driver.h"
#define APPNAME "FCE Ultra GX"
#define APPVERSION "3.0.9"
#define APPVERSION "3.1.0"
#define APPFOLDER "fceugx"
#define PREF_FILE_NAME "settings.xml"
@ -81,6 +81,7 @@ struct SGCSettings{
int widescreen;
int FilterMethod; // convert to RenderFilter
int hideoverscan;
int gamegenie;
int currpal;
int timing;
int Controller;

View File

@ -3068,6 +3068,7 @@ static int MenuSettingsVideo()
static int MenuSettings()
{
int menu = MENU_NONE;
char s[10];
GuiText titleTxt("Settings", 28, (GXColor){255, 255, 255, 255});
titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
@ -3082,6 +3083,7 @@ static int MenuSettings()
GuiImageData iconFile(icon_settings_file_png);
GuiImageData iconMenu(icon_settings_menu_png);
GuiImageData iconNetwork(icon_settings_network_png);
GuiImageData iconCheats(icon_game_cheats_png);
GuiTrigger trigA;
if(GCSettings.WiimoteOrientation)
@ -3135,7 +3137,7 @@ static int MenuSettings()
GuiImage networkBtnIcon(&iconNetwork);
GuiButton networkBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
networkBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
networkBtn.SetPosition(0, 250);
networkBtn.SetPosition(-125, 250);
networkBtn.SetLabel(&networkBtnTxt);
networkBtn.SetImage(&networkBtnImg);
networkBtn.SetImageOver(&networkBtnImgOver);
@ -3145,6 +3147,29 @@ static int MenuSettings()
networkBtn.SetTrigger(&trigA);
networkBtn.SetEffectGrow();
if(!FindGameGenie()) sprintf(s, "DISABLED");
else if(GCSettings.gamegenie) sprintf(s, "ON");
else sprintf(s, "OFF");
GuiText cheatsBtnTxt("Game Genie", 24, (GXColor){0, 0, 0, 255});
GuiText cheatsBtnTxt2(s, 18, (GXColor){0, 0, 0, 255});
cheatsBtnTxt.SetPosition(0, -16);
cheatsBtnTxt2.SetPosition(0, +8);
GuiImage cheatsBtnImg(&btnLargeOutline);
GuiImage cheatsBtnImgOver(&btnLargeOutlineOver);
GuiImage cheatsBtnIcon(&iconCheats);
GuiButton cheatsBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
cheatsBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
cheatsBtn.SetPosition(125, 250);
cheatsBtn.SetLabel(&cheatsBtnTxt, 0);
cheatsBtn.SetLabel(&cheatsBtnTxt2, 1);
cheatsBtn.SetImage(&cheatsBtnImg);
cheatsBtn.SetImageOver(&cheatsBtnImgOver);
cheatsBtn.SetIcon(&cheatsBtnIcon);
cheatsBtn.SetSoundOver(&btnSoundOver);
cheatsBtn.SetSoundClick(&btnSoundClick);
cheatsBtn.SetTrigger(&trigA);
cheatsBtn.SetEffectGrow();
GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255});
GuiImage backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver);
@ -3183,6 +3208,7 @@ static int MenuSettings()
w.Append(&networkBtn);
#endif
w.Append(&cheatsBtn);
w.Append(&backBtn);
w.Append(&resetBtn);
@ -3206,6 +3232,22 @@ static int MenuSettings()
{
menu = MENU_SETTINGS_NETWORK;
}
else if(cheatsBtn.GetState() == STATE_CLICKED)
{
cheatsBtn.ResetState();
if(!FindGameGenie())
{
ErrorPrompt("Game Genie ROM not found!");
}
else
{
GCSettings.gamegenie ^= 1;
if (GCSettings.gamegenie) sprintf(s, "ON");
else sprintf(s, "OFF");
cheatsBtnTxt2.SetText(s);
}
}
else if(backBtn.GetState() == STATE_CLICKED)
{
menu = MENU_GAMESELECTION;

View File

@ -126,6 +126,7 @@ preparePrefsData ()
createXMLSetting("SaveFolder", "Save Folder", GCSettings.SaveFolder);
createXMLSetting("CheatFolder", "Cheats Folder", GCSettings.CheatFolder);
createXMLSetting("VerifySaves", "Verify Memory Card Saves", toStr(GCSettings.VerifySaves));
createXMLSetting("gamegenie", "Game Genie", toStr(GCSettings.gamegenie));
createXMLSection("Network", "Network Settings");
@ -277,7 +278,8 @@ decodePrefsData ()
result = false;
else if(verMajor < 3) // less than version 3.0.0
result = false; // reset settings
else if(verMajor > curMajor || verMinor > curMinor || verPoint > curPoint) // some future version
else if((verMajor*100 + verMinor*10 + verPoint) >
(curMajor*100 + curMinor*10 + curPoint)) // some future version
result = false; // reset settings
else
result = true;
@ -296,6 +298,7 @@ decodePrefsData ()
loadXMLSetting(GCSettings.SaveFolder, "SaveFolder", sizeof(GCSettings.SaveFolder));
loadXMLSetting(GCSettings.CheatFolder, "CheatFolder", sizeof(GCSettings.CheatFolder));
loadXMLSetting(&GCSettings.VerifySaves, "VerifySaves");
loadXMLSetting(&GCSettings.gamegenie, "gamegenie");
// Network Settings

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<app version="3.0.9">
<file url="http://fceugc.googlecode.com/files/FCE%20Ultra%20GX%203.0.9%20-%20Wii.zip"></file>
<app version="3.1.0">
<file url="http://fceugc.googlecode.com/files/FCE%20Ultra%20GX%203.1.0%20-%20Wii.zip"></file>
</app>