libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PARALLACTION: Cleanup dialogue code.

Browse Source 
Turned 'no answer selected' into a constant.

svn-id: r55607
This commit is contained in:
Nicola Mettifogo 2011-01-29 07:22:04 +00:00
parent bcd18232ad
commit 2856e959be
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/parallaction/dialogue.cpp
View File

@ -107,6 +107,8 @@ protected:
DIALOGUE_OVER
} _state;
static const int NO_ANSWER_SELECTED = -1;
void transitionToState(DialogueState newState);
bool displayQuestion();
@ -205,7 +207,7 @@ void DialogueManager::displayAnswers() {
} else
if (_numVisAnswers > 1) {
mood = _visAnswers[0]._a->speakerMood();
_oldSelection = -1;
_oldSelection = NO_ANSWER_SELECTED;
_selection = 0;
}
@ -222,7 +224,7 @@ int16 DialogueManager::selectAnswer1() {
return _visAnswers[0]._index;
}
return -1;
return NO_ANSWER_SELECTED;
}
int16 DialogueManager::selectAnswerN() {
@ -230,11 +232,11 @@ int16 DialogueManager::selectAnswerN() {
_selection = _vm->_balloonMan->hitTestDialogueBalloon(_mousePos.x, _mousePos.y);
if (_selection != _oldSelection) {
if (_oldSelection != -1) {
if (_oldSelection != NO_ANSWER_SELECTED) {
_vm->_balloonMan->setBalloonText(_visAnswers[_oldSelection]._balloon, _visAnswers[_oldSelection]._a->_text, BalloonManager::kUnselectedColor);
}
if (_selection != -1) {
if (_selection != NO_ANSWER_SELECTED) {
_vm->_balloonMan->setBalloonText(_visAnswers[_selection]._balloon, _visAnswers[_selection]._a->_text, BalloonManager::kSelectedColor);
_vm->_gfx->setItemFrame(_faceId, _visAnswers[_selection]._a->speakerMood());
}
@ -242,11 +244,11 @@ int16 DialogueManager::selectAnswerN() {
_oldSelection = _selection;
if ((_mouseButtons == kMouseLeftUp) && (_selection != -1)) {
if ((_mouseButtons == kMouseLeftUp) && (_selection != NO_ANSWER_SELECTED)) {
return _visAnswers[_selection]._index;
}
return -1;
return NO_ANSWER_SELECTED;
}
bool DialogueManager::displayQuestion() {
@ -298,7 +300,7 @@ void DialogueManager::nextAnswer() {
void DialogueManager::runAnswer() {
_answerId = selectAnswer();
if (_answerId != -1) {
if (_answerId != NO_ANSWER_SELECTED) {
_cmdList = &_q->_answers[_answerId]->_commands;
_vm->_gfx->freeDialogueObjects();
transitionToState(NEXT_QUESTION);
@ -396,7 +398,7 @@ protected:
}
}
return -1;
return NO_ANSWER_SELECTED;
}
public:
@ -432,7 +434,7 @@ public:
}
virtual int16 selectAnswer() {
int ans = -1;
int ans = NO_ANSWER_SELECTED;
if (_askPassword) {
ans = askPassword();
} else
@ -481,7 +483,7 @@ public:
}
virtual int16 selectAnswer() {
int16 ans = -1;
int16 ans = NO_ANSWER_SELECTED;
if (_numVisAnswers == 1) {
ans = selectAnswer1();
} else {