[Scummvm-git-logs] scummvm master -> 7ce632f8627354672b49169ad27d65e2cd399cf0

sev- sev at scummvm.org
Fri Nov 4 23:50:19 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ce632f862 JANITORIAL: Whitespace fixes


Commit: 7ce632f8627354672b49169ad27d65e2cd399cf0
    https://github.com/scummvm/scummvm/commit/7ce632f8627354672b49169ad27d65e2cd399cf0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-04T23:50:01+01:00

Commit Message:
JANITORIAL: Whitespace fixes

Changed paths:
    engines/director/frame.h
    engines/director/movie.cpp
    engines/director/movie.h
    engines/director/score.cpp
    engines/director/score.h
    engines/director/sound.cpp
    engines/director/sprite.cpp
    engines/director/sprite.h



diff --git a/engines/director/frame.h b/engines/director/frame.h
index 694d3a7..ce82fa5 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 f952346..9799510 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 888262a..e4729a6 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 a197d0e..c1b5589 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 62c41cb..5721532 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 af08094..1bd70d2 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 24db236..ccbe8e3 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 7cf7a8a..d248036 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





More information about the Scummvm-git-logs mailing list