From 6dbdad02e5f48951797c3dafdb48f76055bf730d Mon Sep 17 00:00:00 2001
From: John Willis
Date: Mon, 3 Aug 2009 18:38:46 +0000
Subject: GP2XWiz: Fix bug with downscaled cursors.

svn-id: r43029
---
 backends/platform/gp2xwiz/gp2xwiz-graphics.cpp | 10 ++++------
 backends/platform/gp2xwiz/gp2xwiz-hw.cpp       |  2 +-
 backends/platform/gp2xwiz/gp2xwiz-main.cpp     |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp b/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
index faa326e6f5..90f2c821aa 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp
@@ -115,8 +115,6 @@ void OSystem_GP2XWIZ::setGraphicsModeIntern() {
 void OSystem_GP2XWIZ::initSize(uint w, uint h) {
     assert(_transactionMode == kTransactionActive);
 
-    printf("Init Size: w=%d, h=%d\n", w, h);
-
 	// Avoid redundant res changes
 	if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight)
 		return;
@@ -371,11 +369,11 @@ void OSystem_GP2XWIZ::internUpdateScreen() {
 				assert(scalerProc != NULL);
 
                 if(_videoMode.mode == GFX_HALF && scalerProc == HalfScale){
-                    if(dst_x % 2 == 1){
+                    if(dst_x%2==1){
                         dst_x--;
                         dst_w++;
                     }
-                    if(dst_y % 2 == 1){
+                    if(dst_y%2==1){
                         dst_y--;
                         dst_h++;
                     }
@@ -441,8 +439,8 @@ void OSystem_GP2XWIZ::showOverlay() {
 
 void OSystem_GP2XWIZ::hideOverlay() {
     if(_videoMode.mode == GFX_HALF){
-        _mouseCurState.x = _mouseCurState.x / 2;
-        _mouseCurState.y = _mouseCurState.y / 2;
+        _mouseCurState.x = _mouseCurState.x * 2;
+        _mouseCurState.y = _mouseCurState.y * 2;
     }
 	OSystem_SDL::hideOverlay();
 }
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp b/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
index 4d69915e27..4a86443aa7 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
@@ -48,7 +48,7 @@ enum {
 	VOLUME_UP				= 2,
 	VOLUME_CHANGE_RATE		= 8,
 	VOLUME_MIN				= 0,
-	VOLUME_INITIAL			= 70,
+	VOLUME_INITIAL			= 60,
 	VOLUME_MAX				= 100
 };
 
diff --git a/backends/platform/gp2xwiz/gp2xwiz-main.cpp b/backends/platform/gp2xwiz/gp2xwiz-main.cpp
index 4bd3f98211..394c3090c3 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-main.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-main.cpp
@@ -148,9 +148,9 @@ void OSystem_GP2XWIZ::initBackend() {
 	WIZ_HW::mixerMoveVolume(0);
 
 	/* Up default volume values as we use a seperate system level volume anyway. */
-	ConfMan.registerDefault("music_volume", 220);
-	ConfMan.registerDefault("sfx_volume", 220);
-	ConfMan.registerDefault("speech_volume", 220);
+	ConfMan.registerDefault("music_volume", 192);
+	ConfMan.registerDefault("sfx_volume", 192);
+	ConfMan.registerDefault("speech_volume", 192);
 
 	/* Trigger autosave every 4 minutes - On low batts 5 mins is about your warning time. */
 	ConfMan.registerDefault("autosave_period", 4 * 60);
-- 
cgit v1.2.3