[Scummvm-cvs-logs] scummvm master -> 818b9a652b730947085b34c4b0ebd2682870fe05

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
818b9a652b MORTEVIELLE: Remove some dead code and variables related to graphical modes


Commit: 818b9a652b730947085b34c4b0ebd2682870fe05
    https://github.com/scummvm/scummvm/commit/818b9a652b730947085b34c4b0ebd2682870fe05
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-17T03:45:28-07:00

Commit Message:
MORTEVIELLE: Remove some dead code and variables related to graphical modes

Changed paths:
    engines/mortevielle/mortevielle.h
    engines/mortevielle/outtext.cpp
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index c9eebe1..4c9e57a 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -130,16 +130,6 @@ enum Places {
 	DOOR = 25,        ROOM26 = 26,      COAT_ARMS = 27
 };
 
-struct nhom {
-	byte _id;     /* number between 0 and 32 */
-	byte _hom[4];
-};
-
-struct CgaPalette {
-	byte _p;
-	nhom _a[16];
-};
-
 struct Pattern {
 	byte _tay, _tax;
 	byte _des[kMaxPatt + 1][kMaxPatt + 1];
@@ -179,7 +169,6 @@ private:
 	Common::StringArray _engineStrings;
 	Common::StringArray _gameStrings;
 
-	Pattern _patternArr[15];
 	int _menuOpcode;
 
 	bool _inMainGameLoop;	// Flag when the main game loop is active
@@ -223,7 +212,6 @@ private:
 	int  _startHour;
 	int  _endHour;
 	Common::Point _stdPal[91][17];
-	CgaPalette _cgaPal[91];
 
 	int  _x26KeyCount;
 	int  _roomDoorId;
@@ -256,7 +244,6 @@ private:
 	void mainGame();
 	void playGame();
 	void handleAction();
-	void displayCGAPattern(int n, Pattern *p, nhom *pal);
 	void loadPalette();
 	void loadTexts();
 	void loadCFIEC();
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index 4629a47..d50f400 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -164,8 +164,6 @@ void TextHandler::loadAniFile(Common::String filename, int32 skipSize, int lengt
 }
 
 void TextHandler::taffich() {
-	static const byte rang[16] = {15, 14, 11, 7, 13, 12, 10, 6, 9, 5, 3, 1, 2, 4, 8, 0};
-
 	static const byte tran1[] = { 121, 121, 138, 139, 120 };
 	static const byte tran2[] = { 150, 150, 152, 152, 100, 110, 159, 100, 100 };
 
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index cc3e879..f138dde 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1949,28 +1949,11 @@ void MortevielleEngine::setPal(int n) {
 }
 
 /**
- * Engine function - Display a CGA pattern, using a specified palette
- * @remarks	Originally called 'outbloc'
- */
-void MortevielleEngine::displayCGAPattern(int n, Pattern *p, nhom *pal) {
-	int addr = n * 404 + 0xd700;
-
-	WRITE_LE_UINT16(&_curPict[addr], p->_tax);
-	WRITE_LE_UINT16(&_curPict[addr + 2], p->_tay);
-	addr += 4;
-	for (int i = 0; i < p->_tax; ++i) {
-		for (int j = 0; j < p->_tay; ++j)
-			_curPict[addr + j * p->_tax + i] = pal[n]._hom[p->_des[i + 1][j + 1]];
-	}
-}
-
-/**
  * Engine function - Load Palette from File
  * @remarks	Originally called 'charpal'
  */
 void MortevielleEngine::loadPalette() {
 	Common::File f;
-	byte b;
 
 	if (!f.open("fxx.mor")) {
 		if (f.open("mfxx.mor"))
@@ -1996,27 +1979,8 @@ void MortevielleEngine::loadPalette() {
 	if (!f.open("cxx.mor"))
 		error("Missing file - cxx.mor");
 
-	for (int j = 0; j <= 90; ++j) {
-		_cgaPal[j]._p = f.readByte();
-		for (int i = 0; i <= 15; ++i) {
-			nhom &with = _cgaPal[j]._a[i];
+	// Skip CGA Palette and Patterns
 
-			b = f.readByte();
-			with._id = (uint)b >> 4;
-			with._hom[0] = ((uint)b >> 2) & 3;
-			with._hom[1] = b & 3;
-		}
-	}
-
-	_cgaPal[10]._a[9] = _cgaPal[10]._a[5];
-	for (int j = 0; j <= 14; ++j) {
-		_patternArr[j]._tax = f.readByte();
-		_patternArr[j]._tay = f.readByte();
-		for (int i = 1; i <= 20; ++i) {
-			for (int k = 1; k <= 20; ++k)
-				_patternArr[j]._des[i][k] = f.readByte();
-		}
-	}
 	f.close();
 }