diff options
| author | David Eriksson | 2003-11-06 15:26:44 +0000 |
|---|---|---|
| committer | David Eriksson | 2003-11-06 15:26:44 +0000 |
| commit | d3936b616c751303ddada6cabab8fbd11eb770c9 (patch) | |
| tree | b7848a4514094595ec635996768ff3695f98b4ed /queen | |
| parent | 0f98be649b940a7b686aeebc7cd2fe3794486934 (diff) | |
| download | scummvm-rg350-d3936b616c751303ddada6cabab8fbd11eb770c9.tar.gz scummvm-rg350-d3936b616c751303ddada6cabab8fbd11eb770c9.tar.bz2 scummvm-rg350-d3936b616c751303ddada6cabab8fbd11eb770c9.zip | |
Validate room number
svn-id: r11162
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/logic.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/queen/logic.h b/queen/logic.h index 543e649041..8c67c1d89c 100644 --- a/queen/logic.h +++ b/queen/logic.h @@ -169,7 +169,13 @@ public: 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]; } |