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

[lordhoto at users.sourceforge.net]

Revision: 38251
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38251&view=rev
Author:   lordhoto
Date:     2009-02-15 15:06:14 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Fixed more warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/klists.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-02-15 15:00:31 UTC (rev 38250)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-02-15 15:06:14 UTC (rev 38251)
@@ -415,7 +415,7 @@
 kMoveCursor(state_t *s, int funct_nr, int argc, reg_t *argv)
 {
 	point_t newpos;
-	static point_t oldpos = {0};
+	static point_t oldpos = {0,0};
 
 	newpos = s->gfx_state->pointer_pos;
 
@@ -2168,7 +2168,7 @@
 	while (node) {
 		reg_t obj = node->value; /* The object we're using */
 		reg_t next_node;
-		gfxw_dyn_view_t *widget;
+		gfxw_dyn_view_t *tempWidget;
 
 		if (options & _K_MAKE_VIEW_LIST_CYCLE) {
 			unsigned int signal = GET_SEL32V(obj, signal);
@@ -2186,10 +2186,10 @@
 		    list->first.offset == 0) /* The cast list was completely emptied! */
 			break;
 
-		widget = _k_make_dynview_obj(s, obj, options, sequence_nr--,
+		tempWidget = _k_make_dynview_obj(s, obj, options, sequence_nr--,
 					     funct_nr, argc, argv);
-		if (widget) 
-			GFX_ASSERT((*widget_list)->add(GFXWC(*widget_list), GFXW(widget)));
+		if (tempWidget) 
+			GFX_ASSERT((*widget_list)->add(GFXWC(*widget_list), GFXW(tempWidget)));
 
 			node = LOOKUP_NODE(next_node); /* Next node */
 		}
@@ -2583,7 +2583,7 @@
 		   official semantics) would cut off the lower part of the
 		   icons in an SCI1 icon bar. Instead we have an
 		   iconbar_port that does not exist in SSCI. */
-		if (port_nr == -1) port_nr = s->iconbar_port->ID;
+		if (port_nr == (unsigned int)-1) port_nr = s->iconbar_port->ID;
 
 		new_port = gfxw_find_port(s->visual, port_nr);
 
@@ -2728,7 +2728,7 @@
 	gfx_color_t bgcolor;
 	gfx_color_t fgcolor;
 	gfx_color_t black;
-	gfx_color_t white;
+	gfx_color_t lWhite;
 	int priority;
 	int argextra = argc == 13 ? 4 : 0; /* Triggers in PQ3 */
 
@@ -2766,13 +2766,13 @@
 	black.visual = *(get_pic_color(s, 0));
 	black.mask = GFX_MASK_VISUAL;
 	black.alpha = 0;
-	white.visual = *(get_pic_color(s, s->resmgr->sci_version < SCI_VERSION_01_VGA ? 15 : 255)),
-	white.mask = GFX_MASK_VISUAL;
-	white.alpha = 0;
+	lWhite.visual = *(get_pic_color(s, s->resmgr->sci_version < SCI_VERSION_01_VGA ? 15 : 255)),
+	lWhite.mask = GFX_MASK_VISUAL;
+	lWhite.alpha = 0;
 
 	window = sciw_new_window(s, gfx_rect(x, y, xl, yl), s->titlebar_port->font_nr,
 				 fgcolor, bgcolor, s->titlebar_port->font_nr,
-				 white,
+				 lWhite,
 				 black,
 				 argv[4+argextra].segment ? kernel_dereference_char_pointer(s, argv[4+argextra], 0) : NULL, 
 				 flags);

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2009-02-15 15:00:31 UTC (rev 38250)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2009-02-15 15:06:14 UTC (rev 38251)
@@ -597,9 +597,9 @@
 
 	for (i=0;i<input_size;i++)
 	{
-		reg_t node = _k_new_node(s, temp_array[i].key,
+		reg_t lNode = _k_new_node(s, temp_array[i].key,
 					 temp_array[i].value);
-		_k_add_to_end(s, output_data, node);
+		_k_add_to_end(s, output_data, lNode);
 	}
 
 	free(temp_array);


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