amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow opening files from other packages

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@65 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-10-31 15:53:25 +00:00
parent f7a6d9e79d
commit fe27f2b770
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/package.cpp
+5 -4
View File
@@ -7,6 +7,7 @@
// ----------------------------------------------------------------------------- : Includes // ----------------------------------------------------------------------------- : Includes
#include <util/io/package.hpp> #include <util/io/package.hpp>
#include <util/io/package_manager.hpp>
#include <util/error.hpp> #include <util/error.hpp>
#include <wx/wfstream.h> #include <wx/wfstream.h>
#include <wx/zipstrm.h> #include <wx/zipstrm.h>
@@ -147,10 +148,10 @@ class ZipFileInputStream : private wxFileInputStream, public wxZipInputStream {
}; };
InputStreamP Package::openIn(const String& file) { InputStreamP Package::openIn(const String& file) {
// if (!n.empty() && n.getChar(0) == _('/')) { if (!file.empty() && file.GetChar(0) == _('/')) {
// // absolute path, open file from another package // absolute path, open file from another package
// return packMan.openFileFromPackage(n); return packages.openFileFromPackage(file);
// } }
FileInfos::iterator it = files.find(toStandardName(file)); FileInfos::iterator it = files.find(toStandardName(file));
if (it == files.end()) { if (it == files.end()) {
throw FileNotFoundError(file, filename); throw FileNotFoundError(file, filename);