thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed ZipArchive/FSDirectory creation.

Browse source 
svn-id: r35133
This commit is contained in:
Johannes Schickel 2008-11-20 18:25:22 +00:00
parent 398fdab276
commit 4368081c55
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
graphics/imageman.cpp
View file

@ -47,10 +47,11 @@ ImageManager::~ImageManager() {
bool ImageManager::addArchive(const Common::String &name) {
Common::Archive *arch = 0;
Common::FSNode node(name);
if (name.hasSuffix(".zip")) {
if (node.getName().hasSuffix(".zip")) {
#ifdef USE_ZLIB
Common::ZipArchive *zip = new Common::ZipArchive(name);
Common::ZipArchive *zip = new Common::ZipArchive(node);
if (!zip || !zip->isOpen())
return false;
@ -59,7 +60,7 @@ bool ImageManager::addArchive(const Common::String &name) {
return false;
#endif
} else {
Common::FSDirectory *dir = new Common::FSDirectory(name);
Common::FSDirectory *dir = new Common::FSDirectory(node);
if (!dir || !dir->getFSNode().isDirectory())
return false;

11
gui/ThemeEngine.cpp
View file

@ -398,9 +398,8 @@ bool ThemeEngine::addFont(const Common::String &fontId, const Common::String &fi
}
bool ThemeEngine::addBitmap(const Common::String &filename) {
if (_bitmaps.contains(filename)) {
if (_bitmaps.contains(filename))
ImageMan.unregisterSurface(filename);
}
ImageMan.registerSurface(filename, 0);
_bitmaps[filename] = ImageMan.getSurface(filename);
@ -1070,9 +1069,11 @@ const Graphics::Font *ThemeEngine::loadFontFromArchive(const Common::String &fil
Common::Archive *arch = 0;
const Graphics::NewFont *font = 0;
if (getThemeFileName().hasSuffix(".zip")) {
Common::FSNode node(getThemeFileName());
if (node.getName().hasSuffix(".zip")) {
#ifdef USE_ZLIB
Common::ZipArchive *zip = new Common::ZipArchive(getThemeFileName());
Common::ZipArchive *zip = new Common::ZipArchive(node);
if (!zip || !zip->isOpen())
return 0;
@ -1081,7 +1082,7 @@ const Graphics::Font *ThemeEngine::loadFontFromArchive(const Common::String &fil
return 0;
#endif
} else {
Common::FSDirectory *dir = new Common::FSDirectory(getThemeFileName());
Common::FSDirectory *dir = new Common::FSDirectory(node);
if (!dir || !dir->getFSNode().isDirectory())
return 0;