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

[Tanoku at users.sourceforge.net]

Revision: 33862
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33862&view=rev
Author:   Tanoku
Date:     2008-08-14 10:58:28 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
Bugfix: Compressed font/bitmap loading.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/theme.cpp
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.zip

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-14 10:24:39 UTC (rev 33861)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-14 10:58:28 UTC (rev 33862)
@@ -182,7 +182,7 @@
 	for (ImagesMap::iterator i = _bitmaps.begin(); i != _bitmaps.end(); ++i)
 		ImageMan.unregisterSurface(i->_key);
 
-	ImageMan.remArchive(_themeFileName + ".zip");
+	ImageMan.remArchive(_themeFileName);
 	
 	_themeEval->reset();
 	_themeOk = false;
@@ -358,7 +358,7 @@
 		if (ConfMan.hasKey("extrapath"))
 			Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
 		
-		ImageMan.addArchive(fileName + ".zip");
+		ImageMan.addArchive(fileName);
 	}
 
 	if (fileName == "builtin") {

Modified: scummvm/branches/gsoc2008-gui/gui/theme.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/theme.cpp	2008-08-14 10:24:39 UTC (rev 33861)
+++ scummvm/branches/gsoc2008-gui/gui/theme.cpp	2008-08-14 10:58:28 UTC (rev 33862)
@@ -43,7 +43,7 @@
 			return font;
 
 #ifdef USE_ZLIB
-		unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str());
+		unzFile zipFile = unzOpen((getThemeFileName()).c_str());
 		if (zipFile && unzLocateFile(zipFile, cacheFilename.c_str(), 2) == UNZ_OK) {
 			unz_file_info fileInfo;
 			unzOpenCurrentFile(zipFile);
@@ -73,7 +73,7 @@
 
 #ifdef USE_ZLIB
 	if (!font) {
-		unzFile zipFile = unzOpen((getThemeFileName() + ".zip").c_str());
+		unzFile zipFile = unzOpen((getThemeFileName()).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.