libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JANITORIAL: Formatting fixes

Browse Source
This commit is contained in:
Eugene Sandulenko 2017-02-11 20:18:17 +01:00
parent 8b043bc731
commit eafa56daf0
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/director/archive.cpp
View File

@ -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', ' '))

4
engines/director/cast.cpp
View File

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

4
engines/director/frame.cpp
View File

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

4
engines/director/images.cpp
View File

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

4
engines/director/lingo/lingo-codegen.cpp
View File

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

4
engines/director/lingo/lingo-funcs.cpp
View File

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

6
engines/director/score.cpp
View File

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