diff options
| author | Strangerke | 2016-09-18 22:15:51 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-18 22:16:52 +0200 |
| commit | 8bdabc16bde7b5d197797a9f1f2ff474ff7e726b (patch) | |
| tree | 7513991726e83ce1cfe27e54398811ce0799612d /engines/dm/objectman.cpp | |
| parent | 94cee9dead9e3bbea7dc7350c4071848d03c5325 (diff) | |
| download | scummvm-rg350-8bdabc16bde7b5d197797a9f1f2ff474ff7e726b.tar.gz scummvm-rg350-8bdabc16bde7b5d197797a9f1f2ff474ff7e726b.tar.bz2 scummvm-rg350-8bdabc16bde7b5d197797a9f1f2ff474ff7e726b.zip | |
DM: Rename some more enums
Diffstat (limited to 'engines/dm/objectman.cpp')
| -rw-r--r-- | engines/dm/objectman.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index 5b3407b42a..20e3ceb2ad 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -98,7 +98,7 @@ void ObjectMan::initConstants() { } ObjectMan::ObjectMan(DMEngine *vm) : _vm(vm) { - for (uint16 i = 0; i < k199_ObjectNameCount; ++i) + for (uint16 i = 0; i < kDMObjectNameCount; ++i) _objectNames[i] = nullptr; _objectIconForMousePointer = nullptr; @@ -116,10 +116,10 @@ void ObjectMan::loadObjectNames() { _objectIconForMousePointer = new byte[16 * 16]; - char *objectNames = new char[dispMan.getCompressedDataSize(k556_ObjectNamesGraphicIndice) + k199_ObjectNameCount]; - Common::MemoryReadStream stream = dispMan.getCompressedData(k556_ObjectNamesGraphicIndice); + char *objectNames = new char[dispMan.getCompressedDataSize(kDMObjectNamesGraphicIndice) + kDMObjectNameCount]; + Common::MemoryReadStream stream = dispMan.getCompressedData(kDMObjectNamesGraphicIndice); - for (uint16 objNameIndex = 0; objNameIndex < k199_ObjectNameCount; ++objNameIndex) { + for (uint16 objNameIndex = 0; objNameIndex < kDMObjectNameCount; ++objNameIndex) { _objectNames[objNameIndex] = objectNames; byte tmpByte; @@ -221,7 +221,7 @@ void ObjectMan::drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { int16 byteWidth; byte* blitDestination; int16 destHeight; - if (slotBoxIndex >= k8_SlotBoxInventoryFirstSlot) { + if (slotBoxIndex >= kDMSlotBoxInventoryFirstSlot) { blitDestination = _vm->_displayMan->_bitmapViewport; byteWidth = k112_byteWidthViewport; destHeight = 136; @@ -257,7 +257,7 @@ void ObjectMan::drawLeaderObjectName(Thing thing) { } else objectName = Common::String(_objectNames[iconIndex]); - _vm->_textMan->printWithTrailingSpaces(_vm->_displayMan->_bitmapScreen, k160_byteWidthScreen, 233, 37, kDMColorCyan, kDMColorBlack, objectName.c_str(), k14_ObjectNameMaximumLength, k200_heightScreen); + _vm->_textMan->printWithTrailingSpaces(_vm->_displayMan->_bitmapScreen, k160_byteWidthScreen, 233, 37, kDMColorCyan, kDMColorBlack, objectName.c_str(), kDMObjectNameMaximumLength, k200_heightScreen); } IconIndice ObjectMan::getIconIndexInSlotBox(uint16 slotBoxIndex) { |