small bugfixes

Makefile.gc

@@ -32,7 +32,7 @@ CFLAGS  = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC -DNO_SOUND \
 		-DFRAMESKIP -DPSS_STYLE=1 -DPATH_MAX=1024 -DHAVE_ASPRINTF \
 	    -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
 	    -fomit-frame-pointer \
-		-Wno-unused-parameter -Wno-strict-aliasing
+		-Wno-unused-parameter -Wno-strict-aliasing -Wno-write-strings
 
 CXXFLAGS	=	$(CFLAGS)
 

Makefile.wii

@@ -32,7 +32,7 @@ CFLAGS  = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC \
 		-DFRAMESKIP -DPSS_STYLE=1 -DPATH_MAX=1024 -DHAVE_ASPRINTF \
 	    -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
 	    -fomit-frame-pointer \
-		-Wno-unused-parameter -Wno-strict-aliasing
+		-Wno-unused-parameter -Wno-strict-aliasing -Wno-write-strings
 CXXFLAGS	=	$(CFLAGS)
 
 LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref

source/ngc/filebrowser.cpp

@@ -274,6 +274,12 @@ bool MakeFilePath(char filepath[], int type, char * filename, int filenum)
 	{
 		switch(type)
 		{
+			if(GCSettings.SaveMethod == DEVICE_AUTO)
+				GCSettings.SaveMethod = autoSaveMethod(SILENT);
+			
+			if(GCSettings.SaveMethod == DEVICE_AUTO)
+				return false;
+			
 			case FILE_RAM:
 			case FILE_STATE:
 				sprintf(folder, GCSettings.SaveFolder);
@@ -687,7 +693,7 @@ OpenGameList ()
 
 	// change current dir to roms directory
 	if(device > 0)
-		sprintf(browser.dir, "%s%s", pathPrefix[device], GCSettings.LoadFolder);
+		sprintf(browser.dir, "%s%s/", pathPrefix[device], GCSettings.LoadFolder);
 	else
 		browser.dir[0] = 0;
 	

source/ngc/fileop.cpp

@@ -377,11 +377,9 @@ bool ChangeInterface(int device, bool silent)
 		case DEVICE_DVD:
 			mounted = MountDVD(silent);
 			break;
-#ifdef HW_RVL
 		case DEVICE_SMB:
 			mounted = ConnectShare(silent);
 			break;
-#endif
 		case DEVICE_MC_SLOTA:
 			mounted = TestMC(CARD_SLOTA, silent);
 			break;
@@ -524,6 +522,10 @@ ParseDirectory(bool waitParse)
 		while(!IsDeviceRoot(browser.dir))
 		{
 			char * devEnd = strrchr(browser.dir, '/');
+			
+			if(devEnd == NULL)
+				break;
+			
 			devEnd[0] = 0; // strip remaining file listing
 			dirIter = diropen(browser.dir);
 			if (dirIter)
@@ -633,6 +635,8 @@ LoadFile (char * rbuffer, char *filepath, u32 length, bool silent)
 	int retry = 1;
 	int device;
 	
+	printf("loading %s\n", filepath);
+	
 	if(!FindDevice(filepath, &device))
 		return 0;
 

source/ngc/gui/gui_filebrowser.cpp

@@ -356,7 +356,7 @@ void GuiFileBrowser::Update(GuiTrigger * t)
 				{
 					delete fileListIcon[i];
 					fileListIcon[i] = NULL;
-					fileListText[i]->SetPosition(10,0);
+					fileListText[i]->SetPosition(5,0);
 				}
 
 				switch(browserList[browser.pageIndex+i].icon)

source/ngc/networkop.cpp

@@ -9,7 +9,15 @@
  * Network and SMB support routines
  ****************************************************************************/
 
-#ifdef HW_RVL
+#ifdef HW_DOL
+
+bool
+ConnectShare (bool silent)
+{
+	return false;
+}
+
+#else
 
 #include <network.h>
 #include <smb.h>

source/ngc/patch.cpp

@@ -416,9 +416,9 @@ int LoadPatch(int size)
 	AllocSaveBuffer ();
 
 	memset(patchpath, 0, sizeof(patchpath));
-	sprintf(patchpath[0], "%s/%s.ips", browser.dir, romFilename);
-	sprintf(patchpath[1], "%s/%s.ups", browser.dir, romFilename);
-	sprintf(patchpath[2], "%s/%s.ppf", browser.dir, romFilename);
+	sprintf(patchpath[0], "%s%s.ips", browser.dir, romFilename);
+	sprintf(patchpath[1], "%s%s.ups", browser.dir, romFilename);
+	sprintf(patchpath[2], "%s%s.ppf", browser.dir, romFilename);
 
 	for(patchtype=0; patchtype<3; patchtype++)
 	{