[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.5,1.6 animation.h,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Fri Jan 30 12:53:48 CET 2004


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31653/sword1

Modified Files:
	animation.cpp animation.h 
Log Message:
fix whitespaces (we should eventually try to remove this code duplication again, folks. maybe add a 'video' global module or so...)

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- animation.cpp	28 Jan 2004 04:11:06 -0000	1.5
+++ animation.cpp	30 Jan 2004 20:47:21 -0000	1.6
@@ -37,10 +37,10 @@
 	if (decoder)
 		mpeg2_close(decoder);
 	delete mpgfile;
-        delete sndfile;
+	delete sndfile;
 #ifndef BACKEND_8BIT
-        _sys->hide_overlay();
-        delete overlay;
+	_sys->hide_overlay();
+	delete overlay;
 #endif
 #endif
 }
@@ -57,7 +57,7 @@
 
 #ifdef BACKEND_8BIT
 
-        int i, p;
+	int i, p;
 
 	// Load lookup palettes
 	// TODO: Binary format so we can use File class
@@ -269,7 +269,7 @@
 			ptr[linepos               ] = lut[i + dat[0][        ypos  ]];
 			ptr[640 + linepos++] = lut[i + dat[0][width + ypos++]];
 
-                }
+		}
 		linepos += (2 * 640 - width);
 		ypos += width;
 	}
@@ -360,7 +360,7 @@
 				framenum++;
 				return true;
 
-                        }
+			}
 			break;
 
 		default:

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- animation.h	18 Jan 2004 07:21:10 -0000	1.2
+++ animation.h	30 Jan 2004 20:47:21 -0000	1.3
@@ -26,13 +26,13 @@
 // #define USE_MPEG2_0_3_1
 
 #ifdef _MSC_VER
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
+typedef int8 int8_t;
+typedef int16 int16_t;
+typedef int32 int32_t;
 
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t; 
+typedef uint8 uint8_t;
+typedef uint16 uint16_t;
+typedef uint32 uint32_t; 
 #else
 #include <inttypes.h>
 #endif
@@ -111,9 +111,9 @@
 		byte pal[4 * 256];
 	} palettes[50];
 #else
-        static NewGuiColor lookup2[BITDEPTH * BITDEPTH * 256];
-        NewGuiColor * overlay;
-        static bool lookupInit;
+	static NewGuiColor lookup2[BITDEPTH * BITDEPTH * 256];
+	NewGuiColor * overlay;
+	static bool lookupInit;
 
 #endif
 





More information about the Scummvm-git-logs mailing list