fix for Super Mario RPG, minor bug fixes, auto update feature

dborth · Dec 24, 2008 · b6791d1 · b6791d1
1 parent 2794ede
commit b6791d1
Show file tree

Hide file tree

Showing 31 changed files with 3,528 additions and 301 deletions.
diff --git a/Makefile.gc b/Makefile.gc
@@ -18,9 +18,8 @@ include $(DEVKITPPC)/gamecube_rules
 TARGET		:=	snes9xgx-gc
 TARGETDIR   :=  executables
 BUILD		:=	build_gc
-SOURCES		:=	source/snes9x source/ngc source/sz
-DATA		:=	data  
-INCLUDES	:=	source/snes9x source/ngc
+SOURCES		:=	source/snes9x source/ngc source/sz source/unzip
+INCLUDES	:=	source/snes9x source/ngc source/unzip
 
 #---------------------------------------------------------------------------------
 # options for code generation

diff --git a/Makefile.wii b/Makefile.wii
@@ -18,9 +18,8 @@ include $(DEVKITPPC)/wii_rules
 TARGET		:=	snes9xgx-wii
 TARGETDIR   :=  executables
 BUILD		:=	build_wii
-SOURCES		:=	source/snes9x source/ngc source/sz
-DATA		:=	data  
-INCLUDES	:=	source/snes9x source/ngc
+SOURCES		:=	source/snes9x source/ngc source/sz source/unzip
+INCLUDES	:=	source/snes9x source/ngc source/unzip
 
 #---------------------------------------------------------------------------------
 # options for code generation

diff --git a/source/ngc/dvd.cpp b/source/ngc/dvd.cpp
@@ -24,7 +24,7 @@ extern "C" {
 #endif
 
 #include "menudraw.h"
-#include "unzip.h"
+#include "gcunzip.h"
 #include "filesel.h"
 #include "snes9xGX.h"
 

diff --git a/source/ngc/fileop.cpp b/source/ngc/fileop.cpp
@@ -8,7 +8,7 @@
  *
  * fileop.cpp
  *
- * FAT File operations
+ * File operations
  ***************************************************************************/
 
 #include <gccore.h>
@@ -25,10 +25,10 @@
 
 #include "snes9xGX.h"
 #include "fileop.h"
-#include "smbop.h"
+#include "networkop.h"
 #include "dvd.h"
 #include "memcardop.h"
-#include "unzip.h"
+#include "gcunzip.h"
 #include "video.h"
 #include "menudraw.h"
 #include "filesel.h"
@@ -83,6 +83,7 @@ devicecallback (void *arg)
 		}
 
 		InitializeNetwork(SILENT);
+		UpdateCheck();
 #else
 		if(isMounted[METHOD_SD_SLOTA])
 		{
@@ -103,7 +104,6 @@ devicecallback (void *arg)
 #endif
 		usleep(500000); // suspend thread for 1/2 sec
 	}
-
 	return NULL;
 }
 
@@ -126,11 +126,11 @@ InitDeviceThread()
 void UnmountAllFAT()
 {
 #ifdef HW_RVL
-	fatUnmount("sd");
-	fatUnmount("usb");
+	fatUnmount("sd:/");
+	fatUnmount("usb:/");
 #else
-	fatUnmount("carda");
-	fatUnmount("cardb");
+	fatUnmount("carda:/");
+	fatUnmount("cardb:/");
 #endif
 }
 
@@ -179,7 +179,7 @@ bool MountFAT(int method)
 	if(unmountRequired[method])
 	{
 		unmountRequired[method] = false;
-		fatUnmount(name);
+		fatUnmount(rootdir);
 		disc->shutdown();
 	}
 	if(!isMounted[method])
@@ -505,4 +505,3 @@ u32 SaveFile(char filepath[], u32 datasize, int method, bool silent)
 {
 	return SaveFile((char *)savebuffer, filepath, datasize, method, silent);
 }
-
diff --git a/source/ngc/fileop.h b/source/ngc/fileop.h
@@ -35,6 +35,7 @@ u32 SaveFile(char filepath[], u32 datasize, int method, bool silent);
 extern char currFATdir[MAXPATHLEN];
 extern FILE * file;
 extern bool unmountRequired[];
+extern bool isMounted[];
 extern lwp_t devicethread;
 
 #endif
diff --git a/source/ngc/filesel.cpp b/source/ngc/filesel.cpp
@@ -34,11 +34,11 @@ extern "C" {
 #include "menudraw.h"
 #include "video.h"
 #include "aram.h"
-#include "smbop.h"
+#include "networkop.h"
 #include "fileop.h"
 #include "memcardop.h"
 #include "input.h"
-#include "unzip.h"
+#include "gcunzip.h"
 
 int offset;
 int selection;
@@ -108,7 +108,8 @@ int autoLoadMethod()
 	else
 		WaitPrompt("Unable to auto-determine load method!");
 
-	GCSettings.LoadMethod = method; // save method found for later use
+	if(GCSettings.LoadMethod == METHOD_AUTO)
+		GCSettings.LoadMethod = method; // save method found for later use
 	return method;
 }
 
@@ -137,7 +138,8 @@ int autoSaveMethod(bool silent)
 	else if(!silent)
 		WaitPrompt("Unable to auto-determine save method!");
 
-	GCSettings.SaveMethod = method; // save method found for later use
+	if(GCSettings.SaveMethod == METHOD_AUTO)
+		GCSettings.SaveMethod = method; // save method found for later use
 	return method;
 }
 

diff --git a/source/ngc/filesel.h b/source/ngc/filesel.h
@@ -15,6 +15,7 @@
 #define _NGCFILESEL_
 
 #include <unistd.h>
+#include <gccore.h>
 
 #define SAVEBUFFERSIZE (512 * 1024)
 #define MAXJOLIET 255

diff --git a/source/ngc/freeze.cpp b/source/ngc/freeze.cpp
@@ -154,7 +154,7 @@ NGCFreezeGame (int method, bool silent)
 		// And the freezecomment
 		memset(freezecomment, 0, 64);
 
-		sprintf (freezecomment[0], "%s Freeze", VERSIONSTR);
+		sprintf (freezecomment[0], "%s Freeze", APPVERSION);
 		sprintf (freezecomment[1], Memory.ROMName);
 		memcpy (savebuffer + woffset, freezecomment, 64);
 		woffset += 64;

diff --git a/source/ngc/unzip.cpp → source/ngc/gcunzip.cpp b/source/ngc/unzip.cpp → source/ngc/gcunzip.cpp
@@ -24,11 +24,11 @@ extern "C" {
 
 #include "snes9xGX.h"
 #include "dvd.h"
-#include "smbop.h"
+#include "networkop.h"
 #include "fileop.h"
 #include "video.h"
 #include "menudraw.h"
-#include "unzip.h"
+#include "gcunzip.h"
 
 /*
   * PKWare Zip Header - adopted into zip standard

diff --git a/source/ngc/unzip.h → source/ngc/gcunzip.h b/source/ngc/unzip.h → source/ngc/gcunzip.h
@@ -5,14 +5,12 @@
  * Michniewski 2008
  * Tantric September 2008
  *
- * unzip.h
+ * gcunzip.h
  *
  * File unzip routines
  ****************************************************************************/
-#ifndef _UNZIP_
-#define _UNZIP_
-
-#include <smb.h>
+#ifndef _GCUNZIP_H_
+#define _GCUNZIP_H_
 
 extern int IsZipFile (char *buffer);
 char * GetFirstZipFilename(int method);