diff options
| -rw-r--r-- | queen/command.cpp | 29 | ||||
| -rw-r--r-- | queen/verb.h | 6 |
2 files changed, 14 insertions, 21 deletions
diff --git a/queen/command.cpp b/queen/command.cpp index 6a0c754304..d608ef1383 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -857,27 +857,20 @@ bool Command::executeIfCutaway(const char *description) { bool Command::executeIfDialog(const char *description) { - if (strlen(description) > 4 && - scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) { - char cutaway[20]; + if (strlen(description) > 4 && + scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) { + char cutaway[20]; - _logic->dialogue(description, _curCmd.noun, cutaway); + _logic->dialogue(description, _curCmd.noun, cutaway); - while (cutaway[0] != '\0') { - char currentCutaway[20]; - strcpy(currentCutaway, cutaway); - _logic->playCutaway(currentCutaway, cutaway); - } + while (cutaway[0] != '\0') { + char currentCutaway[20]; + strcpy(currentCutaway, cutaway); + _logic->playCutaway(currentCutaway, cutaway); + } - /* XXX - talk(Kstr); - strcpy(Kstr,Paramstr); - while(Kstr[0]) { - CUTAWAY(Kstr); - strcpy(Kstr,Paramstr); - }*/ - return true; - } + return true; + } return false; } diff --git a/queen/verb.h b/queen/verb.h index fc66e3d173..c787d0ecb9 100644 --- a/queen/verb.h +++ b/queen/verb.h @@ -111,9 +111,9 @@ public: _verb <= VERB_DIGIT_LAST; } - int digit() const { - return (int)_verb - VERB_DIGIT_1 + 1; - } + int digit() const { + return (int)_verb - VERB_DIGIT_1 + 1; + } bool isSkipText() const { return _verb == VERB_SKIP_TEXT; |