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

[lordhoto at users.sourceforge.net]

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

Log Message:
-----------
Yet more warning fixes.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmenu.cpp
    scummvm/trunk/engines/sci/engine/kpathing.cpp

Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-02-15 15:09:45 UTC (rev 38252)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp	2009-02-15 15:10:47 UTC (rev 38253)
@@ -393,20 +393,20 @@
 		old_menu = -1;
 
 		while (menu_mode) {
-			sci_event_t event = gfxop_get_event(s->gfx_state, SCI_EVT_ANY);
+			sci_event_t ev = gfxop_get_event(s->gfx_state, SCI_EVT_ANY);
 
 			claimed = 0;
 
-			switch (event.type) {
+			switch (ev.type) {
 			case SCI_EVT_QUIT:
 				quit_vm();
 				return NULL_REG;
 
 			case SCI_EVT_KEYBOARD:
-				switch (event.data) {
+				switch (ev.data) {
 
 				case '`':
-					if (event.buckybits & SCI_EVM_CTRL)
+					if (ev.buckybits & SCI_EVM_CTRL)
 						s->visual->print(GFXW(s->visual), 0);
 					break;
 

Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp	2009-02-15 15:09:45 UTC (rev 38252)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp	2009-02-15 15:10:47 UTC (rev 38253)
@@ -80,21 +80,13 @@
 /* Floating point struct */
 typedef struct pointf
 {
+	pointf() : x(0), y(0) {}
+	pointf(float x_, float y_) : x(x_), y(y_) {}
+
 	float x, y;
 } pointf_t;
 
 pointf_t
-pointf(float x, float y)
-{
-	pointf_t p;
-
-	p.x = x;
-	p.y = y;
-
-	return p;
-}
-
-pointf_t
 to_pointf(point_t p)
 {
 	return pointf(p.x, p.y);


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