aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNicola Mettifogo2009-03-31 14:35:06 +0000
committerNicola Mettifogo2009-03-31 14:35:06 +0000
commit9880a2e5780aceeca11eef0a8c8c3b6d24e10722 (patch)
tree673085ca3a907ce3ef23e989a25c4658c5d36554 /engines
parent66de3bb9059a96485e877135f06c3ed8d574d825 (diff)
downloadscummvm-rg350-9880a2e5780aceeca11eef0a8c8c3b6d24e10722.tar.gz
scummvm-rg350-9880a2e5780aceeca11eef0a8c8c3b6d24e10722.tar.bz2
scummvm-rg350-9880a2e5780aceeca11eef0a8c8c3b6d24e10722.zip
There have been subclasses of DialogueManager for a while, so now we use their constructors for something.
svn-id: r39772
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/dialogue.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 26aecbda00..451e54f449 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -98,6 +98,7 @@ class DialogueManager {
bool _isKeyDown;
uint16 _downKey;
+protected:
BalloonPositions _ballonPos;
public:
@@ -138,6 +139,7 @@ class DialogueManager_ns : public DialogueManager {
public:
DialogueManager_ns(Parallaction_ns *vm, ZonePtr z) : DialogueManager(vm, z), _vm(vm) {
+ _ballonPos = _balloonPositions_NS;
}
virtual bool canDisplayAnswer(Answer *a) {
@@ -150,6 +152,7 @@ class DialogueManager_br : public DialogueManager {
public:
DialogueManager_br(Parallaction_br *vm, ZonePtr z) : DialogueManager(vm, z), _vm(vm) {
+ _ballonPos = _balloonPositions_BR;
}
virtual bool canDisplayAnswer(Answer *a) {
@@ -167,15 +170,6 @@ public:
DialogueManager::DialogueManager(Parallaction *vm, ZonePtr z) : _vm(vm), _z(z) {
- int gtype = vm->getGameType();
- if (gtype == GType_Nippon) {
- _ballonPos = _balloonPositions_NS;
- } else
- if (gtype == GType_BRA) {
- _ballonPos = _balloonPositions_BR;
- } else
- error("unsupported game in DialogueManager");
-
_dialogue = _z->u._speakDialogue;
isNpc = !_z->u._filename.empty() && _z->u._filename.compareToIgnoreCase("yourself");
_questioner = isNpc ? _vm->_disk->loadTalk(_z->u._filename.c_str()) : _vm->_char._talk;