TIM file loading/unloading for HoF

svn-id: r29217

1 files changed, 15 insertions, 1 deletions

diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index 83f68c3747..f984dbb66b 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -61,7 +61,7 @@ int KyraEngine_v2::o2_setCharacterPos(ScriptState *script) {
 int KyraEngine_v2::o2_defineObject(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "o2_defineObject(%p) (%d, '%s', %d, %d, %d, %d)", (const void *)script,
 			stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
-	Object *object = &_objectList[stackPos(0)];
+	TalkObject *object = &_talkObjectList[stackPos(0)];
 	strcpy(object->filename, stackPosString(1));
 	object->scriptId = stackPos(2);
 	object->x = stackPos(3);
@@ -667,6 +667,20 @@ int KyraEngine_v2::o2_countItemInstances(ScriptState *script) {
 	return count;
 }
 
+int KyraEngine_v2::o2_initObject(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "o2_initObject(%p) (%d)", (const void *)script, stackPos(0));
+	initTalkObject(stackPos(0));
+
+	return 0;
+}
+
+int KyraEngine_v2::o2_deinitObject(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "o2_deinitObject(%p) (%d)", (const void *)script, stackPos(0));
+	deinitTalkObject(stackPos(0));
+
+	return 0;
+}
+
 int KyraEngine_v2::o2_setSpecialSceneScriptState(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "o2_setSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0));
 	_specialSceneScriptState[stackPos(0)] = 1;