Cleaned up warnings

src/OpenJazz.h

@@ -66,7 +66,7 @@
 // Files
 #ifdef __SYMBIAN32__
 #ifdef UIQ3
-#define CONFIG_FILE "c:\\shared\\openjazz\\openjazz.cfg""
+#define CONFIG_FILE "c:\\shared\\openjazz\\openjazz.cfg"
 #else
 #define CONFIG_FILE "c:\\data\\openjazz\\openjazz.cfg"
 #endif
@@ -221,7 +221,7 @@ EXTERN fixed  fTan                 (fixed angle);
 #ifdef VERBOSE
 #define LOG(x, y) log(x, y)
 #else
-#define LOG(x, y) x; y
+#define LOG(x, y)
 #endif
 
 #endif

src/io/file.cpp

@@ -349,7 +349,7 @@ unsigned char* File::loadPixels  (int length, int key) {
 
 	unsigned char* pixels;
 	unsigned char* sorted;
-	unsigned char mask;
+	unsigned char mask = 0;
 	int count;
 
 

src/io/gfx/scale2x/pixel.cpp

@@ -29,20 +29,20 @@ pixel_t pixel_get(int x, int y, const unsigned char* pix, unsigned slice, unsign
 	if (opt_tes) {
 		if (x < 0)
 			x += dx;
-		if (x >= dx)
+		if ((unsigned int)x >= dx)
 			x -= dx;
 		if (y < 0)
 			y += dy;
-		if (y >= dy)
+		if ((unsigned int)y >= dy)
 			y -= dy;
 	} else {
 		if (x < 0)
 			x = 0;
-		if (x >= dx)
+		if ((unsigned int)x >= dx)
 			x = dx - 1;
 		if (y < 0)
 			y = 0;
-		if (y >= dy)
+		if ((unsigned int)y >= dy)
 			y = dy - 1;
 	}
 

src/io/gfx/video.cpp

@@ -183,7 +183,7 @@ SDL_Color* Video::getPalette () {
 }
 
 
-void Video::changePalette (SDL_Color *palette, unsigned char first, unsigned char amount) {
+void Video::changePalette (SDL_Color *palette, unsigned char first, unsigned int amount) {
 
 	SDL_SetPalette(screen, SDL_PHYSPAL, palette, first, amount);
 

src/io/gfx/video.h

@@ -76,7 +76,7 @@ class Video {
 
 		void       setPalette            (SDL_Color *palette);
 		SDL_Color* getPalette            ();
-		void       changePalette         (SDL_Color *palette, unsigned char first, unsigned char amount);
+		void       changePalette         (SDL_Color *palette, unsigned char first, unsigned int amount);
 		void       restoreSurfacePalette (SDL_Surface *surface);
 
 		int        getWidth              ();

src/level/levelload.cpp

@@ -322,7 +322,8 @@ int Level::load (char *fileName, unsigned char diff, bool checkpoint) {
 
 	File *file;
 	unsigned char *buffer;
-	char *string, *ext;
+	const char *ext;
+	char *string;
 	int tiles;
 	int count, x, y, type;
 

src/scene/scene.cpp

@@ -253,7 +253,7 @@ int Scene::play () {
 	SDL_Rect dst;
 	unsigned int sceneIndex = 0;
 	SceneImage *image;
-	SceneAnimation* animation;
+	SceneAnimation* animation = NULL;
 	SceneFrame* currentFrame = NULL;
 	SceneFrame* lastFrame = NULL;
 	int	frameDelay = 0;

src/scene/sceneload.cpp

@@ -483,7 +483,7 @@ void Scene::loadScripts (File *f) {
 	    int textPosY = -1;
 
 	    int extraheight = -1;
-	    SDL_Rect textRect;
+	    SDL_Rect textRect = { 0,0,0,0 };
 	    bool textRectValid = false;
 		f->seek(scriptStarts[loop], true); // Seek to data start