Silenced a ton of warnings, and disabled several unreferenced functions (dead code) - hopefully, compilation hasn't been broken...

svn-id: r38243

24 files changed, 86 insertions, 28 deletions

diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp
index 7daf735b6d..265286b72d 100644
--- a/engines/sci/engine/grammar.cpp
+++ b/engines/sci/engine/grammar.cpp
@@ -104,6 +104,9 @@ _vfree(parse_rule_t *rule)
   rule = NULL;
 }
 
+#if 0
+// Unreferenced - removed
+
 static parse_rule_t *
 _vbuild(int id, int argc, ...)
 {
@@ -132,7 +135,10 @@ _vbuild(int id, int argc, ...)
   va_end(args);
   return rule;
 }
+#endif
 
+#if 0
+// Unreferenced - removed
 static parse_rule_t *
 _vcat(int id, parse_rule_t *a, parse_rule_t *b)
 {
@@ -149,6 +155,7 @@ _vcat(int id, parse_rule_t *a, parse_rule_t *b)
 
   return rule;
 }
+#endif
 
 static parse_rule_t *
 _vdup(parse_rule_t *a)
@@ -197,7 +204,8 @@ _vinsert(parse_rule_t *turkey, parse_rule_t *stuffing)
   return rule;
 }
 
-
+#if 0
+// Unreferenced - removed
 static int
 _greibach_rule_p(parse_rule_t *rule)
 {
@@ -212,6 +220,7 @@ _greibach_rule_p(parse_rule_t *rule)
 
   return (rule->data[pos] & TOKEN_TERMINAL);
 }
+#endif
 
 static parse_rule_t *
 _vbuild_rule(parse_tree_branch_t *branch)
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index bd676213f4..8f7203ef87 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -321,7 +321,7 @@ kMenuSelect(state_t *s, int funct_nr, int argc, reg_t *argv)
 	int type = GET_SEL32V(event, type);
 	int message = GET_SEL32V(event, message);
 	int modifiers = GET_SEL32V(event, modifiers);
