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

[dreammaster]

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:
f04cadf0a4 MADS: Properly name popup fields in conversation class


Commit: f04cadf0a4f29b57cffb648ffd87ef66a603d386
    https://github.com/scummvm/scummvm/commit/f04cadf0a4f29b57cffb648ffd87ef66a603d386
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-01-16T16:32:24-05:00

Commit Message:
MADS: Properly name popup fields in conversation class

Changed paths:
    engines/mads/conversations.cpp
    engines/mads/conversations.h
    engines/mads/dialogs.h



diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index 5f273ea..54f2d5d 100644
--- a/engines/mads/conversations.cpp
+++ b/engines/mads/conversations.cpp
@@ -111,9 +111,9 @@ void GameConversations::run(int id) {
 	Common::fill(&_speakerActive[0], &_speakerActive[MAX_SPEAKERS], false);
 	Common::fill(&_speakerPortraits[0], &_speakerPortraits[MAX_SPEAKERS], -1);
 	Common::fill(&_speakerExists[0], &_speakerExists[MAX_SPEAKERS], 1);
-	Common::fill(&_arr4[0], &_arr4[MAX_SPEAKERS], 0x8000);
-	Common::fill(&_arr5[0], &_arr5[MAX_SPEAKERS], 0x8000);
-	Common::fill(&_arr6[0], &_arr6[MAX_SPEAKERS], 30);
+	Common::fill(&_popupX[0], &_popupX[MAX_SPEAKERS], POPUP_CENTER);
+	Common::fill(&_popupY[0], &_popupY[MAX_SPEAKERS], POPUP_CENTER);
+	Common::fill(&_popupMaxLen[0], &_popupMaxLen[MAX_SPEAKERS], 30);
 
 	// Start the conversation
 	start();
@@ -122,9 +122,9 @@ void GameConversations::run(int id) {
 	setVariable(2, &_speakerVal);
 	for (int idx = 0; idx < MAX_SPEAKERS; ++idx) {
 		setVariable(3 + idx, &_speakerExists[idx]);
-		setVariable(8 + idx, &_arr4[idx]);
-		setVariable(13 + idx, &_arr5[idx]);
-		setVariable(18 + idx, &_arr6[idx]);
+		setVariable(8 + idx, &_popupX[idx]);
+		setVariable(13 + idx, &_popupY[idx]);
+		setVariable(18 + idx, &_popupMaxLen[idx]);
 	}
 
 	// Load sprite data for speaker portraits
diff --git a/engines/mads/conversations.h b/engines/mads/conversations.h
index e124787..90f078a 100644
--- a/engines/mads/conversations.h
+++ b/engines/mads/conversations.h
@@ -303,9 +303,9 @@ private:
 	bool _speakerActive[MAX_SPEAKERS];
 	int _speakerPortraits[MAX_SPEAKERS];
 	int _speakerExists[MAX_SPEAKERS];
-	int _arr4[MAX_SPEAKERS];
-	int _arr5[MAX_SPEAKERS];
-	int _arr6[MAX_SPEAKERS];
+	int _popupX[MAX_SPEAKERS];
+	int _popupY[MAX_SPEAKERS];
+	int _popupMaxLen[MAX_SPEAKERS];
 	InputMode _inputMode;
 	int _val1;
 	ConversationMode _currentMode;
diff --git a/engines/mads/dialogs.h b/engines/mads/dialogs.h
index 27bc0a4..0b98fdd 100644
--- a/engines/mads/dialogs.h
+++ b/engines/mads/dialogs.h
@@ -31,6 +31,7 @@
 namespace MADS {
 
 #define DIALOG_TOP 22
+#define POPUP_CENTER 0x8000
 
 class Dialog {
 private: