Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 110 insertions, 0 deletions

diff --git a/devtools/create_kyradat/resources/hof_pc98_japanese.h b/devtools/create_kyradat/resources/hof_pc98_japanese.h
new file mode 100644
index 0000000000..3ea4e5df96
--- /dev/null
+++ b/devtools/create_kyradat/resources/hof_pc98_japanese.h
@@ -0,0 +1,110 @@
+static const char *const k2SeqplayStringsPC98Japanese[105] = {
+	"\x83""L""\x83\x89\x83\x93\x83""f""\x83""B""\x83""A""\x82\xAA\x8F\xC1\x82\xA6\x82\xC4\x82\xA2\x82\xAD\x81""I",
+	"\x8A\xE2\x81""X""\x82\xE2\x81""A",
+	"\x96\xD8\x81""X""\x82\xDC\x82\xC5\x82\xE0\x81""B",
+	"\x83""L""\x83\x89\x83\x93\x83""f""\x83""B""\x83""A""\x82\xF0\x8B""~""\x82\xED\x82\xC8\x82\xAF\x82\xEA\x82\xCE\x82\xC8\x82\xE7\x82\xC8\x82\xA2\x81""I",
+	"\x96\x82\x8F""p""\x8E""t""\x82\xBD\x82\xBF\x82\xCD\x94""Y""\x82\xF1\x82\xBE\x81""B",
+	"\x82\xA0\x82\xE7\x82\xE4\x82\xE9\x91\xCE\x8D\xF4\x82\xAA\x8B\xA6\x8B""c""\x82\xB3\x82\xEA\x82\xBD\x82\xAA\x81""E""\x81""E""\x81""E",
+	"\x83""}""\x83\x8B\x83""R""\x82\xC6\x83""n""\x83\x93\x83""h""\x82\xAA\x81""A""\x82\xB1\x82\xCC\x96\xE2\x91\xE8\x82\xF0\x94""C""\x82\xB3\x82\xEA\x82\xBD\x81""B",
+	"\x83""n""\x83\x93\x83""h""\x82\xAA\x94\xAD\x88\xC4\x82\xB5\x82\xC4\x81""A",
+	"\x82\xC2\x82\xA2\x82\xC9\x81""A""\x89\xF0\x8C\x88\x8D\xF4\x82\xAA\x8C\x88\x92\xE8\x82\xB5\x82\xBD\x81""B",
+	"\x83""L""\x83\x89\x83\x93\x83""f""\x83""B""\x83""A""\x82\xF0\x8B""~""\x82\xA4\x82\xC9\x82\xCD\x81""A",
+	"\x90\xA2\x8A""E""\x82\xCC\x92\x86\x90""S""\x82\xC9\x82\xA0\x82\xE9\x81""h""\x96\x82\x96""@""\x82\xCC\x82\xA2\x82\xA9\x82\xE8\x90\xCE\x81""h""\x82\xAA\x95""K""\x97""v""\x82\xBE\x81""B",
+	"\x83""U""\x83\x93\x83""V""\x83""A""\x81""A""\x8C""N""\x82\xAA\x8D\xCC\x82\xE8\x82\xC9\x8D""s""\x82\xAD\x82\xCC\x82\xBE\x81""B",
+	"Thank you for playing The Hand of Fate.",
+	"\x90\xA2\x8A""E""\x82\xCC\x92\x86\x90""S""\x82\xD6\x8D""s""\x82\xAD\x82\xC9\x82\xCD\x81""A""\x83""u""\x83\x8B\x81""[""\x83""x""\x83\x8A\x81""[""\x82\xE0\x95""K""\x97""v""\x82\xBE\x82\xC6\x8E""v""\x82\xA4\x82\xED\x81""B",
+	" DUMMY STRING... ",
+	" DUMMY STRING... ",
+	"\x82\xA0\x82\x9F\x81""A""\x8E\x84\x82\xCC\x8E\x9D\x82\xBF\x95\xA8\x82\xAA\x82\xB7\x82\xD7\x82\xC4\x93\x90\x82\xDC\x82\xEA\x82\xC4\x82\xA2\x82\xE9\x81""I",
+	" DUMMY STRING... ",
+	"\x82\xBE\x82\xC1\x82\xC4\x81""A""\x90\xA2\x8A""E""\x82\xCC\x92\x86\x90""S""\x82\xDC\x82\xC5\x95\xE0\x82\xA2\x82\xC4\x8D""s""\x82\xAD\x82\xC8\x82\xF1\x82\xC4\x81""A""\x8B""C""\x82\xAA\x89\x93\x82\xAD\x82\xC8\x82\xE9\x82\xB6\x82\xE1\x82\xC8\x82\xA2\x81""I",
+	" DUMMY STRING... ",
+	" DUMMY STRING... ",
+	"\x8B""}""\x82\xAE\x82\xCC\x82\xE6\x81""A""\x83""t""\x83""H""\x81""[""\x83\x93\x81""I",
+	"\x82\xE2\x82\xC1\x82\xCF\x82\xE8\x81""A""\x97\x88\x82\xE9\x82\xF1\x82\xB6\x82\xE1\x82\xC8\x82\xA9\x82\xC1\x82\xBD\x81""I",
+	"\x82\xE0\x82\xA4\x81""A""\x93\xF1\x93""x""\x82\xC6\x97\xC2\x82\xC9\x8D""s""\x82\xA9\x82\xCB\x82\xA6\x81""I",
+	"\x83""Q""\x83\x8D\x83""Q""\x81""[""\x83\x8D\x81""B",
+	"\x8A""^""\x82\xCC\x8E""q""\x82\xCD\x8A""^""\x82\xBE\x81""B""\x81""@",
+	"\x82\xC8\x82\xF1\x82\xBE\x81""A""\x82\xE0\x82\xA4\x83""`""\x81""[""\x83""Y""\x82\xCD\x82\xC8\x82\xA2\x82\xBC\x81""I",
+	"\x82\xE6\x82\xB5\x81""A""\x83""I""\x83\x8C\x83\x93\x83""W""\x82\xCC\x94\xE7\x82\xC5\x82\xE2\x82\xEB\x82\xA4\x81""B",
+	"\x83""}""\x83""}""\x81""A""\x96""l""\x82\xCC\x96\xD1\x82\xE0\x82\xD3\x82\xB3\x82\xD3\x82\xB3\x81""H",
+	"\x82\xA8\x82\xA2\x82\xB1\x82\xE7\x81""A""\x82\xB1\x82\xB1\x82\xA9\x82\xE7\x8F""o""\x82\xC4\x8D""s""\x82\xAF\x81""I",
+	"\x82\xA8\x91""O""\x82\xAA\x94\xBC\x95\xAA\x82\xC9\x90\xD8\x82\xEA\x82\xE6\x81""A""\x89\xB4\x82\xAA\x91""I""\x82\xD4\x82\xA9\x82\xE7\x82\xB3\x81""B",
+	"\x82\xA2\x82\xE2\x81""A""\x82\xA8\x91""O""\x82\xAA\x94\xBC\x95\xAA\x82\xC9\x90\xD8\x82\xEA\x82\xCE\x81""A""\x89\xB4\x82\xAA\x91""I""\x82\xD4\x81""B",
+	"\x89\xB4\x82\xCD\x82\xDC\x82\xBE\x81""A""\x94""[""\x93\xBE\x82\xB5\x82\xBF\x82\xE1\x82\xA2\x82\xC8\x82\xA2\x82\xBA\x81""B",
+	"\x82\xA2\x82\xA2\x89\xC1\x8C\xB8\x82\xC9\x82\xB5\x82\xEB\x81""A""\x82\xDC\x82\xBD\x89\xA3\x82\xE9\x82\xBC\x81""I",
+	"Executive Producer",
+	"Brett W. Sperry",
+	"Designed & Directed by",
+	"Rick Gush",
+	"Lead Programmer",
+	"Michael Legg",
+	"Art Management",
+	"Louis Castle",
+	"Joseph B. Hewitt IV",
+	"Lead Artist",
+	"Rick Parks",
+	"Additional Coding by",
+	"Philip W. Gorrow",
+	"Matt Collins",
+	"Mark McCubbin",
+	"Artists",
+	"Cameron Chun",
+	"Cary Averett",
+	"Cindy Chinn",
+	"Elie Arabian",
+	"Fei Cheng",
+	"Ferby Miguel",
+	"Frank Mendeola",
+	"Jack Martin",
+	"Jerry Moore",
+	"",
+	"Judith Peterson",
+	"Larry Miller",
+	"Lenny Lee",
+	"Louise Sandoval",
+	"Ren Olsen",
+	"Music & Sounds by",
+	"Paul Mudra",
+	"Frank Klepacki",
+	"Dwight Okahara",
+	"Pat Collins",
+	"Qualilty Assurance by",
+	"Glenn Sperry",
+	"Michael Lightner",
+	"William Foster",
+	"Jesse Clemit",
+	"Jeff Fillhaber",
+	"Manual, Package Design",
+	"& Fulfillment",
+	"Eydie Laramore",
+	"Lisa Marcinko",
+	"Lauren Rifkin",
+	"Congratulations!",
+	"Thank you for playing The Hand of Fate!",
+	"Guest Coding",
+	"Producer Liaison",
+	"Scott Duckett",
+	"Irvine Testers",
+	"Chris McFarland",
+	"Paul Moore",
+	"Chad Soares",
+	"Jared Brinkley",
+	"Jon Willliams",
+	"Chris Toft",
+	"Chris's Hair by",
+	"Cumulo Nimbus",
+	"\x83""f""\x81""[""\x83""^""\x82\xF0\x83\x8D\x81""[""\x83""h""\x82\xB7\x82\xE9",
+	"\x83""C""\x83\x93\x83""g""\x83\x8D\x83""_""\x83""N""\x83""V""\x83\x87\x83\x93",
+	"\x90""V""\x82\xBD\x82\xC9\x83""Q""\x81""[""\x83\x80\x82\xF0\x8E""n""\x82\xDF\x82\xE9",
+	"\x83""Q""\x81""[""\x83\x80\x82\xF0\x8F""I""\x97\xB9\x82\xB7\x82\xE9",
+	"Special Thanks to",
+	"Sake Joe Bostic-san",
+	"Tim Fritz",
+	"Kenny Dunne",
+	"Yukio Sekiguchi (Japan)",
+	"Takeshi Abo (Japan)"
+};
+
+static const StringListProvider k2SeqplayStringsPC98JapaneseProvider = { ARRAYSIZE(k2SeqplayStringsPC98Japanese), k2SeqplayStringsPC98Japanese };
+