about summary refs log tree commit diff
path: root/src/game/editor/ed_io.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2010-10-07 23:51:07 +0200
committeroy <Tom_Adams@web.de>2010-10-07 23:51:07 +0200
commit6a26cd6621b5f0b70177b0d17ed433b5669f1314 (patch)
treea0964f5ed7797058b0718492142126ed55f790cc /src/game/editor/ed_io.cpp
parent3a98f7a048c044ce0d870320fc0b1def0db4f7fb (diff)
downloadzcatch-6a26cd6621b5f0b70177b0d17ed433b5669f1314.tar.gz
zcatch-6a26cd6621b5f0b70177b0d17ed433b5669f1314.zip
fixed various problems with the file dialog in the editor
Diffstat (limited to 'src/game/editor/ed_io.cpp')
-rw-r--r--src/game/editor/ed_io.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/editor/ed_io.cpp b/src/game/editor/ed_io.cpp
index 62e3cf65..1d77a7de 100644
--- a/src/game/editor/ed_io.cpp
+++ b/src/game/editor/ed_io.cpp
@@ -362,17 +362,17 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
 	return 1;
 }
 
-int CEditor::Load(const char *pFileName)
+int CEditor::Load(const char *pFileName, int StorageType)
 {
 	Reset();
-	return m_Map.Load(Kernel()->RequestInterface<IStorage>(), pFileName);
+	return m_Map.Load(Kernel()->RequestInterface<IStorage>(), pFileName, StorageType);
 }
 
-int CEditorMap::Load(class IStorage *pStorage, const char *pFileName)
+int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int StorageType)
 {
 	CDataFileReader DataFile;
 	//DATAFILE *df = datafile_load(filename);
-	if(!DataFile.Open(pStorage, pFileName, IStorage::TYPE_ALL))
+	if(!DataFile.Open(pStorage, pFileName, StorageType))
 		return 0;
 		
 	Clean();
@@ -574,13 +574,13 @@ static void ModifyAdd(int *pIndex)
 		*pIndex += gs_ModifyAddAmount;
 }
 
-int CEditor::Append(const char *pFileName)
+int CEditor::Append(const char *pFileName, int StorageType)
 {
 	CEditorMap NewMap;
 	NewMap.m_pEditor = this;
 
 	int Err;
-	Err = NewMap.Load(Kernel()->RequestInterface<IStorage>(), pFileName);
+	Err = NewMap.Load(Kernel()->RequestInterface<IStorage>(), pFileName, StorageType);
 	if(!Err)
 		return Err;