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

[thebluegr at users.sourceforge.net]

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

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmath.cpp
    scummvm/trunk/engines/sci/engine/kmovement.cpp
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp
    scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
    scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp

Modified: scummvm/trunk/engines/sci/engine/kmath.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmath.cpp	2009-02-15 12:11:27 UTC (rev 38229)
+++ scummvm/trunk/engines/sci/engine/kmath.cpp	2009-02-15 12:23:16 UTC (rev 38230)
@@ -59,7 +59,7 @@
 	if ((xrel == 0) && (yrel == 0))
 		return 0;
 	else {
-		int val = (int) (180.0/PI * atan2(xrel, -yrel));
+		int val = (int) (180.0/PI * atan2((float)xrel, (float)-yrel));
 		if (val < 0)
 			val += 360;
 

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-02-15 12:11:27 UTC (rev 38229)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-02-15 12:23:16 UTC (rev 38230)
@@ -140,7 +140,7 @@
 
 		// FIXME: This choice of vy makes t roughly (2+sqrt(2))/gy * sqrt(dy);
 		// so if gy==3, then t is roughly sqrt(dy)...
-		vy = (int)sqrt(gy * abs(2 * dy)) + 1;
+		vy = (int)sqrt((float)gy * (float)abs(2 * dy)) + 1;
 	} else {
 		// As stated above, the vertical direction is correlated to the horizontal by the
 		// (non-zero) factor c.

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-02-15 12:11:27 UTC (rev 38229)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-02-15 12:23:16 UTC (rev 38230)
@@ -3277,6 +3277,7 @@
 	}
 	
 	sciprintf("%s\n", invalid ? " (invalid)" : "");
+	return 0;
 }
 
 int
@@ -3403,6 +3404,7 @@
 	apply_to_reg_t_hash_map(use_map, NULL, print_all_of_them);
 
 	free_reg_t_hash_map (use_map);
+	return 0;
 }
 
 

Modified: scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp	2009-02-15 12:11:27 UTC (rev 38229)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp	2009-02-15 12:23:16 UTC (rev 38230)
@@ -175,7 +175,7 @@
 	resource_mgr_t *resmgr = (resource_mgr_t *) state->misc_payload;
 	resource_t *res = scir_find_resource(resmgr, sci_view, nr, 0);
 	int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr);
-	gfxr_view_t *result;
+	gfxr_view_t *result = 0;
 
 	if (!res || !res->data)
 		return NULL;

Modified: scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp	2009-02-15 12:11:27 UTC (rev 38229)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp	2009-02-15 12:23:16 UTC (rev 38230)
@@ -62,7 +62,7 @@
 			int op = resource[runlength_pos];
 			int bytes;
 			int readbytes = 0;
-			int color;
+			int color = 0;
 
 			NEXT_RUNLENGTH_BYTE(1);
 


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