diff options
| author | Gregory Montoir | 2003-12-12 10:33:34 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-12-12 10:33:34 +0000 |
| commit | fef457ed0e63e0cf8df9fa7d724f4ea624d7cc5d (patch) | |
| tree | 4f0da60737e7db3506b763f57fc83ba85c5bce34 /queen/talk.cpp | |
| parent | d7411615b89972917bd0da6a08c9ebcbe6c66c53 (diff) | |
| download | scummvm-rg350-fef457ed0e63e0cf8df9fa7d724f4ea624d7cc5d.tar.gz scummvm-rg350-fef457ed0e63e0cf8df9fa7d724f4ea624d7cc5d.tar.bz2 scummvm-rg350-fef457ed0e63e0cf8df9fa7d724f4ea624d7cc5d.zip | |
get rid of Verb class
svn-id: r11594
Diffstat (limited to 'queen/talk.cpp')
| -rw-r--r-- | queen/talk.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index 78cb514adc..e7fdf023f6 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -871,7 +871,7 @@ void Talk::defaultAnimation( } // Skip through text more quickly - if (_vm->input()->keyVerb().isSkipText()) { + if (_vm->input()->keyVerb() == VERB_SKIP_TEXT) { _vm->input()->clearKeyVerb(); break; } @@ -1332,11 +1332,11 @@ int16 Talk::selectSentence() { int mouseButton = _vm->input()->mouseButton(); _vm->input()->clearMouseButton(); - if (_vm->input()->keyVerb().isDigit()) { - for (i = 1; i <= 4; i++) - { - if (talkZone[i] == _vm->input()->keyVerb().digit()) - { + Verb v = _vm->input()->keyVerb(); + if (v >= VERB_DIGIT_FIRST && v <= VERB_DIGIT_LAST) { + int n = v - VERB_DIGIT_FIRST + 1; + for (i = 1; i <= 4; i++) { + if (talkZone[i] == n) { selectedSentence = i; break; } |