-sync with wiiflow r418

scripts/buildtype.sh

@@ -1,30 +1,30 @@
-#!/bin/bash
-
-FILENAME=source/loader/alt_ios_gen.c
-GENERATE=0
-VERSION=249
-
-if [ ! -z "$1" ];
-then
-	VERSION=$1
-fi
-
-if [ ! -f $FILENAME ];
-then
-	GENERATE=1
-else
-	CURRENT_VERSION=`grep mainIOS\ = $FILENAME | awk '{printf "%d", $4}'`
-	if [ $CURRENT_VERSION -ne $VERSION ];
-	then
-		GENERATE=1
-	fi
-fi
-
-if [ $GENERATE -eq 1 ];
-then
-
-	cat <<EOF > $FILENAME
-#include "alt_ios.h"
-int mainIOS = $VERSION;
-EOF
+#!/bin/bash
+
+FILENAME=source/loader/alt_ios_gen.c
+GENERATE=0
+VERSION=249
+
+if [ ! -z "$1" ];
+then
+	VERSION=$1
+fi
+
+if [ ! -f $FILENAME ];
+then
+	GENERATE=1
+else
+	CURRENT_VERSION=`grep mainIOS\ = $FILENAME | awk '{printf "%d", $4}'`
+	if [ $CURRENT_VERSION -ne $VERSION ];
+	then
+		GENERATE=1
+	fi
+fi
+
+if [ $GENERATE -eq 1 ];
+then
+
+	cat <<EOF > $FILENAME
+#include "alt_ios.h"
+int mainIOS = $VERSION;
+EOF
 fi

scripts/svnrev.sh

