aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2017-02-11 20:18:17 +0100
committerEugene Sandulenko2017-02-11 23:23:56 +0100
commiteafa56daf0e159592a9476b803c12ec17da17eb1 (patch)
tree40248220546fc5e2881509ba5631b4c71cb0a17e /engines
parent8b043bc7316b27c1d44d9e68111335346134cbeb (diff)
downloadscummvm-rg350-eafa56daf0e159592a9476b803c12ec17da17eb1.tar.gz
scummvm-rg350-eafa56daf0e159592a9476b803c12ec17da17eb1.tar.bz2
scummvm-rg350-eafa56daf0e159592a9476b803c12ec17da17eb1.zip
JANITORIAL: Formatting fixes
Diffstat (limited to 'engines')
-rw-r--r--engines/director/archive.cpp2
-rw-r--r--engines/director/cast.cpp4
-rw-r--r--engines/director/frame.cpp4
-rw-r--r--engines/director/images.cpp4
-rw-r--r--engines/director/lingo/lingo-codegen.cpp4
-rw-r--r--engines/director/lingo/lingo-funcs.cpp4
-rw-r--r--engines/director/score.cpp6
7 files changed, 14 insertions, 14 deletions
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 496f47cc23..c9b6cc1cfa 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -411,7 +411,7 @@ bool RIFXArchive::openStream(Common::SeekableReadStream *stream, uint32 startOff
keyRes = &resources[resources.size() - 1];
else if (tag == MKTAG('C', 'A', 'S', '*'))
casRes = &resources[resources.size() - 1];
- //or the children of
+ // or the children of
else if (tag == MKTAG('S', 'T', 'X', 'T') ||
tag == MKTAG('B', 'I', 'T', 'D') ||
tag == MKTAG('D', 'I', 'B', ' '))
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 453ca08a07..8b1e57cf18 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -118,13 +118,13 @@ TextCast::TextCast(Common::ReadStreamEndian &stream, uint16 version) {
gutterSize = static_cast<SizeType>(stream.readByte());
boxShadow = static_cast<SizeType>(stream.readByte());
textType = static_cast<TextType>(stream.readByte());
- textAlign = static_cast<TextAlignType>(stream.readSint16()); //this is because 'right' is -1? or should that be 255?
+ textAlign = static_cast<TextAlignType>(stream.readSint16()); // this is because 'right' is -1? or should that be 255?
stream.readUint16();
stream.readUint16();
stream.readUint16();
stream.readUint16();
- fontId = 1; //this is in STXT
+ fontId = 1; // this is in STXT
initialRect = Score::readRect(stream);
stream.readUint16();
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index f6a16e6cef..3dcfd57466 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -304,7 +304,7 @@ void Frame::readPaletteInfo(Common::SeekableSubReadStreamEndian &stream) {
_palette->flags = stream.readByte();
_palette->speed = stream.readByte();
_palette->frameCount = stream.readUint16();
- stream.skip(8); //unknown
+ stream.skip(8); // unknown
}
void Frame::readSprite(Common::SeekableSubReadStreamEndian &stream, uint16 offset, uint16 size) {
@@ -552,7 +552,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
castType = kCastBitmap;
break;
case 0x02:
- case 0x0c: //this is actually a mouse-over shape? I don't think it's a real button.
+ case 0x0c: // this is actually a mouse-over shape? I don't think it's a real button.
castType = kCastShape;
break;
case 0x07:
diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index 7d5e08936e..53e91ac494 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -301,7 +301,7 @@ bool BITDDecoderV4::loadStream(Common::SeekableReadStream &stream) {
}
int offset = 0;
- if (_surface->w < (pixels.size() / _surface->h))
+ if (_surface->w < (pixels.size() / _surface->h))
offset = (pixels.size() / _surface->h) - _surface->w;
if (pixels.size() > 0) {
@@ -316,7 +316,7 @@ bool BITDDecoderV4::loadStream(Common::SeekableReadStream &stream) {
}
case 8:
- //this calculation is wrong.. need a demo with colours.
+ // this calculation is wrong.. need a demo with colours.
*((byte *)_surface->getBasePtr(x, y)) = 0xff - pixels[(y * _surface->w) + x + (y * offset)];
x++;
break;
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 95501677b7..0d771ec44e 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -229,8 +229,8 @@ void Lingo::define(Common::String &name, int start, int nargs, Common::String *p
_handlers[ENTITY_INDEX(_eventHandlerTypeIds[name.c_str()], _currentEntityId)] = sym;
}
} else {
- //we don't want to be here. The getHandler call should have used the EntityId and the result
- //should have been unique!
+ // we don't want to be here. The getHandler call should have used the EntityId and the result
+ // should have been unique!
warning("Redefining handler '%s'", name.c_str());
delete sym->u.defn;
}
diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 95a7506f8d..7056d9a863 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -258,11 +258,11 @@ void Lingo::func_gotoprevious() {
void Lingo::func_cursor(int c) {
if (_cursorOnStack) {
- //pop cursor
+ // pop cursor
_vm->getMacWindowManager()->popCursor();
}
- //and then push cursor.
+ // and then push cursor.
switch (c) {
case 0:
case -1:
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index fbb89e41c6..9cc108d739 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -420,7 +420,7 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
ci->type = castStrings[4];
if (!ci->script.empty()) {
- //the script type here could be wrong!
+ // the script type here could be wrong!
if (ConfMan.getBool("dump_scripts"))
dumpScript(ci->script.c_str(), kCastScript, id);
@@ -649,12 +649,12 @@ int Score::getCurrentLabelNumber() {
}
void Score::gotoNext() {
- //we can just try to use the current frame and get the next label
+ // we can just try to use the current frame and get the next label
_currentFrame = getNextLabelNumber(_currentFrame);
}
void Score::gotoPrevious() {
- //we actually need the frame of the label prior to the most recent label.
+ // we actually need the frame of the label prior to the most recent label.
_currentFrame = getPreviousLabelNumber(getCurrentLabelNumber());
}