MORTEVIELLE: Fix a bug in decodeAlertDetails

scummvm · Apr 6, 2012 · a3ae21f · a3ae21f
1 parent 2f4671a
commit a3ae21f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
@@ -190,17 +190,19 @@ int Alert::show(const Common::String &msg, int n) {
  * Alert function - Decode Alert Details
  * @remarks	Originally called 'decod'
  */
-void Alert::decodeAlertDetails(Common::String s, int &nbc, int &lineNumb, int &col, Common::String &c, Common::String &cs) {
+void Alert::decodeAlertDetails(Common::String s, int &choiceNumb, int &lineNumb, int &col, Common::String &c, Common::String &cs) {
 	int i, k;
 	bool v;
 
 	//val(s[2], nbc, i);
-	nbc = atoi(s.c_str() + 1);
+	choiceNumb = atoi(s.c_str() + 1);
 	i = 0;
 
 	c = "";
 	lineNumb = 0;
-	i = 5;
+
+	// Originally set to 5, decreased to 4 because strings are 0 based, and not 1 based as in Pascal
+	i = 4;
 	k = 0;
 	v = true;
 	col = 0;

diff --git a/engines/mortevielle/dialogs.h b/engines/mortevielle/dialogs.h
@@ -34,7 +34,7 @@ namespace Mortevielle {
 
 class Alert {
 private:
-	static void decodeAlertDetails(Common::String s, int &nbc, int &nbl, int &col, Common::String &c, Common::String &cs);
+	static void decodeAlertDetails(Common::String s, int &choiceNumb, int &lineNumb, int &col, Common::String &c, Common::String &cs);
 	static void setPosition(int ji, int coldep, int esp);
 	static void drawAlertBox(int lidep, int nli, int tx);
 	static void setButtonText(Common::String c, int coldep, int nbcase, Common::String *str, int esp);