@@ -1,42 +1,42 @@
-#! /bin/bash
-#
-rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
-[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
-
-if [ "$rev_new_raw" == "exported" ];
-then
-	echo This copy of wiiflow is not under source control
-	exit
-fi
-
-
-rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
-rev_new=0
-a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
-let "a+=0"
-#find max rev
-while [ "$a" ]; do
-	[ "$a" -gt "$rev_new" ] && rev_new=$a
-	rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
-	a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/') 
-done
-
-rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
-
-if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then
-	
-	cat <<EOF > ./source/svnrev.h
-#define SVN_REV "$rev_new"
-EOF
-
-	if [ -n "$rev_old" ]; then
-		echo "Changed Rev $rev_old to $rev_new" >&2
-	else
-		echo "svnrev.h created" >&2
-	fi
-
-	rev_new=`expr $rev_new + 1`
-	rev_date=`date +%Y%m%d%H%M -u`
-	
-
-fi
+#! /bin/bash
+#
+rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
+[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
+
+if [ "$rev_new_raw" == "exported" ];
+then
+	echo This copy of wiiflow is not under source control
+	exit
+fi
+
+
+rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
+rev_new=0
+a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
+let "a+=0"
+#find max rev
+while [ "$a" ]; do
+	[ "$a" -gt "$rev_new" ] && rev_new=$a
+	rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
+	a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/') 
+done
+
+rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
+
+if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then
+	
+	cat <<EOF > ./source/svnrev.h
+#define SVN_REV "$rev_new"
+EOF
+
+	if [ -n "$rev_old" ]; then
+		echo "Changed Rev $rev_old to $rev_new" >&2
+	else
+		echo "svnrev.h created" >&2
+	fi
+
+	rev_new=`expr $rev_new + 1`
+	rev_date=`date +%Y%m%d%H%M -u`
+	
+
+fi

source/defines.h

@@ -1,5 +1,5 @@
 #define APP_NAME				"WiiFlow"
-#define APP_VERSION				"3.0 ALPHA"
+#define APP_VERSION				"3.1 Alpha"
 
 #define APPDATA_DIR				"wiiflow"
 #define APPDATA_DIR2			"apps/wiiflow"
@@ -22,8 +22,9 @@
 "Lustar, CedWii, Benjay, Domi78, Oops, Celtiore, Jiiwah, FluffyKiwi, Roku93, \
 Spayrosam, Bluescreen81, Chappy23, BlindDude, Bubba, DJTaz, OggZee, Usptactical, \
 WiiPower, Hermes, Spidy1000, Dimok, Kovani, Drexyl, DvZ, Etheboss, FIX94, GaiaKnight, \
-nibb, NJ7, Plasma, Pakatus, ravmn, spidercaleb, Ziggy34, And to anyone who has donated or contributed to Wiiflow \
-\nthat we missed!"
+nibb, NJ7, Plasma, Pakatus, ravmn, spidercaleb, Ziggy34 \
+ And to anyone who has donated or contributed to Wiiflow \
+that we missed!"
 
 #define THANKS_SITES			"devkitpro.org, wiibrew.org, gametdb.com, ohloh.net, wiifanart.com, wiiflowiki.com, tgames.fr.nf"
 #define THANKS_CODE				"CFG Loader, uLoader, USB Loader GX, NeoGamma, WiiXplorer, Triiforce, Mighty Channels"

source/list/cachedlist.cpp

@@ -102,7 +102,7 @@ void CachedList<dir_discHdr>::LoadChannels(string path, u32 channelType)
 
 	if(m_update)
 	{
-		gprintf("Updating\n");
+		gprintf("Updating channels\n");
 		list.GetChannels(*this, m_settingsDir, channelType, m_channelLang);
 		
 		m_loaded = true;

source/menu/menu.hpp

@@ -166,6 +166,7 @@ private:
 	u32 m_mainLblInit;
 	u32 m_mainLblUser[6];
 	bool m_show_dml;
+	bool m_GameTDBLoaded;
 //Main Config menus
 	u32 m_configLblPage;
 	u32 m_configBtnPageM;
@@ -700,7 +701,7 @@ private:
 	int _config4(void);
 	int _configAdv(void);
 	int _configSnd(void);
-	void _game(bool launch = false, bool gametdb = false);
+	void _game(bool launch = false);
 	void _download(std::string gameId = std::string());
 	bool _code(char code[4], bool erase = false);
 	void _about(void);

source/menu/menu_download.cpp

@@ -119,8 +119,9 @@ static string countryCode(const string &gameId)
 static string makeURL(const string format, const string gameId, const string country)
 {
 	string url = format;
-	if (url.find(TAG_LOC) != url.npos) //check if {loc} is in the URL before trying to replace it
-		url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str());
+	if (url.find(TAG_LOC) != url.npos) 
+ 		url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str());	
+	
 	url.replace(url.find(TAG_GAME_ID), strlen(TAG_GAME_ID), gameId.c_str());
 
 	return url;

source/menu/menu_game.cpp

@@ -284,7 +284,7 @@ static void setLanguage(int l)
 		configbytes[0] = 0xCD;
 }
 
-void CMenu::_game(bool launch, bool gametdb)
+void CMenu::_game(bool launch)
 {
 	m_gcfg1.load(sfmt("%s/gameconfig1.ini", m_settingsDir.c_str()).c_str());
 	if (!launch)
@@ -321,7 +321,7 @@ void CMenu::_game(bool launch, bool gametdb)
 			m_gameSound.Stop();
 			break;
 		}
-		else if (BTN_PLUS_PRESSED && gametdb)
+		else if (BTN_PLUS_PRESSED && m_GameTDBLoaded)
 		{
 			_hideGame();
 			m_gameSelected = true;

source/menu/menu_main.cpp

@@ -74,31 +74,17 @@ void CMenu::_hideMain(bool instant)
 }
 
 static bool show_homebrew = true;
-static bool show_channel = true;
 static bool parental_homebrew = false;
+static bool show_channel = true;
 
 void CMenu::_showMain(void)
 {
 	_hideWaitMessage();
 #ifdef SHOWMEM	
 	m_btnMgr.show(m_mem2FreeSize);
-#endif
-#ifdef SHOWMEMGECKO
-	mem1 = SYS_GetArena1Size();
-	mem2 = MEM2_freesize();
-	if( mem1 != mem1old )
-	{
-		mem1old = mem1;
-		gprintf("Mem1 Free: %u\n", mem1);
-	}
-	if( mem2 != mem2old )
-	{
-		mem2old = mem2;
-		gprintf("Mem2 Free: %u\n", mem2);
-	}	
 #endif
 	m_vid.set2DViewport(m_cfg.getInt("GENERAL", "tv_width", 640), m_cfg.getInt("GENERAL", "tv_height", 480),
-		m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0));
+	m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0));
 	_setBg(m_gameBg, m_gameBgLQ);
 	m_btnMgr.show(m_mainBtnInfo);
 	m_btnMgr.show(m_mainBtnConfig);
