aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/conversations.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-01-16 16:32:24 -0500
committerPaul Gilbert2016-01-16 16:32:24 -0500
commitf04cadf0a4f29b57cffb648ffd87ef66a603d386 (patch)
tree0e5abc76f03b3018e95d053328944e1df5264d8d /engines/mads/conversations.cpp
parentc826047cc44943d25ea3ba74a958a7ab34989b8a (diff)
downloadscummvm-rg350-f04cadf0a4f29b57cffb648ffd87ef66a603d386.tar.gz
scummvm-rg350-f04cadf0a4f29b57cffb648ffd87ef66a603d386.tar.bz2
scummvm-rg350-f04cadf0a4f29b57cffb648ffd87ef66a603d386.zip
MADS: Properly name popup fields in conversation class
Diffstat (limited to 'engines/mads/conversations.cpp')
-rw-r--r--engines/mads/conversations.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index 5f273eabbb..54f2d5d445 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