- Added some stubs for the SAGA2 games dino and fta2

- Stopped loading the isomap and puzzle game modules for IHNM, as they are not used for that game (this saves some memory for IHNM)
- Removed getDisplayWidth() and getDisplayHeight()

svn-id: r35473

1 files changed, 11 insertions, 9 deletions

diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index a746efc7bd..b1e239677c 100644
--- a/engines/saga/scene.cpp
+++ b/engines/saga/scene.cpp
@@ -483,9 +483,9 @@ void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionTy
 
 				_vm->_interface->setStatusText("Click or Press Return to continue. Press Q to quit.", 96);
 				_vm->_font->textDrawRect(kKnownFontMedium, sceneSubstitutes[i].title,
-					 Common::Rect(0, 7, _vm->getDisplayWidth(), 27), _vm->KnownColor2ColorId(kKnownColorBrightWhite), _vm->KnownColor2ColorId(kKnownColorBlack), kFontOutline);
+					 Common::Rect(0, 7, _vm->getDisplayInfo().logicalWidth, 27), _vm->KnownColor2ColorId(kKnownColorBrightWhite), _vm->KnownColor2ColorId(kKnownColorBlack), kFontOutline);
 				_vm->_font->textDrawRect(kKnownFontMedium, sceneSubstitutes[i].message,
-					 Common::Rect(24, getHeight() - 33, _vm->getDisplayWidth() - 11,
+					 Common::Rect(24, getHeight() - 33, _vm->getDisplayInfo().logicalWidth - 11,
 								  getHeight()), _vm->KnownColor2ColorId(kKnownColorBrightWhite), _vm->KnownColor2ColorId(kKnownColorBlack), kFontOutline);
 				return;
 			}
@@ -520,8 +520,8 @@ void Scene::getBGInfo(BGInfo &bgInfo) {
 	bgInfo.bounds.left = 0;
 	bgInfo.bounds.top = 0;
 
-	if (_bg.w < _vm->getDisplayWidth()) {
-		bgInfo.bounds.left = (_vm->getDisplayWidth() - _bg.w) / 2;
+	if (_bg.w < _vm->getDisplayInfo().logicalWidth) {
+		bgInfo.bounds.left = (_vm->getDisplayInfo().logicalWidth - _bg.w) / 2;
 	}
 
 	if (_bg.h < getHeight()) {
@@ -553,7 +553,7 @@ bool Scene::offscreenPath(Point &testPoint) {
 		return false;
 	}
 
-	point.x = CLIP<int>(testPoint.x, 0, _vm->getDisplayWidth() - 1);
+	point.x = CLIP<int>(testPoint.x, 0, _vm->getDisplayInfo().logicalWidth - 1);
 	point.y = CLIP<int>(testPoint.y, 0, _bgMask.h - 1);
 	if (point == testPoint) {
 		return false;
@@ -719,13 +719,13 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
 
 		_sceneClip.left = 0;
 		_sceneClip.top = 0;
-		_sceneClip.right = _vm->getDisplayWidth();
+		_sceneClip.right = _vm->getDisplayInfo().logicalWidth;
 		_sceneClip.bottom = getHeight();
 	} else {
 		BGInfo backGroundInfo;
 		getBGInfo(backGroundInfo);
 		_sceneClip = backGroundInfo.bounds;
-		if (!(_bg.w < _vm->getDisplayWidth() || _bg.h < getHeight()))
+		if (!(_bg.w < _vm->getDisplayInfo().logicalWidth || _bg.h < getHeight()))
 			_outsetSceneNumber = _sceneNumber;
 	}
 
@@ -1039,7 +1039,7 @@ void Scene::processSceneResources() {
 
 			// At least in ITE the mask needs to be clipped.
 
-			_bgMask.w = MIN(_bgMask.w, _vm->getDisplayWidth());
+			_bgMask.w = MIN(_bgMask.w, _vm->getDisplayInfo().logicalWidth);
 			_bgMask.h = MIN(_bgMask.h, getHeight());
 
 			debug(4, "BACKGROUND MASK width=%d height=%d length=%d", _bgMask.w, _bgMask.h, (int)_bgMask.buf_len);
@@ -1222,7 +1222,9 @@ void Scene::endScene() {
 	_actionMap->freeMem();
 	_entryList.freeMem();
 	_sceneStrings.freeMem();
-	_vm->_isoMap->freeMem();
+
+	if (_vm->getGameId() == GID_ITE)
+		_vm->_isoMap->freeMem();
 
 	_vm->_events->clearList();
 	_textList.clear();