[Scummvm-cvs-logs] SF.net SVN: scummvm:[35957] scummvm/trunk/backends/vkeybd
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Tue Jan 20 17:13:09 CET 2009
Revision: 35957
http://scummvm.svn.sourceforge.net/scummvm/?rev=35957&view=rev
Author: dhewg
Date: 2009-01-20 16:13:08 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
fixed vkeybd.zip loading
Modified Paths:
--------------
scummvm/trunk/backends/vkeybd/imageman.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
Modified: scummvm/trunk/backends/vkeybd/imageman.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/imageman.cpp 2009-01-20 16:00:36 UTC (rev 35956)
+++ scummvm/trunk/backends/vkeybd/imageman.cpp 2009-01-20 16:13:08 UTC (rev 35957)
@@ -26,6 +26,7 @@
#include "backends/vkeybd/imageman.h"
+#include "common/fs.h"
#include "common/unzip.h"
#include "graphics/imagedec.h"
#include "graphics/surface.h"
@@ -49,7 +50,7 @@
bool ImageManager::addArchive(const Common::String &name) {
#ifdef USE_ZLIB
- Common::ZipArchive *arch = new Common::ZipArchive(name);
+ Common::ZipArchive *arch = new Common::ZipArchive(Common::FSNode(name));
if (!arch || !arch->isOpen())
return false;
_archives.add(name, arch);
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-01-20 16:00:36 UTC (rev 35956)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-01-20 16:13:08 UTC (rev 35957)
@@ -99,7 +99,7 @@
} else if (vkDir.getChild(packName + ".zip").exists()) {
// compressed keyboard pack
#ifdef USE_ZLIB
- ZipArchive arch(vkDir.getChild(packName + ".zip").getPath().c_str());
+ ZipArchive arch(vkDir.getChild(packName + ".zip"));
if (arch.hasFile(packName + ".xml")) {
if (!_parser->loadStream(arch.openFile(packName + ".xml")))
return false;
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