[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec1.cpp,1.3,1.4 config.h,1.3,1.4 frenderer.cpp,1.4,1.5 imuse_channel.cpp,1.6,1.7 player.cpp,1.9,1.10

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv11346

Modified Files:
	codec1.cpp config.h frenderer.cpp imuse_channel.cpp player.cpp 
Log Message:
fixed endlines

Index: codec1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec1.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- codec1.cpp	30 Aug 2002 07:24:45 -0000	1.3
+++ codec1.cpp	30 Aug 2002 15:24:16 -0000	1.4
@@ -48,9 +48,9 @@
 			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 @@
 #endif
 				while(length--) {
 					val = src.getByte();
-					if(val) 
+					if(val)
 						dst.put(val);
 					else dst.advance();
 				}

Index: config.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.h	24 Aug 2002 23:37:40 -0000	1.3
+++ config.h	30 Aug 2002 15:24:16 -0000	1.4
@@ -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

Index: frenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/frenderer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- frenderer.cpp	30 Aug 2002 07:24:45 -0000	1.4
+++ frenderer.cpp	30 Aug 2002 15:24:16 -0000	1.5
@@ -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) {
 }
 

Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- imuse_channel.cpp	30 Aug 2002 07:24:45 -0000	1.6
+++ imuse_channel.cpp	30 Aug 2002 15:24:16 -0000	1.7
@@ -208,9 +208,9 @@
 				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)

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- player.cpp	30 Aug 2002 07:24:45 -0000	1.9
+++ player.cpp	30 Aug 2002 15:24:16 -0000	1.10
@@ -89,11 +89,11 @@
 			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;
-
+
 			while(1) {
 				if(data_end[-2] == '\r' && data_end[1] == '\n' && data_end[-1] == '\n' && data_end[0] == '\r')
 					break;
@@ -103,7 +103,7 @@
 					break;
 				}
 			}
-	
+
 			data_end -= 2;
 			assert(data_end > data_start);
 			char * value = new char[data_end - data_start + 1];
@@ -112,7 +112,7 @@
 			value[data_end - data_start] = 0;
 			char * line_start = value;
 			char * line_end;
-
+
 			while ((line_end = strchr(line_start, '\n'))) {
 				line_start = line_end+1;
 				if (line_start[0] == '/' && line_start[1] == '/') {
@@ -351,7 +351,7 @@
 	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);