diff options
| author | Filippos Karapetis | 2010-06-03 10:16:21 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-03 10:16:21 +0000 |
| commit | 86b452d36cb781c24e1b167dd6cef768b7c6286b (patch) | |
| tree | 97a66ac538ca14982f082d4ca93c5c90c98f4a6c /engines/sci/engine/script.cpp | |
| parent | 86dcc28342021933f04ff3542932fc8823ff2360 (diff) | |
| download | scummvm-rg350-86b452d36cb781c24e1b167dd6cef768b7c6286b.tar.gz scummvm-rg350-86b452d36cb781c24e1b167dd6cef768b7c6286b.tar.bz2 scummvm-rg350-86b452d36cb781c24e1b167dd6cef768b7c6286b.zip | |
Moved several object-related defines inside vm.h into segment.h, where the Object class resides. Also, removed several unused defines
svn-id: r49406
Diffstat (limited to 'engines/sci/engine/script.cpp')
| -rw-r--r-- | engines/sci/engine/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 3fb8a5763e..1f32e50b67 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -205,7 +205,7 @@ void SegManager::scriptInitialiseObjectsSci11(SegmentId seg) { const byte *seeker = scr->_heapStart + 4 + READ_SCI11ENDIAN_UINT16(scr->_heapStart + 2) * 2; while (READ_SCI11ENDIAN_UINT16(seeker) == SCRIPT_OBJECT_MAGIC_NUMBER) { - if (READ_SCI11ENDIAN_UINT16(seeker + 14) & SCRIPT_INFO_CLASS) { // -info- selector + if (READ_SCI11ENDIAN_UINT16(seeker + 14) & kInfoFlagClass) { // -info- selector int classpos = seeker - scr->_buf; int species = READ_SCI11ENDIAN_UINT16(seeker + 10); |