[Scummvm-cvs-logs] SF.net SVN: scummvm:[39772] scummvm/trunk/engines/parallaction/dialogue.cpp

[peres001 at users.sourceforge.net]

Revision: 39772
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39772&view=rev
Author:   peres001
Date:     2009-03-31 14:35:06 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
There have been subclasses of DialogueManager for a while, so now we use their constructors for something.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/dialogue.cpp

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2009-03-31 07:48:44 UTC (rev 39771)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2009-03-31 14:35:06 UTC (rev 39772)
@@ -98,6 +98,7 @@
 	bool			_isKeyDown;
 	uint16			_downKey;
 
+protected:
 	BalloonPositions	_ballonPos;
 
 public:
@@ -138,6 +139,7 @@
 
 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 @@
 
 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 @@
 
 
 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.