From ec3b9314e8cddb4636e45d414f3d7c78dd9f716e Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Sat, 9 Jul 2011 09:44:34 +0200 Subject: CREATE_PROJECT: Quote parameters in MSVC10 post-build step. Also, do the same commands for Release and Debug. --- .../create_project/msvc10/create_project.vcxproj | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj index 3d7f8fdd3d..40c515f26b 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc10/create_project.vcxproj @@ -59,11 +59,11 @@ @echo off -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\ +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" @@ -84,10 +84,12 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\ MachineX86 - xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\ -xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ + @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" @@ -120,4 +122,4 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ - \ No newline at end of file + -- cgit v1.2.3 From d1fbf595206c1010755667b404e823f13caa4c2b Mon Sep 17 00:00:00 2001 From: eriktorbjorn Date: Sat, 16 Jul 2011 11:04:49 +0200 Subject: DREAMWEB: Rewrote lockmon() to fix pausing/unpausing The original function would busy-wait for the user to press space again. We can't do that, of course, since we don't have interrupt- driven keyboard input. --- devtools/tasmrecover/tasm-recover | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 5f7a528a5b..54fc091f06 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -24,6 +24,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'readabyte', 'readoneblock', 'frameoutv', - 'modifychar' + 'modifychar', + 'lockmon' ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From 4d4d3329c3f60db245038d48ff36a14628a0c10f Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 26 Jun 2011 15:10:18 +0200 Subject: DREAMWEB: The generator includes a file for custom structs and a file for custom function definitions It also generates C++ symbols for asm proc addresses --- devtools/tasmrecover/tasm/cpp.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index dfdfb239f4..81c883da1e 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -544,14 +544,19 @@ namespace %s { """\n#include "dreamweb/runtime.h" namespace %s { - +#include "structs.h" class %sContext : public Context { public: void __start(); void __dispatch_call(uint16 addr); +#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f() """ %(self.namespace, self.namespace)) + + for name,addr in self.proc_addr: + self.hd.write("\tstatic const uint16 addr_%s = 0x%04x;\n" %(name, addr)) + offsets = [] for k, v in self.context.get_globals().items(): if isinstance(v, op.var): @@ -564,7 +569,10 @@ public: self.hd.write("\tconst static uint16 k%s = %s;\n" %o) self.hd.write("\n") for p in set(self.methods): - self.hd.write("\tvoid %s();\n" %p) + if p in self.blacklist: + self.hd.write("\t//void %s();\n" %p) + else: + self.hd.write("\tvoid %s();\n" %p) self.hd.write("};\n}\n\n#endif\n") self.hd.close() @@ -574,7 +582,7 @@ public: self.fd.write("\nvoid %sContext::__dispatch_call(uint16 addr) {\n\tswitch(addr) {\n" %self.namespace) self.proc_addr.sort(cmp = lambda x, y: x[1] - y[1]) for name,addr in self.proc_addr: - self.fd.write("\t\tcase 0x%04x: %s(); break;\n" %(addr, name)) + self.fd.write("\t\tcase addr_%s: %s(); break;\n" %(name, name)) self.fd.write("\t\tdefault: ::error(\"invalid call to %04x dispatched\", (uint16)ax);") self.fd.write("\n\t}\n}\n\n} /*namespace*/\n") -- cgit v1.2.3 From 7af3cd565c2c62d4733b2272a841e0ead49988cd Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 26 Jun 2011 15:17:19 +0200 Subject: DREAMWEB: C++-isation of a part of the sprite subsystem --- devtools/tasmrecover/dreamweb/vars.asm | 2 +- devtools/tasmrecover/tasm-recover | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/dreamweb/vars.asm b/devtools/tasmrecover/dreamweb/vars.asm index 8646697e52..8678231a9d 100644 --- a/devtools/tasmrecover/dreamweb/vars.asm +++ b/devtools/tasmrecover/dreamweb/vars.asm @@ -273,7 +273,7 @@ savesource dw 0 savex db 0 savey db 0 currentob db 0 -priority db 0 +priorityDep db 0 ; dep for deprecated, I leave a byte here to minimize changes to the generated code destpos db 0 diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 54fc091f06..8e84c600f9 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -23,6 +23,12 @@ generator = cpp(context, "DreamGen", blacklist = [ 'convertkey', 'readabyte', 'readoneblock', + 'printsprites', + 'printasprite', + 'eraseoldobs', + 'clearsprites', + 'makesprite', + 'spriteupdate', 'frameoutv', 'modifychar', 'lockmon' -- cgit v1.2.3 From 880bcc69ef24fa6fa333a38d14d47d45c123aeb5 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 26 Jun 2011 17:03:17 +0200 Subject: DREAMWEB: showframe blacklisted --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 8e84c600f9..95b42cf652 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -28,6 +28,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'eraseoldobs', 'clearsprites', 'makesprite', + 'showframe', 'spriteupdate', 'frameoutv', 'modifychar', -- cgit v1.2.3 From 9f8036cd86670a3de8562b7c6e398ddace8650fa Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 26 Jun 2011 19:32:02 +0200 Subject: DREAMWEB: Blacklisted frameoutbh and frameoutfx --- devtools/tasmrecover/tasm-recover | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 95b42cf652..727bb41ebf 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -15,7 +15,9 @@ generator = cpp(context, "DreamGen", blacklist = [ 'multiget', 'multiput', 'multidump', - 'frameoutnm', + 'frameoutnm', + 'frameoutbh', + 'frameoutfx', 'cls', 'printundermon', 'worktoscreen', -- cgit v1.2.3 From 25528a56e854795afa7eeda92a338aafee124eb4 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 28 Jun 2011 04:55:10 +0200 Subject: DREAMWEB: dodoor blacklisted --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 727bb41ebf..22010aa71a 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -32,6 +32,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'makesprite', 'showframe', 'spriteupdate', + 'dodoor', 'frameoutv', 'modifychar', 'lockmon' -- cgit v1.2.3 From 40e5e03e32f08562738abde8a22ce4b0c98264f0 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 28 Jun 2011 05:10:35 +0200 Subject: DREAMWEB: Blacklisted liftsprite --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 22010aa71a..8eb70290ef 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -33,6 +33,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showframe', 'spriteupdate', 'dodoor', + 'liftsprite', 'frameoutv', 'modifychar', 'lockmon' -- cgit v1.2.3 From 3ce4f2654075a5bc1b2b93eda9064a5b79180936 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 28 Jun 2011 14:54:26 +0200 Subject: DREAMWEB: walking blacklisted --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 8eb70290ef..dfcb40bfb4 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -31,6 +31,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'clearsprites', 'makesprite', 'showframe', + 'walking', 'spriteupdate', 'dodoor', 'liftsprite', -- cgit v1.2.3 From 2fd19aeedf5d3df90a1be5ae0bba30ea5131ee10 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 28 Jun 2011 15:48:07 +0200 Subject: DREAMWEB: initman reversed --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index dfcb40bfb4..3f04bad1e9 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -31,6 +31,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'clearsprites', 'makesprite', 'showframe', + 'initman', 'walking', 'spriteupdate', 'dodoor', -- cgit v1.2.3 From 9072ecf781bb8fd116a02530631d3cfa1e44648b Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 17 Jul 2011 14:38:30 +0200 Subject: DREAMWEB: Blacklisted 'kernchars' and 'getnextword' --- devtools/tasmrecover/tasm-recover | 2 ++ 1 file changed, 2 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 3f04bad1e9..6b1c6d9d23 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -20,6 +20,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'frameoutfx', 'cls', 'printundermon', + 'kernchars', + 'getnextword', 'worktoscreen', 'width160', 'convertkey', -- cgit v1.2.3 From 2cdd83141ab2cf364de62973de4c014944836f73 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 19 Jul 2011 10:50:12 +0300 Subject: CREATE_PROJECT: Enabled the new Bink video support feature --- devtools/create_project/create_project.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 35d08561bf..0b190b3f0e 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -773,6 +773,7 @@ const Feature s_features[] = { { "theora", "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" }, // Feature flags + { "bink", "USE_BINK", "", true, "Bink video support" }, { "scalers", "USE_SCALERS", "", true, "Scalers" }, { "hqscalers", "USE_HQ_SCALERS", "", true, "HQ scalers" }, { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, -- cgit v1.2.3 From 540d0260e65677848a9f9ef53460ab2c7d0bf6d0 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 19 Jul 2011 11:26:40 +0100 Subject: DREAMWEB: Add ScummVM headers, remove SVN keywords. --- devtools/tasmrecover/tasm-recover | 21 +++++++++++++++++ devtools/tasmrecover/tasm/cpp.py | 47 ++++++++++++++++++++++++++++++++++++- devtools/tasmrecover/tasm/lex.py | 21 +++++++++++++++++ devtools/tasmrecover/tasm/op.py | 21 +++++++++++++++++ devtools/tasmrecover/tasm/parser.py | 21 +++++++++++++++++ devtools/tasmrecover/tasm/proc.py | 21 +++++++++++++++++ 6 files changed, 151 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 6b1c6d9d23..52085daac5 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -1,5 +1,26 @@ #!/usr/bin/python +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + from tasm.parser import parser from tasm.cpp import cpp diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index 81c883da1e..a73fd6c890 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import op, traceback, re, proc from copy import copy proc_module = proc @@ -16,7 +37,31 @@ class cpp: self.namespace = namespace fname = namespace.lower() + ".cpp" header = namespace.lower() + ".h" - banner = "/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */" + banner = """/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */ + +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +""" self.fd = open(fname, "wt") self.hd = open(header, "wt") hid = "TASMRECOVER_%s_STUBS_H__" %namespace.upper() diff --git a/devtools/tasmrecover/tasm/lex.py b/devtools/tasmrecover/tasm/lex.py index cf7e6e19bf..9728c149ca 100644 --- a/devtools/tasmrecover/tasm/lex.py +++ b/devtools/tasmrecover/tasm/lex.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + def parse_args(text): #print "parsing: [%s]" %text escape = False diff --git a/devtools/tasmrecover/tasm/op.py b/devtools/tasmrecover/tasm/op.py index 10fdd8a568..6b19068f2a 100644 --- a/devtools/tasmrecover/tasm/op.py +++ b/devtools/tasmrecover/tasm/op.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import re import lex diff --git a/devtools/tasmrecover/tasm/parser.py b/devtools/tasmrecover/tasm/parser.py index 4cea496722..ebbd714cf4 100644 --- a/devtools/tasmrecover/tasm/parser.py +++ b/devtools/tasmrecover/tasm/parser.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import os, re from proc import proc import lex diff --git a/devtools/tasmrecover/tasm/proc.py b/devtools/tasmrecover/tasm/proc.py index ed7053df89..50a394413f 100644 --- a/devtools/tasmrecover/tasm/proc.py +++ b/devtools/tasmrecover/tasm/proc.py @@ -1,3 +1,24 @@ +# ScummVM - Graphic Adventure Engine +# +# ScummVM is the legal property of its developers, whose names +# are too numerous to list here. Please refer to the COPYRIGHT +# file distributed with this source distribution. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + import re import op -- cgit v1.2.3 From b3e6899f900226c4afd44cee68b06453258e1ac8 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 19 Jul 2011 10:16:20 -0400 Subject: DEVTOOLS: Fix typos and formatting in create_toon --- devtools/create_toon/create_toon.cpp | 6 +++--- devtools/create_toon/create_toon.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'devtools') diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index bdd57be7df..d01102bb71 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -77,8 +77,8 @@ int main(int argc, char *argv[]) { writeByte(outFile, TOON_DAT_VER_MAJ); writeByte(outFile, TOON_DAT_VER_MIN); - // game versions/variantes - writeUint16BE(outFile, NUM_VARIANTE); + // game versions/variants + writeUint16BE(outFile, NUM_VARIANTS); // Write locationDirNotVisited nbrElem = sizeof(locationDirNotVisited_EN) / sizeof(char *); @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) { nbrElem = sizeof(specialInfoLine_SP) / sizeof(char *); writeTextArray(outFile, specialInfoLine_SP, nbrElem); -// Not yet handled : miscTexts, endingLine and exitLine. Are they useful? + // Not yet handled: miscTexts, endingLine and exitLine. Are they useful? fclose(outFile); return 0; diff --git a/devtools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h index 60b33013f4..b047959215 100644 --- a/devtools/create_toon/create_toon.h +++ b/devtools/create_toon/create_toon.h @@ -30,9 +30,9 @@ #define TOON_DAT_VER_MAJ 0 // 1 byte #define TOON_DAT_VER_MIN 3 // 1 byte -// Number of Variante of the game. For the moment, it's the same -// than the number of languages -#define NUM_VARIANTE 5 +// Number of variants of the game. For the moment, it's the same +// as the number of languages +#define NUM_VARIANTS 5 typedef unsigned char uint8; typedef unsigned char byte; -- cgit v1.2.3 From e25e85fbb047fef895ede97c3c2c73451631052c Mon Sep 17 00:00:00 2001 From: eriktorbjorn Date: Wed, 20 Jul 2011 13:15:30 +0200 Subject: DREAMWEB: Blacklist and reimplement cancelch0() and cancelch1() Now any sound playing on the channels is stopped immediately. This fixes missing voice-overs in the intro, makes it possible to skip lines of conversation, and fixes a problem where the sound effect from the Altar Room would keep playing after leaving the room. Possibly other glitches as well. --- devtools/tasmrecover/tasm-recover | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 52085daac5..705d3ac6b1 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -61,6 +61,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'liftsprite', 'frameoutv', 'modifychar', - 'lockmon' + 'lockmon', + 'cancelch0', + 'cancelch1' ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From b728323df751a0aec5aee890cdce52f50796b12a Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 17 Jul 2011 16:06:19 +0200 Subject: DREAMWEB: 'getnumber' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 705d3ac6b1..412d5d4728 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -43,6 +43,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printundermon', 'kernchars', 'getnextword', + 'getnumber', 'worktoscreen', 'width160', 'convertkey', -- cgit v1.2.3 From 599fbf4fe6e8fd92105ae2bcdd21e0c2f82005f9 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 18 Jul 2011 14:30:07 +0200 Subject: DREAMWEB: 'printdirect' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 412d5d4728..ed29eaa617 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -44,6 +44,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'kernchars', 'getnextword', 'getnumber', + 'printdirect', 'worktoscreen', 'width160', 'convertkey', -- cgit v1.2.3 From f15661f698f5b6fc359febdda0089cc5a70f9e81 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 18 Jul 2011 22:27:06 +0200 Subject: DREAMWEB: 'printchar' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index ed29eaa617..8b2317860c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -44,6 +44,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'kernchars', 'getnextword', 'getnumber', + 'printchar', 'printdirect', 'worktoscreen', 'width160', -- cgit v1.2.3 From d0f917d8571c3945b33dbd7a84bf3e0b33ce9715 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 19 Jul 2011 12:37:32 +0200 Subject: DREAMWEB: 'printslow' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 8b2317860c..15969c5280 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -46,6 +46,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getnumber', 'printchar', 'printdirect', + 'printslow', 'worktoscreen', 'width160', 'convertkey', -- cgit v1.2.3 From ac29c2a64db12be6c38d76b763a4503bd1296eb3 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 20 Jul 2011 20:58:03 +0200 Subject: DREAMWEB: 'printboth' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 15969c5280..f668f63bf2 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -44,6 +44,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'kernchars', 'getnextword', 'getnumber', + 'printboth', 'printchar', 'printdirect', 'printslow', -- cgit v1.2.3 From 60d4970fd091c618194684bc0030d70fc3808138 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 21 Jul 2011 22:46:16 +0200 Subject: DREAMWEB: 'dumptextline' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f668f63bf2..79d0dc42e2 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -44,6 +44,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'kernchars', 'getnextword', 'getnumber', + 'dumptextline', 'printboth', 'printchar', 'printdirect', -- cgit v1.2.3 From cbcdb61b288904658198d086a25153eddd60e5c3 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 23 Jul 2011 19:18:10 +0200 Subject: DREAMWEB: Blacklisted 'usetimedtext', 'getundertimed' and 'putundertimed' --- devtools/tasmrecover/tasm-recover | 3 +++ 1 file changed, 3 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 79d0dc42e2..413be6caf1 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -49,6 +49,9 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printchar', 'printdirect', 'printslow', + 'usetimedtext', + 'putundertimed', + 'getundertimed', 'worktoscreen', 'width160', 'convertkey', -- cgit v1.2.3 From 7174f14c61781de8143a03af4801426fdb5ed69f Mon Sep 17 00:00:00 2001 From: athrxx Date: Sun, 24 Jul 2011 20:29:54 +0200 Subject: LOL: add support for Russian floppy version --- devtools/create_kyradat/create_kyradat.cpp | 4 ++-- devtools/create_kyradat/games.cpp | 3 ++- devtools/create_kyradat/tables.cpp | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index e4686cc66c..86927cc12b 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -45,7 +45,7 @@ #include enum { - kKyraDatVersion = 74 + kKyraDatVersion = 75 }; const ExtractFilename extractFilenames[] = { @@ -219,7 +219,7 @@ const ExtractFilename extractFilenames[] = { // Ingame { kLolIngamePakFiles, kTypeStringList, false }, - { kLolCharacterDefs, kLolTypeCharData, false }, + { kLolCharacterDefs, kLolTypeCharData, true }, { kLolIngameSfxFiles, k2TypeSfxList, false }, { kLolIngameSfxIndex, kTypeRawData, false }, { kLolMusicTrackMap, kTypeRawData, false }, diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 76d5d70186..b37878832d 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -98,8 +98,9 @@ const Game lolGames[] = { // DOS demo { kLol, { EN_ANY, -1, -1 }, kPlatformPC, kDemoVersion, { "30bb5af87d38adb47d3e6ce06b1cb042", 0 } }, - // DOS floppy (no language specifc strings) + // DOS floppy (no language specifc strings except character presets) { kLol, { EN_ANY, -1, -1 }, kPlatformPC, kNoSpecial, { "0cc764a204f7ba8cefe1a5f14c479619", 0 } }, + { kLol, { RU_RUS, -1, -1 }, kPlatformPC, kNoSpecial, { "80a9f9bf243bc6ed36d98584fc6988c4", 0 } }, { kLol, { DE_DEU, -1, -1 }, kPlatformPC, kNoSpecial, { "6b843869772c1b779e1386be868c15dd", 0 } }, // PC98 (no language specifc strings) diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 090b32debc..1cf17079d1 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -1281,10 +1281,14 @@ const ExtractEntrySearchData kLolIngamePakFilesProvider[] = { }; const ExtractEntrySearchData kLolCharacterDefsProvider[] = { - { UNK_LANG, kPlatformPC, { 0x00000492, 0x000046B0, { { 0x7A, 0x94, 0x8B, 0xC6, 0xF7, 0xF1, 0x2F, 0xF3, 0xBC, 0x1B, 0x0B, 0x4E, 0x00, 0xC9, 0x44, 0x58 } } } }, // floppy - { UNK_LANG, kPlatformPC, { 0x00000492, 0x000047FD, { { 0x8C, 0x0B, 0x8B, 0xCE, 0xE0, 0xB0, 0x8F, 0xA9, 0x06, 0xC3, 0x98, 0xE6, 0x2E, 0x09, 0xB6, 0x93 } } } }, // floppy - { UNK_LANG, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD - { UNK_LANG, kPlatformPC98, { 0x00000492, 0x00005893, { { 0x7C, 0x7E, 0xFB, 0x80, 0xD9, 0xB6, 0x16, 0x87, 0x80, 0xB7, 0x46, 0x9B, 0x96, 0x1A, 0x6A, 0xBE } } } }, + { RU_RUS, kPlatformPC, { 0x00000492, 0x000052BA, { { 0x52, 0x29, 0x0D, 0x49, 0xFD, 0x17, 0xD7, 0x70, 0x6D, 0xCA, 0xEB, 0xB6, 0x7E, 0xFA, 0xBE, 0x08 } } } }, // floppy + { EN_ANY, kPlatformPC, { 0x00000492, 0x000046B0, { { 0x7A, 0x94, 0x8B, 0xC6, 0xF7, 0xF1, 0x2F, 0xF3, 0xBC, 0x1B, 0x0B, 0x4E, 0x00, 0xC9, 0x44, 0x58 } } } }, // floppy + { DE_DEU, kPlatformPC, { 0x00000492, 0x000047FD, { { 0x8C, 0x0B, 0x8B, 0xCE, 0xE0, 0xB0, 0x8F, 0xA9, 0x06, 0xC3, 0x98, 0xE6, 0x2E, 0x09, 0xB6, 0x93 } } } }, // floppy + { EN_ANY, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { DE_DEU, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { FR_FRA, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { IT_ITA, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { JA_JPN, kPlatformPC98, { 0x00000492, 0x00005893, { { 0x7C, 0x7E, 0xFB, 0x80, 0xD9, 0xB6, 0x16, 0x87, 0x80, 0xB7, 0x46, 0x9B, 0x96, 0x1A, 0x6A, 0xBE } } } }, EXTRACT_END_ENTRY }; -- cgit v1.2.3 From ec553363935b40de63052603b62eccf0d148d31e Mon Sep 17 00:00:00 2001 From: athrxx Date: Sun, 24 Jul 2011 22:48:30 +0200 Subject: LOL: add support for Russian CD-ROM version --- devtools/create_kyradat/create_kyradat.cpp | 2 +- devtools/create_kyradat/games.cpp | 1 + devtools/create_kyradat/tables.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 86927cc12b..085baec05d 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -45,7 +45,7 @@ #include enum { - kKyraDatVersion = 75 + kKyraDatVersion = 76 }; const ExtractFilename extractFilenames[] = { diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index b37878832d..da49b2fbff 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -109,6 +109,7 @@ const Game lolGames[] = { // DOS CD (multi language version, with no language specific strings) { kLol, { EN_ANY, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "263998ec600afca1cc7b935c473df670" } }, { kLol, { IT_ITA, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "f2af366e00f79dbf832fa19701d71ed9" } }, // Italian fan translation + { kLol, { EN_ANY, FR_FRA, RU_RUS }, kPlatformPC, kTalkieVersion, { "9d1778314de80598c0b0d032e2a1a1cf", "5b33478718968676343803911dd5e3e4" } }, // Russian fan translation GAME_DUMMY_ENTRY }; diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 1cf17079d1..3c6720c7b0 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -1287,6 +1287,7 @@ const ExtractEntrySearchData kLolCharacterDefsProvider[] = { { EN_ANY, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD { DE_DEU, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD { FR_FRA, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD + { RU_RUS, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD { IT_ITA, kPlatformPC, { 0x00000492, 0x00004ACD, { { 0xDF, 0x87, 0xFE, 0x89, 0x59, 0xCC, 0x01, 0xD7, 0xC7, 0xEB, 0x16, 0xA4, 0x09, 0xAF, 0x5D, 0xC0 } } } }, // CD { JA_JPN, kPlatformPC98, { 0x00000492, 0x00005893, { { 0x7C, 0x7E, 0xFB, 0x80, 0xD9, 0xB6, 0x16, 0x87, 0x80, 0xB7, 0x46, 0x9B, 0x96, 0x1A, 0x6A, 0xBE } } } }, @@ -1737,6 +1738,7 @@ const ExtractEntrySearchData kLolCreditsProvider[] = { const ExtractEntrySearchData kLolHistoryProvider[] = { { UNK_LANG, kPlatformPC, { 0x000001D1, 0x00007F9B, { { 0x25, 0x10, 0x86, 0x40, 0xAC, 0x53, 0xFE, 0x11, 0x4D, 0xE2, 0xD9, 0x35, 0xD6, 0x89, 0xBB, 0x09 } } } }, + //{ UNK_LANG, kPlatformPC, { 0x000001D1, 0x00007F9B, { { 0x25, 0x10, 0x86, 0x40, 0xAC, 0x53, 0xFE, 0x11, 0x4D, 0xE2, 0xD9, 0x35, 0xD6, 0x89, 0xBB, 0x09 } } } }, EXTRACT_END_ENTRY }; -- cgit v1.2.3 From cf2060a4168236da1a81cf45078bc7bd2f1ee25d Mon Sep 17 00:00:00 2001 From: athrxx Date: Sun, 24 Jul 2011 23:02:48 +0200 Subject: DEVTOOLS: cleanup kyradat tool code --- devtools/create_kyradat/tables.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 3c6720c7b0..cc164e926b 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -1738,7 +1738,6 @@ const ExtractEntrySearchData kLolCreditsProvider[] = { const ExtractEntrySearchData kLolHistoryProvider[] = { { UNK_LANG, kPlatformPC, { 0x000001D1, 0x00007F9B, { { 0x25, 0x10, 0x86, 0x40, 0xAC, 0x53, 0xFE, 0x11, 0x4D, 0xE2, 0xD9, 0x35, 0xD6, 0x89, 0xBB, 0x09 } } } }, - //{ UNK_LANG, kPlatformPC, { 0x000001D1, 0x00007F9B, { { 0x25, 0x10, 0x86, 0x40, 0xAC, 0x53, 0xFE, 0x11, 0x4D, 0xE2, 0xD9, 0x35, 0xD6, 0x89, 0xBB, 0x09 } } } }, EXTRACT_END_ENTRY }; -- cgit v1.2.3 From f2f6ddced9a1b4ab28f4ff6a8d6dc4b3be39a5ee Mon Sep 17 00:00:00 2001 From: athrxx Date: Mon, 25 Jul 2011 17:55:19 +0200 Subject: KYRA: add support for Kyra 2 Russian floppy --- devtools/create_kyradat/create_kyradat.cpp | 2 +- devtools/create_kyradat/extract.cpp | 92 +++++++++++++++++++++++++----- devtools/create_kyradat/games.cpp | 1 + devtools/create_kyradat/tables.cpp | 2 + 4 files changed, 82 insertions(+), 15 deletions(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 085baec05d..4dc8726d71 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -45,7 +45,7 @@ #include enum { - kKyraDatVersion = 76 + kKyraDatVersion = 77 }; const ExtractFilename extractFilenames[] = { diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 5581dacec0..6e39e3da78 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -142,25 +142,32 @@ bool extractRaw(PAKFile &out, const ExtractInformation *info, const byte *data, } bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *data, const uint32 size, const char *filename, int id) { - int fmtPatch = 0; + int patch = 0; // FM Towns files that need addional patches if (info->platform == kPlatformFMTowns) { if (id == k1TakenStrings || id == k1NoDropStrings || id == k1PoisonGoneString || id == k1ThePoisonStrings || id == k1FluteStrings || id == k1WispJewelStrings) - fmtPatch = 1; + patch = 1; else if (id == k1IntroStrings) - fmtPatch = 2; + patch = 2; else if (id == k2SeqplayStrings) - fmtPatch = 3; + patch = 3; } else if (info->platform == kPlatformPC) { if (id == k2IngamePakFiles) - fmtPatch = 4; + patch = 4; + + if (id == k2SeqplayStrings && info->lang == Common::RU_RUS) + patch = 5; // HACK if (id == k2SeqplayIntroTracks && info->game == kLol) return extractStringsWoSuffix(out, info, data, size, filename, id); } + // Skip English string left-overs in the hacky Russian fan translation + static const uint8 rusFanSkipId[] = { 1, 3, 5, 8, 10, 11, 13, 15, 17, 20, 22, 25, 26, 30, 33, 38, 40, 41, 44, 49, 51, 55, 104, 119, 121, 123 }; + uint32 skipCount = 0; + uint32 entries = 0; uint32 targetsize = size + 4; for (uint32 i = 0; i < size; ++i) { @@ -183,7 +190,7 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da break; targetsize--; } - if (fmtPatch == 1) { + if (patch == 1) { // Here is the first step of the extra treatment for all FM-TOWNS string arrays that // contain more than one string and which the original code // addresses via stringname[boolJapanese]. @@ -201,11 +208,38 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da targetsize--; } } + } else if (patch == 5) { + ++skipCount; + while (!data[++i]) { + if (skipCount == 81) { + ++skipCount; + ++entries; + break; + } + if (i == size) + break; + targetsize--; + } + + for (uint32 ii = 0; ii < ARRAYSIZE(rusFanSkipId); ++ii) { + // Skip English string left-overs in the hacky Russian fan translation + if (skipCount == rusFanSkipId[ii]) { + ++skipCount; + uint32 len = strlen((const char*) data + i); + i += len; + targetsize = targetsize - 1 - len; + while (!data[++i]) { + if (i == len) + break; + targetsize--; + } + } + } } } } - if (fmtPatch == 2) { + if (patch == 2) { if (info->lang == EN_ANY) { targetsize--; entries += 1; @@ -215,12 +249,12 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da } } - if (fmtPatch == 3) { + if (patch == 3) { entries++; targetsize++; } - if (fmtPatch == 4) { + if (patch == 4) { targetsize -= 9; } @@ -229,12 +263,13 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da memset(buffer, 0, targetsize); uint8 *output = buffer; const uint8 *input = (const uint8*) data; + skipCount = 0; WRITE_BE_UINT32(output, entries); output += 4; if (info->platform == kPlatformFMTowns) { const byte *c = data + size; do { - if (fmtPatch == 2 && input - data == 0x3C0 && input[0x10] == 0x32) { + if (patch == 2 && input - data == 0x3C0 && input[0x10] == 0x32) { memcpy(output, input, 0x0F); input += 0x11; output += 0x0F; } @@ -245,14 +280,14 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da // skip empty entries while (!*input) { // Write one empty string into intro strings file - if (fmtPatch == 2) { + if (patch == 2) { if ((info->lang == EN_ANY && input - data == 0x260) || (info->lang == JA_JPN && (input - data == 0x2BD || input - data == 0x2BE))) *output++ = *input; } // insert one dummy string at hof sequence strings position 59 - if (fmtPatch == 3) { + if (patch == 3) { if ((info->lang == EN_ANY && input - data == 0x695) || (info->lang == JA_JPN && input - data == 0x598)) *output++ = *input; @@ -262,7 +297,7 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da break; } - if (fmtPatch == 1) { + if (patch == 1) { // Here is the extra treatment for all FM-TOWNS string arrays that // contain more than one string and which the original code // addresses via stringname[boolJapanese]. @@ -292,9 +327,38 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da ++dstPos; } targetsize = dstPos + 4; + } else if (patch == 5) { + const byte *c = data + size; + do { + strcpy((char*) output, (const char*) input); + uint32 stringsize = strlen((const char*)output) + 1; + input += stringsize; output += stringsize; + + ++skipCount; + while (!*input) { + if (skipCount == 81) { + *output++ = *input; + ++skipCount; + } + if (++input == c) + break; + } + // Skip English string left-overs in the hacky Russian fan translation + for (uint32 ii = 0; ii < ARRAYSIZE(rusFanSkipId); ++ii) { + if (skipCount == rusFanSkipId[ii]) { + ++skipCount; + input += strlen((const char*)input); + while (!*input) { + if (++input == c) + break; + } + } + } + + } while (input < c); } else { uint32 copySize = size; - if (fmtPatch == 4) { + if (patch == 4) { memcpy(output, data, 44); output += 44; data += 44; diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index da49b2fbff..a0db9e8ee1 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -71,6 +71,7 @@ const Game kyra2Games[] = { { kKyra2, { FR_FRA, -1, -1 }, kPlatformPC, kNoSpecial, { "df31cc9e37e1cf68df2fdc75ddf2d87b", "fc2c6782778e6c6d5a553d1cb73c98ad" } }, { kKyra2, { DE_DEU, -1, -1 }, kPlatformPC, kNoSpecial, { "0ca4f9a1438264a4c63c3218e064ed3b", "0d9b0eb7b0ad889ec942d74d80dde1bf" } }, { kKyra2, { IT_ITA, -1, -1 }, kPlatformPC, kNoSpecial, { "178d3ab913f61bfba21d2fb196405e8c", "3a61ed6b7c00ddae383a0361799e2ba6" } }, + { kKyra2, { RU_RUS, -1, -1 }, kPlatformPC, kNoSpecial, { "fd6a388c01de9a578e24e3bbeacd8012", "3a61ed6b7c00ddae383a0361799e2ba6" } }, // talkie games { kKyra2, { EN_ANY, FR_FRA, DE_DEU }, kPlatformPC, kTalkieVersion, { "85bbc1cc6c4cef6ad31fc6ee79518efb", "e20d0d2e500f01e399ec588247a7e213" } }, diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index cc164e926b..20f2663553 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -1057,6 +1057,8 @@ const ExtractEntrySearchData k2SeqplayStringsProvider[] = { { IT_ITA, kPlatformPC, { 0x00000916, 0x0003188F, { { 0xDC, 0x46, 0x06, 0xE1, 0xB0, 0x66, 0xBC, 0x18, 0x2E, 0x6E, 0x9E, 0xC9, 0xA4, 0x14, 0x8D, 0x08 } } } }, // floppy { IT_ITA, kPlatformPC, { 0x000008C8, 0x00030947, { { 0x7F, 0x75, 0x5F, 0x99, 0x94, 0xFE, 0xA1, 0xE6, 0xEF, 0xB8, 0x93, 0x71, 0x83, 0x1B, 0xAC, 0x4A } } } }, // (fan) CD + { RU_RUS, kPlatformPC, { 0x000008C8, 0x00028639, { { 0xF9, 0x1D, 0x6A, 0x85, 0x23, 0x5E, 0x2A, 0x64, 0xBC, 0x45, 0xB2, 0x48, 0x13, 0x49, 0xD4, 0xF7 } } } }, // (fan) floppy + { EN_ANY, kPlatformFMTowns, { 0x00000990, 0x00030C61, { { 0x60, 0x51, 0x11, 0x83, 0x3F, 0x06, 0xC3, 0xA3, 0xE0, 0xC0, 0x2F, 0x41, 0x29, 0xDE, 0x65, 0xB1 } } } }, { JA_JPN, kPlatformFMTowns, { 0x000008A8, 0x00036831, { { 0x56, 0x5B, 0x23, 0x61, 0xE8, 0x3B, 0xE1, 0x36, 0xD6, 0x62, 0xD0, 0x84, 0x00, 0x04, 0x05, 0xAD } } } }, -- cgit v1.2.3 From f44874f0a67dab9a45018a16d6fc7bea3def54de Mon Sep 17 00:00:00 2001 From: athrxx Date: Wed, 27 Jul 2011 16:38:31 +0200 Subject: KYRA: add support for Russian Kyra 1 floppy fan translation --- devtools/create_kyradat/create_kyradat.cpp | 7 ++- devtools/create_kyradat/create_kyradat.h | 4 +- devtools/create_kyradat/extract.cpp | 58 ++++++++++++++----- devtools/create_kyradat/games.cpp | 90 ++++++++++++++++++++++++++++++ devtools/create_kyradat/tables.cpp | 65 +++++++++++++++++++-- 5 files changed, 204 insertions(+), 20 deletions(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 4dc8726d71..27cc82efd4 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -45,7 +45,7 @@ #include enum { - kKyraDatVersion = 77 + kKyraDatVersion = 78 }; const ExtractFilename extractFilenames[] = { @@ -119,6 +119,7 @@ const ExtractFilename extractFilenames[] = { // AUDIO filename table { k1AudioTracks, kTypeStringList, false }, + { k1AudioTracks2, kTypeStringList, false }, { k1AudioTracksIntro, kTypeStringList, false }, // AMULET anim @@ -341,6 +342,7 @@ const TypeTable languageTable[] = { { ES_ESP, 4 }, { IT_ITA, 5 }, { JA_JPN, 6 }, + { RU_RUS, 7 }, { -1, -1 } }; @@ -366,6 +368,7 @@ const TypeTable specialTable[] = { { kTalkieVersion, 1 }, { kDemoVersion, 2 }, { kTalkieDemoVersion, 3 }, + { kOldFloppy, 4 }, { -1, -1 } }; @@ -767,6 +770,8 @@ const char *getIdString(const int id) { return "k1CharacterImageFilenames"; case k1AudioTracks: return "k1AudioTracks"; + case k1AudioTracks2: + return "k1AudioTracks2"; case k1AudioTracksIntro: return "k1AudioTracksIntro"; case k1ItemNames: diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h index 22a6db4b39..983ba3c228 100644 --- a/devtools/create_kyradat/create_kyradat.h +++ b/devtools/create_kyradat/create_kyradat.h @@ -131,6 +131,7 @@ enum kExtractID { k1ConfigStrings, k1AudioTracks, + k1AudioTracks2, k1AudioTracksIntro, k1CreditsStrings, @@ -275,7 +276,8 @@ enum kSpecial { kNoSpecial = 0, kTalkieVersion, kDemoVersion, - kTalkieDemoVersion + kTalkieDemoVersion, + kOldFloppy, }; enum kGame { diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 6e39e3da78..88452ab4fc 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -142,6 +142,18 @@ bool extractRaw(PAKFile &out, const ExtractInformation *info, const byte *data, } bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *data, const uint32 size, const char *filename, int id) { + // Skip tables for skipping English string left-overs in the hacky Russian fan translations + static const uint8 rusFanSkip_k2SeqplayStrings[] = { 1, 3, 5, 8, 10, 11, 13, 15, 17, 20, 22, 25, 26, 30, 33, 38, 40, 41, 44, 49, 51, 55, 104, 119, 121, 123 }; + static const uint8 rusFanSkip_k1IntroStrings[] = { 3, 5, 9, 11, 13, 16, 18, 21, 24, 32, 34, 36, 38, 41, 44, 49, 52, 55, 57, 59, 61, 64, 66, 69, 72, 75 }; + static const uint8 rusFanSkip_k1ThePoisonStrings[] = { 1, 4 }; + static const uint8 rusFanSkip_k1FullFlaskStrings[] = { 1, 2, 4, 5, 7 }; + static const uint8 rusFanSkip_k1WispJewelStrings[] = { 2 }; + static const uint8 rusFanSkip_k1GUIStrings[] = { 1, 3, 6, 8, 11, 13, 18 }; + uint32 rusFanSkipIdLen = 0; + const uint8 *rusFanSkipId = 0; + int rusFanEmptyId = 10000; + uint32 skipCount = 0; + int patch = 0; // FM Towns files that need addional patches if (info->platform == kPlatformFMTowns) { @@ -156,18 +168,36 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da if (id == k2IngamePakFiles) patch = 4; - if (id == k2SeqplayStrings && info->lang == Common::RU_RUS) + if (info->lang == Common::RU_RUS) { patch = 5; + if (id == k2SeqplayStrings) { + rusFanSkipId = rusFanSkip_k2SeqplayStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k2SeqplayStrings); + rusFanEmptyId = 81; + } else if (id == k1IntroStrings) { + rusFanSkipId = rusFanSkip_k1IntroStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1IntroStrings); + rusFanEmptyId = 30; + } else if (id == k1ThePoisonStrings) { + rusFanSkipId = rusFanSkip_k1ThePoisonStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1ThePoisonStrings); + } else if (id == k1FullFlaskString) { + rusFanSkipId = rusFanSkip_k1FullFlaskStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1FullFlaskStrings); + } else if (id == k1GUIStrings) { + rusFanSkipId = rusFanSkip_k1GUIStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1GUIStrings); + } else if (id == k1WispJewelStrings) { + rusFanSkipId = rusFanSkip_k1WispJewelStrings; + rusFanSkipIdLen = ARRAYSIZE(rusFanSkip_k1WispJewelStrings); + } + } // HACK if (id == k2SeqplayIntroTracks && info->game == kLol) return extractStringsWoSuffix(out, info, data, size, filename, id); } - // Skip English string left-overs in the hacky Russian fan translation - static const uint8 rusFanSkipId[] = { 1, 3, 5, 8, 10, 11, 13, 15, 17, 20, 22, 25, 26, 30, 33, 38, 40, 41, 44, 49, 51, 55, 104, 119, 121, 123 }; - uint32 skipCount = 0; - uint32 entries = 0; uint32 targetsize = size + 4; for (uint32 i = 0; i < size; ++i) { @@ -210,26 +240,26 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da } } else if (patch == 5) { ++skipCount; - while (!data[++i]) { - if (skipCount == 81) { + while (!data[i + 1]) { + if (skipCount == rusFanEmptyId) { ++skipCount; ++entries; break; } - if (i == size) + if (++i == size) break; targetsize--; } - for (uint32 ii = 0; ii < ARRAYSIZE(rusFanSkipId); ++ii) { - // Skip English string left-overs in the hacky Russian fan translation + // Skip English string left-overs in the hacky Russian fan translation + for (uint32 ii = 0; ii < rusFanSkipIdLen; ++ii) { if (skipCount == rusFanSkipId[ii]) { ++skipCount; uint32 len = strlen((const char*) data + i); i += len; targetsize = targetsize - 1 - len; - while (!data[++i]) { - if (i == len) + while (!data[i + 1]) { + if (++i == len) break; targetsize--; } @@ -336,7 +366,7 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da ++skipCount; while (!*input) { - if (skipCount == 81) { + if (skipCount == rusFanEmptyId) { *output++ = *input; ++skipCount; } @@ -344,7 +374,7 @@ bool extractStrings(PAKFile &out, const ExtractInformation *info, const byte *da break; } // Skip English string left-overs in the hacky Russian fan translation - for (uint32 ii = 0; ii < ARRAYSIZE(rusFanSkipId); ++ii) { + for (uint32 ii = 0; ii < rusFanSkipIdLen; ++ii) { if (skipCount == rusFanSkipId[ii]) { ++skipCount; input += strlen((const char*)input); diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index a0db9e8ee1..1a86ad4729 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -44,6 +44,7 @@ const Game kyra1Games[] = { { kKyra1, { FR_FRA, -1, -1 }, kPlatformPC, kNoSpecial, { "aa9d6d78d8b199deaf48efeca6d19af2", 0 } }, { kKyra1, { IT_ITA, -1, -1 }, kPlatformPC, kNoSpecial, { "5d7550306b369a3492f9f3402702477c", 0 } }, { kKyra1, { ES_ESP, -1, -1 }, kPlatformPC, kNoSpecial, { "9ff130d2558bcd674d4074849d93c362", 0 } }, + { kKyra1, { RU_RUS, -1, -1 }, kPlatformPC, kOldFloppy, { "3b4719e1f8a4d67813b7ada29774aead", 0 } }, // Talkie { kKyra1, { EN_ANY, -1, -1 }, kPlatformPC, kTalkieVersion, { "1ebc18f3e7fbb72474a55cb0fa089ed4", 0 } }, @@ -211,6 +212,93 @@ const int kyra1FloppyNeed[] = { k1NewGameString, k1ConfigStrings, k1AudioTracks, + k1AudioTracks2, + k1AudioTracksIntro, + -1 +}; + +const int kyra1FloppyOldNeed[] = { + k1KallakWritingSeq, + k1MalcolmTreeSeq, + k1WestwoodLogoSeq, + k1KyrandiaLogoSeq, + k1KallakMalcolmSeq, + k1ForestSeq, + k1IntroCPSStrings, + k1IntroCOLStrings, + k1IntroWSAStrings, + k1IntroStrings, + k1RoomList, + k1RoomFilenames, + k1CharacterImageFilenames, + k1DefaultShapes, + k1ItemNames, + k1TakenStrings, + k1PlacedStrings, + k1DroppedStrings, + k1AmuleteAnimSeq, + k1SpecialPalette1, + k1SpecialPalette2, + k1SpecialPalette3, + k1SpecialPalette4, + k1SpecialPalette5, + k1SpecialPalette6, + k1SpecialPalette7, + k1SpecialPalette8, + k1SpecialPalette9, + k1SpecialPalette10, + k1SpecialPalette11, + k1SpecialPalette12, + k1SpecialPalette13, + k1SpecialPalette14, + k1SpecialPalette15, + k1SpecialPalette16, + k1SpecialPalette17, + k1SpecialPalette18, + k1SpecialPalette19, + k1SpecialPalette20, + k1SpecialPalette21, + k1SpecialPalette22, + k1SpecialPalette23, + k1SpecialPalette24, + k1SpecialPalette25, + k1SpecialPalette26, + k1SpecialPalette27, + k1SpecialPalette28, + k1SpecialPalette29, + k1SpecialPalette30, + k1SpecialPalette31, + k1SpecialPalette32, + k1PutDownString, + k1WaitAmuletString, + k1BlackJewelString, + k1HealingTipString, + k1PoisonGoneString, + k1Healing1Shapes, + k1Healing2Shapes, + k1ThePoisonStrings, + k1FluteStrings, + k1PoisonDeathShapes, + k1FluteShapes, + k1Winter1Shapes, + k1Winter2Shapes, + k1Winter3Shapes, + k1DrinkShapes, + k1WispShapes, + k1MagicAnimShapes, + k1BranStoneShapes, + k1WispJewelStrings, + k1MagicJewelStrings, + k1FlaskFullString, + k1FullFlaskString, + k1OutroReunionSeq, + k1OutroHomeString, + k1VeryCleverString, + k1GUIStrings, + k1NewGameString, + k1ConfigStrings, + k1AudioTracks, + k1AudioTracks2, k1AudioTracksIntro, -1 }; @@ -298,6 +386,7 @@ const int kyra1CDNeed[] = { k1NewGameString, k1ConfigStrings, k1AudioTracks, + k1AudioTracks2, k1AudioTracksIntro, -1 }; @@ -941,6 +1030,7 @@ struct GameNeed { const GameNeed gameNeedTable[] = { { kKyra1, kPlatformPC, kNoSpecial, kyra1FloppyNeed }, + { kKyra1, kPlatformPC, kOldFloppy, kyra1FloppyOldNeed }, { kKyra1, kPlatformAmiga, kNoSpecial, kyra1AmigaNeed }, { kKyra1, kPlatformPC, kTalkieVersion, kyra1CDNeed }, diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 20f2663553..40e528267a 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -68,6 +68,7 @@ const ExtractEntrySearchData k1KyrandiaLogoSeqProvider[] = { const ExtractEntrySearchData k1KallakMalcolmSeqProvider[] = { { UNK_LANG, kPlatformPC, { 0x0000026B, 0x00002132, { { 0x51, 0x07, 0x32, 0xA2, 0x09, 0x47, 0x97, 0x02, 0x85, 0x31, 0x39, 0x93, 0x3A, 0x53, 0x47, 0xA5 } } } }, // floppy + { UNK_LANG, kPlatformPC, { 0x00000267, 0x00002100, { { 0xD9, 0x5E, 0x59, 0xF0, 0x7B, 0xC8, 0xF1, 0x40, 0x4F, 0x68, 0x6F, 0xEC, 0xB5, 0xE8, 0x88, 0xE2 } } } }, // floppy { UNK_LANG, kPlatformUnknown, { 0x0000027B, 0x0000220A, { { 0xB7, 0xC1, 0x57, 0x04, 0x9B, 0x67, 0x82, 0x7B, 0x6E, 0xFD, 0x59, 0xF2, 0x10, 0x93, 0x89, 0x12 } } } }, // CD + Amiga { UNK_LANG, kPlatformUnknown, { 0x000002B8, 0x0000280B, { { 0x98, 0xC8, 0x36, 0x8C, 0xF8, 0x92, 0xC2, 0xB9, 0x1B, 0x71, 0x6B, 0x4C, 0xA4, 0x6C, 0xF6, 0x30 } } } }, // Amiga + CD demo @@ -134,8 +135,9 @@ const ExtractEntrySearchData k1AmuleteAnimSeqProvider[] = { const ExtractEntrySearchData k1OutroReunionSeqProvider[] = { { UNK_LANG, kPlatformPC, { 0x00000547, 0x0000781C, { { 0xCF, 0xD6, 0x1D, 0x3D, 0x14, 0x40, 0x88, 0x35, 0x36, 0x4F, 0x0B, 0x1F, 0x9A, 0x1C, 0x3D, 0xAC } } } }, // floppy + { UNK_LANG, kPlatformPC, { 0x00000547, 0x000077E0, { { 0x80, 0xC4, 0xFC, 0xD5, 0xEB, 0xAA, 0xA5, 0x87, 0x58, 0x5E, 0xAA, 0xE7, 0x01, 0x8F, 0x59, 0x3F } } } }, // floppy { UNK_LANG, kPlatformPC, { 0x000005E5, 0x00008918, { { 0x6A, 0x33, 0x8C, 0xB0, 0x16, 0x57, 0x2D, 0xEB, 0xB2, 0xE1, 0x64, 0x80, 0x98, 0x99, 0x98, 0x19 } } } }, // CD - + { UNK_LANG, kPlatformAmiga, { 0x0000054A, 0x0000785F, { { 0x55, 0xEA, 0xB8, 0x7F, 0x3A, 0x86, 0xCD, 0xA6, 0xBC, 0xA7, 0x9A, 0x39, 0xED, 0xF5, 0x30, 0x0A } } } }, { UNK_LANG, kPlatformUnknown, { 0x00000547, 0x00007876, { { 0x7A, 0xC7, 0x80, 0x34, 0x7A, 0x1B, 0xAB, 0xF8, 0xA7, 0x2F, 0x63, 0x3C, 0xDA, 0x89, 0x3F, 0x82 } } } }, // some floppy DOS + FM-TOWNS @@ -150,6 +152,7 @@ const ExtractEntrySearchData k1IntroCPSStringsProvider[] = { { UNK_LANG, kPlatformUnknown, { 0x00000014, 0x0000071D, { { 0xBA, 0xB6, 0x58, 0xB3, 0x28, 0x5E, 0x9F, 0x77, 0x69, 0x9D, 0x77, 0x53, 0x9D, 0x0D, 0xB0, 0x29 } } } }, // floppy + PC98 { UNK_LANG, kPlatformPC, { 0x00000015, 0x00000786, { { 0xCF, 0x09, 0xE1, 0xD9, 0x8E, 0x34, 0x5D, 0xEA, 0xBC, 0xAC, 0xC4, 0xF4, 0x4A, 0xEC, 0xFF, 0xC1 } } } }, // CD + { UNK_LANG, kPlatformPC, { 0x00000019, 0x000008DB, { { 0x3A, 0xDC, 0x1D, 0xAD, 0xF4, 0x5E, 0xC9, 0x19, 0xE9, 0x84, 0xD1, 0x31, 0x89, 0x6B, 0x6C, 0xF7 } } } }, // Old floppy { UNK_LANG, kPlatformPC, { 0x0000000C, 0x00000413, { { 0xA1, 0xE3, 0x06, 0x53, 0x23, 0x9A, 0xE0, 0xF1, 0xE4, 0xFD, 0xD9, 0x05, 0x22, 0xA6, 0x28, 0x46 } } } }, // demo { UNK_LANG, kPlatformAmiga, { 0x00000016, 0x0000070A, { { 0xD9, 0xDB, 0x91, 0xCD, 0x93, 0x81, 0xC4, 0x3F, 0x14, 0xF1, 0xC5, 0x02, 0xE7, 0x3F, 0x3A, 0x6C } } } }, @@ -194,6 +197,8 @@ const ExtractEntrySearchData k1IntroStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x000005CF, 0x00020415, { { 0xCC, 0xE5, 0x9F, 0xB8, 0xCA, 0xFA, 0x2D, 0x05, 0xB8, 0xAF, 0x9F, 0x1F, 0x8A, 0xA8, 0x56, 0xDE } } } }, + { RU_RUS, kPlatformPC, { 0x000004F6, 0x000131C6, { { 0x77, 0x76, 0x12, 0xB1, 0xDA, 0x9C, 0xA9, 0xB5, 0x21, 0x1E, 0x49, 0x08, 0x46, 0xB3, 0xE4, 0x61 } } } }, + { EN_ANY, kPlatformAmiga, { 0x0000050A, 0x0001A7B1, { { 0x1B, 0x74, 0x71, 0x4C, 0xAB, 0x81, 0x10, 0x59, 0x8A, 0x21, 0x50, 0xBB, 0xFE, 0x6F, 0xD0, 0xE8 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000626, 0x00021319, { { 0x80, 0x55, 0x54, 0x14, 0x5D, 0x6F, 0x49, 0x04, 0x4A, 0xEF, 0x92, 0xB8, 0x5B, 0x01, 0x0F, 0x97 } } } }, @@ -219,6 +224,8 @@ const ExtractEntrySearchData k1OutroHomeStringProvider[] = { { IT_ITA, kPlatformPC, { 0x00000007, 0x000001B8, { { 0x17, 0x95, 0x5B, 0x4F, 0xE2, 0x07, 0x5A, 0x49, 0xFA, 0xCE, 0x53, 0x8B, 0xE7, 0x46, 0x69, 0xC7 } } } }, // (fan) CD + { RU_RUS, kPlatformPC, { 0x00000005, 0x000000EF, { { 0xA0, 0xB4, 0xF2, 0x11, 0x16, 0x92, 0xC8, 0xEB, 0xF2, 0x0C, 0xFE, 0x43, 0xFE, 0x18, 0xF6, 0xBB } } } }, + EXTRACT_END_ENTRY }; @@ -235,6 +242,7 @@ const ExtractEntrySearchData k1RoomListProvider[] = { { UNK_LANG, kPlatformFMTowns, { 0x000064E8, 0x0010312B, { { 0x94, 0x5C, 0x87, 0x35, 0x35, 0x6B, 0x3E, 0xBF, 0x55, 0x3D, 0xDB, 0xD9, 0xFB, 0x97, 0x27, 0x5D } } } }, { UNK_LANG, kPlatformUnknown, { 0x00004DD6, 0x0010312B, { { 0xC6, 0xF0, 0xC4, 0x2C, 0x5A, 0xD7, 0x48, 0xE4, 0x41, 0x23, 0x65, 0x6D, 0xC8, 0xC7, 0xCE, 0xF5 } } } }, // DOS + PC98 + { UNK_LANG, kPlatformUnknown, { 0x00004DD6, 0x0010315D, { { 0x4A, 0x1B, 0xA2, 0x35, 0xE1, 0x22, 0xD3, 0x7A, 0xE9, 0x69, 0x12, 0x3A, 0x9C, 0x92, 0x6F, 0x5C } } } }, // Old DOS floppy { UNK_LANG, kPlatformAmiga, { 0x00004ECC, 0x0010312B, { { 0x9A, 0x91, 0xF1, 0x9C, 0x8A, 0x96, 0x1C, 0x7B, 0xB7, 0xE4, 0xF1, 0xE9, 0x7D, 0xEF, 0x40, 0xBF } } } }, @@ -252,13 +260,19 @@ const ExtractEntrySearchData k1CharacterImageFilenamesProvider[] = { }; const ExtractEntrySearchData k1AudioTracksProvider[] = { - { UNK_LANG, kPlatformPC, { 0x00000041, 0x00000FBF, { { 0xB5, 0xA2, 0x90, 0xE9, 0x73, 0x83, 0x47, 0x5A, 0xB3, 0x3E, 0x04, 0xBB, 0xAA, 0xC8, 0x84, 0x53 } } } }, + { UNK_LANG, kPlatformPC, { 0x00000038, 0x00000D5C, { { 0x65, 0x35, 0x2F, 0xA3, 0x93, 0x22, 0x15, 0xA0, 0xC6, 0x2B, 0x73, 0x7C, 0x3E, 0xB8, 0x7A, 0xB5 } } } }, { UNK_LANG, kPlatformFMTowns, { 0x0000005D, 0x0000154E, { { 0xA7, 0x7E, 0x03, 0x0A, 0x81, 0x54, 0xD2, 0x5D, 0x7B, 0x33, 0x07, 0xBF, 0x70, 0x01, 0x4B, 0x79 } } } }, EXTRACT_END_ENTRY }; +const ExtractEntrySearchData k1AudioTracks2Provider[] = { + { UNK_LANG, kPlatformPC, { 0x00000009, 0x00000363, { { 0x16, 0xA2, 0x68, 0x21, 0x04, 0xA8, 0x39, 0x7E, 0xA1, 0x7D, 0x70, 0xFD, 0x86, 0xC7, 0x69, 0x28 } } } }, + + EXTRACT_END_ENTRY +}; + const ExtractEntrySearchData k1AudioTracksIntroProvider[] = { { UNK_LANG, kPlatformUnknown, { 0x00000006, 0x0000022C, { { 0x5F, 0xC9, 0xE1, 0x4B, 0x34, 0x52, 0xB9, 0xF8, 0xFF, 0x37, 0x8B, 0xF4, 0xEF, 0x5E, 0xC5, 0xDA } } } }, // floppy + demo { UNK_LANG, kPlatformUnknown, { 0x0000000C, 0x00000458, { { 0xEB, 0xB3, 0x96, 0xA5, 0x07, 0xE6, 0x11, 0x58, 0xDB, 0x3F, 0x34, 0x30, 0xFB, 0x7B, 0x92, 0xC8 } } } }, // CD @@ -278,6 +292,8 @@ const ExtractEntrySearchData k1ItemNamesProvider[] = { { ES_ESP, kPlatformPC, { 0x00000530, 0x0001D90A, { { 0x52, 0xFB, 0xA8, 0x3F, 0xA3, 0x6F, 0xC2, 0x67, 0x55, 0x9F, 0x66, 0x9F, 0xFD, 0x79, 0x44, 0xDF } } } }, + { RU_RUS, kPlatformPC, { 0x000004AE, 0x00011888, { { 0x6F, 0x4D, 0xBE, 0xC8, 0xAE, 0x7C, 0x12, 0x3E, 0x69, 0x0B, 0x39, 0xCB, 0x4D, 0x4B, 0xA8, 0x3A } } } }, // floppy + { EN_ANY, kPlatformAmiga, { 0x00000380, 0x00012960, { { 0x2D, 0x81, 0xCF, 0x7A, 0x9D, 0x71, 0x83, 0xB7, 0xE5, 0x00, 0xB0, 0x6E, 0x25, 0x94, 0xCB, 0xA4 } } } }, { DE_DEU, kPlatformAmiga, { 0x000003E5, 0x0001607D, { { 0x6D, 0xBE, 0xAD, 0xE5, 0xD1, 0x41, 0x6C, 0x42, 0x71, 0x79, 0x9C, 0x78, 0x93, 0x84, 0xC8, 0x11 } } } }, @@ -302,6 +318,8 @@ const ExtractEntrySearchData k1TakenStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000014, 0x000005D8, { { 0xD6, 0x00, 0x90, 0x6A, 0x75, 0x3B, 0xF1, 0xFE, 0xF4, 0x3E, 0x0E, 0x1D, 0x39, 0xEB, 0x2D, 0xC8 } } } }, + { RU_RUS, kPlatformPC, { 0x00000010, 0x00000262, { { 0x1E, 0x90, 0x20, 0xC8, 0xD3, 0x08, 0x53, 0x4F, 0x28, 0x95, 0x6A, 0xA4, 0x14, 0x37, 0x05, 0xF0 } } } }, + { EN_ANY, kPlatformAmiga, { 0x00000008, 0x00000261, { { 0x93, 0x5B, 0x79, 0xE8, 0x89, 0x8E, 0xB5, 0x37, 0x39, 0x2A, 0xB0, 0x04, 0x98, 0x80, 0x5A, 0x4E } } } }, { DE_DEU, kPlatformAmiga, { 0x0000000E, 0x000004E0, { { 0x52, 0x4D, 0x74, 0x91, 0x70, 0x0D, 0x4C, 0x40, 0x5C, 0x7E, 0xBA, 0xDA, 0x24, 0x49, 0xF3, 0x1A } } } }, @@ -324,8 +342,10 @@ const ExtractEntrySearchData k1PlacedStringsProvider[] = { { IT_ITA, kPlatformPC, { 0x0000000D, 0x0000040D, { { 0x9C, 0x71, 0x53, 0x35, 0xC3, 0xE8, 0x46, 0xB9, 0xD2, 0xFA, 0x1C, 0x8C, 0xC3, 0xFF, 0xBC, 0x1F } } } }, // floppy { IT_ITA, kPlatformPC, { 0x00000011, 0x000003B8, { { 0xC8, 0xA6, 0xE4, 0x8A, 0xF7, 0x4C, 0x3F, 0xA6, 0x24, 0x7F, 0xEF, 0xE4, 0x63, 0x8B, 0x72, 0xF3 } } } }, // (fan) CD - + { ES_ESP, kPlatformPC, { 0x0000000D, 0x00000439, { { 0x57, 0xAE, 0x1C, 0xC1, 0xF5, 0xE8, 0x5B, 0x9E, 0x90, 0x02, 0xB9, 0x8D, 0x86, 0x38, 0xFB, 0xA8 } } } }, + + { RU_RUS, kPlatformPC, { 0x00000009, 0x00000203, { { 0x7D, 0xAE, 0x67, 0x94, 0x8E, 0x73, 0x35, 0xC1, 0x11, 0xB4, 0x55, 0x6E, 0x92, 0x25, 0x39, 0xE4 } } } }, EXTRACT_END_ENTRY }; @@ -344,6 +364,8 @@ const ExtractEntrySearchData k1DroppedStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000008, 0x00000261, { { 0x1D, 0xB5, 0xFB, 0x23, 0x94, 0xA7, 0x86, 0x7A, 0xAC, 0x53, 0xDA, 0x6F, 0xCC, 0x41, 0x0F, 0xD7 } } } }, + { RU_RUS, kPlatformPC, { 0x0000000A, 0x000001F5, { { 0xAA, 0x21, 0x88, 0x6D, 0xD0, 0xAB, 0x5C, 0x15, 0x7F, 0xAD, 0x0E, 0x3B, 0x2F, 0x17, 0xBF, 0xAD } } } }, + EXTRACT_END_ENTRY }; @@ -384,6 +406,8 @@ const ExtractEntrySearchData k1PutDownStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000002D, 0x00001052, { { 0x12, 0x0A, 0x23, 0x11, 0xDF, 0x8A, 0x59, 0xD4, 0xF2, 0xCA, 0xA5, 0xA7, 0x76, 0x1B, 0x54, 0xB6 } } } }, + { RU_RUS, kPlatformPC, { 0x00000024, 0x0000099F, { { 0x05, 0xD7, 0xB8, 0x32, 0x95, 0x93, 0x29, 0x5F, 0xF3, 0x1A, 0xF0, 0x2E, 0xBA, 0x3A, 0x0D, 0x27 } } } }, + EXTRACT_END_ENTRY }; @@ -401,6 +425,8 @@ const ExtractEntrySearchData k1WaitAmuletStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000042, 0x000017FD, { { 0x0A, 0x8A, 0x7E, 0x9A, 0x5F, 0x4A, 0x35, 0x06, 0x4D, 0x6B, 0xBF, 0x29, 0x1B, 0xAD, 0xD8, 0x37 } } } }, + { RU_RUS, kPlatformPC, { 0x0000003C, 0x00000EF1, { { 0xC1, 0x0A, 0xFA, 0xBB, 0x65, 0xC3, 0x31, 0xC9, 0x80, 0x9B, 0x0C, 0x16, 0xED, 0xBF, 0x47, 0xFA } } } }, + { EN_ANY, kPlatformUnknown, { 0x0000003E, 0x0000150D, { { 0xA8, 0xBF, 0x99, 0x9B, 0xC1, 0x36, 0x21, 0x47, 0x6D, 0x99, 0x4F, 0x34, 0xE6, 0x61, 0x47, 0xFD } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -420,6 +446,8 @@ const ExtractEntrySearchData k1BlackJewelStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000025, 0x00000CF6, { { 0x4B, 0x13, 0x39, 0xCB, 0x3F, 0x44, 0x18, 0x46, 0x43, 0xDB, 0x94, 0xC5, 0x3E, 0x6B, 0xC4, 0x74 } } } }, + { RU_RUS, kPlatformPC, { 0x00000021, 0x000007FF, { { 0x3F, 0x26, 0xB4, 0xB4, 0x11, 0x0C, 0xEF, 0xC0, 0x6A, 0xD1, 0xCC, 0x0E, 0x68, 0x7D, 0xA5, 0x1A } } } }, + { EN_ANY, kPlatformUnknown, { 0x00000024, 0x00000B73, { { 0x8D, 0x57, 0x5F, 0x93, 0x85, 0x75, 0xF2, 0xD8, 0x36, 0xC2, 0x7C, 0x0E, 0x3B, 0xEA, 0xE0, 0x0A } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -438,6 +466,8 @@ const ExtractEntrySearchData k1PoisonGoneStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000033, 0x0000127E, { { 0x67, 0xEB, 0xD3, 0x00, 0xF8, 0x4F, 0xF1, 0x79, 0x48, 0xE6, 0x9C, 0xB2, 0xA7, 0xCF, 0x76, 0x07 } } } }, + { RU_RUS, kPlatformPC, { 0x00000027, 0x00000952, { { 0x36, 0x64, 0x30, 0x1C, 0x5A, 0xC0, 0x0D, 0x73, 0xE5, 0xA6, 0x2F, 0xD8, 0x64, 0x98, 0x81, 0x56 } } } }, + { EN_ANY, kPlatformAmiga, { 0x0000002E, 0x00000F59, { { 0xAD, 0x95, 0xF3, 0xA7, 0xBB, 0x04, 0x08, 0x77, 0xD0, 0x71, 0xFC, 0x8B, 0x33, 0x2A, 0x6D, 0xD3 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000037, 0x00001324, { { 0xB3, 0xE6, 0x0A, 0x49, 0x37, 0x73, 0x3C, 0xAF, 0x78, 0x9E, 0x7D, 0x13, 0x75, 0xAE, 0xA8, 0x89 } } } }, @@ -463,6 +493,8 @@ const ExtractEntrySearchData k1HealingTipStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000028, 0x00000E0F, { { 0x3E, 0x40, 0xCA, 0x2A, 0x5F, 0xFE, 0x74, 0x30, 0x8C, 0x31, 0x41, 0x09, 0xBD, 0xFD, 0xA3, 0x7E } } } }, + { RU_RUS, kPlatformPC, { 0x00000026, 0x000008EE, { { 0x7C, 0xC0, 0x62, 0x39, 0x66, 0x9E, 0x63, 0xCD, 0x21, 0x3D, 0x72, 0x91, 0xB8, 0xB9, 0xB6, 0x92 } } } }, + { EN_ANY, kPlatformUnknown, { 0x0000002E, 0x00000F04, { { 0x95, 0x39, 0x36, 0x89, 0xC4, 0x60, 0x7C, 0x0C, 0xDC, 0x06, 0xF7, 0x86, 0x1A, 0xF7, 0x93, 0x2B } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -483,6 +515,9 @@ const ExtractEntrySearchData k1WispJewelStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x0000005F, 0x0000211E, { { 0xE7, 0x0A, 0x85, 0x25, 0x44, 0x41, 0x47, 0x3B, 0x7A, 0xA6, 0x62, 0xAE, 0xAE, 0xD5, 0x92, 0x45 } } } }, + // only one of two strings translated in the fan translation + { RU_RUS, kPlatformPC, { 0x00000053, 0x0000191F, { { 0x14, 0xEB, 0x38, 0x54, 0x40, 0x40, 0x04, 0xA6, 0xA0, 0xFE, 0xDB, 0xD0, 0x8C, 0xA6, 0x1F, 0x55 } } } }, + { EN_ANY, kPlatformAmiga, { 0x00000056, 0x00001C62, { { 0x43, 0x28, 0x3C, 0x0F, 0x78, 0x52, 0xE7, 0x2A, 0x77, 0xF3, 0x21, 0x5A, 0xF0, 0xFC, 0x9E, 0xF8 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000063, 0x00002184, { { 0x6B, 0xDC, 0x6B, 0xCF, 0xD4, 0xC7, 0x2A, 0x9A, 0x2E, 0x34, 0x71, 0x4E, 0xB7, 0xF6, 0xAF, 0xDA } } } }, @@ -508,6 +543,8 @@ const ExtractEntrySearchData k1MagicJewelStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000011, 0x000005CD, { { 0x32, 0x2A, 0xFF, 0x9F, 0x10, 0x75, 0x6B, 0xD6, 0x46, 0xAE, 0x55, 0xD3, 0x68, 0x4F, 0xBB, 0x5A } } } }, + { RU_RUS, kPlatformPC, { 0x00000012, 0x0000047D, { { 0xB1, 0xC3, 0x66, 0xBC, 0x42, 0xAD, 0x5B, 0xD8, 0xF5, 0x3D, 0xB9, 0x50, 0x77, 0x32, 0xA7, 0x15 } } } }, + { EN_ANY, kPlatformUnknown, { 0x00000014, 0x0000069E, { { 0x6A, 0x1C, 0x9B, 0x85, 0x61, 0xC7, 0x28, 0xA9, 0xA3, 0xF4, 0xFA, 0x47, 0x90, 0x8F, 0x06, 0xB4 } } } }, // Amiga + FM-TOWNS EXTRACT_END_ENTRY @@ -525,6 +562,8 @@ const ExtractEntrySearchData k1ThePoisonStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000059, 0x00001DF7, { { 0x16, 0x7B, 0x5F, 0x91, 0x06, 0x5B, 0xFC, 0x9C, 0x88, 0x61, 0xCC, 0x1B, 0x52, 0x4F, 0x91, 0xC5 } } } }, + { RU_RUS, kPlatformPC, { 0x00000052, 0x0000136F, { { 0xEF, 0xD2, 0xA0, 0x5F, 0xD5, 0xE6, 0x77, 0x96, 0xFA, 0xC5, 0x60, 0x7C, 0xB7, 0xA8, 0x7C, 0x7A } } } }, + { EN_ANY, kPlatformAmiga, { 0x00000058, 0x00001C24, { { 0xBA, 0x1F, 0xBD, 0x5C, 0x85, 0x3D, 0x3C, 0x92, 0xD1, 0x13, 0xF3, 0x40, 0x2E, 0xBB, 0x1C, 0xE2 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000073, 0x00002690, { { 0x44, 0xAE, 0xC9, 0xFD, 0x9F, 0x8E, 0x1B, 0xDD, 0x3F, 0xE4, 0x4D, 0x4B, 0x5A, 0x13, 0xE5, 0x99 } } } }, @@ -549,6 +588,9 @@ const ExtractEntrySearchData k1FluteStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x00000052, 0x00001D8E, { { 0x9D, 0xA5, 0xF1, 0x42, 0xD1, 0x48, 0xEB, 0x8F, 0x4B, 0xDC, 0xD9, 0x10, 0x55, 0xBD, 0x12, 0xBB } } } }, + // not translated in the fan translation + { RU_RUS, kPlatformPC, { 0x0000003C, 0x00001599, { { 0x96, 0x72, 0x5A, 0x8A, 0xA0, 0xEE, 0xA2, 0xCE, 0x4D, 0x21, 0x01, 0x6C, 0xC5, 0x1A, 0xEB, 0x21 } } } }, + { EN_ANY, kPlatformFMTowns, { 0x0000005A, 0x000024F9, { { 0xCA, 0x1F, 0x62, 0x23, 0x22, 0x25, 0x4A, 0x94, 0x8A, 0x50, 0x59, 0xD5, 0xB4, 0x4E, 0xF1, 0xA6 } } } }, { JA_JPN, kPlatformFMTowns, { 0x00000053, 0x00002745, { { 0x7A, 0xBB, 0xFC, 0x30, 0xB6, 0xCE, 0x61, 0xD4, 0xDB, 0xB0, 0xE6, 0xB2, 0xF4, 0x4D, 0x81, 0x35 } } } }, @@ -571,6 +613,8 @@ const ExtractEntrySearchData k1FlaskFullStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000001B, 0x0000099D, { { 0x13, 0x23, 0x5D, 0x38, 0x9B, 0xFB, 0x00, 0x5C, 0xA1, 0x3A, 0x22, 0xD6, 0xCD, 0x5C, 0x09, 0xAE } } } }, + { RU_RUS, kPlatformPC, { 0x0000001A, 0x0000066E, { { 0x36, 0x43, 0xB6, 0xB2, 0xED, 0xBA, 0x21, 0x0C, 0x16, 0x54, 0x99, 0xF9, 0x2E, 0x6E, 0x0A, 0x28 } } } }, + EXTRACT_END_ENTRY }; @@ -586,6 +630,8 @@ const ExtractEntrySearchData k1FullFlaskStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000009A, 0x0000363B, { { 0x38, 0x25, 0xE6, 0xB5, 0xCB, 0x78, 0x5E, 0xAD, 0x2D, 0xD4, 0x2E, 0x8B, 0x89, 0x20, 0xB1, 0x95 } } } }, + { RU_RUS, kPlatformPC, { 0x00000094, 0x0000232B, { { 0xBF, 0x68, 0xF9, 0x8F, 0x82, 0xE9, 0xE7, 0x69, 0x33, 0xD6, 0x41, 0x15, 0x2C, 0xFE, 0x72, 0xAB } } } }, + { EN_ANY, kPlatformAmiga, { 0x0000009A, 0x00003521, { { 0x26, 0xE5, 0xC8, 0x6D, 0x14, 0x81, 0x9F, 0x90, 0x38, 0x3C, 0x00, 0x9D, 0x8E, 0x72, 0xB1, 0x83 } } } }, { DE_DEU, kPlatformAmiga, { 0x000000B0, 0x00003E38, { { 0x8A, 0x6D, 0x42, 0x36, 0x29, 0x06, 0xB2, 0xCE, 0xA3, 0x41, 0x14, 0xE8, 0xB1, 0xEF, 0x6E, 0x3B } } } }, @@ -611,6 +657,9 @@ const ExtractEntrySearchData k1VeryCleverStringProvider[] = { { ES_ESP, kPlatformPC, { 0x00000036, 0x000013F8, { { 0x2D, 0x9B, 0x7D, 0x58, 0xD1, 0x94, 0x04, 0x45, 0x6E, 0x81, 0xCC, 0x1E, 0x2F, 0xC5, 0xC9, 0xEA } } } }, + // not translated in the fan translation + { RU_RUS, kPlatformPC, { 0x00000032, 0x0000118D, { { 0x4B, 0x6D, 0xD4, 0xDC, 0x3E, 0xA2, 0x2D, 0x6D, 0x2C, 0x5A, 0xF7, 0x67, 0x4B, 0x6D, 0x40, 0xEF } } } }, + EXTRACT_END_ENTRY }; @@ -628,6 +677,8 @@ const ExtractEntrySearchData k1NewGameStringProvider[] = { { ES_ESP, kPlatformPC, { 0x0000001B, 0x00000701, { { 0x2B, 0x87, 0xC3, 0x82, 0x68, 0xA5, 0xFC, 0xC5, 0x64, 0x9E, 0xAB, 0xD2, 0x8A, 0x07, 0x9C, 0x1E } } } }, + { RU_RUS, kPlatformPC, { 0x00000015, 0x0000035F, { { 0x7E, 0x49, 0xC1, 0xCB, 0x2D, 0x61, 0xA7, 0x4C, 0x20, 0xAC, 0xEC, 0x54, 0x80, 0x14, 0x6A, 0xCA } } } }, + EXTRACT_END_ENTRY }; @@ -654,7 +705,7 @@ const ExtractEntrySearchData k1Healing2ShapesProvider[] = { const ExtractEntrySearchData k1PoisonDeathShapesProvider[] = { { UNK_LANG, kPlatformUnknown, { 0x0000008C, 0x00002E90, { { 0xBC, 0x44, 0xFB, 0x98, 0xE7, 0x42, 0xF6, 0xC8, 0x87, 0xDD, 0x00, 0x42, 0x85, 0xD8, 0x1E, 0x81 } } } }, - + { UNK_LANG, kPlatformUnknown, { 0x0000008C, 0x00002E7C, { { 0xA5, 0xD7, 0x13, 0xFC, 0x43, 0x22, 0x13, 0xBC, 0x5F, 0x3F, 0xC8, 0x28, 0xDA, 0x04, 0xB0, 0xDD } } } }, // Old Dos Floppy EXTRACT_END_ENTRY }; @@ -931,6 +982,8 @@ const ExtractEntrySearchData k1GUIStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x0000023A, 0x0000C3BD, { { 0xED, 0x0D, 0xE7, 0x5B, 0xDC, 0x21, 0x41, 0x54, 0x68, 0x7D, 0x8E, 0x97, 0x1A, 0xB1, 0xA1, 0x4A } } } }, // floppy + { RU_RUS, kPlatformPC, { 0x000001B1, 0x000065E8, { { 0x91, 0x22, 0x61, 0x8B, 0xCD, 0x7C, 0x0E, 0xD4, 0x32, 0x00, 0xC3, 0x6E, 0x50, 0x7F, 0x3C, 0x82 } } } }, // floppy + { EN_ANY, kPlatformAmiga, { 0x000001DF, 0x00009042, { { 0x0D, 0xD3, 0x1A, 0x92, 0x8D, 0x9C, 0x72, 0x55, 0xEF, 0xFB, 0x81, 0x21, 0x3B, 0x43, 0xA7, 0xE8 } } } }, { DE_DEU, kPlatformAmiga, { 0x00000237, 0x0000BAF7, { { 0xD7, 0x1A, 0x8E, 0xCC, 0x6D, 0x3E, 0xA9, 0xDD, 0x9A, 0x6B, 0x71, 0xFE, 0xD4, 0x50, 0x30, 0x6E } } } }, @@ -957,6 +1010,9 @@ const ExtractEntrySearchData k1ConfigStringsProvider[] = { { ES_ESP, kPlatformPC, { 0x0000004A, 0x00001B7B, { { 0x6B, 0x69, 0x50, 0x92, 0x9B, 0x35, 0x58, 0xE1, 0xEA, 0xBF, 0x42, 0x0B, 0xEB, 0x88, 0x41, 0x8D } } } }, // floppy + // not translated in the fan translation + { RU_RUS, kPlatformPC, { 0x0000003F, 0x00000B0D, { { 0x0E, 0x60, 0x0F, 0x4A, 0xA9, 0xF0, 0x1B, 0x76, 0xBB, 0x33, 0xB2, 0x4B, 0x5C, 0xB5, 0x4A, 0x97 } } } }, // floppy + { EN_ANY, kPlatformAmiga, { 0x0000002E, 0x00000FA1, { { 0x5E, 0xFF, 0xFF, 0x3D, 0xF8, 0x11, 0x6F, 0x3B, 0xC5, 0x39, 0x8F, 0x25, 0x8F, 0x0F, 0xE9, 0x2B } } } }, { DE_DEU, kPlatformAmiga, { 0x00000043, 0x00001783, { { 0xB2, 0x2B, 0xAB, 0x27, 0x06, 0x9A, 0x1E, 0x4B, 0xA7, 0xD3, 0xFF, 0xEB, 0xFD, 0x12, 0xDC, 0x94 } } } }, @@ -1773,6 +1829,7 @@ const ExtractEntry extractProviders[] = { { k1RoomList, k1RoomListProvider }, { k1CharacterImageFilenames, k1CharacterImageFilenamesProvider }, { k1AudioTracks, k1AudioTracksProvider }, + { k1AudioTracks2, k1AudioTracks2Provider }, { k1AudioTracksIntro, k1AudioTracksIntroProvider }, { k1ItemNames, k1ItemNamesProvider }, { k1TakenStrings, k1TakenStringsProvider }, -- cgit v1.2.3 From fcd698c289a801e6e6b1e9fb76d22c3753c3ca41 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 25 Jul 2011 10:46:35 +0200 Subject: DREAMWEB: Fixed what is very probably a typo in original code and regenerated the source --- devtools/tasmrecover/dreamweb/sprite.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm index 45f807da3f..9b214eaa0a 100644 --- a/devtools/tasmrecover/dreamweb/sprite.asm +++ b/devtools/tasmrecover/dreamweb/sprite.asm @@ -4226,7 +4226,7 @@ botofdoor2: sub ah,ch opendoor2: cmp throughdoor,1 jz mustbeopen cmp lockstatus,1 - jz shutdoor + jz shutdoor2 mustbeopen: mov cl,[es:bx+19] cmp cl,1 jnz notdoorsound4 -- cgit v1.2.3 From a101204422db7928aafcea1ff1e110979aa82c1b Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 25 Jul 2011 10:50:00 +0200 Subject: DREAMWEB: Ported 'lockeddoorway' --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 413be6caf1..f09e2d186d 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -67,6 +67,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'walking', 'spriteupdate', 'dodoor', + 'lockeddoorway', 'liftsprite', 'frameoutv', 'modifychar', -- cgit v1.2.3 From 5fc6a6e385813bb2b060e79f7853cd6ad112cad7 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 26 Jul 2011 07:54:25 +0200 Subject: DREAMWEB: 'getroomspaths' and 'facerightway' ported to C++ --- devtools/tasmrecover/tasm-recover | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f09e2d186d..e0b0e21394 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -73,6 +73,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'modifychar', 'lockmon', 'cancelch0', - 'cancelch1' + 'cancelch1', + 'getroomspaths', + 'facerightway', ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From fe73a2407820000d0321173a50e0d98dbcfc213f Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 27 Jul 2011 17:53:50 +0200 Subject: DREAMWEB: 'makebackob' ported --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e0b0e21394..f550cb0826 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -75,6 +75,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'cancelch0', 'cancelch1', 'getroomspaths', + 'makebackob', 'facerightway', ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From bb7a1bd93d22fc7da9e317cea9fee083be83d5a0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sun, 26 Jun 2011 12:05:46 +0200 Subject: DREAMWEB: Add option to process asm functions but not output them --- devtools/tasmrecover/tasm/cpp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index a73fd6c890..4ed89f650d 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -33,7 +33,7 @@ def parse_bin(s): return v class cpp: - def __init__(self, context, namespace, skip_first = 0, blacklist = []): + def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = []): self.namespace = namespace fname = namespace.lower() + ".cpp" header = namespace.lower() + ".h" @@ -79,6 +79,7 @@ class cpp: self.proc_done = [] self.blacklist = blacklist self.failed = list(blacklist) + self.skip_output = skip_output self.translated = [] self.proc_addr = [] self.methods = [] @@ -527,7 +528,8 @@ namespace %s { self.proc.optimize(keep_labels=[label]) self.proc.visit(self, start) self.body += "}\n"; - self.translated.insert(0, self.body) + if name not in self.skip_output: + self.translated.insert(0, self.body) self.proc = None if self.temps_count > 0: raise Exception("temps count == %d at the exit of proc" %self.temps_count); -- cgit v1.2.3 From c54cae6aea614c6303424d64b81a7327c069070a Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sun, 26 Jun 2011 12:06:16 +0200 Subject: DREAMWEB: Move main function to stubs --- devtools/tasmrecover/tasm-recover | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 413be6caf1..183792b5df 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -29,6 +29,7 @@ p.strip_path = 3 context = p.parse('dreamweb/dreamweb.asm') p.link() generator = cpp(context, "DreamGen", blacklist = [ + # These functions are not processed 'randomnumber', 'quickquit', 'quickquit2', @@ -73,5 +74,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'lockmon', 'cancelch0', 'cancelch1' + ], skip_output = [ + # These functions are processed but not output + 'dreamweb' ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From 5de064f1e4416d03daf9728a7f552c8a270424dd Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Fri, 29 Jul 2011 01:12:29 +0200 Subject: DREAMWEB: Use of the new feature of the generator to stop generating code for 'backobject' and 'mainman' (because addr_backobject is used) --- devtools/tasmrecover/tasm-recover | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 278e4465d5..4ad926f241 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -80,6 +80,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'facerightway', ], skip_output = [ # These functions are processed but not output - 'dreamweb' + 'dreamweb', + 'backobject', + 'mainman', ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From 1f0eccb296b0177775dd3cba2fc58961b743e819 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 15:12:50 +0200 Subject: DREAMWEB: 'aboutturn' does not need to be generated now --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 4ad926f241..2ec64933dd 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -65,6 +65,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'makesprite', 'showframe', 'initman', + 'aboutturn', 'walking', 'spriteupdate', 'dodoor', -- cgit v1.2.3 From 95fa7451d63ad674308f1134e954387c967fb9c8 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 15:19:22 +0200 Subject: DREAMWEB: 'findsource' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 2ec64933dd..86e9b4cd91 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -66,6 +66,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showframe', 'initman', 'aboutturn', + 'findsource', 'walking', 'spriteupdate', 'dodoor', -- cgit v1.2.3 From 92938f810fc4da74ef4872728ccf19833ad12773 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 15:25:28 +0200 Subject: DREAMWEB: 'showreelframe' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 86e9b4cd91..ab0a5651b4 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -66,6 +66,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showframe', 'initman', 'aboutturn', + 'showreelframe', 'findsource', 'walking', 'spriteupdate', -- cgit v1.2.3 From 74a943667fc612639f48d39926bf6e7e8121d4b8 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 19:54:53 +0200 Subject: DREAMWEB: 'getroomdata' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index ab0a5651b4..e04621e852 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -66,6 +66,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showframe', 'initman', 'aboutturn', + 'getroomdata', 'showreelframe', 'findsource', 'walking', -- cgit v1.2.3 From 0cbc291cbd0266a6522568dea9950ee35c234c55 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 21:46:59 +0200 Subject: DREAMWEB: 'startloading' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e04621e852..57890688b7 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -67,6 +67,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'initman', 'aboutturn', 'getroomdata', + 'startloading', 'showreelframe', 'findsource', 'walking', -- cgit v1.2.3 From a607b78ec0fda1bb029dc9e215b397eadc408eca Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 21:56:33 +0200 Subject: DREAMWEB: 'readheader' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 57890688b7..7f7947a9f6 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -66,6 +66,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showframe', 'initman', 'aboutturn', + 'readheader', 'getroomdata', 'startloading', 'showreelframe', -- cgit v1.2.3 From a4f05b36e4a866bf686ba1810f6aea8b584a9f7c Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 22:56:29 +0200 Subject: DREAMWEB: 'fillspace' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 7f7947a9f6..e6748a4196 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -67,6 +67,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'initman', 'aboutturn', 'readheader', + 'fillspace', 'getroomdata', 'startloading', 'showreelframe', -- cgit v1.2.3 From 5d13e2f837f897e46a8a574c9a3b3c992151b9c2 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 23:11:48 +0200 Subject: DREAMWEB: Ported 'clearwork' --- devtools/tasmrecover/tasm-recover | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e6748a4196..453dba1e7d 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -40,7 +40,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'frameoutnm', 'frameoutbh', 'frameoutfx', - 'cls', + 'cls', + 'clearwork', 'printundermon', 'kernchars', 'getnextword', -- cgit v1.2.3 From 7c40d798de8f650f6178ea94c62042a850c1d604 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 23:21:43 +0200 Subject: DREAMWEB: 'dealwithspecial' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 453dba1e7d..e4d070703d 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -85,6 +85,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'cancelch1', 'getroomspaths', 'makebackob', + 'dealwithspecial', 'facerightway', ], skip_output = [ # These functions are processed but not output -- cgit v1.2.3 From 52fef5a59949e915d1785c094dda64e2db5edea2 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 30 Jul 2011 23:37:18 +0200 Subject: DREAMWEB: 'plotreel' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e4d070703d..4e110bec04 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -86,6 +86,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getroomspaths', 'makebackob', 'dealwithspecial', + 'plotreel', 'facerightway', ], skip_output = [ # These functions are processed but not output -- cgit v1.2.3 From c36642651e8df6d3d36d1e2c4e29dc3ea0e278f2 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Wed, 3 Aug 2011 00:11:58 -0400 Subject: SCUMM: Remove BluesBirthday dependency on the binary The game scripts detected Yellow or Red variants based on what binary was present. That could potentially cause problems with a Mac dump in case someone dumped into MacBinary format. --- devtools/scumm-md5.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'devtools') diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index e9e155925e..cae949b99b 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -433,8 +433,8 @@ arttime Blue's Art Time Activities d00ffc8c32d17e575fd985d435d2eb88 -1 en All - Demo - Kirben BluesBirthday Blue's Birthday Adventure - 99128b6a5bdd9831d9682fb8b5cbf8d4 -1 en All - Yellow - knifethrower - 1ff5997c78fbd0a841a75ef15a05d9d5 -1 en Windows - Red - Mathew + 99128b6a5bdd9831d9682fb8b5cbf8d4 -1 en All Yellow Yellow - knifethrower + 1ff5997c78fbd0a841a75ef15a05d9d5 -1 en All Red Red - Mathew 2d4acbdcfd8e374c9da8c2e7303a5cd0 -1 en All - Demo - Kirben cc0c4111449054f1692bb3c0c5e04629 -1 en All - Demo - George Kormend -- cgit v1.2.3 From 7fd8895de62ad0421d8038cdb0618b493aecec1c Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 12:21:46 +0200 Subject: DREAMWEB: 'allocatework' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 4e110bec04..f279473f34 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -80,6 +80,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'liftsprite', 'frameoutv', 'modifychar', + 'allocatework', 'lockmon', 'cancelch0', 'cancelch1', -- cgit v1.2.3 From 4e39a41e6218c7206e706734eb608e9706e2678a Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 12:24:06 +0200 Subject: DREAWMEB: Ported 'zoom' to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f279473f34..4774dc564d 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -89,6 +89,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'dealwithspecial', 'plotreel', 'facerightway', + 'zoom', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From c6049ac0c49c83d6367c77c23aafec0369d0e335 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 13:54:03 +0200 Subject: DREAMWEB: 'crosshair' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 4774dc564d..48301c6e84 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -90,6 +90,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'plotreel', 'facerightway', 'zoom', + 'crosshair', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From f7752243196e83b9191735634a764c26f24d7427 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 14:16:09 +0200 Subject: DREAMWEB: Ported 'showrain' to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 48301c6e84..aedb20f197 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -91,6 +91,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'facerightway', 'zoom', 'crosshair', + 'showrain', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 095689ab49ae9aa93b3e675576a2ab16afbd9bb1 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 16:14:39 +0200 Subject: DREAMWEB: Some sound mixing was not needed anymore --- devtools/tasmrecover/tasm-recover | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index aedb20f197..100e4e510e 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -92,6 +92,11 @@ generator = cpp(context, "DreamGen", blacklist = [ 'zoom', 'crosshair', 'showrain', + 'domix', + 'channel0tran', + 'makenextblock', + 'loopchannel0', + 'parseblaster', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 2b03076149535d29c83b5ab5f165456a6238e57c Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 16:19:27 +0200 Subject: DREAMWEB: 'deltextline' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 100e4e510e..1c02417cfd 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -97,6 +97,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'makenextblock', 'loopchannel0', 'parseblaster', + 'deltextline', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 3427d07de07032b203f7aa02486b8073a65bca26 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 3 Aug 2011 18:48:43 +0200 Subject: DREAMWEB: 'doblocks' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 1c02417cfd..f665b7403b 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -98,6 +98,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'loopchannel0', 'parseblaster', 'deltextline', + 'doblocks', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From bf580e6e6b9af3a545dfd7105aa4e5d691443495 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sun, 7 Aug 2011 11:38:42 +0200 Subject: JANITORIAL: Add missing NL at EOF. --- devtools/create_hugo/dists/msvc10/create_hugo.vcxproj | 2 +- devtools/create_mads/main.cpp | 2 +- devtools/create_project/msvc10/create_project.vcxproj.filters | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'devtools') diff --git a/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj index eae5fbc55c..1bc98740a0 100644 --- a/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj +++ b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj @@ -110,4 +110,4 @@ - \ No newline at end of file + diff --git a/devtools/create_mads/main.cpp b/devtools/create_mads/main.cpp index aec9e45b8b..b4de34d832 100644 --- a/devtools/create_mads/main.cpp +++ b/devtools/create_mads/main.cpp @@ -124,4 +124,4 @@ int main(int argc, char *argv[]) { } return 0; -} \ No newline at end of file +} diff --git a/devtools/create_project/msvc10/create_project.vcxproj.filters b/devtools/create_project/msvc10/create_project.vcxproj.filters index 5ecd6c3dde..b4f0b18774 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj.filters +++ b/devtools/create_project/msvc10/create_project.vcxproj.filters @@ -68,4 +68,4 @@ scripts - \ No newline at end of file + -- cgit v1.2.3 From 23a0f5318c50cdf3dce19e4de0c98fb5ae1c2618 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sun, 7 Aug 2011 11:39:54 +0200 Subject: JANITORIAL: Remove trailing empty lines. --- devtools/create_hugo/README | 1 - devtools/create_hugo/staticdata.h | 1 - devtools/create_kyradat/create_kyradat.cpp | 1 - devtools/create_kyradat/extract.cpp | 1 - devtools/create_kyradat/extract.h | 1 - devtools/create_kyradat/games.cpp | 1 - devtools/create_kyradat/search.cpp | 1 - devtools/create_kyradat/search.h | 1 - devtools/create_kyradat/tables.cpp | 1 - devtools/create_kyradat/tables.h | 1 - devtools/create_kyradat/util.cpp | 1 - devtools/create_mads/scripts/rex_nebular.txt | 2 -- devtools/create_toon/create_toon.cpp | 1 - devtools/create_toon/staticdata.h | 1 - devtools/sci/musicplayer.cpp | 2 -- devtools/sci/scitrace.asm | 1 - devtools/skycpt/KmpSearch.h | 2 -- devtools/skycpt/skycpt-engine.patch | 1 - devtools/tasmrecover/.gitignore | 1 - devtools/tasmrecover/dreamweb/backdrop.asm | 24 ---------------------- devtools/tasmrecover/dreamweb/dreamweb.asm | 17 ---------------- devtools/tasmrecover/dreamweb/keypad.asm | 1 - devtools/tasmrecover/dreamweb/look.asm | 6 ------ devtools/tasmrecover/dreamweb/monitor.asm | 5 ----- devtools/tasmrecover/dreamweb/newplace.asm | 5 ----- devtools/tasmrecover/dreamweb/object.asm | 5 ----- devtools/tasmrecover/dreamweb/saveload.asm | 4 ---- devtools/tasmrecover/dreamweb/sblaster.asm | 30 ---------------------------- devtools/tasmrecover/dreamweb/sprite.asm | 14 ------------- devtools/tasmrecover/dreamweb/talk.asm | 18 ----------------- devtools/tasmrecover/dreamweb/titles.asm | 13 ------------ devtools/tasmrecover/dreamweb/use.asm | 11 ---------- devtools/tasmrecover/dreamweb/vars.asm | 1 - devtools/tasmrecover/dreamweb/vgafades.asm | 2 -- devtools/tasmrecover/dreamweb/vgagrafx.asm | 2 -- devtools/tasmrecover/tasm/op.py | 1 - devtools/themeparser.py | 1 - 37 files changed, 182 deletions(-) (limited to 'devtools') diff --git a/devtools/create_hugo/README b/devtools/create_hugo/README index 42bdd22c36..0d57d5eae5 100644 --- a/devtools/create_hugo/README +++ b/devtools/create_hugo/README @@ -4,4 +4,3 @@ is used by the engine depending on the version of the game started. In order to work properly, the content of the DATA sub-directory has to be copy next to the executable. - diff --git a/devtools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h index 582d5aaa8e..612e044982 100644 --- a/devtools/create_hugo/staticdata.h +++ b/devtools/create_hugo/staticdata.h @@ -11682,4 +11682,3 @@ int16 def_tunes_2d[] = {-1}; int16 def_tunes_3d[] = {-1}; #endif - diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 27cc82efd4..ddcc8ad6d1 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -1438,4 +1438,3 @@ bool getExtractionData(const Game *g, Search &search, ExtractMap &map) { return result; } - diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 88452ab4fc..2aa9fc0d39 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -1075,4 +1075,3 @@ bool extractMrShapeAnimData(PAKFile &out, const ExtractInformation *info, const } } // end of anonymous namespace - diff --git a/devtools/create_kyradat/extract.h b/devtools/create_kyradat/extract.h index fc473b33d1..a44927427f 100644 --- a/devtools/create_kyradat/extract.h +++ b/devtools/create_kyradat/extract.h @@ -72,4 +72,3 @@ const ExtractType *findExtractType(const int type); byte getTypeID(int type); #endif - diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 1a86ad4729..86f3535f10 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -1077,4 +1077,3 @@ const int *getNeedList(const Game *g) { return 0; } - diff --git a/devtools/create_kyradat/search.cpp b/devtools/create_kyradat/search.cpp index 36b59d948c..b861ff0f5a 100644 --- a/devtools/create_kyradat/search.cpp +++ b/devtools/create_kyradat/search.cpp @@ -213,4 +213,3 @@ bool Search::search(ResultList &res) { return !res.empty(); } - diff --git a/devtools/create_kyradat/search.h b/devtools/create_kyradat/search.h index bd6aa0355b..a9e8ee2726 100644 --- a/devtools/create_kyradat/search.h +++ b/devtools/create_kyradat/search.h @@ -114,4 +114,3 @@ private: }; #endif - diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 40e528267a..8042dcac71 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -2026,4 +2026,3 @@ ExtractEntryList getProvidersForId(int id) { return list; } - diff --git a/devtools/create_kyradat/tables.h b/devtools/create_kyradat/tables.h index b9687a5949..833c70a4fe 100644 --- a/devtools/create_kyradat/tables.h +++ b/devtools/create_kyradat/tables.h @@ -39,4 +39,3 @@ typedef std::list ExtractEntryList; ExtractEntryList getProvidersForId(int id); #endif - diff --git a/devtools/create_kyradat/util.cpp b/devtools/create_kyradat/util.cpp index 3b9f621949..2420f44168 100644 --- a/devtools/create_kyradat/util.cpp +++ b/devtools/create_kyradat/util.cpp @@ -137,4 +137,3 @@ uint32 fileSize(FILE *fp) { fseek(fp, pos, SEEK_SET); return sz; } - diff --git a/devtools/create_mads/scripts/rex_nebular.txt b/devtools/create_mads/scripts/rex_nebular.txt index f177720398..f33a574813 100644 --- a/devtools/create_mads/scripts/rex_nebular.txt +++ b/devtools/create_mads/scripts/rex_nebular.txt @@ -2239,5 +2239,3 @@ sub scene101_actions @2f6ba: RET end - - diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index d01102bb71..2cf8895d4b 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -160,4 +160,3 @@ void writeTextArray(FILE *outFile, const char *textArray[], int nbrText) { fwrite(padBuf, pad, 1, outFile); } } - diff --git a/devtools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h index 2164512337..bc49c7adaf 100644 --- a/devtools/create_toon/staticdata.h +++ b/devtools/create_toon/staticdata.h @@ -318,4 +318,3 @@ const char *exitLine_RU = "Hope you enjoyed playing ToonStruck!!"; const char* exitLine_SP = "\255\255Esperamos que te diviertas jugando a ToonStruck!!"; #endif - diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp index e4d0779848..d225195f71 100644 --- a/devtools/sci/musicplayer.cpp +++ b/devtools/sci/musicplayer.cpp @@ -96,5 +96,3 @@ int main(int argc, char** argv) { scir_free_resource_manager(resmgr); return 0; } - - diff --git a/devtools/sci/scitrace.asm b/devtools/sci/scitrace.asm index 2e541326f2..2c5d2cc4cc 100644 --- a/devtools/sci/scitrace.asm +++ b/devtools/sci/scitrace.asm @@ -130,4 +130,3 @@ NowInstallTSR: code_seg ends end scitrace - diff --git a/devtools/skycpt/KmpSearch.h b/devtools/skycpt/KmpSearch.h index f39b993bd2..7bec5f07a8 100644 --- a/devtools/skycpt/KmpSearch.h +++ b/devtools/skycpt/KmpSearch.h @@ -32,5 +32,3 @@ private: }; #endif //__KmpSearch__ - - diff --git a/devtools/skycpt/skycpt-engine.patch b/devtools/skycpt/skycpt-engine.patch index 16388a3221..d7ead35c9b 100644 --- a/devtools/skycpt/skycpt-engine.patch +++ b/devtools/skycpt/skycpt-engine.patch @@ -64,4 +64,3 @@ Index: engines/sky/logic.cpp + _skyControl->doLoadSavePanel(); return true; } - diff --git a/devtools/tasmrecover/.gitignore b/devtools/tasmrecover/.gitignore index f2bff8e8d9..69ae325082 100644 --- a/devtools/tasmrecover/.gitignore +++ b/devtools/tasmrecover/.gitignore @@ -1,4 +1,3 @@ *.pyc dreamgen.* _stubs* - diff --git a/devtools/tasmrecover/dreamweb/backdrop.asm b/devtools/tasmrecover/dreamweb/backdrop.asm index 5dfe20bf5d..ec0e4959b3 100644 --- a/devtools/tasmrecover/dreamweb/backdrop.asm +++ b/devtools/tasmrecover/dreamweb/backdrop.asm @@ -850,27 +850,3 @@ over147: mov ch,0 ret endp - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm index c222a63178..8a52435b0c 100644 --- a/devtools/tasmrecover/dreamweb/dreamweb.asm +++ b/devtools/tasmrecover/dreamweb/dreamweb.asm @@ -6264,20 +6264,3 @@ STACKSPACE ends ;-----------------------------------------------------------End of all code---- end Dreamweb - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/keypad.asm b/devtools/tasmrecover/dreamweb/keypad.asm index 8d918e618b..6eee2fa11c 100644 --- a/devtools/tasmrecover/dreamweb/keypad.asm +++ b/devtools/tasmrecover/dreamweb/keypad.asm @@ -1759,4 +1759,3 @@ Findtext1 proc near ret endp - diff --git a/devtools/tasmrecover/dreamweb/look.asm b/devtools/tasmrecover/dreamweb/look.asm index 399e1f16fd..a5a8b8055e 100644 --- a/devtools/tasmrecover/dreamweb/look.asm +++ b/devtools/tasmrecover/dreamweb/look.asm @@ -158,9 +158,3 @@ dogetback: mov getback,1 ret endp - - - - - - diff --git a/devtools/tasmrecover/dreamweb/monitor.asm b/devtools/tasmrecover/dreamweb/monitor.asm index 7f3979c2b3..5354e9f7d5 100644 --- a/devtools/tasmrecover/dreamweb/monitor.asm +++ b/devtools/tasmrecover/dreamweb/monitor.asm @@ -1490,8 +1490,3 @@ finishcurdel: ret endp - - - - - diff --git a/devtools/tasmrecover/dreamweb/newplace.asm b/devtools/tasmrecover/dreamweb/newplace.asm index 2bbf4fe498..b06a351f5f 100644 --- a/devtools/tasmrecover/dreamweb/newplace.asm +++ b/devtools/tasmrecover/dreamweb/newplace.asm @@ -577,8 +577,3 @@ Readcitypic proc near ret endp - - - - - diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm index 830c9676f3..e6f8037579 100644 --- a/devtools/tasmrecover/dreamweb/object.asm +++ b/devtools/tasmrecover/dreamweb/object.asm @@ -2603,8 +2603,3 @@ beforethistext: mov [es:di],ax ret endp - - - - - diff --git a/devtools/tasmrecover/dreamweb/saveload.asm b/devtools/tasmrecover/dreamweb/saveload.asm index 369e799d53..f3c92d36f6 100644 --- a/devtools/tasmrecover/dreamweb/saveload.asm +++ b/devtools/tasmrecover/dreamweb/saveload.asm @@ -1513,7 +1513,3 @@ alreadyloadold: mov ax,mousebutton noloadold: ret endp - - - - diff --git a/devtools/tasmrecover/dreamweb/sblaster.asm b/devtools/tasmrecover/dreamweb/sblaster.asm index 46eb8e2366..7a271e9c90 100644 --- a/devtools/tasmrecover/dreamweb/sblaster.asm +++ b/devtools/tasmrecover/dreamweb/sblaster.asm @@ -1260,33 +1260,3 @@ nopitflip: cli iret endp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm index 45f807da3f..22840dc8d4 100644 --- a/devtools/tasmrecover/dreamweb/sprite.asm +++ b/devtools/tasmrecover/dreamweb/sprite.asm @@ -5017,17 +5017,3 @@ dumpevery2: mov ax,[es:bx] finishevery2: ret endp - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/talk.asm b/devtools/tasmrecover/dreamweb/talk.asm index b6b96313f7..4d6b381881 100644 --- a/devtools/tasmrecover/dreamweb/talk.asm +++ b/devtools/tasmrecover/dreamweb/talk.asm @@ -563,21 +563,3 @@ doredes: call delpointer ret endp - - - - - - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/titles.asm b/devtools/tasmrecover/dreamweb/titles.asm index 8f2b46e3f4..52f58867ed 100644 --- a/devtools/tasmrecover/dreamweb/titles.asm +++ b/devtools/tasmrecover/dreamweb/titles.asm @@ -570,16 +570,3 @@ realcreditsearly: ret endp - - - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/use.asm b/devtools/tasmrecover/dreamweb/use.asm index fbbd9c99db..78917d50f4 100644 --- a/devtools/tasmrecover/dreamweb/use.asm +++ b/devtools/tasmrecover/dreamweb/use.asm @@ -3815,14 +3815,3 @@ nowinch: call showfirstuse ret endp - - - - - - - - - - - diff --git a/devtools/tasmrecover/dreamweb/vars.asm b/devtools/tasmrecover/dreamweb/vars.asm index 8678231a9d..6d34074528 100644 --- a/devtools/tasmrecover/dreamweb/vars.asm +++ b/devtools/tasmrecover/dreamweb/vars.asm @@ -560,4 +560,3 @@ roomssample db 0 gameerror db 0 howmuchalloc dw 0 - diff --git a/devtools/tasmrecover/dreamweb/vgafades.asm b/devtools/tasmrecover/dreamweb/vgafades.asm index 06cc9d6a44..a1043d9cf5 100644 --- a/devtools/tasmrecover/dreamweb/vgafades.asm +++ b/devtools/tasmrecover/dreamweb/vgafades.asm @@ -862,5 +862,3 @@ Initialmoncols proc near ret endp - - diff --git a/devtools/tasmrecover/dreamweb/vgagrafx.asm b/devtools/tasmrecover/dreamweb/vgagrafx.asm index 110fc95ee0..4ba1b16ba1 100644 --- a/devtools/tasmrecover/dreamweb/vgagrafx.asm +++ b/devtools/tasmrecover/dreamweb/vgagrafx.asm @@ -1758,5 +1758,3 @@ Title6graphics db "DREAMWEB.I06",0 Title7graphics db "DREAMWEB.I07",0 Palettescreen db "DREAMWEB.PAL",0 - - diff --git a/devtools/tasmrecover/tasm/op.py b/devtools/tasmrecover/tasm/op.py index 6b19068f2a..30852bcb58 100644 --- a/devtools/tasmrecover/tasm/op.py +++ b/devtools/tasmrecover/tasm/op.py @@ -428,4 +428,3 @@ class label(baseop): self.name = name def visit(self, visitor): visitor._label(self.name) - diff --git a/devtools/themeparser.py b/devtools/themeparser.py index a3524461a0..5c6f89897b 100644 --- a/devtools/themeparser.py +++ b/devtools/themeparser.py @@ -616,4 +616,3 @@ class STXBinaryFile(object): if __name__ == '__main__': bin = STXBinaryFile('../gui/themes/scummclassic', True, True) bin.parse() - -- cgit v1.2.3 From ab80b20a305728ecbe402ab0461c9a10cd7570b5 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sun, 7 Aug 2011 10:19:30 +0200 Subject: COMMON: Replace x + ARRAYSIZE(x) by the simpler ARRAYEND(x). --- devtools/create_kyradat/create_kyradat.cpp | 8 ++++---- devtools/create_kyradat/extract.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'devtools') diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index ddcc8ad6d1..627b517c62 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -331,7 +331,7 @@ const TypeTable gameTable[] = { }; byte getGameID(int game) { - return std::find(gameTable, gameTable + ARRAYSIZE(gameTable) - 1, game)->value; + return std::find(gameTable, ARRAYEND(gameTable) - 1, game)->value; } const TypeTable languageTable[] = { @@ -347,7 +347,7 @@ const TypeTable languageTable[] = { }; byte getLanguageID(int lang) { - return std::find(languageTable, languageTable + ARRAYSIZE(languageTable) - 1, lang)->value; + return std::find(languageTable, ARRAYEND(languageTable) - 1, lang)->value; } const TypeTable platformTable[] = { @@ -360,7 +360,7 @@ const TypeTable platformTable[] = { }; byte getPlatformID(int platform) { - return std::find(platformTable, platformTable + ARRAYSIZE(platformTable) - 1, platform)->value; + return std::find(platformTable, ARRAYEND(platformTable) - 1, platform)->value; } const TypeTable specialTable[] = { @@ -373,7 +373,7 @@ const TypeTable specialTable[] = { }; byte getSpecialID(int special) { - return std::find(specialTable, specialTable + ARRAYSIZE(specialTable) - 1, special)->value; + return std::find(specialTable, ARRAYEND(specialTable) - 1, special)->value; } // filename processing diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 2aa9fc0d39..371f2f4e2b 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -127,7 +127,7 @@ const ExtractType *findExtractType(const int type) { } byte getTypeID(int type) { - return std::find(typeTable, typeTable + ARRAYSIZE(typeTable) - 1, type)->value; + return std::find(typeTable, ARRAYEND(typeTable) - 1, type)->value; } // Extractor implementation -- cgit v1.2.3 From 3407f2803aec89fcf091900b841f83683fcc8675 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 8 Aug 2011 22:26:31 +0200 Subject: DREAMWEB: 'autosetwalk' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f665b7403b..ed4c9f1352 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -74,6 +74,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showreelframe', 'findsource', 'walking', + 'autosetwalk', 'spriteupdate', 'dodoor', 'lockeddoorway', -- cgit v1.2.3 From 4ad8b54241fb04aca95618637b50e4220e461034 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 9 Aug 2011 22:04:06 +0200 Subject: DREAMWEB: 'checkdest' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index ed4c9f1352..d4f4af715a 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -75,6 +75,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'findsource', 'walking', 'autosetwalk', + 'checkdest', 'spriteupdate', 'dodoor', 'lockeddoorway', -- cgit v1.2.3 From 2250c10ffeddad9b1b1796b6946cfd285f48207f Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 11 Aug 2011 15:24:06 +0200 Subject: DREAMWEB: 'dumptimedtext' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index d4f4af715a..0a86ab43d0 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -52,6 +52,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printdirect', 'printslow', 'usetimedtext', + 'dumptimedtext', 'putundertimed', 'getundertimed', 'worktoscreen', -- cgit v1.2.3 From b08b31eed3e31fb485a9091829f23cfb9006551f Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 11 Aug 2011 16:59:20 +0200 Subject: DREAMWEB: 'setuptimedtemp' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 0a86ab43d0..3a9d4f462c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -53,6 +53,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'printslow', 'usetimedtext', 'dumptimedtext', + 'setuptimedtemp', 'putundertimed', 'getundertimed', 'worktoscreen', -- cgit v1.2.3 From c8d8056777e61f1ee3e56fcf00679c16aa3ebd6d Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 11 Aug 2011 22:58:06 +0200 Subject: DREAMWEB: 'showgamereel' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 3a9d4f462c..f2dbd1d80f 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -74,6 +74,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getroomdata', 'startloading', 'showreelframe', + 'showgamereel', 'findsource', 'walking', 'autosetwalk', -- cgit v1.2.3 From 01ccadf7c12a2675ced62ec6f89873bf821b4c6a Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 11 Aug 2011 23:10:30 +0200 Subject: DREAMWEB: 'getreelframeax' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f2dbd1d80f..209ae38006 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -75,6 +75,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'startloading', 'showreelframe', 'showgamereel', + 'getreelframeax', 'findsource', 'walking', 'autosetwalk', -- cgit v1.2.3 From e78a5a2b08012dfe786da6d77abcc052436ace9c Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 11 Aug 2011 23:13:17 +0200 Subject: DREAMWEB: 'checkifperson' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 209ae38006..b151c31bff 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -105,6 +105,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'parseblaster', 'deltextline', 'doblocks', + 'checkifperson', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 2dadf6ba19b61c4af20da31a81cdf31bd5d3e79c Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 15 Aug 2011 13:49:11 +0200 Subject: DREAMWEB: 'getreelstart' is now only called from C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index b151c31bff..d256e44b36 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -106,6 +106,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'deltextline', 'doblocks', 'checkifperson', + 'getreelstart', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 8cb9ff31cf67c3161c9513e36cdba48db55f4ed9 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 15 Aug 2011 14:02:50 +0200 Subject: DREAMWEB: 'findobname' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index d256e44b36..d0cbae8fe5 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -107,6 +107,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'doblocks', 'checkifperson', 'getreelstart', + 'findobname', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From b0f5e4dfb07062002a52ded364eb02d8fc7f1dc6 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 15 Aug 2011 14:35:44 +0200 Subject: DREAMWEB: 'copyname' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index d0cbae8fe5..f75a4aa82b 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -108,6 +108,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'checkifperson', 'getreelstart', 'findobname', + 'copyname', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 03e222f37f917d8491e96bbbc17a73151ee11478 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 15 Aug 2011 15:42:09 +0200 Subject: DREAMWEB: 'commandwithob' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f75a4aa82b..2763ec5e9f 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -109,6 +109,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getreelstart', 'findobname', 'copyname', + 'commandwithob', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 73d7ff3523712fee4f4121507f63dd70deb03b58 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 15 Aug 2011 17:00:20 +0200 Subject: DREAMWEB: 'showpanel' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 2763ec5e9f..9bc5ff7030 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -110,6 +110,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'findobname', 'copyname', 'commandwithob', + 'showpanel', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 9d8e5c0df49a6a6d52f71c31f3ab0b406ad84ede Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 15 Aug 2011 17:11:11 +0200 Subject: DREAMWEB: 'updatepeople' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 9bc5ff7030..cc678b711b 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -111,6 +111,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'copyname', 'commandwithob', 'showpanel', + 'updatepeople', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 3971a0dbf51b52df0762e43cc90b214978484c1e Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 16 Aug 2011 01:25:59 +0200 Subject: DREAMWEB: 'madmantext' ported to C++ There is a debatable hack to accomodate the two different builds of the game, cd or not. --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index cc678b711b..e05e58c2f7 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -112,6 +112,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'commandwithob', 'showpanel', 'updatepeople', + 'madmantext', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 1fb3cb182f6b71a681c646d35e56322de3e38660 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 16 Aug 2011 03:23:09 +0200 Subject: DREAMWEB: 'madman' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e05e58c2f7..376e2dc39f 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -118,5 +118,6 @@ generator = cpp(context, "DreamGen", blacklist = [ 'dreamweb', 'backobject', 'mainman', + 'madman', ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From 5783a303b90255be3d8d8b354c7bdb2c10a7e46f Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 16 Aug 2011 04:01:40 +0200 Subject: DREAMWEB: 'madmode' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 376e2dc39f..937a8eb671 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -113,6 +113,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showpanel', 'updatepeople', 'madmantext', + 'madmode', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 87b48806dd2b02b99eb986683d286789213a7985 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Tue, 16 Aug 2011 05:18:56 +0200 Subject: CREDITS: Added myself --- devtools/credits.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index a124314670..48ee47dae3 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -526,6 +526,7 @@ begin_credits("Credits"); begin_section("DreamWeb"); add_person("Vladimir Menshakov", "whoozle", ""); add_person("Torbjörn Andersson", "eriktorbjorn", ""); + add_person("Bertrand Augereau", "Tramb", ""); end_section(); begin_section("Gob"); @@ -709,6 +710,7 @@ begin_credits("Credits"); begin_section("Nintendo DS"); add_person("Neil Millstone", "agent-q", ""); + add_person("Bertrand Augereau", "Tramb", "HQ software scaler"); end_section(); begin_section("OpenPandora"); -- cgit v1.2.3 From ca32fb2b34e36d5d02452d6f6c6c1c9f56f9a6b9 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 17 Aug 2011 01:16:05 +0200 Subject: DREAMWEB: Ported 'movemap' to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 937a8eb671..4af00914d2 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -114,6 +114,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'updatepeople', 'madmantext', 'madmode', + 'movemap', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From e36832bbf84cba88fe6b17e1634fab0d550f13df Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 17 Aug 2011 06:51:29 +0200 Subject: DREAMWEB: Removal of unneeded stubs --- devtools/tasmrecover/tasm-recover | 2 ++ 1 file changed, 2 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 4af00914d2..f216013f5c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -115,6 +115,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'madmantext', 'madmode', 'movemap', + 'doorway', + 'widedoor', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 3700e04e0f8bdd93ee95fee136d896b5fd836c93 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Wed, 17 Aug 2011 07:08:38 +0200 Subject: DREAMWEB: Drawing of background objects ported to C++ --- devtools/tasmrecover/tasm-recover | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index f216013f5c..1c5dacc69c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -117,6 +117,12 @@ generator = cpp(context, "DreamGen", blacklist = [ 'movemap', 'doorway', 'widedoor', + 'showallobs', + 'getxad', + 'getyad', + 'getmapad', + 'calcfrframe', + 'finalframe', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 7eab6a7c59feaff698061be19aef61d0d0e688c2 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 00:35:10 +0200 Subject: DREAMWEB: 'commandonly' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 1c5dacc69c..c333f58ad4 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -123,6 +123,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getmapad', 'calcfrframe', 'finalframe', + 'commandonly', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 0ac5544b64322b55f0dab2c1dbf6582a7c4b9da0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 17 Aug 2011 23:22:49 +0200 Subject: DREAMWEB: Emit symbolic constants for data offsets --- devtools/tasmrecover/tasm/cpp.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index 4ed89f650d..db7855e0d0 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -82,6 +82,7 @@ class cpp: self.skip_output = skip_output self.translated = [] self.proc_addr = [] + self.used_data_offsets = set() self.methods = [] self.fd.write("""%s @@ -99,11 +100,13 @@ namespace %s { if self.indirection == -1: try: offset,p,p = self.context.get_offset(name) - print "OFFSET = %d" %offset - self.indirection = 0 - return str(offset) except: pass + else: + print "OFFSET = %d" %offset + self.indirection = 0 + self.used_data_offsets.add((name,offset)) + return "offset_%s" % (name,) g = self.context.get_global(name) if isinstance(g, op.const): @@ -604,6 +607,10 @@ public: for name,addr in self.proc_addr: self.hd.write("\tstatic const uint16 addr_%s = 0x%04x;\n" %(name, addr)) + + for name,addr in self.used_data_offsets: + self.hd.write("\tstatic const uint16 offset_%s = 0x%04x;\n" %(name, addr)) + offsets = [] for k, v in self.context.get_globals().items(): if isinstance(v, op.var): -- cgit v1.2.3 From aa9f9708737d687d702db31f7976426ddc61f41c Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 18 Aug 2011 00:27:44 +0200 Subject: DREAMWEB: Reorder modifiers for consistency (cosmetic) --- devtools/tasmrecover/tasm/cpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py index db7855e0d0..d2b860ddf5 100644 --- a/devtools/tasmrecover/tasm/cpp.py +++ b/devtools/tasmrecover/tasm/cpp.py @@ -620,7 +620,7 @@ public: offsets = sorted(offsets, key=lambda t: t[1]) for o in offsets: - self.hd.write("\tconst static uint16 k%s = %s;\n" %o) + self.hd.write("\tstatic const uint16 k%s = %s;\n" %o) self.hd.write("\n") for p in set(self.methods): if p in self.blacklist: -- cgit v1.2.3 From f3131e2dbf9d18bd37ef7fb56de1c15a9826301a Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sun, 26 Jun 2011 12:09:56 +0200 Subject: DREAMWEB: Move several load/save functions out of dreamgen --- devtools/tasmrecover/tasm-recover | 3 +++ 1 file changed, 3 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index c333f58ad4..0c89f53d36 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -130,5 +130,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'backobject', 'mainman', 'madman', + 'loadgame', + 'savegame', + 'doload' ]) generator.generate('dreamweb') #start routine -- cgit v1.2.3 From 8a5c8f33203932138266b172b928a662928d3a8a Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Sat, 25 Jun 2011 20:30:16 +0200 Subject: DREAMWEB: Add/fix loading from launcher This is very error-prone, and needs testing. --- devtools/tasmrecover/dreamweb/saveload.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/dreamweb/saveload.asm b/devtools/tasmrecover/dreamweb/saveload.asm index f3c92d36f6..6c98774a0f 100644 --- a/devtools/tasmrecover/dreamweb/saveload.asm +++ b/devtools/tasmrecover/dreamweb/saveload.asm @@ -1502,6 +1502,7 @@ Loadold proc near alreadyloadold: mov ax,mousebutton and ax,1 jz noloadold + mov ax,0ffffh call doload cmp getback,4 jz noloadold -- cgit v1.2.3 From efe76ac494e23f94a7a320fe0f7e31cab8225020 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 10:36:57 +0200 Subject: DREAMWEB: 'getposition' ported to C++ --- devtools/tasmrecover/tasm-recover | 3 +++ 1 file changed, 3 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 0c89f53d36..e14388ac65 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -118,6 +118,9 @@ generator = cpp(context, "DreamGen", blacklist = [ 'doorway', 'widedoor', 'showallobs', + 'addalong', + 'addlength', + 'getdimension', 'getxad', 'getyad', 'getmapad', -- cgit v1.2.3 From 1dff2ebe8eda57bfb396c92fcdf83f9980fc02b9 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 18:36:15 +0200 Subject: DREAMWEB: 'calcmapad' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e14388ac65..1082c12682 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -124,6 +124,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'getxad', 'getyad', 'getmapad', + 'calcmapad', 'calcfrframe', 'finalframe', 'commandonly', -- cgit v1.2.3 From 089e20ec2b3e8198bbb078a1ccdbbaf7b8c8da39 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 21:49:15 +0200 Subject: DREAMWEB: No need to generate unused C++ for 'makename' --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 1082c12682..5a18229d3c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -128,6 +128,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'calcfrframe', 'finalframe', 'commandonly', + 'makename', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 5ff686a6dc180566dc4e6618f73ee4ea36ab9dcc Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 22:03:54 +0200 Subject: DREAMWEB: 'findlen' is unused --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 5a18229d3c..8627321227 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -129,6 +129,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'finalframe', 'commandonly', 'makename', + 'findlen', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From ef7c28c2cd33b6b8a8f7532d74693bf8e68a0cf6 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 22:09:28 +0200 Subject: DREAMWEB: Ported 'blocknametext', 'walktotext', 'personnametext', --- devtools/tasmrecover/tasm-recover | 3 +++ 1 file changed, 3 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 8627321227..8aa820538e 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -130,6 +130,9 @@ generator = cpp(context, "DreamGen", blacklist = [ 'commandonly', 'makename', 'findlen', + 'blocknametext', + 'walktotext', + 'personnametext', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 3f6a277819aabffc0d15802ce7d83f4e9825e254 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 18 Aug 2011 22:22:39 +0200 Subject: DREAMWEB: Ported 'findxyfrompath' to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 8aa820538e..2c785ec32c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -133,6 +133,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'blocknametext', 'walktotext', 'personnametext', + 'findxyfrompath', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 663ca4774f2a51287212140b39a4c1e96309a06d Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Fri, 19 Aug 2011 10:35:29 +0200 Subject: DREAMWEB: 'findormake' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 2c785ec32c..0de0b840aa 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -134,6 +134,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'walktotext', 'personnametext', 'findxyfrompath', + 'findormake', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From eaa342fdd88227e71ee95551a064f95df3eb0dd6 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Fri, 19 Aug 2011 11:42:13 +0200 Subject: DREAMWEB: 'setallchanges' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 0de0b840aa..24d219951a 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -135,6 +135,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'personnametext', 'findxyfrompath', 'findormake', + 'setallchanges', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 6cab258032b72054f901d4a19a85ac6ef8ef4513 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 20 Aug 2011 12:26:10 +0200 Subject: DREAMWEB: Ported 'dochange' to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 24d219951a..c67111108c 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -136,6 +136,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'findxyfrompath', 'findormake', 'setallchanges', + 'dochange', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 51fbc7200c3758e526195260d4c705de87f56733 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 20 Aug 2011 13:12:18 +0100 Subject: CREDITS: Reflect new team structure --- devtools/credits.pl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index 48ee47dae3..117357485f 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -445,12 +445,27 @@ sub add_paragraph { begin_credits("Credits"); begin_section("ScummVM Team"); - begin_section("Project Leaders"); + begin_section("Project Leader"); begin_persons(); add_person("Eugene Sandulenko", "sev", ""); end_persons(); end_section(); + begin_section("PR Office"); + begin_persons(); + add_person("Arnaud Boutonné", "Strangerke", "Public Relations Officer, Project Administrator"); + add_person("Eugene Sandulenko", "sev", "Project Leader"); + end_persons(); + end_section(); + + begin_section("Core Team"); + begin_persons(); + add_person("Willem Jan Palenstijn", "wjp", ""); + add_person("Eugene Sandulenko", "sev", ""); + add_person("Johannes Schickel", "LordHoto", ""); + end_persons(); + end_section(); + begin_section("Retired Project Leaders"); begin_persons(); add_person("James Brown", "ender", ""); -- cgit v1.2.3 From b17561dd09c3a09e6c1a084a8006373e60f079b6 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 20 Aug 2011 12:33:21 +0200 Subject: DREAMWEB: 'deletetaken' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index c67111108c..6b95f3db4a 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -137,6 +137,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'findormake', 'setallchanges', 'dochange', + 'deletetaken', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From f4207b8149f562381f6a1b6ea4a908a6be9221c5 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sat, 20 Aug 2011 13:23:47 +0200 Subject: DREAMWEB: 'placesetobject' and 'removesetobject' ported to C++ --- devtools/tasmrecover/tasm-recover | 2 ++ 1 file changed, 2 insertions(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 6b95f3db4a..004a4c8b25 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -138,6 +138,8 @@ generator = cpp(context, "DreamGen", blacklist = [ 'setallchanges', 'dochange', 'deletetaken', + 'placesetobject', + 'removesetobject', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 6d47a6d93556cab9275cbb1ecd399c3acb072aa7 Mon Sep 17 00:00:00 2001 From: Chris Warren-Smith Date: Mon, 8 Aug 2011 19:59:31 +1000 Subject: BADA: Updated credit.pl to include BADA port information --- devtools/credits.pl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index 117357485f..8d4bc19df0 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -699,6 +699,10 @@ begin_credits("Credits"); add_person("Angus Lees", "Gus", ""); end_section(); + begin_section("BADA"); + add_person("Chris Warren-Smith", "", ""); + end_section(); + begin_section("Dreamcast"); add_person("Marcus Comstedt", "", ""); end_section(); -- cgit v1.2.3 From 7393cce711c24b1911c2ed4f9a7fcd87367b058e Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Sun, 21 Aug 2011 15:24:05 +0200 Subject: DREAMWEB: 'showallfree' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 004a4c8b25..c380bfae4d 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -140,6 +140,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'deletetaken', 'placesetobject', 'removesetobject', + 'showallfree', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 6fc0176aacacc9eefa215b8a6a1121cd6721f2c8 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 22 Aug 2011 14:46:06 +0200 Subject: DREAMWEB: 'checkiffree' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index c380bfae4d..9cbd4c8816 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -106,6 +106,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'deltextline', 'doblocks', 'checkifperson', + 'checkiffree', 'getreelstart', 'findobname', 'copyname', -- cgit v1.2.3 From b65f54982e14b04378abae0323e0b48ec7686c81 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 22 Aug 2011 12:44:07 +0200 Subject: DREAMWEB: 'adjustlen' is not needed --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 9cbd4c8816..9ca2d890f7 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -142,6 +142,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'placesetobject', 'removesetobject', 'showallfree', + 'adjustlen', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From 911cb1ea5852839bbaed3732ba60ce8561ba15d1 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 22 Aug 2011 15:53:54 +0200 Subject: DREAMWEB: 'finishedwalking' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 9ca2d890f7..84859b1cd4 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -143,6 +143,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'removesetobject', 'showallfree', 'adjustlen', + 'finishedwalking', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3 From a39a3eda46aea108a51556f001617ad28d29e520 Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Mon, 22 Aug 2011 17:30:53 +0200 Subject: DREAMWEB: 'checkone' ported to C++ --- devtools/tasmrecover/tasm-recover | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 84859b1cd4..8e37b4e851 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -144,6 +144,7 @@ generator = cpp(context, "DreamGen", blacklist = [ 'showallfree', 'adjustlen', 'finishedwalking', + 'checkone', ], skip_output = [ # These functions are processed but not output 'dreamweb', -- cgit v1.2.3