[Scummvm-cvs-logs] scummvm master -> c981c52799d25c610c9455dbe251066fa0722d35

[Strangerke]

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

Summary:
c8f7583542 TSAGE: R2R - Fix cursor behavior (and crash) when leaving room 200 (corridor hall 2) via East (150) and West (175) exits
c981c52799 MORTEVIELLE: some renaming in Dialogs


Commit: c8f7583542cff8827f38048a9a9d5ec52fead398
    https://github.com/scummvm/scummvm/commit/c8f7583542cff8827f38048a9a9d5ec52fead398
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-18T01:21:31-07:00

Commit Message:
TSAGE: R2R - Fix cursor behavior (and crash) when leaving room 200 (corridor hall 2) via East (150) and West (175) exits

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index e64e910..63bb24f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2026,7 +2026,7 @@ void Scene200::EastExit::changeScene() {
 	Scene200 *scene = (Scene200 *)R2_GLOBALS._sceneManager._scene;
 
 	_enabled = false;
-	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
 	scene->_sceneMode = 206;
 	scene->setAction(&scene->_sequenceManager, scene, 206, &R2_GLOBALS._player, NULL);
 }
@@ -2035,7 +2035,7 @@ void Scene200::WestExit::changeScene() {
 	Scene200 *scene = (Scene200 *)R2_GLOBALS._sceneManager._scene;
 
 	_enabled = false;
-	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.disableControl(CURSOR_WALK);
 	scene->_sceneMode = 208;
 	scene->setAction(&scene->_sequenceManager, scene, 208, &R2_GLOBALS._player, NULL);
 }


Commit: c981c52799d25c610c9455dbe251066fa0722d35
    https://github.com/scummvm/scummvm/commit/c981c52799d25c610c9455dbe251066fa0722d35
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-18T01:21:32-07:00

Commit Message:
MORTEVIELLE: some renaming in Dialogs

Changed paths:
    engines/mortevielle/dialogs.cpp
    engines/mortevielle/dialogs.h



diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index b8d197d..a7bd381 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -57,13 +57,12 @@ int DialogManager::show(const Common::String &msg, int n) {
 
 	decodeAlertDetails(msg, caseNumb, lignNumb, colNumb, alertStr, caseStr);
 
-	int i = 0;
 	Common::Point curPos;
 	if (alertStr == "") {
 		drawAlertBox(10, 5, colNumb);
 	} else {
 		drawAlertBox(8, 7, colNumb);
-		i = 0;
+		int i = 0;
 		_vm->_screenSurface._textPos.y = 70;
 		do {
 			curPos.x = 320;
@@ -229,13 +228,13 @@ void DialogManager::setPosition(int ji, int coldep, int esp) {
  * Alert function - Draw Alert Box
  * @remarks	Originally called 'fait_boite'
  */
-void DialogManager::drawAlertBox(int lidep, int nli, int tx) {
-	if (tx > 640)
-		tx = 640;
-	int x = 320 - ((uint)tx / 2);
-	int y = (lidep - 1) * 8;
-	int xx = x + tx;
-	int yy = y + (nli * 8);
+void DialogManager::drawAlertBox(int firstLine, int lineNum, int width) {
+	if (width > 640)
+		width = 640;
+	int x = 320 - ((uint)width / 2);
+	int y = (firstLine - 1) * 8;
+	int xx = x + width;
+	int yy = y + (lineNum * 8);
 	_vm->_screenSurface.fillRect(15, Common::Rect(x, y, xx, yy));
 	_vm->_screenSurface.fillRect(0, Common::Rect(x, y + 2, xx, y + 4));
 	_vm->_screenSurface.fillRect(0, Common::Rect(x, yy - 4, xx, yy - 2));
diff --git a/engines/mortevielle/dialogs.h b/engines/mortevielle/dialogs.h
index af667e4..ee210a6 100644
--- a/engines/mortevielle/dialogs.h
+++ b/engines/mortevielle/dialogs.h
@@ -48,7 +48,7 @@ private:
 
 	void decodeAlertDetails(Common::String inputStr, int &choiceNumb, int &lineNumb, int &col, Common::String &choiceStr, Common::String &choiceListStr);
 	void setPosition(int ji, int coldep, int esp);
-	void drawAlertBox(int lidep, int nli, int tx);
+	void drawAlertBox(int firstLine, int lineNum, int width);
 	void setButtonText(Common::String c, int coldep, int nbcase, Common::String *str, int esp);
 public:
 	void setParent(MortevielleEngine *vm);