aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-08-18 10:20:47 +0200
committerStrangerke2013-08-18 10:21:32 +0200
commitc981c52799d25c610c9455dbe251066fa0722d35 (patch)
treead763659dd7a26c538f7319079ed73bd24550641
parentc8f7583542cff8827f38048a9a9d5ec52fead398 (diff)
downloadscummvm-rg350-c981c52799d25c610c9455dbe251066fa0722d35.tar.gz
scummvm-rg350-c981c52799d25c610c9455dbe251066fa0722d35.tar.bz2
scummvm-rg350-c981c52799d25c610c9455dbe251066fa0722d35.zip
MORTEVIELLE: some renaming in Dialogs
-rw-r--r--engines/mortevielle/dialogs.cpp17
-rw-r--r--engines/mortevielle/dialogs.h2
2 files changed, 9 insertions, 10 deletions
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index b8d197da2a..a7bd381603 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 af667e40c5..ee210a62b2 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);