diff options
| author | Bendegúz Nagy | 2016-07-14 20:23:09 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 247b9210e1280aef243000b954e880054b4cfaa0 (patch) | |
| tree | 5aa61a2e6814df46b9c1111dbbab09cde892bdb2 /engines/dm/objectman.cpp | |
| parent | d7c7f110c1f63ec91c0837e09e9a614b6eee3cb2 (diff) | |
| download | scummvm-rg350-247b9210e1280aef243000b954e880054b4cfaa0.tar.gz scummvm-rg350-247b9210e1280aef243000b954e880054b4cfaa0.tar.bz2 scummvm-rg350-247b9210e1280aef243000b954e880054b4cfaa0.zip | |
DM: Some refactoring
Diffstat (limited to 'engines/dm/objectman.cpp')
| -rw-r--r-- | engines/dm/objectman.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index ea07c582bf..40c650b0f8 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -236,19 +236,18 @@ void ObjectMan::f38_drawIconInSlotBox(uint16 slotBoxIndex, int16 iconIndex) { #define k14_ObjectNameMaximumLength 14 // @ C014_OBJECT_NAME_MAXIMUM_LENGTH void ObjectMan::f34_drawLeaderObjectName(Thing thing) { - IconIndice iconIndex = f33_getIconIndex(thing); - char *objName; - char objectNameBuffer[16]; - if (iconIndex == k147_IconIndiceJunkChampionBones) { + char* objectName = nullptr; + int16 L0007_i_IconIndex = _vm->_objectMan->f33_getIconIndex(thing); + if (L0007_i_IconIndex == k147_IconIndiceJunkChampionBones) { Junk *junk = (Junk*)_vm->_dungeonMan->f156_getThingData(thing); - strcpy(objectNameBuffer, _vm->_championMan->_gK71_champions[junk->getChargeCount()]._name); - strcat(objectNameBuffer, _g352_objectNames[iconIndex]); - objName = objectNameBuffer; + char champBonesName[16]; + strcpy(champBonesName, _vm->_championMan->_gK71_champions[junk->getChargeCount()]._name); + strcat(champBonesName, _vm->_objectMan->_g352_objectNames[L0007_i_IconIndex]); + objectName = champBonesName; } else { - objName = _g352_objectNames[iconIndex]; + objectName = _vm->_objectMan->_g352_objectNames[L0007_i_IconIndex]; } - _vm->_textMan->f41_printWithTrailingSpaces(_vm->_displayMan->_g348_bitmapScreen, k160_byteWidthScreen, 233, 37, - k4_ColorCyan, k0_ColorBlack, objName, k14_ObjectNameMaximumLength, k200_heightScreen); + _vm->_textMan->f41_printWithTrailingSpaces(_vm->_displayMan->_g348_bitmapScreen, k160_byteWidthScreen, 233, 37, k4_ColorCyan, k0_ColorBlack, objectName, k14_ObjectNameMaximumLength, k200_heightScreen); } IconIndice ObjectMan::f39_getIconIndexInSlotBox(uint16 slotBoxIndex) { |