aboutsummaryrefslogtreecommitdiff
path: root/queen/logic.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-01-16 14:15:44 +0000
committerGregory Montoir2004-01-16 14:15:44 +0000
commit899843443f6ff6f92ea86fd0ddfbe682abf04b01 (patch)
tree9bcaae8305b70cf916684e2596d99368ea2ca22b /queen/logic.cpp
parent11411767758dda1b7341c28e085064ee13c32c7b (diff)
downloadscummvm-rg350-899843443f6ff6f92ea86fd0ddfbe682abf04b01.tar.gz
scummvm-rg350-899843443f6ff6f92ea86fd0ddfbe682abf04b01.tar.bz2
scummvm-rg350-899843443f6ff6f92ea86fd0ddfbe682abf04b01.zip
it seems entryObj can be <0, check for it
svn-id: r12433
Diffstat (limited to 'queen/logic.cpp')
-rw-r--r--queen/logic.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 38c9a23112..dac66f6547 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -608,9 +608,6 @@ ObjectData *Logic::setupJoeInRoom(bool autoPosition, uint16 scale) {
debug(9, "Logic::setupJoeInRoom(%d, %d) joe.x=%d joe.y=%d", autoPosition, scale, _joe.x, _joe.y);
WalkOffData *pwo = NULL;
ObjectData *pod = objectData(_entryObj);
- if (pod == NULL) {
- error("Logic::setupJoeInRoom() - No object data for obj %d", _entryObj);
- }
uint16 oldx, oldy;
if (!autoPosition || joeX() != 0 || joeY() != 0) {