[Scummvm-git-logs] scummvm master -> 415bd5644494d4a4ef532a2e8e70c0c6f23aab05

[sev-]

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:
415bd56444 DIRECTOR: Janitorial: Fix code formatting


Commit: 415bd5644494d4a4ef532a2e8e70c0c6f23aab05
    https://github.com/scummvm/scummvm/commit/415bd5644494d4a4ef532a2e8e70c0c6f23aab05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-02T23:12:42+01:00

Commit Message:
DIRECTOR: Janitorial: Fix code formatting

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


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 4b391bd..dbfb2c1 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -182,7 +182,7 @@ ButtonCast::ButtonCast(Common::ReadStreamEndian &stream, uint16 version) : TextC
 		stream.readByte();
 		stream.readByte();
 
-		//This has already been populated in the super TextCast constructor
+		// This has already been populated in the super TextCast constructor
 		//initialRect = Score::readRect(stream);
 		//boundingRect = Score::readRect(stream);
 
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 1f0c897..edea7ea 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -137,7 +137,7 @@ Common::Error DirectorEngine::run() {
 		return Common::kNoError;
 	}
 
-	//FIXME
+	// FIXME
 	//_mainArchive = new RIFFArchive();
 	//_mainArchive->openFile("bookshelf_example.mmm");
 
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 3799c20..704319b 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -143,7 +143,7 @@ public:
 	byte _channelData[kChannelDataSize];
 	uint8 _actionId;
 	uint8 _transDuration;
-	uint8 _transArea; //1 - Whole Stage, 0 - Changing Area
+	uint8 _transArea; // 1 - Whole Stage, 0 - Changing Area
 	uint8 _transChunkSize;
 	TransitionType _transType;
 	PaletteInfo *_palette;
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index 76ff417..5322abc 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -210,7 +210,7 @@ void DirectorEngine::loadPatterns() {
 }
 
 Graphics::MacPatterns &DirectorEngine::getPatterns() {
-	//TOOD: implement switch and other version patterns. (use getVersion());
+	// TOOD: implement switch and other version patterns. (use getVersion());
 	return _director3QuickDrawPatterns;
 }
 
diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 9799510..5d7b60e 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -18,22 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *
- * Additional copyright for this file:
- * Copyright (C) 1995-1997 Presto Studios, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #include "common/system.h"
diff --git a/engines/director/movie.h b/engines/director/movie.h
index e4729a6..8cccb99 100644
--- a/engines/director/movie.h
+++ b/engines/director/movie.h
@@ -18,22 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *
- * Additional copyright for this file:
- * Copyright (C) 1995-1997 Presto Studios, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #ifndef DIRECTOR_MOVIE_H
@@ -60,6 +44,7 @@ private:
 	Video::VideoDecoder *_currentVideo;
 	DirectorEngine *_vm;
 };
+
 } // End of namespace Director
 
 #endif
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index c72fc0c..5bad616 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -344,12 +344,12 @@ void Score::setSpriteCasts() {
 }
 
 void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, Resource *res) {
-	// d4+ variant
+	// D4+ variant
 	if (stream.size() == 0)
 		return;
 
-	//TODO: Determine if there really is a minimum size.
-	//This value was too small for Shape Casts.
+	// TODO: Determine if there really is a minimum size.
+	// This value was too small for Shape Casts.
 	if (stream.size() < 10) {
 		warning("CAST data id %d is too small", id);
 		return;
@@ -909,7 +909,7 @@ void Score::update() {
 	if (_vm->getVersion() >= 6) {
 		for (uint16 i = 0; i < CHANNEL_COUNT; i++) {
 			if (_frames[_currentFrame]->_sprites[i]->_enabled) {
-				//TODO: Check if this is also possibly a kSpriteScript?
+				// TODO: Check if this is also possibly a kSpriteScript?
 				_lingo->processEvent(kEventBeginSprite, kCastScript, _frames[_currentFrame]->_sprites[i]->_scriptId);
 			}
 		}
diff --git a/engines/director/sprite.h b/engines/director/sprite.h
index d9b7729..c434188 100644
--- a/engines/director/sprite.h
+++ b/engines/director/sprite.h
@@ -49,7 +49,7 @@ enum InkType {
 	kInkTypeDark
 };
 
-//Director v4
+// Director v4
 enum SpriteType {
 	kInactiveSprite, // turns the sprite off
 	kBitmapSprite,