XEEN: Compilation fixes for create_xeen tool

scummvm · Feb 23, 2018 · d99905f · d99905f
1 parent cd6e5ee
commit d99905f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/devtools/create_xeen/clouds.cpp b/devtools/create_xeen/clouds.cpp
@@ -64,11 +64,17 @@ void writeCloudsData(CCArchive &cc, const char *darkName) {
 	if (darkFile.open(darkName, Common::kFileReadMode)) {
 		CCArchive darkCc(darkFile, kRead);
 
-		cc.add("mae.cld", darkCc.getMember("mae.xen"));
-		cc.add("spells.cld", darkCc.getMember("spells.xen"));
-		cc.add("animinfo.cld", darkCc.getMember("clouds.dat"));
-		cc.add("monsters.cld", darkCc.getMember("xeen.mon"));
-		cc.add("wallpics.cld", darkCc.getMember("xeenpic.dat"));
+		Common::MemFile mae = darkCc.getMember("mae.xen");
+		Common::MemFile spells = darkCc.getMember("spells.xen");
+		Common::MemFile animInfo = darkCc.getMember("clouds.dat");
+		Common::MemFile monsters = darkCc.getMember("xeen.mon");
+		Common::MemFile wallPics = darkCc.getMember("xeenpic.dat");
+
+		cc.add("mae.cld", mae);
+		cc.add("spells.cld", spells);
+		cc.add("animinfo.cld", animInfo);
+		cc.add("monsters.cld", monsters);
+		cc.add("wallpics.cld", wallPics);
 
 		Common::MemFile mapNames;
 		for (int idx = 0; idx < 86; ++idx)

diff --git a/devtools/create_xeen/file.h b/devtools/create_xeen/file.h
@@ -186,6 +186,7 @@ class MemFile : public Stream {
 	bool open() {
 		memset(_data, 0, MAX_MEM_SIZE);
 		_size = _offset = 0;
+		return true;
 	}
 	void close() {
 	}

diff --git a/devtools/create_xeen/map.cpp b/devtools/create_xeen/map.cpp
@@ -208,8 +208,8 @@ void writeMonstersObjects(CCArchive &cc) {
 			f.writeShort(0);
 			break;
 		case 4:
-			f.writeShort(0x80);
-			f.writeShort(0x80);
+			f.writeByte(0x80);
+			f.writeByte(0x80);
 			f.writeByte(0);
 			f.writeShort(0);
 			break;