[Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.17,1.18 imuse_channel.cpp,1.20,1.21 saud_channel.cpp,1.17,1.18 smush_player.cpp,1.52,1.53
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 23 23:35:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.57,1.58 midiparser_s1d.cpp,1.5,1.6 res.cpp,1.24,1.25 simon.cpp,1.298,1.299 vga.cpp,1.80,1.81
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.88,1.89 imuse_digi.cpp,1.47,1.48 object.cpp,1.141,1.142 script.cpp,1.133,1.134 script_v2.cpp,2.201,2.202 script_v5.cpp,1.191,1.192 script_v6.cpp,1.196,1.197 script_v8.cpp,2.196,2.197 sound.cpp,1.253,1.254
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv10736/smush
Modified Files:
chunk.cpp imuse_channel.cpp saud_channel.cpp smush_player.cpp
Log Message:
Whitespace changes
Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- chunk.cpp 10 Sep 2003 12:29:18 -0000 1.17
+++ chunk.cpp 24 Sep 2003 06:33:59 -0000 1.18
@@ -87,21 +87,21 @@
bool BaseChunk::seek(int32 delta, seek_type dir) {
switch(dir) {
- case seek_cur:
- _curPos += delta;
- break;
- case seek_start:
- if (delta < 0)
- error("invalid seek request");
+ case seek_cur:
+ _curPos += delta;
+ break;
+ case seek_start:
+ if (delta < 0)
+ error("invalid seek request");
- _curPos = (uint32)delta;
- break;
- case seek_end:
- if (delta > 0 || _size < (uint32)-delta)
- error("invalid seek request");
+ _curPos = (uint32)delta;
+ break;
+ case seek_end:
+ if (delta > 0 || _size < (uint32)-delta)
+ error("invalid seek request");
- _curPos = (uint32)(_size + delta);
- break;
+ _curPos = (uint32)(_size + delta);
+ break;
}
if (_curPos > _size) {
error("invalid seek request : %d > %d (delta == %d)", _curPos, _size, delta);
Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- imuse_channel.cpp 21 Jun 2003 20:57:01 -0000 1.20
+++ imuse_channel.cpp 24 Sep 2003 06:33:59 -0000 1.21
@@ -141,20 +141,20 @@
while (!map.eof()) {
Chunk *sub = map.subBlock();
switch(sub->getType()) {
- case TYPE_FRMT:
- handleFormat(*sub);
- break;
- case TYPE_TEXT:
- handleText(*sub);
- break;
- case TYPE_REGN:
- handleRegion(*sub);
- break;
- case TYPE_STOP:
- handleStop(*sub);
- break;
- default:
- error("Unknown iMUS subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+ case TYPE_FRMT:
+ handleFormat(*sub);
+ break;
+ case TYPE_TEXT:
+ handleText(*sub);
+ break;
+ case TYPE_REGN:
+ handleRegion(*sub);
+ break;
+ case TYPE_STOP:
+ handleStop(*sub);
+ break;
+ default:
+ error("Unknown iMUS subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
}
delete sub;
}
@@ -213,36 +213,36 @@
uint32 size = READ_BE_UINT32(_tbuffer + offset + 4);
uint32 available_size = _tbufferSize - offset;
switch(type) {
- case TYPE_MAP_:
- _inData = false;
- if (available_size >= (size + 8)) {
- MemoryChunk c((byte *)_tbuffer + offset);
- handleMap(c);
+ case TYPE_MAP_:
+ _inData = false;
+ if (available_size >= (size + 8)) {
+ MemoryChunk c((byte *)_tbuffer + offset);
+ handleMap(c);
+ }
+ break;
+ case TYPE_DATA:
+ _inData = true;
+ _dataSize = size;
+ offset += 8;
+ {
+ int reqsize = 1;
+ if (_channels == 2)
+ reqsize *= 2;
+ if (_bitsize == 16)
+ reqsize *= 2;
+ else if (_bitsize == 12) {
+ if (reqsize > 1)
+ reqsize = reqsize * 3 / 2;
+ else reqsize = 3;
}
- break;
- case TYPE_DATA:
- _inData = true;
- _dataSize = size;
- offset += 8;
- {
- int reqsize = 1;
- if (_channels == 2)
- reqsize *= 2;
- if (_bitsize == 16)
- reqsize *= 2;
- else if (_bitsize == 12) {
- if (reqsize > 1)
- reqsize = reqsize * 3 / 2;
- else reqsize = 3;
- }
- if ((size % reqsize) != 0) {
- debug(2, "Invalid iMUS sound data size : (%d %% %d) != 0, correcting...", size, reqsize);
- size += 3 - (size % reqsize);
- }
+ if ((size % reqsize) != 0) {
+ debug(2, "Invalid iMUS sound data size : (%d %% %d) != 0, correcting...", size, reqsize);
+ size += 3 - (size % reqsize);
}
- return false;
- default:
- error("unknown Chunk in iMUS track : %s ", Chunk::ChunkString(type));
+ }
+ return false;
+ default:
+ error("unknown Chunk in iMUS track : %s ", Chunk::ChunkString(type));
}
offset += size + 8;
return true;
Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/saud_channel.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- saud_channel.cpp 20 Jul 2003 19:50:32 -0000 1.17
+++ saud_channel.cpp 24 Sep 2003 06:33:59 -0000 1.18
@@ -49,40 +49,37 @@
uint32 available_size = _tbufferSize - offset;
switch(type) {
- case TYPE_STRK:
- _inData = false;
- if (available_size >= (size + 8)) {
- MemoryChunk c((byte *)_tbuffer + offset);
- handleStrk(c);
- }
- else
- return false;
- break;
- case TYPE_SMRK:
- _inData = false;
- if (available_size >= (size + 8)) {
- MemoryChunk c((byte *)_tbuffer + offset);
- handleSmrk(c);
- }
- else
- return false;
- break;
- case TYPE_SHDR:
- _inData = false;
- if (available_size >= (size + 8)) {
- MemoryChunk c((byte *)_tbuffer + offset);
- handleShdr(c);
- }
- else
- return false;
- break;
- case TYPE_SDAT:
- _inData = true;
- _dataSize = size;
- offset += 8;
+ case TYPE_STRK:
+ _inData = false;
+ if (available_size >= (size + 8)) {
+ MemoryChunk c((byte *)_tbuffer + offset);
+ handleStrk(c);
+ } else
return false;
- default:
- error("unknown Chunk in SAUD track : %s ", Chunk::ChunkString(type));
+ break;
+ case TYPE_SMRK:
+ _inData = false;
+ if (available_size >= (size + 8)) {
+ MemoryChunk c((byte *)_tbuffer + offset);
+ handleSmrk(c);
+ } else
+ return false;
+ break;
+ case TYPE_SHDR:
+ _inData = false;
+ if (available_size >= (size + 8)) {
+ MemoryChunk c((byte *)_tbuffer + offset);
+ handleShdr(c);
+ } else
+ return false;
+ break;
+ case TYPE_SDAT:
+ _inData = true;
+ _dataSize = size;
+ offset += 8;
+ return false;
+ default:
+ error("unknown Chunk in SAUD track : %s ", Chunk::ChunkString(type));
}
offset += size + 8;
return true;
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- smush_player.cpp 18 Sep 2003 02:07:17 -0000 1.52
+++ smush_player.cpp 24 Sep 2003 06:33:59 -0000 1.53
@@ -542,7 +542,7 @@
}
while (str[0] == '^') {
- switch(str[1]) {
+ switch (str[1]) {
case 'f':
{
int id = str[3] - '0';
@@ -574,31 +574,31 @@
// bit 2 - ??? 4
// bit 3 - wrap around 8
switch (flags & 9) {
- case 0:
- sf->drawStringAbsolute(str, _dst, _width, pos_x, pos_y);
- break;
- case 1:
- sf->drawStringCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top));
- break;
- case 8:
- // FIXME: Is 'right' the maximum line width here, just
- // as it is in the next case? It's used several times
- // in The Dig's intro, where 'left' and 'right' are
- // always 0 and 321 respectively, and apparently we
- // handle that correctly.
- sf->drawStringWrap(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, right);
- break;
- case 9:
- // In this case, the 'right' parameter is actually the
- // maximum line width. This explains why it's sometimes
- // smaller than 'left'.
- //
- // Note that in The Dig's "Spacetime Six" movie it's
- // 621. I have no idea what that means.
- sf->drawStringWrapCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, MIN(left + right, _width));
- break;
- default:
- warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
+ case 0:
+ sf->drawStringAbsolute(str, _dst, _width, pos_x, pos_y);
+ break;
+ case 1:
+ sf->drawStringCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top));
+ break;
+ case 8:
+ // FIXME: Is 'right' the maximum line width here, just
+ // as it is in the next case? It's used several times
+ // in The Dig's intro, where 'left' and 'right' are
+ // always 0 and 321 respectively, and apparently we
+ // handle that correctly.
+ sf->drawStringWrap(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, right);
+ break;
+ case 9:
+ // In this case, the 'right' parameter is actually the
+ // maximum line width. This explains why it's sometimes
+ // smaller than 'left'.
+ //
+ // Note that in The Dig's "Spacetime Six" movie it's
+ // 621. I have no idea what that means.
+ sf->drawStringWrapCentered(str, _dst, _width, _height, pos_x, MAX(pos_y, top), left, MIN(left + right, _width));
+ break;
+ default:
+ warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
}
if (string != NULL) {
@@ -753,39 +753,39 @@
while (!b.eof()) {
Chunk *sub = b.subBlock();
if (sub->getSize() & 1) b.seek(1);
- switch(sub->getType()) {
- case TYPE_NPAL:
- handleNewPalette(*sub);
- break;
- case TYPE_FOBJ:
- handleFrameObject(*sub);
- break;
- case TYPE_PSAD:
- handleSoundFrame(*sub);
- break;
- case TYPE_TRES:
- handleTextResource(*sub);
- break;
- case TYPE_XPAL:
- handleDeltaPalette(*sub);
- break;
- case TYPE_IACT:
- handleImuseAction(*sub);
- break;
- case TYPE_STOR:
- handleStore(*sub);
- break;
- case TYPE_FTCH:
- handleFetch(*sub);
- break;
- case TYPE_SKIP:
- handleSkip(*sub);
- break;
- case TYPE_TEXT:
- handleTextResource(*sub);
- break;
- default:
- error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+ switch (sub->getType()) {
+ case TYPE_NPAL:
+ handleNewPalette(*sub);
+ break;
+ case TYPE_FOBJ:
+ handleFrameObject(*sub);
+ break;
+ case TYPE_PSAD:
+ handleSoundFrame(*sub);
+ break;
+ case TYPE_TRES:
+ handleTextResource(*sub);
+ break;
+ case TYPE_XPAL:
+ handleDeltaPalette(*sub);
+ break;
+ case TYPE_IACT:
+ handleImuseAction(*sub);
+ break;
+ case TYPE_STOR:
+ handleStore(*sub);
+ break;
+ case TYPE_FTCH:
+ handleFetch(*sub);
+ break;
+ case TYPE_SKIP:
+ handleSkip(*sub);
+ break;
+ case TYPE_TEXT:
+ handleTextResource(*sub);
+ break;
+ default:
+ error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
}
delete sub;
}
@@ -854,12 +854,12 @@
}
Chunk *sub = _base->subBlock();
- switch(sub->getType()) {
- case TYPE_FRME:
- handleFrame(*sub);
- break;
- default:
- error("Unknown Chunk found : %d, %d", sub->getType(), sub->getSize());
+ switch (sub->getType()) {
+ case TYPE_FRME:
+ handleFrame(*sub);
+ break;
+ default:
+ error("Unknown Chunk found : %d, %d", sub->getType(), sub->getSize());
}
delete sub;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.57,1.58 midiparser_s1d.cpp,1.5,1.6 res.cpp,1.24,1.25 simon.cpp,1.298,1.299 vga.cpp,1.80,1.81
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.88,1.89 imuse_digi.cpp,1.47,1.48 object.cpp,1.141,1.142 script.cpp,1.133,1.134 script_v2.cpp,2.201,2.202 script_v5.cpp,1.191,1.192 script_v6.cpp,1.196,1.197 script_v8.cpp,2.196,2.197 sound.cpp,1.253,1.254
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list