diff options
| -rw-r--r-- | scumm/smush/codec1.cpp | 6 | ||||
| -rw-r--r-- | scumm/smush/config.h | 12 | ||||
| -rw-r--r-- | scumm/smush/frenderer.cpp | 6 | ||||
| -rw-r--r-- | scumm/smush/imuse_channel.cpp | 4 | ||||
| -rw-r--r-- | scumm/smush/player.cpp | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/scumm/smush/codec1.cpp b/scumm/smush/codec1.cpp index 14327af931..538ed8daef 100644 --- a/scumm/smush/codec1.cpp +++ b/scumm/smush/codec1.cpp @@ -48,9 +48,9 @@ bool Codec1Decoder::decode(Blitter & dst, Chunk & src) { if(code & 1) { val = src.getByte(); size_line --; - if(val) + if(val) dst.put(val, length); - else + else dst.advance(length); #ifdef DEBUG_CODEC1 debug(7, "codec1 : blitting %d times %d", length, val); @@ -62,7 +62,7 @@ bool Codec1Decoder::decode(Blitter & dst, Chunk & src) { #endif while(length--) { val = src.getByte(); - if(val) + if(val) dst.put(val); else dst.advance(); } diff --git a/scumm/smush/config.h b/scumm/smush/config.h index 515423ae03..112b166e4d 100644 --- a/scumm/smush/config.h +++ b/scumm/smush/config.h @@ -29,14 +29,14 @@ #define DEBUG #endif -//~ #define NO_DEBUG_MIXER -//~ #define NO_DEBUG_CHANNEL -//~ #define NO_DEBUG_CLIPPER +#define NO_DEBUG_MIXER +#define NO_DEBUG_CHANNEL +#define NO_DEBUG_CLIPPER #define NO_DEBUG_CODEC1 -//#define NO_DEBUG_CODEC37 +#define NO_DEBUG_CODEC37 #define NO_DEBUG_CODEC44 -//~ #define NO_DEBUG_WIN32 -//~ #define NO_DEBUG_FONT_RENDERER +#define NO_DEBUG_WIN32 +#define NO_DEBUG_FONT_RENDERER #endif diff --git a/scumm/smush/frenderer.cpp b/scumm/smush/frenderer.cpp index a45cd2344c..191235fb05 100644 --- a/scumm/smush/frenderer.cpp +++ b/scumm/smush/frenderer.cpp @@ -28,9 +28,9 @@ #include <assert.h> #include <string.h> -FontRenderer::FontRenderer(bool use_original_colors) : - _nbChars(0), - _color(-1), +FontRenderer::FontRenderer(bool use_original_colors) : + _nbChars(0), + _color(-1), _original(use_original_colors) { } diff --git a/scumm/smush/imuse_channel.cpp b/scumm/smush/imuse_channel.cpp index a4152a5a5c..0c4d531b89 100644 --- a/scumm/smush/imuse_channel.cpp +++ b/scumm/smush/imuse_channel.cpp @@ -208,9 +208,9 @@ bool ImuseChannel::handleSubTags(int32 & offset) { offset += 8; { int reqsize = 1; - if(_channels == 2) + if(_channels == 2) reqsize *= 2; - if(_bitsize == 16) + if(_bitsize == 16) reqsize *= 2; else if(_bitsize == 12) { if(reqsize > 1) diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp index aeac41f055..cbe6aae69d 100644 --- a/scumm/smush/player.cpp +++ b/scumm/smush/player.cpp @@ -89,8 +89,8 @@ public: idstring[id_end - id_start] = 0; int32 id = atoi(idstring); char * data_start = def_end; - - while(*data_start == '\n' || *data_start == '\r') + + while(*data_start == '\n' || *data_start == '\r') data_start++; char * data_end = data_start; @@ -103,7 +103,7 @@ public: break; } } - + data_end -= 2; assert(data_end > data_start); char * value = new char[data_end - data_start + 1]; @@ -351,7 +351,7 @@ void SmushPlayer::handleTextResource(Chunk & b) { if(!_strings) return; // if subtitles disabled and bit 3 is set, then do not draw - if((!_subtitles) && ((flags & 8) == 8)) + if((!_subtitles) && ((flags & 8) == 8)) return; const char * str = _strings->get(string_id); |