1 files changed, 99 insertions, 36 deletions

diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index ae1eb11f4f..9a83c9e1c1 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -19,81 +19,118 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "backends/fs/wii/wii-fs-factory.h"
-#include "common/config-manager.h"
-
-#include "osystem.h"
-
 #include <unistd.h>
 
 #include <ogc/mutex.h>
 #include <ogc/lwp_watchdog.h>
 
+#include "common/config-manager.h"
+#include "backends/fs/wii/wii-fs-factory.h"
+
+#include "osystem.h"
+#include "options.h"
+
 OSystem_Wii::OSystem_Wii() :
 	_startup_time(0),
 
-	_palette(NULL),
-	_cursorPalette(NULL),
+	_cursorScale(1),
 	_cursorPaletteDisabled(true),
+	_cursorPalette(NULL),
+	_cursorPaletteDirty(false),
 
+	_gameRunning(false),
 	_gameWidth(0),
 	_gameHeight(0),
 	_gamePixels(NULL),
+	_gameDirty(false),
 
-	_overlayVisible(false),
+	_overlayVisible(true),
 	_overlayWidth(0),
 	_overlayHeight(0),
 	_overlaySize(0),
 	_overlayPixels(NULL),
+	_overlayDirty(false),
 
 	_lastScreenUpdate(0),
-	_texture(NULL),
 	_currentWidth(0),
 	_currentHeight(0),
-
-	_activeGraphicsMode(0),
-
+	_currentXScale(1),
+	_currentYScale(1),
+
+	_configGraphicsMode(0),
+	_actualGraphicsMode(0),
+	_bilinearFilter(false),
+#ifdef USE_RGB_COLOR
+	_pfRGB565(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)),
+	_pfRGB3444(Graphics::PixelFormat(2, 4, 4, 4, 3, 8, 4, 0, 12)),
+	_pfGame(Graphics::PixelFormat::createFormatCLUT8()),
+	_pfGameTexture(Graphics::PixelFormat::createFormatCLUT8()),
+	_pfCursor(Graphics::PixelFormat::createFormatCLUT8()),
+#endif
+
+	_optionsDlgActive(false),
+	_consoleVisible(false),
 	_fullscreen(false),
+	_arCorrection(false),
 
 	_mouseVisible(false),
 	_mouseX(0),
 	_mouseY(0),
-	_mouseWidth(0),
-	_mouseHeight(0),
 	_mouseHotspotX(0),
 	_mouseHotspotY(0),
 	_mouseKeyColor(0),
-	_mouseCursor(NULL),
 
 	_kbd_active(false),
 
 	_event_quit(false),
 
