libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 15:40:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Change DEBUG_SMUSH to DEBUG_MOVIE

Browse Source
This commit is contained in:
Einar Johan T. Sømåen 2011-10-01 02:56:54 +02:00
parent 5e93a6f9b1
commit c34dae8eff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/grim/debug.h
View File

@ -37,11 +37,11 @@ enum enDebugLevels {
DEBUG_BITMAPS = 16, DEBUG_BITMAPS = 16,
DEBUG_MODEL = 32, DEBUG_MODEL = 32,
DEBUG_STUB = 64, DEBUG_STUB = 64,
DEBUG_SMUSH = 128, DEBUG_MOVIE = 128,
DEBUG_IMUSE = 256, DEBUG_IMUSE = 256,
DEBUG_CHORES = 512, DEBUG_CHORES = 512,
DEBUG_ALL = DEBUG_NORMAL | DEBUG_WARN | DEBUG_ERROR | DEBUG_LUA | DEBUG_BITMAPS | DEBUG_ALL = DEBUG_NORMAL | DEBUG_WARN | DEBUG_ERROR | DEBUG_LUA | DEBUG_BITMAPS |
DEBUG_MODEL | DEBUG_STUB | DEBUG_SMUSH | DEBUG_IMUSE | DEBUG_CHORES DEBUG_MODEL | DEBUG_STUB | DEBUG_MOVIE | DEBUG_IMUSE | DEBUG_CHORES
}; };
} }

10
engines/grim/movie/codecs/smush_decoder.cpp
View File

@ -157,12 +157,12 @@ void SmushDecoder::handleFrame() {
// MakeAnim animation type 'Bl16' parameters: 6000;8000;100;0;0;0;0;0;2;0; // MakeAnim animation type 'Bl16' parameters: 6000;8000;100;0;0;0;0;0;2;0;
// Lola engine room (loops a limited number of times?): // Lola engine room (loops a limited number of times?):
// MakeAnim animation type 'Bl16' parameters: 6000;8000;90;1;0;0;0;0;2;0; // MakeAnim animation type 'Bl16' parameters: 6000;8000;90;1;0;0;0;0;2;0;
if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL) if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
debug("Announcement data: %s\n", anno); debug("Announcement data: %s\n", anno);
// It looks like the announcement data is actually for setting some of the // It looks like the announcement data is actually for setting some of the
// header parameters, not for any looping purpose // header parameters, not for any looping purpose
} else { } else {
if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL) if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
debug("Announcement header not understood: %s\n", anno); debug("Announcement header not understood: %s\n", anno);
} }
delete[] anno; delete[] anno;
@ -185,7 +185,7 @@ void SmushDecoder::handleFrame() {
else else
handleWave(frame + pos + 8 + 4, decompressed_size); handleWave(frame + pos + 8 + 4, decompressed_size);
pos += READ_BE_UINT32(frame + pos + 4) + 8; pos += READ_BE_UINT32(frame + pos + 4) + 8;
} else if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL) { } else if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL) {
error("SmushDecoder::handleFrame() unknown tag"); error("SmushDecoder::handleFrame() unknown tag");
} }
} while (pos < size); } while (pos < size);
@ -443,7 +443,7 @@ bool SmushDecoder::setupAnim() {
flags = READ_LE_UINT16(s_header + 18); flags = READ_LE_UINT16(s_header + 18);
// Output information for checking out the flags // Output information for checking out the flags
if (gDebugLevel == DEBUG_SMUSH || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL) { if (gDebugLevel == DEBUG_MOVIE || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL) {
warning("SMUSH Flags:"); warning("SMUSH Flags:");
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
warning(" %d", (flags & (1 << i)) != 0); warning(" %d", (flags & (1 << i)) != 0);
@ -481,7 +481,7 @@ bool SmushDecoder::loadStream(Common::SeekableReadStream *stream) {
} }
bool SmushDecoder::loadFile(const Common::String &filename) { bool SmushDecoder::loadFile(const Common::String &filename) {
if (gDebugLevel == DEBUG_SMUSH) if (gDebugLevel == DEBUG_MOVIE)
warning("Playing video '%s'.\n", filename.c_str()); warning("Playing video '%s'.\n", filename.c_str());
if (g_grim->getGameFlags() & ADGF_DEMO) { if (g_grim->getGameFlags() & ADGF_DEMO) {

2
engines/grim/movie/movie.cpp
View File

@ -132,7 +132,7 @@ bool MoviePlayer::play(const char *filename, bool looping, int x, int y) {
if (!_videoDecoder->loadFile(_fname)) if (!_videoDecoder->loadFile(_fname))
return false; return false;
if (gDebugLevel == DEBUG_SMUSH) if (gDebugLevel == DEBUG_MOVIE)
warning("Playing video '%s'.\n", filename); warning("Playing video '%s'.\n", filename);
init(); init();