[Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.56,1.57

[David Eriksson]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv31441/queen

Modified Files:
	logic.h 
Log Message:
Validate room number


Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- logic.h	6 Nov 2003 08:44:33 -0000	1.56
+++ logic.h	6 Nov 2003 15:26:44 -0000	1.57
@@ -169,7 +169,13 @@
 	int16 gameState(int index);
 	void gameState(int index, int16 newValue);
 
-	const char *roomName(uint16 roomNum) const { return _roomName[roomNum] ; }
+	const char *roomName(uint16 roomNum) const { 
+		if (roomNum >= 1 && roomNum <= _numRooms)
+			return _roomName[roomNum];
+		else
+			error("Invalid room number: %i", roomNum);
+	}
+	
 	const char *objectName(uint16 objNum) const { return _objName[objNum]; }
 	const char *objectTextualDescription(uint16 objNum) const { return _objDescription[objNum]; }