From 121039101d1b48eaad9e2da6935ff008a02061d1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 12 Oct 2012 07:46:58 +0200
Subject: MORTEVIELLE: Remove dead code.

m was computed to in order to display a message while loading the next
resource. As there are no more delays, the message isn't displayed anymore,
thus it's useless to compute the message id.
---
 engines/mortevielle/actions.cpp     |  1 -
 engines/mortevielle/mortevielle.cpp |  5 +----
 engines/mortevielle/mortevielle.h   |  2 +-
 engines/mortevielle/outtext.cpp     | 23 -----------------------
 4 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'engines/mortevielle')

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 9aca451685..5bcaf4cf03 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -512,7 +512,6 @@ void MortevielleEngine::fctSearch() {
 				rechai(_mchai);
 				if (_mchai != 0) {
 					_cs = 0;
-					_is = 0;
 					_heroSearching = true;
 					_menu.setSearchMenu();
 					tsuiv();
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index df80408b63..e4e9610f4a 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -1753,7 +1753,6 @@ void MortevielleEngine::endSearch() {
 	_heroSearching = false;
 	_obpart = false;
 	_cs = 0;
-	_is = 0;
 	_menu.unsetSearchMenu();
 }
 
@@ -1890,7 +1889,6 @@ void MortevielleEngine::gameLoaded() {
 	_startHour = 0;
 	_endHour = 0;
 	_cs = 0;
-	_is = 0;
 	_roomDoorId = OWN_ROOM;
 	_syn = true;
 	_heroSearching = true;
@@ -3584,8 +3582,7 @@ void MortevielleEngine::tsuiv() {
 		tbcl = _tabdon[cl];
 	} while ((tbcl == 0) && (_cs <= 9));
 
-	if ((tbcl != 0) && (_cs < 11)) { // 2nd check useless as _cs is <= 10
-		++_is;
+	if ((tbcl != 0) && (_cs < 11)) {
 		_caff = tbcl;
 		_crep = _caff + 400;
 		if (_currBitIndex != 0)
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 390ff7a1ef..59fd6f645b 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -470,7 +470,7 @@ public:
 	int _res;
 	int _caff;
 	int _crep;
-	byte _is;
+//	byte _is;
 	byte _v_lieu[7][25];
 
 	// TODO: Replace the following with proper implementations, or refactor out the code using them
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index e105002f7c..e18c5c1692 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -248,29 +248,6 @@ void TextHandler::taffich() {
 	Common::String filename;
 
 	if ((a != 50) && (a != 51)) {
-		int m = a + 2000;
-		if ((m > 2001) && (m < 2010))
-			m = 2001;
-		if (m == 2011)
-			m = 2010;
-		if (a == 32)
-			m = 2034;
-		if ((a == 17) && (g_vm->_maff == 14))
-			m = 2018;
-
-		if (a > 99) {
-			if ((g_vm->_is == 1) || (g_vm->_is == 0))
-				m = 2031;
-			else
-				m = 2032;
-		}
-
-		if (((a > 69) && (a < 80)) || (a == 30) || (a == 31) || (a == 144) || (a == 147) || (a == 149))
-			m = 2030;
-
-		if (((a < 27) && (((g_vm->_maff > 69) && (!g_vm->_coreVar._alreadyEnteredManor)) || (g_vm->_maff > 99))) || ((g_vm->_maff > 29) && (g_vm->_maff < 33)))
-			m = 2033;
-
 		g_vm->_maff = a;
 		if (a == 159)
 			a = 86;
-- 
cgit v1.2.3