-	int menu_nr = -1, item_nr;
+	int menu_nr = -1, item_nr = 0;
 	menu_item_t *item;
 	int menu_mode = 0; /* Menu is active */
 	int mouse_down = 0;
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 89273d1137..4679a45f9a 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -1091,9 +1091,9 @@ nearest_intersection(pf_state_t *s, point_t p, point_t q, point_t *ret)
 **             (point_t) *ret: On success, the closest intersection point
 */
 {
-	polygon_t *polygon;
+	polygon_t *polygon = 0;
 	pointf_t isec;
-	polygon_t *ipolygon;
+	polygon_t *ipolygon = 0;
 	float dist = HUGE_DISTANCE;
 
 	LIST_FOREACH(polygon, &s->polygons, entries) {
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index ebce947b50..6a2b72557b 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -532,7 +532,7 @@ kDoSound_SCI01(state_t *s, int funct_nr, int argc, reg_t *argv)
 		int sec = 0;
 		int frame = 0;
 		int result = SI_LOOP; /* small hack */
-		int cue;
+		int cue = 0;
 
 		while (result == SI_LOOP)
 		       result = sfx_poll_specific(&s->sound, handle, &cue);
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index b8e4ec3b74..6143a2af88 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -203,7 +203,7 @@ kSetSynonyms(state_t *s, int funct_nr, int argc, reg_t *argv)
 	while (node) {
 		reg_t objpos = node->value;
 		int seg;
-		int synonyms_nr;
+		int synonyms_nr = 0;
 
 		script = GET_SEL32V(objpos, number);
 		seg = sm_seg_get(&(s->seg_manager), script);
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index bf4657a96e..2417e2a38b 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -27,14 +27,19 @@
 
 #include "sci/engine/message.h"
 
+#if 0
+// Unreferenced - removed
 static
 int get_talker_trivial(index_record_cursor_t *cursor)
 {
 	return -1;
 }
+#endif
 
 /* Version 2.101 and later code ahead */
 
+#if 0
+// Unreferenced - removed
 static
 void index_record_parse_2101(index_record_cursor_t *cursor, message_tuple_t *t)
 {
@@ -45,7 +50,10 @@ void index_record_parse_2101(index_record_cursor_t *cursor, message_tuple_t *t)
 	t->verb = verb;
 	t->cond = t->seq = 0;
 }
+#endif
 
+#if 0
+// Unreferenced - removed
 static
 void index_record_get_text_2101(index_record_cursor_t *cursor, char *buffer, int buffer_size)
 {
@@ -54,12 +62,16 @@ void index_record_get_text_2101(index_record_cursor_t *cursor, char *buffer, int
 	
 	strncpy(buffer, stringptr, buffer_size);
 }
+#endif
 
+#if 0
+// Unreferenced - removed
 static
 int header_get_index_record_count_2101(byte *header)
 {
 	return getUInt16(header + 4);
 }
+#endif
 
 /* Version 3.411 and later code ahead */
 
@@ -211,7 +223,7 @@ static message_handler_t fixed_handler = {3411,
 void message_state_initialize(resource_mgr_t *resmgr, message_state_t *state)
 {
 	resource_t *tester = scir_find_resource(resmgr, sci_message, 0, 0);
-	int version;
+	//int version;
 
 //	if (tester == NULL) return;
 
diff --git a/engines/sci/engine/scriptconsole.cpp b/engines/sci/engine/scriptconsole.cpp
index 48f1f1695b..04aaa47b87 100644
--- a/engines/sci/engine/scriptconsole.cpp
+++ b/engines/sci/engine/scriptconsole.cpp
@@ -1083,7 +1083,7 @@ c_man (state_t * s)
 	unsigned int i;
 	char *name = cmd_params[0].str;
 	char *c = strchr(name, '.');
-	cmd_mm_entry_t *entry;
+	cmd_mm_entry_t *entry = 0;
 
 	if (c) {
 		*c = 0;
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index d260fa3d49..73bfcf3a97 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -1977,7 +1977,7 @@ c_visible_map(state_t *s)
     sciprintf("Not in debug state\n");
     return 1;
   }
-WARNING(fixme!)
+//WARNING(fixme!)
 #if 0
   if (s->onscreen_console)
     con_restore_screen(s, s->osc_backup);
@@ -2296,6 +2296,8 @@ rr = GET_SELECTOR(pos, rr); \
 tt = GET_SELECTOR(pos, tt); \
 bb = GET_SELECTOR(pos, bb);
 
+#if 0
+// Unreferenced - removed
 static int
 c_gfx_draw_viewobj(state_t *s)
 {
@@ -2379,7 +2381,7 @@ c_gfx_draw_viewobj(state_t *s)
 	return 0;
 #endif
 }
-
+#endif
 
 static int
 c_gfx_flush_resources(state_t *s)
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index b4a675174a..42654e1e01 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -476,6 +476,8 @@ sm_free_script ( mem_obj_t* mem )
 }
 
 /* memory operations */
+#if 0
+// Unreferenced - removed
 static void
 sm_mset (seg_manager_t* self, int offset, int c, size_t n, int id, int flag) {
 	mem_obj_t* mem_obj;
@@ -495,7 +497,10 @@ sm_mset (seg_manager_t* self, int offset, int c, size_t n, int id, int flag) {
 		break;
 	}
 }
+#endif
 
+#if 0
+// Unreferenced - removed
 static void
 sm_mcpy_in_in (seg_manager_t* self, int dst, const int src, size_t n, int id, int flag) {
 	mem_obj_t* mem_obj;
@@ -515,6 +520,7 @@ sm_mcpy_in_in (seg_manager_t* self, int dst, const int src, size_t n, int id, in
 		break;
 	}
 }
+#endif
 
 void
 sm_mcpy_in_out (seg_manager_t* self, int dst, const void* src, size_t n, int id, int flag) {
@@ -536,6 +542,8 @@ sm_mcpy_in_out (seg_manager_t* self, int dst, const void* src, size_t n, int id,
 	}
 }
 
+#if 0
+// Unreferenced - removed
 static void
 sm_mcpy_out_in (seg_manager_t* self, void* dst, const int src, size_t n, int id, int flag) {
 	mem_obj_t* mem_obj;
@@ -555,6 +563,7 @@ sm_mcpy_out_in (seg_manager_t* self, void* dst, const int src, size_t n, int id,
 		break;
 	}
 }
+#endif
 
 gint16
 sm_get_heap (seg_manager_t* self, reg_t reg)
@@ -701,6 +710,8 @@ sm_set_export_width(struct _seg_manager_t* self, int flag)
 	self->exports_wide = flag;
 }
 
+#if 0
+// Unreferenced - removed
 static guint16 *
 sm_get_export_table_offset (struct _seg_manager_t* self, int id, int flag, int *max)
 {
@@ -709,6 +720,7 @@ sm_get_export_table_offset (struct _seg_manager_t* self, int id, int flag, int *
 		*max = self->heap[id]->data.script.exports_nr;
 	return self->heap[id]->data.script.export_table;
 }
+#endif
 
 void
 sm_set_synonyms_offset (struct _seg_manager_t* self, int offset, int id, id_flag flag) {
@@ -737,13 +749,18 @@ sm_get_synonyms_nr (struct _seg_manager_t* self, int id, id_flag flag)
 	return self->heap[id]->data.script.synonyms_nr;
 }
 
+#if 0
+// Unreferenced - removed
 static int
 sm_get_heappos (struct _seg_manager_t* self, int id, int flag)
 {
 	GET_SEGID();
 	return 0;
 }
+#endif
 
+#if 0
+// Unreferenced - removed
 static void
 sm_set_variables (struct _seg_manager_t* self, reg_t reg, int obj_index, reg_t variable_reg, int variable_index ) {
 	script_t* script;
@@ -760,7 +777,7 @@ sm_set_variables (struct _seg_manager_t* self, reg_t reg, int obj_index, reg_t v
 
 	script->objects[obj_index].variables[variable_index] = variable_reg;
 }
-
+#endif
 
 static inline int
 _relocate_block(seg_manager_t *self, reg_t *block, int block_location, int block_items, seg_id_t segment, int location)
@@ -959,7 +976,7 @@ sm_script_obj_init0(seg_manager_t *self, state_t *s, reg_t obj_pos)
 	script_t *scr;
 	object_t *obj;
 	int id;
-	int base = obj_pos.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
+	unsigned int base = obj_pos.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
 	reg_t temp;
 
 	VERIFY( !(obj_pos.segment >= self->heap_size || mobj->type != MEM_OBJ_SCRIPT),
@@ -1165,7 +1182,7 @@ void
 sm_script_initialise_locals(seg_manager_t *self, reg_t location)
 {
 	mem_obj_t *mobj = self->heap[location.segment];
-	int count;
+	unsigned int count;
 	script_t *scr;
 	local_variables_t *locals;
 
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index d2831fbd69..c9c4560d67 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -683,7 +683,7 @@ run_vm(state_t *s, int restoring)
 	seg_id_t variables_seg[4]; /* Same as above, contains segment IDs */
 #ifndef DISABLE_VALIDATIONS
 	int variables_max[4]; /* Max. values for all variables */
-	int code_buf_size = 0 /* (Avoid spurious warning) */;
+	unsigned int code_buf_size = 0 /* (Avoid spurious warning) */;
 #endif
 	int temp;
 	gint16 aux_acc; /* Auxiliary 16 bit accumulator */
diff --git a/engines/sci/gfx/gfx_crossblit.cpp b/engines/sci/gfx/gfx_crossblit.cpp
index af55a90490..89be4b911a 100644
--- a/engines/sci/gfx/gfx_crossblit.cpp
+++ b/engines/sci/gfx/gfx_crossblit.cpp
@@ -35,6 +35,8 @@
 ** BYTESPP: Bytes per pixel
 */
 
+#include "common/scummsys.h"
+
 /* set optimisations for Win32: */
 /* g on: enable global optimizations */
 /* t on: use fast code */
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index 110f52a52c..665a00459c 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -111,6 +111,8 @@ _gfxop_alloc_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_n
 		gfx_alloc_color(state->driver->mode->palette, colors + i);
 }
 
+#if 0
+// Unreferenced - removed
 static void
 _gfxop_free_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_nr)
 {
@@ -122,7 +124,7 @@ _gfxop_free_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_nr
 	for (i = 0; i < colors_nr; i++)
 		gfx_free_color(state->driver->mode->palette, colors + i);
 }
-
+#endif
 
 int _gfxop_clip(rect_t *rect, rect_t clipzone)
 /* Returns 1 if nothing is left */
diff --git a/engines/sci/gfx/resource/sci_pal_1.cpp b/engines/sci/gfx/resource/sci_pal_1.cpp
index 2a127f4bb3..2f12f8180c 100644
--- a/engines/sci/gfx/resource/sci_pal_1.cpp
+++ b/engines/sci/gfx/resource/sci_pal_1.cpp
@@ -42,7 +42,7 @@ gfxr_read_pal11(int id, int *colors_nr, byte *resource, int size)
 {
 	int start_color = resource[25];
 	int format = resource[32];
-	int entry_size;
+	int entry_size = 0;
 	gfx_pixmap_color_t *retval;
 	byte *pal_data = resource + 37;
 	int _colors_nr = *colors_nr = getUInt16(resource + 29);
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp
index 6bb6d6f6f7..d3c16724fb 100644
--- a/engines/sci/gfx/resource/sci_pic_0.cpp
+++ b/engines/sci/gfx/resource/sci_pic_0.cpp
@@ -368,7 +368,8 @@ _gfxr_auxbuf_tag_line(gfxr_pic_t *pic, int pos, int width)
 		pic->aux_map[i+pos] |= FRESH_PAINT;
 }
 
-
+#if 0
+// Unreferenced - removed
 static void
 _gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *max_y)
 {
@@ -518,7 +519,7 @@ _gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *ma
 		(*max_y)++;
 }
 
-
+#endif
 
 /*** Regular drawing operations ***/
 
diff --git a/engines/sci/gfx/resource/sci_picfill.cpp b/engines/sci/gfx/resource/sci_picfill.cpp
index c7ecea08a7..e791231589 100644
--- a/engines/sci/gfx/resource/sci_picfill.cpp
+++ b/engines/sci/gfx/resource/sci_picfill.cpp
@@ -18,6 +18,8 @@
 
 ***************************************************************************/
 
+#include "sci/include/gfx_resource.h"
+
 /* Generic pic filling code, to be included by sci_pic_0.c
  *
  *
diff --git a/engines/sci/gfx/sbtree.cpp b/engines/sci/gfx/sbtree.cpp
index 48054d4620..3e0f7883ee 100644
--- a/engines/sci/gfx/sbtree.cpp
+++ b/engines/sci/gfx/sbtree.cpp
@@ -191,6 +191,7 @@ sbtree_get(sbtree_t *tree, int key)
 		return NULL;
 }
 
+#if 0
 static void
 sbtree_print(sbtree_t *tree)
 {
@@ -216,7 +217,7 @@ sbtree_print(sbtree_t *tree)
 	}
 	fprintf(stderr,"\n");
 }
-
+#endif
 
 
 /***************************** TEST CODE ********************************/
diff --git a/engines/sci/include/gfx_system.h b/engines/sci/include/gfx_system.h
index 4943a2aff1..45341b6237 100644
--- a/engines/sci/include/gfx_system.h
+++ b/engines/sci/include/gfx_system.h
@@ -132,7 +132,7 @@ typedef struct { /* gfx_pixmap_color_t: Pixmap-specific color entries */
 typedef struct { /* gfx_color_t: Full color */
 	gfx_pixmap_color_t visual;
 	guint8 alpha; /* transparency = (1-opacity) */
-	byte priority, control;
+	signed char priority, control;
 	byte mask; /* see mask values below */
 } gfx_color_t;
 
diff --git a/engines/sci/scicore/console.cpp b/engines/sci/scicore/console.cpp
index 0aba9bd019..4bb45160b5 100644
--- a/engines/sci/scicore/console.cpp
+++ b/engines/sci/scicore/console.cpp
@@ -48,7 +48,7 @@ sciprintf (const char *fmt, ...)
 {
 	va_list argp;
 	size_t bufsize = 256;
-	int i;
+	unsigned int i;
 	char *buf 	= (char *) sci_malloc (bufsize);
 
 	if (NULL == fmt) {
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index ac7983309f..74cb850beb 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -442,7 +442,7 @@ scir_add_appropriate_sources(resource_mgr_t *mgr,
 			     char *dir)
 {
 	char *trailing_slash = "";
-	char path_separator;
+	//char path_separator;
 	sci_dir_t dirent;
 	char *name;
 	resource_source_t *map;
diff --git a/engines/sci/scicore/script.cpp b/engines/sci/scicore/script.cpp
index b3d977e5ad..b54c0e52c3 100644
--- a/engines/sci/scicore/script.cpp
+++ b/engines/sci/scicore/script.cpp
@@ -363,7 +363,7 @@ script_dissect(resource_mgr_t *resmgr, int res_no, char **snames, int snames_nr)
   while (_seeker < script->size) {
     int objtype = getInt16(script->data + _seeker);
     int objsize;
-    int seeker = _seeker + 4;
+    unsigned int seeker = _seeker + 4;
 
     if (!objtype) {
       sciprintf("End of script object (#0) encountered.\n");
diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp
index 6b6e1ef0ee..fd2bb404db 100644
--- a/engines/sci/scicore/versions.cpp
+++ b/engines/sci/scicore/versions.cpp
@@ -115,7 +115,7 @@ is_mac_exe(char *filename)
 	FILE *file;
 	byte buf[4];
 	guint32 val;
-	int i;
+	unsigned int i;
 
 	/* Mac executables have no extension */
 	if (strchr(filename, '.'))
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 786f80ab45..5555af4dfe 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -125,7 +125,8 @@ _freeze_time(sfx_state_t *self)
 	}
 }
 
-
+#if 0
+// Unreferenced - removed
 static void
 _dump_playing_list(sfx_state_t *self, char *msg)
 {
@@ -148,6 +149,7 @@ _dump_playing_list(sfx_state_t *self, char *msg)
 
 	fprintf(stderr, "]\n");
 }
+#endif
 
 static void
 _dump_songs(sfx_state_t *self)
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index 78bbdf816b..a7e66497ea 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -799,7 +799,7 @@ _sci1_song_init(sci1_song_iterator_t *self)
 {
 	sci1_sample_t *seeker;
 	int last_time;
-	int offset = 0;
+	unsigned int offset = 0;
 	self->channels_nr = 0;
 	self->next_sample = 0;
 //	self->device_id = 0x0c;
@@ -947,6 +947,8 @@ _sci1_no_delta_time(sci1_song_iterator_t *self)
 	return 1;
 }
 
+#if 0
+// Unreferenced - removed
 static void
 _sci1_dump_state(sci1_song_iterator_t *self)
 {
@@ -982,6 +984,7 @@ _sci1_dump_state(sci1_song_iterator_t *self)
 	}
 	sciprintf("------------------------------------------\n");
 }
+#endif
 
 #define COMMAND_INDEX_NONE -1
 #define COMMAND_INDEX_PCM -2
@@ -1537,7 +1540,7 @@ _tee_read_next_command(tee_song_iterator_t *it, unsigned char *buf,
 	if ((it->status & (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE))
 	    != (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE)) {
 		/* Not all are is active? */
-		int which;
+		int which = 0;
 #ifdef DEBUG_TEE_ITERATOR
 		fprintf(stderr, "\tRequesting transformation...\n");
 #endif
@@ -1742,6 +1745,8 @@ _tee_init(tee_song_iterator_t *it)
 	it->children[TEE_RIGHT].it->init(it->children[TEE_RIGHT].it);
 }
 
+#if 0
+// Unreferenced - removed
 static void
 _tee_free(tee_song_iterator_t *it)
 {
@@ -1750,6 +1755,7 @@ _tee_free(tee_song_iterator_t *it)
 		if (it->children[i].it && it->may_destroy)
 			songit_free(it->children[i].it);
 }
+#endif
 
 static void
 songit_tee_death_notification(tee_song_iterator_t *self,
diff --git a/engines/sci/sfx/mixer/soft.cpp b/engines/sci/sfx/mixer/soft.cpp
index d71567a209..d4ab7232bc 100644
--- a/engines/sci/sfx/mixer/soft.cpp
+++ b/engines/sci/sfx/mixer/soft.cpp
@@ -250,6 +250,8 @@ _mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed)
 	BREAKPOINT();
 }
 
+#if 0
+// Unreferenced - removed
 static void
 mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed)
 {
@@ -257,7 +259,7 @@ mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed)
 	_mix_unsubscribe(self, feed);
 	RELEASE_LOCK();
 }
-
+#endif
 
 static void
 mix_exit(sfx_pcm_mixer_t *self)