[Scummvm-cvs-logs] SF.net SVN: scummvm:[38267] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 38267
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38267&view=rev
Author:   thebluegr
Date:     2009-02-15 16:45:39 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Silenced more warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/scriptconsole.cpp
    scummvm/trunk/engines/sci/gfx/operations.cpp
    scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
    scummvm/trunk/engines/sci/scicore/resource.cpp
    scummvm/trunk/engines/sci/sfx/iterator.cpp
    scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp

Modified: scummvm/trunk/engines/sci/engine/scriptconsole.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptconsole.cpp	2009-02-15 16:29:02 UTC (rev 38266)
+++ scummvm/trunk/engines/sci/engine/scriptconsole.cpp	2009-02-15 16:45:39 UTC (rev 38267)
@@ -459,6 +459,7 @@
 				int valid = 1;
 				object_t *obj = NULL; /* Surpress spurious warning */
 				reg_t objpos;
+				objpos.offset = 0;
 				objpos.segment = i;
 
 				if (mobj->type == MEM_OBJ_SCRIPT) {

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-02-15 16:29:02 UTC (rev 38266)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-02-15 16:45:39 UTC (rev 38267)
@@ -1838,6 +1838,8 @@
 {
 	sci_event_t error_event = { SCI_EVT_ERROR, 0, 0 };
 	sci_event_t event;
+	event.data = 0;
+	event.buckybits = 0;
 	gfx_input_event_t **seekerp = &(state->events);
 
 	BASIC_CHECKS(error_event);

Modified: scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp	2009-02-15 16:29:02 UTC (rev 38266)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp	2009-02-15 16:45:39 UTC (rev 38267)
@@ -135,7 +135,7 @@
 			gfx_sci0_pic_colors[i].b = INTERCOL(gfx_sci0_image_colors[sci0_palette][i & 0xf].b,
 							    gfx_sci0_image_colors[sci0_palette][i >> 4].b);
 		}
-		WARNING("Uncomment me after fixing sci0_palette changes to reset me");
+		//WARNING("Uncomment me after fixing sci0_palette changes to reset me");
                 /*  _gfxr_pic0_colors_initialized = 1; */
 	}
 }

Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-15 16:29:02 UTC (rev 38266)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-15 16:45:39 UTC (rev 38267)
@@ -244,7 +244,7 @@
 static void
 _scir_load_from_patch_file(int fh, resource_t *res, char *filename)
 {
-	int really_read;
+	unsigned int really_read;
 
 	res->data = (unsigned char*)sci_malloc(res->size);
 	really_read = read(fh, res->data, res->size);

Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-02-15 16:29:02 UTC (rev 38266)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-02-15 16:45:39 UTC (rev 38267)
@@ -753,7 +753,7 @@
 	int begin;
 	int end;
 
-	CHECK_FOR_END_ABSOLUTE(offset + 10);
+	CHECK_FOR_END_ABSOLUTE((unsigned int)offset + 10);
 	if (self->data[offset + 1] != 0)
 		sciprintf("[iterator-1] In sample at offset 0x04x: Byte #1 is %02x instead of zero\n",
 			  self->data[offset + 1]);
@@ -763,7 +763,7 @@
 	begin = getInt16(self->data + offset + 6);
 	end = getInt16(self->data + offset + 8);
 
-	CHECK_FOR_END_ABSOLUTE(offset + 10 + length);
+	CHECK_FOR_END_ABSOLUTE((unsigned int)(offset + 10 + length));
 
 	sample = (sci1_sample_t*)sci_malloc(sizeof(sci1_sample_t));
 	sample->delta = begin;

Modified: scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp	2009-02-15 16:29:02 UTC (rev 38266)
+++ scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp	2009-02-15 16:45:39 UTC (rev 38267)
@@ -430,7 +430,7 @@
 	sciprintf("                Segment offsets: 0 %i %i\n", loop_offset, read_int32(header + 43));
 #endif
 	instrument->samples = (sbyte *) sci_malloc(size + 1);
-	if (fread(instrument->samples, 1, size, file) < size) {
+	if (fread(instrument->samples, 1, size, file) < (unsigned int)size) {
 		sciprintf("[sfx:seq:amiga] Error: failed to read instrument samples\n");
 		return NULL;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.