@@ -169,7 +155,8 @@ void CMenu::LoadView(void)
 	_loadCFLayout(m_cfg.getInt(_domainFromView(), "last_cf_mode", 1));
 	m_cf.applySettings();
 
-	char *mode = (m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true)) ? (char *)"NAND" : ((m_current_view == COVERFLOW_DML) ? (char *)"DML" : (char *)DeviceName[currentPartition]);
+	char *mode = (m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true)) 
+		? (char *)"NAND" : ((m_current_view == COVERFLOW_DML) ? (char *)"DML" : (char *)DeviceName[currentPartition]);
 
 	for(u8 i = 0; strncmp((const char *)&mode[i], "\0", 1) != 0; i++)
 			mode[i] = toupper(mode[i]);
@@ -184,8 +171,8 @@ int CMenu::main(void)
 	wstringEx curLetter;
 	string prevTheme = m_cfg.getString("GENERAL", "theme", "default");
 	bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false);
-	show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false);
 	show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false);
+	show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false);
 	parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);	
 
 	m_reload = false;
@@ -197,12 +184,16 @@ int CMenu::main(void)
 
 	SetupInput();
 	MusicPlayer::Instance()->Play();
-	GameTDB m_gametdb;
-	m_gametdb.OpenFile(sfmt("%s/wiitdb.xml", m_settingsDir.c_str()).c_str());
-	bool gametdbloaded=false;
-	if (m_gametdb.IsLoaded())
-		gametdbloaded=true;
-	m_gametdb.CloseFile();
+	
+	GameTDB m_gametdb; 
+ 	m_gametdb.OpenFile(sfmt("%s/wiitdb.xml", m_settingsDir.c_str()).c_str());
+	m_GameTDBLoaded=false;
+ 	if( m_gametdb.IsLoaded() )
+	{
+		m_GameTDBLoaded=true;
+		m_gametdb.CloseFile();
+	}
+	
 	m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str());
 	if (m_cfg.getBool("GENERAL", "update_cache", false))
 	{
@@ -472,7 +463,7 @@ int CMenu::main(void)
 			{
 				m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str());
 								
-				UpdateCache(m_current_view); 				
+				UpdateCache(m_current_view);				
 				LoadView();
 			}
 		}
@@ -592,7 +583,7 @@ int CMenu::main(void)
 				if (m_cf.select())
 				{
 					_hideMain();
-					_game(BTN_B_HELD, gametdbloaded);
+					_game(BTN_B_HELD);
 					if(m_exit) break;
 					m_cf.cancel();
 					_showMain();

wiiflow.pnps

@@ -1 +1 @@
-<pd><ViewState><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\source\cheats" x="true"></e><e p="Wiiflow\data\images" x="false"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\source\gecko" x="false"></e><e p="Wiiflow\source\homebrew" x="true"></e><e p="Wiiflow\source\loader" x="false"></e><e p="Wiiflow\resources\app_booter" x="true"></e><e p="Wiiflow\source\wstringEx" x="false"></e><e p="Wiiflow\source\gc" x="true"></e><e p="Wiiflow\source\list" x="false"></e><e p="Wiiflow\source\music" x="false"></e><e p="Wiiflow\source\config" x="true"></e><e p="Wiiflow\source\memory" x="true"></e><e p="Wiiflow\source" x="true"></e><e p="Wiiflow\source\channel" x="true"></e><e p="Wiiflow\source\menu" x="true"></e><e p="Wiiflow\source\network" x="false"></e><e p="Wiiflow\source\unzip" x="false"></e><e p="Wiiflow\wii" x="true"></e><e p="Wiiflow\wii\docs" x="false"></e><e p="Wiiflow\data" x="true"></e><e p="Wiiflow\resources" x="true"></e><e p="Wiiflow\resources\app_booter\source" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow\source\devicemounter" x="true"></e><e p="Wiiflow\source\gui" x="true"></e><e p="Wiiflow" x="true"></e><e p="Wiiflow\data\sounds" x="false"></e><e p="Wiiflow\source\devicemounter\libwbfs" x="false"></e><e p="Wiiflow\wii\apps" x="false"></e><e p="Wiiflow\wii\wiiflow" x="false"></e></ViewState></pd>
+<pd><ViewState><e p="Wiiflow\data" x="false"></e><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\resources" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow" x="true"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\source" x="false"></e><e p="Wiiflow\wii" x="false"></e></ViewState></pd>