+	_lastPadCheck(0),
+	_padSensitivity(16),
+	_padAcceleration(4),
+
 	_savefile(NULL),
 	_mixer(NULL),
 	_timer(NULL) {
 }
 
 OSystem_Wii::~OSystem_Wii() {
-	if (_savefile) {
-		delete _savefile;
-		_savefile = NULL;
-	}
+	delete _savefile;
+	_savefile = NULL;
 
-	if (_mixer) {
-		delete _mixer;
-		_mixer = NULL;
-	}
+	delete _mixer;
+	_mixer = NULL;
 
-	if (_timer) {
-		delete _timer;
-		_timer = NULL;
-	}
+	delete _timer;
+	_timer = NULL;
 }
 
 void OSystem_Wii::initBackend() {
 	_startup_time = gettime();
 
+	ConfMan.registerDefault("fullscreen", true);
+	ConfMan.registerDefault("aspect_ratio", true);
+	ConfMan.registerDefault("wii_video_default_underscan_x", 16);
+	ConfMan.registerDefault("wii_video_default_underscan_y", 16);
+	ConfMan.registerDefault("wii_video_ds_underscan_x", 16);
+	ConfMan.registerDefault("wii_video_ds_underscan_y", 16);
+	ConfMan.registerDefault("wii_pad_sensitivity", 48);
+	ConfMan.registerDefault("wii_pad_acceleration", 5);
+	ConfMan.registerDefault("wii_smb_server", "");
+	ConfMan.registerDefault("wii_smb_share", "");
+	ConfMan.registerDefault("wii_smb_username", "");
+	ConfMan.registerDefault("wii_smb_password", "");
+
+	WiiFilesystemFactory &fsf = WiiFilesystemFactory::instance();
+
+#ifdef USE_WII_SMB
+	fsf.setSMBLoginData(ConfMan.get("wii_smb_server"),
+						ConfMan.get("wii_smb_share"),
+						ConfMan.get("wii_smb_username"),
+						ConfMan.get("wii_smb_password"));
+#endif
+
+	fsf.asyncInit();
+
 	char buf[MAXPATHLEN];
 	if (!getcwd(buf, MAXPATHLEN))
 		strcpy(buf, "/");
@@ -102,8 +139,6 @@ void OSystem_Wii::initBackend() {
 	_mixer = new Audio::MixerImpl(this);
 	_timer = new DefaultTimerManager();
 
-	_fullscreen = ConfMan.getBool("fullscreen");
-
 	initGfx();
 	initSfx();
 	initEvents();
@@ -116,20 +151,35 @@ void OSystem_Wii::quit() {
 	deinitSfx();
 	deinitGfx();
 
-	// umount all async filesystems
-	WiiFilesystemFactory::asyncHandler(false, NULL);
+	WiiFilesystemFactory::instance().asyncDeinit();
+}
+
+void OSystem_Wii::engineInit() {
+	_gameRunning = true;
+	WiiFilesystemFactory::instance().umountUnused(ConfMan.get("path"));
+}
+
+void OSystem_Wii::engineDone() {
+	_gameRunning = false;
+	switchVideoMode(gmStandard);
+	gfx_set_ar(4.0 / 3.0);
 }
 
 bool OSystem_Wii::hasFeature(Feature f) {
 	return (f == kFeatureFullscreenMode) ||
-			(f == kFeatureCursorHasPalette);
+			(f == kFeatureAspectRatioCorrection) ||
+			(f == kFeatureCursorHasPalette) ||
+			(f == kFeatureOverlaySupportsAlpha);
 }
 
 void OSystem_Wii::setFeatureState(Feature f, bool enable) {
 	switch (f) {
 	case kFeatureFullscreenMode:
 		_fullscreen = enable;
-		setGraphicsMode(_activeGraphicsMode);
+		gfx_set_pillarboxing(!enable);
+		break;
+	case kFeatureAspectRatioCorrection:
+		_arCorrection = enable;
 		break;
 	default:
 		break;
@@ -140,6 +190,8 @@ bool OSystem_Wii::getFeatureState(Feature f) {
 	switch (f) {
 	case kFeatureFullscreenMode:
 		return _fullscreen;
+	case kFeatureAspectRatioCorrection:
+		return _arCorrection;
 	default:
 		return false;
 	}
@@ -215,8 +267,19 @@ void OSystem_Wii::getTimeAndDate(struct tm &t) const {
 	t = *localtime(&curTime);
 }
 
-void OSystem_Wii::engineInit() {
-	// umount not required filesystems for this game
-	WiiFilesystemFactory::asyncHandler(false, &ConfMan.get("path"));
+void OSystem_Wii::showOptionsDialog() {
+	if (_optionsDlgActive)
+		return;
+
+	bool ds = (_actualGraphicsMode == gmDoubleStrike) ||
+				(_actualGraphicsMode == gmDoubleStrikeFiltered);
+
+	_optionsDlgActive = true;
+	WiiOptionsDialog dlg(ds);
+	dlg.runModal();
+	_optionsDlgActive = false;
+
+	_padSensitivity = 64 - ConfMan.getInt("wii_pad_sensitivity");
+	_padAcceleration = 9 - ConfMan.getInt("wii_pad_acceleration");
 }