aboutsummaryrefslogtreecommitdiff
path: root/queen/cutaway.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-08-14 22:33:13 +0000
committerGregory Montoir2004-08-14 22:33:13 +0000
commit5a6590ba7dcdc77f515fe98e83b9a2c03fcd864f (patch)
tree8a18351b06351b2711573e9d5bd790666c370131 /queen/cutaway.cpp
parentb45b82a4a385715cc84708fffdb0ec0452c78875 (diff)
downloadscummvm-rg350-5a6590ba7dcdc77f515fe98e83b9a2c03fcd864f.tar.gz
scummvm-rg350-5a6590ba7dcdc77f515fe98e83b9a2c03fcd864f.tar.bz2
scummvm-rg350-5a6590ba7dcdc77f515fe98e83b9a2c03fcd864f.zip
minor cleanp
svn-id: r14616
Diffstat (limited to 'queen/cutaway.cpp')
-rw-r--r--queen/cutaway.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 495c41dfad..91380bb1ce 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -188,23 +188,23 @@ byte *Cutaway::getCutawayObject(byte *ptr, CutawayObject &object)
{
byte *oldPtr = ptr;
- object.objectNumber = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.objectNumber = (int16)READ_BE_INT16(ptr); ptr += 2;
object.moveToX = (int16)READ_BE_INT16(ptr); ptr += 2;
object.moveToY = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.bank = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.animList = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.execute = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.bank = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.animList = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.execute = (int16)READ_BE_INT16(ptr); ptr += 2;
object.limitBobX1 = (int16)READ_BE_INT16(ptr); ptr += 2;
object.limitBobY1 = (int16)READ_BE_INT16(ptr); ptr += 2;
object.limitBobX2 = (int16)READ_BE_INT16(ptr); ptr += 2;
object.limitBobY2 = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.specialMove = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.animType = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.fromObject = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.specialMove = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.animType = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.fromObject = (int16)READ_BE_INT16(ptr); ptr += 2;
object.bobStartX = (int16)READ_BE_INT16(ptr); ptr += 2;
object.bobStartY = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.room = (int16)READ_BE_INT16(ptr); ptr += 2;
- object.scale = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.room = (int16)READ_BE_INT16(ptr); ptr += 2;
+ object.scale = (int16)READ_BE_INT16(ptr); ptr += 2;
if ((ptr - oldPtr) != 17*sizeof(int16))
error("Wrong number of values read");
@@ -858,7 +858,6 @@ void Cutaway::run(char *nextFilename) {
char sentence[MAX_STRING_SIZE];
_nextSentence = Talk::getString(_nextSentence, sentence, MAX_STRING_LENGTH);
- //debug(6, "Sentence = '%s'", sentence);
if (OBJECT_ROOMFADE == object.objectNumber) {
_roomFade = true;