TSAGE: for consistency, use display2() when possible

1 files changed, 37 insertions, 37 deletions

diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp
index 2a4df68926..39288e89b2 100644
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@ -348,7 +348,7 @@ void Scene7000::Action7::signal() {
 
 void Scene7000::SceneItem1::doAction(int action) {
 	if (action == CURSOR_LOOK)
-		SceneItem::display(7000, 2, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7000, 2);
 
 	SceneItem::doAction(action);
 }
@@ -412,9 +412,9 @@ void Scene7000::Object1::doAction(int action) {
 		break;
 	case CURSOR_LOOK:
 		if (_globals->getFlag(81))
-			SceneItem::display(7000, 1, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7000, 1);
 		else
-			SceneItem::display(7000, 0, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7000, 0);
 		break;
 	case CURSOR_USE:
 		if (_globals->getFlag(81)) {
@@ -422,7 +422,7 @@ void Scene7000::Object1::doAction(int action) {
 			_globals->_player.disableControl();
 			scene->setAction(&scene->_action5);
 		} else {
-			SceneItem::display(7000, 5, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7000, 5);
 		}
 		break;
 	case CURSOR_TALK:
@@ -1689,7 +1689,7 @@ void Scene7700::Action4::signal() {
 		break;
 	case 3:
 		CursorMan.showMouse(true);
-		SceneItem::display(7700, 11, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 11);
 		_globals->_player.enableControl();
 		remove();
 		break;
@@ -1749,14 +1749,14 @@ void Scene7700::Action6::signal() {
 
 void Scene7700::SceneHotspot1::doAction(int action) {
 	if (action == CURSOR_LOOK)
-		SceneItem::display(7700, 4, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 4);
 	else
 		SceneHotspot::doAction(action);
 }
 
 void Scene7700::SceneHotspot2::doAction(int action) {
 	if (action == CURSOR_LOOK)
-		SceneItem::display(7700, 6, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 6);
 	else
 		SceneHotspot::doAction(action);
 }
@@ -1766,14 +1766,14 @@ void Scene7700::SceneHotspot3::doAction(int action) {
 
 	switch (action) {
 	case OBJECT_KEY:
-		SceneItem::display(7702, 3, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7702, 3);
 		RING_INVENTORY._key._sceneNumber = 7700;
 		break;
 	case CURSOR_LOOK:
 		if (RING_INVENTORY._key._sceneNumber == 7700)
 			scene->setAction(&scene->_action4, NULL);
 		else
-			SceneItem::display(7700, 53, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7700, 53);
 		break;
 	case CURSOR_USE:
 		if (!_globals->getFlag(78)) {
@@ -1796,14 +1796,14 @@ void Scene7700::SceneHotspot4::doAction(int action) {
 
 	switch (action) {
 	case CURSOR_LOOK:
-		SceneItem::display(7700, 12, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 12);
 		break;
 	case CURSOR_USE:
 		if (!_globals->getFlag(78)) {
 			scene->_sceneMode = 7712;
 			scene->setAction(&scene->_sequenceManager, scene, 7715, NULL);
 		} else {
-			SceneItem::display(7700, 12, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7700, 12);
 		}
 		break;
 	default:
@@ -1817,7 +1817,7 @@ void Scene7700::SceneHotspot5::doAction(int action) {
 
 	switch (action) {
 	case CURSOR_LOOK:
-		SceneItem::display(7700, 28, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 28);
 		break;
 	case CURSOR_USE:
 		if (_globals->getFlag(78)) {
@@ -1840,10 +1840,10 @@ void Scene7700::SceneHotspot5::doAction(int action) {
 void Scene7700::SceneHotspot6::doAction(int action) {
 	switch (action) {
 	case CURSOR_LOOK:
-		SceneItem::display(7700, 43, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 43);
 		break;
 	case CURSOR_USE:
-		SceneItem::display(7700, 56, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 56);
 		break;
 	default:
 		SceneHotspot::doAction(action);
@@ -1853,7 +1853,7 @@ void Scene7700::SceneHotspot6::doAction(int action) {
 
 void Scene7700::SceneItem7::doAction(int action) {
 	if (action == CURSOR_LOOK)
-		SceneItem::display(7700, 51, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 51);
 }
 
 void Scene7700::SceneHotspot8::doAction(int action) {
@@ -1861,7 +1861,7 @@ void Scene7700::SceneHotspot8::doAction(int action) {
 
 	switch (action) {
 	case CURSOR_LOOK:
-		SceneItem::display(7700, 48, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 48);
 		break;
 	case CURSOR_USE:
 		scene->_sceneMode = 7709;
@@ -1887,7 +1887,7 @@ void Scene7700::SceneHotspot9::doAction(int action) {
 
 	switch (action) {
 	case CURSOR_LOOK:
-		SceneItem::display(7700, 48, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 48);
 		break;
 	case CURSOR_USE:
 		scene->_sceneMode = 7709;
@@ -1929,7 +1929,7 @@ void Scene7700::Object1::doAction(int action) {
 	Scene7700 *scene = (Scene7700 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
-		SceneItem::display(7700, _lookLineNum, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, _lookLineNum);
 	} else if (action == CURSOR_USE) {
 		if (_globals->getFlag(78)) {
 			_globals->_player.disableControl();
@@ -1946,10 +1946,10 @@ void Scene7700::Object1::doAction(int action) {
 void Scene7700::SceneHotspot11::doAction(int action) {
 	switch (action) {
 	case CURSOR_LOOK:
-		SceneItem::display(7700, _lookLineNum, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, _lookLineNum);
 		break;
 	case CURSOR_USE:
-		SceneItem::display(7701, _useLineNum, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7701, _useLineNum);
 		break;
 	default:
 		SceneHotspot::doAction(action);
@@ -1960,7 +1960,7 @@ void Scene7700::SceneHotspot11::doAction(int action) {
 void Scene7700::Object1::signal() {
 	if (_state == 0) {
 		_state = 1;
-		SceneItem::display(7701, _defltLineNum, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7701, _defltLineNum);
 	} else {
 		_state = 0;
 	}
@@ -1971,7 +1971,7 @@ void Scene7700::Object3::doAction(int action) {
 	Scene7700 *scene = (Scene7700 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
-		SceneItem::display(7700, 34, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 34);
 	} else if (action == CURSOR_USE) {
 		if (_globals->getFlag(78)) {
 			if (scene->_object3._frame == 1) {
@@ -1979,7 +1979,7 @@ void Scene7700::Object3::doAction(int action) {
 				scene->_sceneMode = 7707;
 				scene->setAction(&scene->_sequenceManager, scene, 7707, &_globals->_player, this, NULL);
 			} else {
-				SceneItem::display(7700, 60, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+				SceneItem::display2(7700, 60);
 			}
 		} else {
 			scene->_sceneMode = 7712;
@@ -1996,13 +1996,13 @@ void Scene7700::Object7::doAction(int action) {
 	switch (action) {
 	case CURSOR_LOOK:
 		if (_globals->getFlag(78))
-			SceneItem::display(7700, 45, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7700, 45);
 		else
-			SceneItem::display(7700, 44, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7700, 44);
 		break;
 	case CURSOR_USE:
 		if (_globals->getFlag(78)) {
-			SceneItem::display(7701, 41, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7701, 41);
 		} else {
 			scene->_sceneMode = 7712;
 			scene->setAction(&scene->_sequenceManager, scene, 7714, NULL);
@@ -2010,7 +2010,7 @@ void Scene7700::Object7::doAction(int action) {
 		break;
 	case CURSOR_TALK:
 		if (_globals->getFlag(78)) {
-			SceneItem::display(7702, 1, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7702, 1);
 		} else {
 			_globals->_player.disableControl();
 			if (_state == 0) {
@@ -2097,13 +2097,13 @@ void Scene7700::Object9::doAction(int action) {
 
 	switch (action) {
 		case CURSOR_LOOK:
-			SceneItem::display(7700, 49, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7700, 49);
 			break;
 		case CURSOR_USE:
-			SceneItem::display(7701, 42, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7701, 42);
 			break;
 		case CURSOR_TALK:
-			SceneItem::display(7702, 4, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+			SceneItem::display2(7702, 4);
 			break;
 		case OBJECT_KEY:
 			if (_frame == 1) {
@@ -2129,7 +2129,7 @@ void Scene7700::Object10::doAction(int action) {
 	Scene7700 *scene = (Scene7700 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
-		SceneItem::display(7700, 50, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 50);
 	} else if (action == CURSOR_USE) {
 		_globals->_player._canWalk = true;
 		RING_INVENTORY._translator._sceneNumber = 1;
@@ -2150,19 +2150,19 @@ void Scene7700::Object11::doAction(int action) {
 	switch (action) {
 		case OBJECT_SCANNER:
 			if (_frame != 1)
-				SceneItem::display(7701, 44, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+				SceneItem::display2(7701, 44);
 			else
 				SceneItem::doAction(action);
 			break;
 		case CURSOR_LOOK:
 			if (_frame != 1)
-				SceneItem::display(7700, 9, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+				SceneItem::display2(7700, 9);
 			else
-				SceneItem::display(7700, 52, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+				SceneItem::display2(7700, 52);
 			break;
 		case CURSOR_USE:
 			if (_frame != 1) {
-				SceneItem::display(7701, 8, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+				SceneItem::display2(7701, 8);
 			} else {
 				_globals->setFlag(49);
 				_globals->_player.disableControl();
@@ -2186,7 +2186,7 @@ void Scene7700::Object12::doAction(int action) {
 	Scene7700 *scene = (Scene7700 *)_globals->_sceneManager._scene;
 
 	if (action == CURSOR_LOOK) {
-		SceneItem::display(7700, 15, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 15);
 	} else if (action == CURSOR_USE) {
 		if (_globals->getFlag(78)) {
 			scene->_sceneMode = 7713;
@@ -2243,7 +2243,7 @@ void Scene7700::signal() {
 		break;
 	case 7710:
 		_globals->_player.enableControl();
-		SceneItem::display(7700, 62, SET_WIDTH, 200, SET_EXT_BGCOLOR, 7, LIST_END);
+		SceneItem::display2(7700, 62);
 		break;
 	case 7713:
 		_emptyJar.remove();