aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-11-04 23:50:01 +0100
committerEugene Sandulenko2016-11-04 23:50:01 +0100
commit7ce632f8627354672b49169ad27d65e2cd399cf0 (patch)
treeca588fe27c00fb3677f1254c4fee0aa5d7b9188a
parentfda89a9f5997081f4ccb59cb052a81b3f9452d80 (diff)
downloadscummvm-rg350-7ce632f8627354672b49169ad27d65e2cd399cf0.tar.gz
scummvm-rg350-7ce632f8627354672b49169ad27d65e2cd399cf0.tar.bz2
scummvm-rg350-7ce632f8627354672b49169ad27d65e2cd399cf0.zip
JANITORIAL: Whitespace fixes
-rw-r--r--engines/director/frame.h2
-rw-r--r--engines/director/movie.cpp2
-rw-r--r--engines/director/movie.h2
-rw-r--r--engines/director/score.cpp12
-rw-r--r--engines/director/score.h2
-rw-r--r--engines/director/sound.cpp2
-rw-r--r--engines/director/sprite.cpp2
-rw-r--r--engines/director/sprite.h20
8 files changed, 23 insertions, 21 deletions
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 694d3a770c..ce82fa527c 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -152,6 +152,6 @@ public:
DirectorEngine *_vm;
};
-} //End of namespace Director
+} // End of namespace Director
#endif
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index f952346d16..9799510c6b 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -79,4 +79,4 @@ Movie::~Movie() {
delete _currentVideo;
}
-} //End of namespace Director
+} // End of namespace Director
diff --git a/engines/director/movie.h b/engines/director/movie.h
index 888262a2d1..e4729a62c3 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -60,6 +60,6 @@ private:
Video::VideoDecoder *_currentVideo;
DirectorEngine *_vm;
};
-} //End of namespace Director
+} // End of namespace Director
#endif
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index a197d0e304..c1b55897bd 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -276,7 +276,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
size -= 16;
warning("STUB: Score::loadFrames. unk1: %x unk2: %x unk3: %x unk4: %x unk5: %x unk6: %x", unk1, unk2, unk3, unk4, unk5, unk6);
- //Unknown, some bytes - constant (refer to contuinity).
+ // Unknown, some bytes - constant (refer to contuinity).
}
uint16 channelSize;
@@ -324,7 +324,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
_frames.push_back(frame);
}
- //remove initial frame
+ // Remove initial frame
_frames.remove_at(0);
}
@@ -381,7 +381,7 @@ void Score::loadCastDataD2(Common::SeekableSubReadStreamEndian &stream) {
}
}
- //Set cast pointers to sprites
+ // Set cast pointers to sprites
for (uint16 i = 0; i < _frames.size(); i++) {
for (uint16 j = 0; j < _frames[i]->_sprites.size(); j++) {
byte castId = _frames[i]->_sprites[j]->_castId;
@@ -473,9 +473,11 @@ void Score::loadLabels(Common::SeekableSubReadStreamEndian &stream) {
stream.seek(stringPos);
Common::String label;
+
for (uint16 j = stringPos; j < nextStringPos; j++) {
label += stream.readByte();
}
+
_labels->insert(new Label(label, frame));
stream.seek(streamPos);
@@ -499,7 +501,7 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) {
uint16 offset = count * 4 + 2;
byte id = stream.readByte();
- /*byte subId = */ stream.readByte(); //I couldn't find how it used in continuity (except print). Frame actionId = 1 byte.
+ /*byte subId = */ stream.readByte(); // I couldn't find how it used in continuity (except print). Frame actionId = 1 byte.
uint16 stringPos = stream.readUint16() + offset;
for (uint16 i = 0; i < count; i++) {
@@ -1024,4 +1026,4 @@ Sprite *Score::getSpriteById(uint16 id) {
}
}
-} //End of namespace Director
+} // End of namespace Director
diff --git a/engines/director/score.h b/engines/director/score.h
index 62c41cbd67..5721532d58 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -244,6 +244,6 @@ private:
DirectorEngine *_vm;
};
-} //End of namespace Director
+} // End of namespace Director
#endif
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index af08094821..1bd70d257d 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -102,4 +102,4 @@ void DirectorSound::stopSound() {
_mixer->stopHandle(*_sound2);
}
-} //End of namespace Director
+} // End of namespace Director
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index 24db236563..ccbe8e3c5a 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -93,4 +93,4 @@ Sprite::~Sprite() {
delete _cast;
}
-} //End of namespace Director
+} // End of namespace Director
diff --git a/engines/director/sprite.h b/engines/director/sprite.h
index 7cf7a8a7ac..d248036693 100644
--- a/engines/director/sprite.h
+++ b/engines/director/sprite.h
@@ -51,18 +51,18 @@ enum InkType {
//Director v4
enum SpriteType {
- kInactiveSprite, //turns the sprite off
+ kInactiveSprite, // turns the sprite off
kBitmapSprite,
kRectangleSprite,
kRoundedRectangleSprite,
kOvalSprite,
- kLineTopBottomSprite, //line from top left to bottom right
- kLineBottomTopSprite, //line from bottom left to top right
+ kLineTopBottomSprite, // line from top left to bottom right
+ kLineBottomTopSprite, // line from bottom left to top right
kTextSprite,
kButtonSprite,
kCheckboxSprite,
kRadioButtonSprite,
- kUndeterminedSprite = 16 //use castType property to examine the type of cast member associated with sprite
+ kUndeterminedSprite = 16 // use castType property to examine the type of cast member associated with sprite
};
enum SpritePosition {
@@ -114,8 +114,8 @@ public:
Common::Point _startPoint;
uint16 _width;
uint16 _height;
- //TODO: default constraint = 0, if turned on, sprite is constrainted to the bounding rect
- //As i know, constrainted != 0 only if sprite moveable
+ // TODO: default constraint = 0, if turned on, sprite is constrainted to the bounding rect
+ // As i know, constrainted != 0 only if sprite moveable
byte _constraint;
byte _moveable;
byte _backColor;
@@ -127,19 +127,19 @@ public:
byte _blend;
bool _visible;
SpriteType _type;
- //Using in digital movie sprites
+ // Using in digital movie sprites
byte _movieRate;
uint16 _movieTime;
uint16 _startTime;
uint16 _stopTime;
byte _volume;
byte _stretch;
- //Using in shape sprites
+ // Using in shape sprites
byte _lineSize;
- //Using in text sprites
+ // Using in text sprites
Common::String _editableText;
};
-} //End of namespace Director
+} // End of namespace Director
#endif