[Scummvm-cvs-logs] SF.net SVN: scummvm: [22507] scummvm/trunk/gui

[sev at users.sourceforge.net]

Revision: 22507
Author:   sev
Date:     2006-05-17 18:36:06 -0700 (Wed, 17 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22507&view=rev

Log Message:
-----------
Better cursor image

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeNew.cpp
    scummvm/trunk/gui/theme.h
    scummvm/trunk/gui/themes/modern.ini
    scummvm/trunk/gui/themes/modern.zip
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-05-18 00:20:53 UTC (rev 22506)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-05-18 01:36:06 UTC (rev 22507)
@@ -38,7 +38,7 @@
 #define kShadowTr3 64
 #define kShadowTr4 128
 
-#define THEME_VERSION 10
+#define THEME_VERSION 11
 
 using Graphics::Surface;
 
@@ -248,6 +248,8 @@
 
 	getExtraValueFromConfig(_configFile, "cursor_hotspot_x", _cursorHotspotX, 0);
 	getExtraValueFromConfig(_configFile, "cursor_hotspot_y", _cursorHotspotY, 0);
+
+	getExtraValueFromConfig(_configFile, "cursor_targetScale", _cursorTargetScale, 1);
 	
 	// inactive dialog shading stuff
 	_dialogShadingCallback = 0;
@@ -300,7 +302,7 @@
 	
 	_lastUsedBitMask = gBitFormat;
 
-	// creats the cursor image
+	// creates cursor image
 	if (_system->hasFeature(OSystem::kFeatureCursorHasPalette)) {
 		createCursor();
 	}
@@ -334,6 +336,7 @@
 		_initOk = true;
 		clearAll();
 		setupFonts();
+		setUpCursor();
 		resetDrawArea();
 	}
 
@@ -1506,7 +1509,7 @@
 
 void ThemeNew::setUpCursor() {
 	_system->setCursorPalette(_cursorPal, 0, MAX_CURS_COLORS);
-	_system->setMouseCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY);
+	_system->setMouseCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale);
 	_system->disableCursorPalette(false);
 }
 

Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h	2006-05-18 00:20:53 UTC (rev 22506)
+++ scummvm/trunk/gui/theme.h	2006-05-18 01:36:06 UTC (rev 22507)
@@ -454,6 +454,7 @@
 	void setUpCursor();
 	void createCursor();
 	int _cursorHotspotX, _cursorHotspotY;
+	int _cursorTargetScale;
 #define MAX_CURS_COLORS 255
 	byte *_cursor;
 	bool _needPaletteUpdates;

Modified: scummvm/trunk/gui/themes/modern.ini
===================================================================
--- scummvm/trunk/gui/themes/modern.ini	2006-05-18 00:20:53 UTC (rev 22506)
+++ scummvm/trunk/gui/themes/modern.ini	2006-05-18 01:36:06 UTC (rev 22507)
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 [theme]
-version=10
+version=11
 
 [pixmaps]
 dialog_corner=dialog_bkgd_corner.bmp
@@ -150,6 +150,7 @@
 fontfile_normal=helvr12-l1.bdf
 cursor_hotspot_x=0
 cursor_hotspot_y=0
+cursor_targetScale=3
 
 [XxY]
 skipFor=320xY

Modified: scummvm/trunk/gui/themes/modern.zip
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.