aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorAndre Heider2009-01-20 16:13:08 +0000
committerAndre Heider2009-01-20 16:13:08 +0000
commitf67bb6c8f127a38efac71207542a0351b321e1b7 (patch)
treec808477c21ff165412f2f00611674960576ea861 /backends
parentfbfec8e63e7d3fc3fdcf24afb04493872bb4b390 (diff)
downloadscummvm-rg350-f67bb6c8f127a38efac71207542a0351b321e1b7.tar.gz
scummvm-rg350-f67bb6c8f127a38efac71207542a0351b321e1b7.tar.bz2
scummvm-rg350-f67bb6c8f127a38efac71207542a0351b321e1b7.zip
fixed vkeybd.zip loading
svn-id: r35957
Diffstat (limited to 'backends')
-rw-r--r--backends/vkeybd/imageman.cpp3
-rw-r--r--backends/vkeybd/virtual-keyboard.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/backends/vkeybd/imageman.cpp b/backends/vkeybd/imageman.cpp
index c4ea35c908..2f68fcb71f 100644
--- a/backends/vkeybd/imageman.cpp
+++ b/backends/vkeybd/imageman.cpp
@@ -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 @@ ImageManager::~ImageManager() {
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);
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 22b1693220..6022a032bd 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -99,7 +99,7 @@ bool VirtualKeyboard::loadKeyboardPack(String packName) {
} 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;