diff options
Diffstat (limited to 'queen')
-rw-r--r-- | queen/command.cpp | 2 | ||||
-rw-r--r-- | queen/cutaway.cpp | 10 | ||||
-rw-r--r-- | queen/display.cpp | 8 | ||||
-rw-r--r-- | queen/talk.cpp | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/queen/command.cpp b/queen/command.cpp index 16cd5c805f..bb1c9a754c 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -954,7 +954,7 @@ void Command::openOrCloseAssociatedObject(Verb action, int16 otherObj) { int16 Command::setConditions(uint16 command, bool lastCmd) { debug(9, "Command::setConditions(%d, %d)", command, lastCmd); // Test conditions, if FAIL write && exit, Return -1 - // if(Joe speaks before he returns, -2 is returned + // if (Joe speaks before he returns, -2 is returned // This way a -1 return will allow Joe to speak normal description uint16 temp[21]; diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 874480f3d5..a369a19a2b 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -350,7 +350,7 @@ void Cutaway::changeRooms(CutawayObject &object) { } } - } // for() + } // for () } // set coordinates for Joe if he is on screen @@ -686,7 +686,7 @@ const byte *Cutaway::handleAnimation(const byte *ptr, CutawayObject &object) { if (objAnim[i].song > 0) _vm->sound()->playSong(objAnim[i].song); - } // for() + } // for () } bool moving = true; @@ -886,7 +886,7 @@ void Cutaway::run(char *nextFilename) { _roomFade = false; } - } // for() + } // for () _vm->display()->clearTexts(0, 198); // XXX lines 1887-1895 in cutaway.c @@ -1086,7 +1086,7 @@ void Cutaway::stop() { } } } - } // for() + } // for () int16 specialMove = (int16)READ_BE_INT16(ptr); ptr += 2; if (specialMove > 0) @@ -1162,7 +1162,7 @@ void Cutaway::updateGameState() { } } - } // for() + } // for () } void Cutaway::talk(char *nextFilename) { diff --git a/queen/display.cpp b/queen/display.cpp index aa4f6eeb12..78da49bb36 100644 --- a/queen/display.cpp +++ b/queen/display.cpp @@ -721,9 +721,9 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin } } else if (!xflip) { // Masked bitmap unflipped while (h--) { - for(int i = 0; i < w; ++i) { + for (int i = 0; i < w; ++i) { uint8 b = *(srcBuf + i); - if(b != 0) { + if (b != 0) { *(dstBuf + i) = b; } } @@ -732,9 +732,9 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin } } else { // Masked bitmap flipped while (h--) { - for(int i = 0; i < w; ++i) { + for (int i = 0; i < w; ++i) { uint8 b = *(srcBuf + i); - if(b != 0) { + if (b != 0) { *(dstBuf - i) = b; } } diff --git a/queen/talk.cpp b/queen/talk.cpp index 2a146a5300..bbf623e791 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -156,7 +156,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) { sprintf(_joeVoiceFilePrefix[i], "%2d%4xJ", _talkKey, _dialogueTree[level][i].head); } - // Check to see if(all the dialogue options have been selected. + // Check to see if (all the dialogue options have been selected. // if this is the case, and the last one left is the exit option, // then automatically set S to that and exit. @@ -495,7 +495,7 @@ int Talk::getSpeakCommand(const Person *person, const char *sentence, unsigned & else _vm->walk()->movePerson(person, x, y, _vm->graphics()->numFrames(), 0); index += 11; - // if(JOEWALK==3) CUTQUIT=0; + // if (JOEWALK==3) CUTQUIT=0; // XXX personWalking = true; } break; @@ -1312,7 +1312,7 @@ int16 Talk::selectSentence() { selectedSentence = zone; } - } // while() + } // while () } } |