diff options
| author | Torbjörn Andersson | 2010-10-12 04:19:58 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-10-12 04:19:58 +0000 |
| commit | 54b2a8c98df204dfe64a27fc830936ec62e3f9ed (patch) | |
| tree | 731b870d395e797886b9d184ff709782632cc1bd /engines/queen | |
| parent | 8388e0dfea4ae0d80e51368acd12685c740c5bb5 (diff) | |
| download | scummvm-rg350-54b2a8c98df204dfe64a27fc830936ec62e3f9ed.tar.gz scummvm-rg350-54b2a8c98df204dfe64a27fc830936ec62e3f9ed.tar.bz2 scummvm-rg350-54b2a8c98df204dfe64a27fc830936ec62e3f9ed.zip | |
JANITORIAL: Cleanup (mostly whitespace)
svn-id: r53161
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/cutaway.cpp | 6 | ||||
| -rw-r--r-- | engines/queen/talk.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp index 6b08dd8d63..11a8704d60 100644 --- a/engines/queen/cutaway.cpp +++ b/engines/queen/cutaway.cpp @@ -283,7 +283,7 @@ void Cutaway::limitBob(CutawayObject &object) { } BobSlot *bob = - _vm->graphics()->bob( _vm->logic()->findBob(object.objectNumber) ); + _vm->graphics()->bob(_vm->logic()->findBob(object.objectNumber)); if (!bob) { warning("Failed to find bob"); @@ -667,7 +667,7 @@ const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) { // Only flip if we are not moving or it is not a person object if (!(objAnim[i].object > 0 && objAnim[i].object < 4) || - !(objAnim[i].mx || objAnim[i].my) ) + !(objAnim[i].mx || objAnim[i].my)) bob->xflip = objAnim[i].flip; // Add frame alteration @@ -1235,7 +1235,7 @@ void Cutaway::handleText( } BobSlot *bob = - _vm->graphics()->bob( _vm->logic()->findBob(ABS(object.objectNumber)) ); + _vm->graphics()->bob(_vm->logic()->findBob(ABS(object.objectNumber))); _vm->graphics()->setBobText(bob, sentence, x, object.bobStartY, object.specialMove, flags); diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 27b1e9c60a..6bc79daa73 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -551,11 +551,11 @@ bool Talk::speak(const char *sentence, Person *person, const char *voiceFilePref return personWalking; } - if (0 == strcmp(person->name, "FAYE-H" ) || + if (0 == strcmp(person->name, "FAYE-H") || 0 == strcmp(person->name, "FRANK-H") || 0 == strcmp(person->name, "AZURA-H") || 0 == strcmp(person->name, "X3_RITA") || - (0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == FAYE_HEAD ) || + (0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == FAYE_HEAD) || (0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == AZURA_HEAD) || (0 == strcmp(person->name, "JOE") && _vm->logic()->currentRoom() == FRANK_HEAD)) _talkHead = true; |