diff options
| author | Max Horn | 2010-02-13 11:56:30 +0000 |
|---|---|---|
| committer | Max Horn | 2010-02-13 11:56:30 +0000 |
| commit | 8ac5d00d576519b2fc0f18aff28d29ad3f6ab852 (patch) | |
| tree | 4cb7b4d9c18e3f3afbcc9de20b866d7b6a8232e4 /backends | |
| parent | 52c2abba96878d3bd731f17ba04b192da3f61deb (diff) | |
| download | scummvm-rg350-8ac5d00d576519b2fc0f18aff28d29ad3f6ab852.tar.gz scummvm-rg350-8ac5d00d576519b2fc0f18aff28d29ad3f6ab852.tar.bz2 scummvm-rg350-8ac5d00d576519b2fc0f18aff28d29ad3f6ab852.zip | |
Hide ZipArchive implementation, only expose it via factory functions: makeZipArchive()
svn-id: r48040
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/psp/pspkeyboard.cpp | 2 | ||||
| -rw-r--r-- | backends/vkeybd/virtual-keyboard.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/psp/pspkeyboard.cpp b/backends/platform/psp/pspkeyboard.cpp index 40b63d0cbd..e7e1dbb011 100644 --- a/backends/platform/psp/pspkeyboard.cpp +++ b/backends/platform/psp/pspkeyboard.cpp @@ -518,7 +518,7 @@ bool PSPKeyboard::load() { #ifdef PSP_KB_DEBUG fprintf(stderr, "found kbd.zip\n"); #endif - zipArchive = new Common::ZipArchive(node.getChild("kbd.zip")); + zipArchive = Common::makeZipArchive(node.getChild("kbd.zip")); } // Loop through different png images diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp index 0e2b98a91d..bd512fe3ad 100644 --- a/backends/vkeybd/virtual-keyboard.cpp +++ b/backends/vkeybd/virtual-keyboard.cpp @@ -93,8 +93,8 @@ bool VirtualKeyboard::openPack(const String &packName, const FSNode &node) { #ifdef USE_ZLIB if (node.getChild(packName + ".zip").exists()) { // compressed keyboard pack - _fileArchive = new ZipArchive(node.getChild(packName + ".zip")); - if (_fileArchive->hasFile(packName + ".xml")) { + _fileArchive = makeZipArchive(node.getChild(packName + ".zip")); + if (_fileArchive && _fileArchive->hasFile(packName + ".xml")) { if (!_parser->loadStream(_fileArchive->createReadStreamForMember(packName + ".xml"))) { delete _fileArchive; _fileArchive = 0; |