[Scummvm-cvs-logs] SF.net SVN: scummvm:[33899] scummvm/branches/gsoc2008-gui/gui/ThemeRenderer .cpp
Tanoku at users.sourceforge.net
Tanoku at users.sourceforge.net
Fri Aug 15 15:50:08 CEST 2008
Revision: 33899
http://scummvm.svn.sourceforge.net/scummvm/?rev=33899&view=rev
Author: Tanoku
Date: 2008-08-15 13:50:08 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Bugfix: Cross cursor animation disabled when switching themes/resolutions on the fly.
Modified Paths:
--------------
scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp 2008-08-15 11:05:25 UTC (rev 33898)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp 2008-08-15 13:50:08 UTC (rev 33899)
@@ -208,8 +208,11 @@
init();
if (_enabled) {
_system->showOverlay();
- CursorMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS);
- CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale);
+
+ if (_useCursor) {
+ CursorMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS);
+ CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale);
+ }
}
}
@@ -374,7 +377,7 @@
error("Could not load default embeded theme");
}
else if (!loadThemeXML(fileName)) {
- warning("Could not parse custom theme '%s'.\nFalling back to default theme", fileName.c_str());
+ warning("Could not parse custom theme '%s'. Falling back to default theme", fileName.c_str());
if (!loadDefaultXML()) // if we can't load the embeded theme, this is a complete failure
error("Could not load default embeded theme");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list