thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Fixed the pathfinding issue for LSL5 room 640, where Patti walks off-screen (we still need a proper way of detecting this, though...)

Browse source 
- Made warnings where invalid pointers are dereferenced more precise

svn-id: r45257
This commit is contained in:
Filippos Karapetis 2009-10-20 10:08:28 +00:00
parent c0f6657797
commit a88aa2f45f
3 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/engine/segment.cpp
View file

@ -222,7 +222,7 @@ bool Script::isValidOffset(uint16 offset) const {
SegmentRef Script::dereference(reg_t pointer) {
if (pointer.offset > _bufSize) {
warning("Attempt to dereference invalid pointer %04x:%04x into script segment (script size=%d)",
warning("Script::dereference(): Attempt to dereference invalid pointer %04x:%04x into script segment (script size=%d)",
PRINT_REG(pointer), (uint)_bufSize);
return SegmentRef();
}
@ -299,7 +299,7 @@ SegmentRef SystemStrings::dereference(reg_t pointer) {
ret.raw = (byte *)(_strings[pointer.offset]._value);
else {
// This occurs in KQ5CD when interacting with certain objects
warning("Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
warning("SystemStrings::dereference(): Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
}
return ret;