1 files changed, 33 insertions, 28 deletions

diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index 245c1f4544..7e87b9e8f8 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -1,27 +1,27 @@
-/* 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.
- *
- * $URL$
- * $Id$
- *
- */
+	/* 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.
+	 *
+	 * $URL$
+	 * $Id$
+	 *
+	 */
 
 #include "common/stdafx.h"
 #include "common/endian.h"
@@ -34,13 +34,13 @@
 #include "gob/dataio.h"
 #include "gob/draw.h"
 #include "gob/goblin.h"
-#include "gob/imd.h"
 #include "gob/inter.h"
 #include "gob/mult.h"
 #include "gob/parse.h"
 #include "gob/scenery.h"
 #include "gob/sound.h"
 #include "gob/video.h"
+#include "gob/videoplayer.h"
 
 namespace Gob {
 
@@ -101,6 +101,7 @@ void Game_v2::playTot(int16 skipPlay) {
 			_extTable = 0;
 			_extHandle = -1;
 
+			_vm->_draw->_cursorHotspotXVar = -1;
 			_totToLoad[0] = 0;
 
 			if ((_curTotFile[0] == 0) && (_totFileData == 0))
@@ -134,12 +135,16 @@ void Game_v2::playTot(int16 skipPlay) {
 			totTextLoc = false;
 			if (READ_LE_UINT32(filePtr) != (uint32) -1) {
 				_totTextData = new TotTextTable;
+
+				int32 size;
+
 				if (READ_LE_UINT32(filePtr) == 0) {
-					_totTextData->dataPtr = loadLocTexts();
+					_totTextData->dataPtr = loadLocTexts(&size);
 					totTextLoc = true;
 				} else {
 					_totTextData->dataPtr =
 						(_totFileData + READ_LE_UINT32(_totFileData + 0x30));
+					size = totSize;
 					_vm->_global->_language = _vm->_global->_languageWanted;
 				}
 
@@ -147,7 +152,7 @@ void Game_v2::playTot(int16 skipPlay) {
 				if (_totTextData->dataPtr != 0) {
 					Common::MemoryReadStream totTextData(_totTextData->dataPtr,
 							4294967295U);
-					_totTextData->itemsCount = totTextData.readSint16LE();
+					_totTextData->itemsCount = totTextData.readSint16LE() & 0x3FFF;
 
 					_totTextData->items = new TotTextItem[_totTextData->itemsCount];
 					for (int i = 0; i < _totTextData->itemsCount; ++i) {
@@ -267,7 +272,7 @@ void Game_v2::playTot(int16 skipPlay) {
 						_vm->_snd->freeSample(_soundSamples[i]);
 			}
 
-			_vm->_imdPlayer->closeImd();
+			_vm->_vidPlayer->closeVideo();
 			if (_totToLoad[0] == 0)
 				break;