[Scummvm-cvs-logs] CVS: scummvm config-file.cpp,1.7,1.8 object.cpp,1.65,1.66 script.cpp,1.53,1.54 script_v1.cpp,1.95,1.96

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10198

Modified Files:
	config-file.cpp object.cpp script.cpp script_v1.cpp 
Log Message:
fixed some warnings

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/config-file.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config-file.cpp	2 May 2002 00:46:12 -0000	1.7
+++ config-file.cpp	5 May 2002 18:10:28 -0000	1.8
@@ -33,7 +33,8 @@
 
 static char *ltrim(char *t)
 {
-	for (; *t && (*t == ' '); t++);
+	for (; *t && (*t == ' '); t++)
+		;
 	return t;
 }
 

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- object.cpp	24 Apr 2002 04:26:08 -0000	1.65
+++ object.cpp	5 May 2002 18:10:28 -0000	1.66
@@ -920,6 +920,7 @@
 			return i;
 	}
 	error("Inventory full, %d max items", _maxInventoryItems);
+	return -1;
 }
 
 void Scumm::SamInventoryHack(int obj)
@@ -1281,6 +1282,7 @@
 			return i;
 	}
 	error("findFlObjectSlot: Out of FLObject slots");
+	return -1;
 }
 
 void Scumm::loadFlObject(uint object, uint room)

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- script.cpp	26 Apr 2002 14:13:39 -0000	1.53
+++ script.cpp	5 May 2002 18:10:29 -0000	1.54
@@ -162,6 +162,7 @@
 			return i;
 	}
 	error("Too many scripts running, %d max", NUM_SCRIPT_SLOT);
+	return -1;
 }
 
 /* Run script 'script' nested - eg, within the parent script.*/
@@ -350,6 +351,7 @@
 	}
 
 	error("Illegal varbits (r)");
+	return -1;
 }
 
 void Scumm::writeVar(uint var, int value)
@@ -1055,6 +1057,7 @@
 			return i;
 	}
 	error("Out of array pointers, %d max", _numArray);
+	return -1;
 }
 
 void Scumm::arrayop_1(int a, byte *ptr)

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- script_v1.cpp	1 May 2002 22:31:29 -0000	1.95
+++ script_v1.cpp	5 May 2002 18:10:29 -0000	1.96
@@ -2056,7 +2056,8 @@
 			char buf[256], *s;
 			a = getVarOrDirectByte(0x80);
 			s = buf;
-			while ((*s++ = fetchScriptByte()));
+			while ((*s++ = fetchScriptByte()))
+				;
 			warning("roomops:13 save-string(%d,\"%s\") not implemented", a, buf);
 			break;
 		}
@@ -2064,7 +2065,8 @@
 		char buf[256], *s;
 		a = getVarOrDirectByte(0x80);
 		s = buf;
-		while ((*s++ = fetchScriptByte()));
+		while ((*s++ = fetchScriptByte()))
+			;
 		warning("roomops:14 load-string(%d,\"%s\") not implemented", a, buf);
 		break;
 	case 15:											/* palmanip? */