thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DIRECTOR: Janitorial: Fix code formatting

Browse source
This commit is contained in:
Eugene Sandulenko 2017-03-02 23:12:42 +01:00
parent e229e3c4a4
commit 415bd56444
8 changed files with 10 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/director/cast.cpp
View file

@ -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);

2
engines/director/director.cpp
View file

@ -137,7 +137,7 @@ Common::Error DirectorEngine::run() {
return Common::kNoError;
}
//FIXME
// FIXME
//_mainArchive = new RIFFArchive();
//_mainArchive->openFile("bookshelf_example.mmm");

2
engines/director/frame.h
View file

@ -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;

2
engines/director/graphics.cpp
View file

@ -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;
}

16
engines/director/movie.cpp
View file

@ -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"

17
engines/director/movie.h
View file

@ -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

8
engines/director/score.cpp
View file

@ -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);
}
}

2
engines/director/sprite.h
View file

@ -49,7 +49,7 @@ enum InkType {
kInkTypeDark
};
//Director v4
// Director v4
enum SpriteType {
kInactiveSprite, // turns the sprite off
kBitmapSprite,