diff options
| author | Max Horn | 2011-05-25 16:44:50 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-25 16:44:50 +0200 |
| commit | 8615cecfe07ee4d76d9620dd96d11c8ce4df5011 (patch) | |
| tree | 8f548439cd7060bd9e1055775ce9a17c1890190a /engines | |
| parent | 587811d852713dfd14a23e48bedc06ae9d99a79b (diff) | |
| download | scummvm-rg350-8615cecfe07ee4d76d9620dd96d11c8ce4df5011.tar.gz scummvm-rg350-8615cecfe07ee4d76d9620dd96d11c8ce4df5011.tar.bz2 scummvm-rg350-8615cecfe07ee4d76d9620dd96d11c8ce4df5011.zip | |
SCI: Constify Object::_baseVars
This may have to be undone if we ever want to start free'ing _baseVars again.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/object.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/object.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp index aee93ffaa7..f09f18298a 100644 --- a/engines/sci/engine/object.cpp +++ b/engines/sci/engine/object.cpp @@ -58,14 +58,14 @@ void Object::init(byte *buf, reg_t obj_pos, bool initVariables) { if (getSciVersion() <= SCI_VERSION_1_LATE) { _variables.resize(READ_LE_UINT16(data + kOffsetSelectorCounter)); - _baseVars = (uint16 *)(_baseObj + _variables.size() * 2); + _baseVars = (const uint16 *)(_baseObj + _variables.size() * 2); _methodCount = READ_LE_UINT16(data + READ_LE_UINT16(data + kOffsetFunctionArea) - 2); for (int i = 0; i < _methodCount * 2 + 2; ++i) { _baseMethod.push_back(READ_SCI11ENDIAN_UINT16(data + READ_LE_UINT16(data + kOffsetFunctionArea) + i * 2)); } } else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) { _variables.resize(READ_SCI11ENDIAN_UINT16(data + 2)); - _baseVars = (uint16 *)(buf + READ_SCI11ENDIAN_UINT16(data + 4)); + _baseVars = (const uint16 *)(buf + READ_SCI11ENDIAN_UINT16(data + 4)); _methodCount = READ_SCI11ENDIAN_UINT16(buf + READ_SCI11ENDIAN_UINT16(data + 6)); for (int i = 0; i < _methodCount * 2 + 3; ++i) { _baseMethod.push_back(READ_SCI11ENDIAN_UINT16(buf + READ_SCI11ENDIAN_UINT16(data + 6) + i * 2)); diff --git a/engines/sci/engine/object.h b/engines/sci/engine/object.h index 7e07fb2f6d..80c8e9e83d 100644 --- a/engines/sci/engine/object.h +++ b/engines/sci/engine/object.h @@ -236,7 +236,7 @@ private: void initSelectorsSci3(const byte *buf); const byte *_baseObj; /**< base + object offset within base */ - uint16 *_baseVars; /**< Pointer to the varselector area for this object */ + const uint16 *_baseVars; /**< Pointer to the varselector area for this object */ Common::Array<uint16> _baseMethod; /**< Pointer to the method selector area for this object */ uint16 *_propertyOffsetsSci3; /**< This is used to enable relocation of property valuesa in SCI3 */ |