From a117024d23c3d43ee0ced9046fdbf8e866ddc135 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 10 Jul 2008 12:12:42 +0000
Subject: Added filename to unkown command/opcode warnings for TIM scripts.

svn-id: r32989
---
 engines/kyra/script_tim.cpp | 8 +++++---
 engines/kyra/script_tim.h   | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 8725f6def9..8ea316f159 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -124,6 +124,8 @@ TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpc
 	for (int i = 0; i < num; ++i)
 		tim->func[i].avtl = tim->avtl + tim->avtl[i];	
 
+	strncpy(tim->filename, filename, 13);
+
 	return tim;
 }
 
@@ -201,12 +203,12 @@ void TIMInterpreter::refreshTimersAfterPause(uint32 elapsedTime) {
 
 int TIMInterpreter::execCommand(int cmd, const uint16 *param) {
 	if (cmd < 0 || cmd >= _commandsSize) {
-		warning("Calling unimplemented TIM command %d", cmd);
+		warning("Calling unimplemented TIM command %d from file '%s'", cmd, _currentTim->filename);
 		return 0;
 	}
 
 	if (_commands[cmd].proc == 0) {
-		warning("Calling unimplemented TIM command %d", cmd);
+		warning("Calling unimplemented TIM command %d from file '%s'", cmd, _currentTim->filename);
 		return 0;
 	}
 
@@ -261,7 +263,7 @@ int TIMInterpreter::cmd_execOpcode(const uint16 *param) {
 
 	uint16 opcode = *param++;
 	if (opcode > _currentTim->opcodes->size()) {
-		warning("Calling unimplemented TIM opcode(0x%.02X/%d)", opcode, opcode);
+		warning("Calling unimplemented TIM opcode(0x%.02X/%d) form file '%s'", opcode, opcode, _currentTim->filename);
 		return 0;
 	}
 
diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h
index f171823444..39a1d90a44 100644
--- a/engines/kyra/script_tim.h
+++ b/engines/kyra/script_tim.h
@@ -37,6 +37,8 @@ struct TIM;
 typedef Common::Functor2<const TIM*, const uint16*, int> TIMOpcode;
 
 struct TIM {
+	char filename[13];
+
 	int16 procFunc;
 	uint16 procParam;
 
-- 
cgit v1.2.3