aboutsummaryrefslogtreecommitdiff
path: root/devtools/create_xeen
diff options
context:
space:
mode:
authorPaul Gilbert2018-02-23 18:47:48 -0500
committerPaul Gilbert2018-02-23 18:47:48 -0500
commitd99905f76d9372c4578fe8eeb1dc0049fbd9167e (patch)
treeb2b89add5735f4403efc167c9db0bfc762cceb06 /devtools/create_xeen
parentcd6e5eef48425966122e9ef33128630c80d2769f (diff)
downloadscummvm-rg350-d99905f76d9372c4578fe8eeb1dc0049fbd9167e.tar.gz
scummvm-rg350-d99905f76d9372c4578fe8eeb1dc0049fbd9167e.tar.bz2
scummvm-rg350-d99905f76d9372c4578fe8eeb1dc0049fbd9167e.zip
XEEN: Compilation fixes for create_xeen tool
Diffstat (limited to 'devtools/create_xeen')
-rw-r--r--devtools/create_xeen/clouds.cpp16
-rw-r--r--devtools/create_xeen/file.h1
-rw-r--r--devtools/create_xeen/map.cpp4
3 files changed, 14 insertions, 7 deletions
diff --git a/devtools/create_xeen/clouds.cpp b/devtools/create_xeen/clouds.cpp
index 2e41263bde..6fd8770977 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 15091bcd11..3d10825711 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 254528c8a3..7e38cd7407 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;