From b21a7352569c863018a55887428e523e8b6ea2c2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 9 Nov 2011 00:50:31 +0100
Subject: TSAGE: BF - Map (50): rename a couple of parameters, remove two
 useless variables and simplify checks

---
 engines/tsage/blue_force/blueforce_scenes0.cpp | 17 +++++------------
 engines/tsage/blue_force/blueforce_scenes0.h   |  4 +---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 6ad0d63f43..61f19b9e9a 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -239,11 +239,11 @@ void Scene50::Tooltip2::dispatch() {
 	}
 }
 
-void Scene50::Tooltip::set(const Rect &bounds, int v60, const Common::String &msg, int v62) {
+void Scene50::Tooltip::set(const Rect &bounds, int sceneNum, const Common::String &msg, int locationId) {
 	_bounds = bounds;
-	_newSceneNumber = v60;
+	_newSceneNumber = sceneNum;
 	_msg = msg;
-	_locationId = v62;
+	_locationId = locationId;
 }
 
 void Scene50::Tooltip::update() {
@@ -261,8 +261,8 @@ void Scene50::Tooltip::update() {
 void Scene50::Tooltip::highlight(bool btnDown) {
 	Scene50 *scene = (Scene50 *)BF_GLOBALS._sceneManager._scene;
 
-	scene->_field382 = _newSceneNumber;
-	if ((scene->_field380 != 0) || (scene->_field380 != _newSceneNumber))
+	// In the original, a variable was used, always set to 0. The check is simplified
+	if (_newSceneNumber != 0)
 		update();
 
 	if (btnDown) {
@@ -323,11 +323,6 @@ void Scene50::Tooltip::highlight(bool btnDown) {
 
 /*--------------------------------------------------------------------------*/
 
-Scene50::Scene50(): SceneExt() {
-	_field382 = 0;
-	_field380 = 0;
-}
-
 void Scene50::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 
@@ -469,7 +464,6 @@ void Scene50::signal() {
 		BF_GLOBALS._player.enableControl();
 		BF_GLOBALS._events.setCursor(CURSOR_WALK);
 		_sceneMode = 0;
-		_field380 = 0;
 	}
 }
 
@@ -477,7 +471,6 @@ void Scene50::process(Event &event) {
 	SceneExt::process(event);
 	Common::Point pt(event.mousePos.x + _sceneBounds.left, event.mousePos.y + _sceneBounds.top);
 	bool mouseDown = false;
-	_field382 = 0;
 
 	if ((event.mousePos.x > 270 && (_sceneBounds.right < (SCREEN_WIDTH * 2))))
 		loadBackground(4, 0);
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 7680fb2cbd..29adec7e00 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -65,7 +65,7 @@ class Scene50: public SceneExt {
 		int _locationId;
 	public:
 		Tooltip();
-		void set(const Rect &bounds, int v60, const Common::String &msg, int v62);
+		void set(const Rect &bounds, int sceneNum, const Common::String &msg, int locationId);
 		void update();
 		void highlight(bool btnDown);
 
@@ -81,7 +81,6 @@ class Scene50: public SceneExt {
 		virtual void dispatch();
 	};
 public:
-	int _field380, _field382;
 	int _sceneNumber;
 	SceneText _text;
 	SceneItemType2 _item;
@@ -89,7 +88,6 @@ public:
 	Tooltip _location6, _location7, _location8, _location9;
 	Timer _timer;
 public:
-	Scene50();
 	virtual Common::String getClassName() { return "Scene50"; }
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
-- 
cgit v1.2.3