[Scummvm-cvs-logs] SF.net SVN: scummvm:[33751] scummvm/branches/gsoc2008-gui/gui

Tanoku at users.sourceforge.net Tanoku at users.sourceforge.net
Sun Aug 10 11:53:43 CEST 2008


Revision: 33751
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33751&view=rev
Author:   Tanoku
Date:     2008-08-10 09:53:42 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Fixed error when loading BDF fonts.
Hot scaler swapping works without crashes!

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
    scummvm/branches/gsoc2008-gui/gui/theme.cpp

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-10 02:11:14 UTC (rev 33750)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-10 09:53:42 UTC (rev 33751)
@@ -183,8 +183,8 @@
 
 	ImageMan.remArchive(_themeFileName + ".zip");
 
-	_themeName.clear();
-	_themeFileName.clear();
+//	_themeName.clear();
+//	_themeFileName.clear();
 	_themeOk = false;
 }
 
@@ -196,6 +196,15 @@
 	_system->grabOverlay((OverlayColor*)_screen->pixels, _screen->w);
 }
 
+void ThemeRenderer::refresh() {
+	init();
+	if (_enabled) {
+		_system->showOverlay();
+//		CursorMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS);
+//		CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale);
+	}
+}
+
 void ThemeRenderer::enable() {
 	init();
 	resetDrawArea();

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-08-10 02:11:14 UTC (rev 33750)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-08-10 09:53:42 UTC (rev 33751)
@@ -234,7 +234,7 @@
 	void deinit();
 	void clearAll();
 
-	void refresh() {}
+	void refresh();
 	void enable();
 	void disable();
 	

Modified: scummvm/branches/gsoc2008-gui/gui/theme.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/theme.cpp	2008-08-10 02:11:14 UTC (rev 33750)
+++ scummvm/branches/gsoc2008-gui/gui/theme.cpp	2008-08-10 09:53:42 UTC (rev 33751)
@@ -68,7 +68,7 @@
 			return font;
 
 #ifdef USE_ZLIB
-		unzFile zipFile = unzOpen((_stylefile + ".zip").c_str());
+		unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str());
 		if (zipFile && unzLocateFile(zipFile, cacheFilename.c_str(), 2) == UNZ_OK) {
 			unz_file_info fileInfo;
 			unzOpenCurrentFile(zipFile);
@@ -98,7 +98,7 @@
 
 #ifdef USE_ZLIB
 	if (!font) {
-		unzFile zipFile = unzOpen((_stylefile + ".zip").c_str());
+		unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str());
 		if (zipFile && unzLocateFile(zipFile, filename, 2) == UNZ_OK) {
 			unz_file_info fileInfo;
 			unzOpenCurrentFile(zipFile);


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