[Scummvm-git-logs] scummvm master -> d99905f76d9372c4578fe8eeb1dc0049fbd9167e

dreammaster dreammaster at scummvm.org
Sat Feb 24 00:49:22 CET 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d99905f76d XEEN: Compilation fixes for create_xeen tool


Commit: d99905f76d9372c4578fe8eeb1dc0049fbd9167e
    https://github.com/scummvm/scummvm/commit/d99905f76d9372c4578fe8eeb1dc0049fbd9167e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-23T18:47:48-05:00

Commit Message:
XEEN: Compilation fixes for create_xeen tool

Changed paths:
    devtools/create_xeen/clouds.cpp
    devtools/create_xeen/file.h
    devtools/create_xeen/map.cpp


diff --git a/devtools/create_xeen/clouds.cpp b/devtools/create_xeen/clouds.cpp
index 2e41263..6fd8770 100644
--- 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
index 15091bc..3d10825 100644
--- a/devtools/create_xeen/file.h
+++ b/devtools/create_xeen/file.h
@@ -186,6 +186,7 @@ public:
 	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
index 254528c..7e38cd7 100644
--- 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;





More information about the Scummvm-git-logs mailing list