Merged trunk into the GUI branch.

Fixed MSVS9 project files.

svn-id: r32702

1 files changed, 24 insertions, 11 deletions

diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 67e076cbf8..4ad6464424 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-TIMInterpreter::TIMInterpreter(KyraEngine *vm, OSystem *system) : _vm(vm), _system(system), _currentTim(0) {
+TIMInterpreter::TIMInterpreter(KyraEngine_v1 *vm, OSystem *system) : _vm(vm), _system(system), _currentTim(0) {
 #define COMMAND(x) { &TIMInterpreter::x, #x }
 #define COMMAND_UNIMPL() { 0, 0 }
 	static CommandEntry commandProcs[] = {
@@ -118,7 +118,8 @@ TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpc
 	for (uint i = 0; i < avtlChunkSize; ++i)
 		tim->avtl[i] = READ_LE_UINT16(tim->avtl + i);
 	
-	for (int i = 0; i < 10; ++i)
+	int num = (avtlChunkSize < TIM::kCountFuncs) ? avtlChunkSize : (int)TIM::kCountFuncs;
+	for (int i = 0; i < num; ++i)
 		tim->func[i].avtl = tim->avtl + tim->avtl[i];	
 
 	return tim;
@@ -128,8 +129,8 @@ void TIMInterpreter::unload(TIM *&tim) const {
 	if (!tim)
 		return;
 
-	delete [] tim->text;
-	delete [] tim->avtl;
+	delete[] tim->text;
+	delete[] tim->avtl;
 	delete tim;
 	tim = 0;
 }
@@ -145,7 +146,7 @@ void TIMInterpreter::exec(TIM *tim, bool loop) {
 	}
 
 	do {
-		for (_currentFunc = 0; _currentFunc < 10; ++_currentFunc) {
+		for (_currentFunc = 0; _currentFunc < TIM::kCountFuncs; ++_currentFunc) {
 			TIM::Function &cur = _currentTim->func[_currentFunc];
 
 			if (_currentTim->procFunc != -1)
@@ -184,6 +185,18 @@ void TIMInterpreter::exec(TIM *tim, bool loop) {
 	} while (loop);
 }
 
+void TIMInterpreter::refreshTimersAfterPause(uint32 elapsedTime) {
+	if (!_currentTim)
+		return;
+
+	for (int i = 0; i < TIM::kCountFuncs; i++) {
+		if (_currentTim->func[i].lastTime)
+			_currentTim->func[i].lastTime += elapsedTime;
+		if (_currentTim->func[i].nextTime)
+			_currentTim->func[i].nextTime += elapsedTime;
+	}
+}
+
 int TIMInterpreter::execCommand(int cmd, const uint16 *param) {
 	if (cmd < 0 || cmd >= _commandsSize) {
 		warning("Calling unimplemented TIM command %d", cmd);
@@ -206,7 +219,7 @@ int TIMInterpreter::cmd_initFunc0(const uint16 *param) {
 }
 
 int TIMInterpreter::cmd_stopCurFunc(const uint16 *param) {
-	if (_currentFunc < 10)
+	if (_currentFunc < TIM::kCountFuncs)
 		_currentTim->func[_currentFunc].ip = 0;
 	if (!_currentFunc)
 		_finished = true;
@@ -215,7 +228,7 @@ int TIMInterpreter::cmd_stopCurFunc(const uint16 *param) {
 
 int TIMInterpreter::cmd_initFunc(const uint16 *param) {
 	uint16 func = *param;
-	assert(func < 10);
+	assert(func < TIM::kCountFuncs);
 	if (_currentTim->func[func].avtl)
 		_currentTim->func[func].ip = _currentTim->func[func].avtl;
 	else
@@ -225,13 +238,13 @@ int TIMInterpreter::cmd_initFunc(const uint16 *param) {
 
 int TIMInterpreter::cmd_stopFunc(const uint16 *param) {
 	uint16 func = *param;
-	assert(func < 10);
+	assert(func < TIM::kCountFuncs);
 	_currentTim->func[func].ip = 0;
 	return 1;
 }
 
 int TIMInterpreter::cmd_resetAllRuntimes(const uint16 *param) {
-	for (int i = 0; i < 10; ++i) {
+	for (int i = 0; i < TIM::kCountFuncs; ++i) {
 		if (_currentTim->func[i].ip)
 			_currentTim->func[i].nextTime = _system->getMillis();
 	}
@@ -255,7 +268,7 @@ int TIMInterpreter::cmd_execOpcode(const uint16 *param) {
 
 int TIMInterpreter::cmd_initFuncNow(const uint16 *param) {
 	uint16 func = *param;
-	assert(func < 10);
+	assert(func < TIM::kCountFuncs);
 	_currentTim->func[func].ip = _currentTim->func[func].avtl;
 	_currentTim->func[func].lastTime = _currentTim->func[func].nextTime = _system->getMillis();
 	return 1;
@@ -263,7 +276,7 @@ int TIMInterpreter::cmd_initFuncNow(const uint16 *param) {
 
 int TIMInterpreter::cmd_stopFuncNow(const uint16 *param) {
 	uint16 func = *param;
-	assert(func < 10);
+	assert(func < TIM::kCountFuncs);
 	_currentTim->func[func].ip = 0;
 	_currentTim->func[func].lastTime = _currentTim->func[func].nextTime = _system->getMillis();
 	return 1;