mm7: Player.cpp comparison

comparison Player.cpp @ 1687:5f01f1ed97f4

Player::StealFromActor cleanup, renamed UIMSG_1B to UIMSG_STEALFROMACTOR

author	Grumpy7
date	Sun, 22 Sep 2013 03:12:11 +0200
parents	df30a0c901e5
children	ece764a4672d

comparison

equal deleted inserted replaced

-:df30a0c901e5
+:5f01f1ed97f4
 if ( !itemToSteal
 || this->IsEradicated()
 || this->IsDead()
 || this->IsPertified()
-|| this->pConditions[Condition_Drunk]
+|| this->IsDrunk()
 || this->IsUnconcious()
 || this->IsAsleep() )
 {
 return 0;
 }
 v6 = this->pActiveSkills[34];
 v7 = v6 & 0x3F;
 v8 = SkillToMastery(v6);
 itemvalue = itemToSteal->GetValue();
 v10 = pItemsTable->pItems[itemToSteal->uItemID].uEquipType;
-if ( v10 == 0 || v10 == 1 || v10 == 2 )
+if ( v10 == EQUIP_OFF_HAND || v10 == EQUIP_MAIN_HAND || v10 == EQUIP_BOW )
 itemvalue *= 3;
 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8];
 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue;
 if (a5)
 {
 // 4EDEB4: using guessed type int dword_4EDEB4[];
 //----- (0048D88B) --------------------------------------------------------
 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation)
 {
-Player *v4; // esi@1
+Actor *actroPtr; // edi@1
-Actor *v5; // edi@1
-unsigned __int16 v6; // cx@10
 int v7; // ebx@10
-unsigned int v8; // esi@10
+unsigned int stealingMastery; // esi@10
-int v9; // eax@10
+int fineIfFailed; // esi@10
-int v10; // esi@10
 int v11; // eax@13
-signed int v12; // ebx@15
+bool HasFullItemSlots; // ebx@15
-signed int v13; // edx@15
+unsigned __int16 carriedItemId; // si@21
-int v14; // ecx@15
+unsigned int enchBonusSum; // esi@31
-unsigned __int16 v15; // si@21
+int *enchTypePtr; // eax@34
-unsigned int v16; // ebx@24
+ItemGen tempItem; // [sp+8h] [bp-34h]@15
-int v17; // esi@24
+int currMaxItemValue;
-const void *v18; // eax@29
-unsigned int v19; // esi@31
+actroPtr = &pActors[uActorID];
-int v20; // eax@34
+if ( !actroPtr
-char v21; // zf@36
+|| this->IsEradicated()
-unsigned int v22; // ST0C_4@39
+|| this->IsDead()
-char *v23; // esi@39
+|| this->IsPertified()
-const char *v25; // [sp-Ch] [bp-48h]@40
+|| this->IsDrunk()
-int v26; // [sp-8h] [bp-44h]@40
+|| this->IsUnconcious()
-ItemGen v27; // [sp+8h] [bp-34h]@15
+|| this->IsAsleep() )
-unsigned int v28; // [sp+2Ch] [bp-10h]@10
+{
-int v29; // [sp+30h] [bp-Ch]@10
+return 0;
-int v30; // [sp+34h] [bp-8h]@10
+}
-Player *v31; // [sp+38h] [bp-4h]@1
+pGlobalTXT_LocalizationStrings[1];
-signed int _steal_perma; // [sp+48h] [bp+Ch]@12
+if ( !(BYTE2(actroPtr->uAttributes) & 0x80) )
+actroPtr->SetRandomGoldIfTheresNoItem();
-v4 = this;
+unsigned __int16 v6 = this->pActiveSkills[34];
-v5 = &pActors[uActorID];
+v7 = v6 & 0x3F;
-v31 = this;
+stealingMastery = SkillToMastery(v6);
-if ( &pActors[uActorID]
+int v30 = StealingMasteryBonuses[stealingMastery];
-&& !this->pConditions[16]
+int v29 = StealingRandomBonuses[rand() % 5];
-&& !this->pConditions[14]
+fineIfFailed = actroPtr->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation);
-&& !this->pConditions[15]
+currMaxItemValue = v29 + v7 * v30;
-&& !this->pConditions[4]
+pGlobalTXT_LocalizationStrings[200];
-&& !this->pConditions[13]
+if ( false && (rand() % 100 < 5 || fineIfFailed > currMaxItemValue || BYTE2(actroPtr->uAttributes) & 8) )
-&& !this->pConditions[2] )
+{
-{
+Actor::AggroSurroundingPeasants(uActorID, 1);
-if ( !(BYTE2(v5->uAttributes) & 0x80) )
+sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[376], this->pName);
-pActors[uActorID].SetRandomGoldIfTheresNoItem();
+ShowStatusBarString(pTmpBuf2.data(), 2u);
-v6 = v4->pActiveSkills[34];
+return 0;
-v7 = v6 & 0x3F;
+}
-v8 = SkillToMastery(v6);
+else
-v9 = rand();
+{
-v30 = StealingMasteryBonuses[v8];
+v11 = rand();
-v29 = StealingRandomBonuses[v9 % 100 / 20];
+if ( v11 % 100 >= 40 )
-v10 = v5->pMonsterInfo.uLevel + 100 * (_steal_perm + reputation);
+{
-if ( rand() % 100 < 5 || v10 > v29 + v7 * v30 || (_steal_perma = 2, BYTE2(v5->uAttributes) & 8) )
+if ( v11 % 100 >= 70 )
 {
-Actor::AggroSurroundingPeasants(uActorID, 1);
+enchBonusSum = 0;
-_steal_perma = 0;
+for (int i = 0; i < v7; i++)
-v26 = (int)v31->pName;
-v25 = pGlobalTXT_LocalizationStrings[376];
-}
-else
-{
-v11 = rand();
-if ( v11 % 100 >= 40 )
-{
-if ( v11 % 100 >= 70 )
 {
-v19 = 0;
+enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1;
-if ( v7 > 0 )
+}
-{
+if ( pItemsTable->pItems[actroPtr->array_000234[3].uItemID].uEquipType != EQUIP_GOLD )
-do
+return 2;
-{
+enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType;
---v7;
+if ( (int)enchBonusSum >= *enchTypePtr )
-v19 += rand() % StealingEnchantmentBonusForSkill[v8] + 1;
+{
-}
+actroPtr->array_000234[3].uItemID = 0;
-while ( v7 );
+*enchTypePtr = 0;
-}
-if ( pItemsTable->pItems[v5->array_000234[3].uItemID].uEquipType != 18 )
-return _steal_perma;
-v20 = (int)&v5->array_000234[3].uSpecEnchantmentType;
-if ( (signed int)v19 > v5->array_000234[3].uSpecEnchantmentType )
-v19 = v5->array_000234[3].uSpecEnchantmentType;
-v21 = *(int *)v20 == v19;
-*(int *)v20 -= v19;
-if ( v21 )
-v5->array_000234[3].uItemID = 0;
-if ( v19 )
-{
-party_finds_gold(v19, 2);
-v22 = v19;
-v23 = pTmpBuf2.data();
-sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], v31->pName, v22);
-LABEL_43:
-ShowStatusBarString(v23, 2u);
-return _steal_perma;
-}
 }
 else
 {
-v27.Reset();
+*enchTypePtr -= enchBonusSum;
-v12 = 0;
+}
-v13 = 0;
+if ( enchBonusSum )
-v14 = (int)v5->array_000234;
+{
-while ( !*(int *)v14 || pItemsTable->pItems[*(int *)v14].uEquipType == 18 )
+party_finds_gold(enchBonusSum, 2);
+sprintf(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[302], this->pName, enchBonusSum);     //%stole %d gold
+}
+else
+{
+sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName);   //%s failed to steal anything
+}
+ShowStatusBarString(pTmpBuf2.data(), 2u);
+return 2;
+}
+else
+{
+tempItem.Reset();
+HasFullItemSlots = false;
+int i;
+for (i = 0; i < 4; i++)
+{
+if ( actroPtr->array_000234[i].uItemID != 0 && pItemsTable->pItems[actroPtr->array_000234[i].uItemID].uEquipType != EQUIP_GOLD )
+break;
+}
+if (i == 4)
+HasFullItemSlots = true;
+carriedItemId = actroPtr->uCarriedItemID;
+if ( carriedItemId != 0 || HasFullItemSlots )
+{
+tempItem.Reset();
+if ( carriedItemId != 0 )
 {
-++v13;
+actroPtr->uCarriedItemID = 0;
-v14 += 36;
+tempItem.uItemID = carriedItemId;
-if ( v13 >= 4 )
+if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_WAND )
-goto LABEL_21;
+tempItem.uNumCharges = rand() % 6 + pItemsTable->pItems[carriedItemId].uDamageMod + 1;
+else if ( pItemsTable->pItems[carriedItemId].uEquipType == EQUIP_POTION && carriedItemId != ITEM_POTION_BOTTLE)
+tempItem.uEnchantmentType = 2 * rand() % 4 + 2;
 }
-v12 = 1;
+else
-LABEL_21:
-v15 = v5->uCarriedItemID;
-if ( v15 || v12 )
 {
-v27.Reset();
+ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4];
-if ( v15 )
+memcpy(&tempItem, itemToSteal, sizeof(tempItem));
-{
+itemToSteal->Reset();
-v16 = (signed __int16)v15;
+carriedItemId = tempItem.uItemID;
-v5->uCarriedItemID = 0;
-v27.uItemID = (signed __int16)v15;
-v17 = (signed __int16)v15;
-if ( pItemsTable->pItems[v17].uEquipType == 12 )
-v27.uNumCharges = rand() % 6 + pItemsTable->pItems[v17].uDamageMod + 1;
-if ( pItemsTable->pItems[v17].uEquipType == 14 )
-{
-if ( v16 != 220 )
-v27.uEnchantmentType = 2 * rand() % 4 + 2;
-}
-}
-else
-{
-v18 = &v5->array_000234[rand() % 4];
-memcpy(&v27, v18, sizeof(v27));
-((ItemGen *)v18)->Reset();
-v16 = v27.uItemID;
-}
-sub_421B2C_PlaceInInventory_or_DropPickedItem();
-sprintf(
-pTmpBuf2.data(),
-pGlobalTXT_LocalizationStrings[304],
-v31->pName,
-pItemsTable->pItems[v16].pUnidentifiedName);
-ShowStatusBarString(pTmpBuf2.data(), 2u);
-sub_421B2C_PlaceInInventory_or_DropPickedItem();
-memcpy(&pParty->pPickedItem, &v27, sizeof(pParty->pPickedItem));
-pMouse->SetCursorBitmapFromItemID(v16);
-return _steal_perma;
 }
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
+sprintf(
+pTmpBuf2.data(),
+pGlobalTXT_LocalizationStrings[304],   // Official                   //TODO: add a normal "%d stole %d" message
+this->pName,
+pItemsTable->pItems[carriedItemId].pUnidentifiedName);
+ShowStatusBarString(pTmpBuf2.data(), 2u);
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
+memcpy(&pParty->pPickedItem, &tempItem, sizeof(ItemGen));
+pMouse->SetCursorBitmapFromItemID(carriedItemId);
+return 2;
 }
 }
-v26 = (int)v31->pName;
+}
-v25 = pGlobalTXT_LocalizationStrings[377];
+sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName);   //%s failed to steal anything
-}
+ShowStatusBarString(pTmpBuf2.data(), 2u);
-v23 = pTmpBuf2.data();
+return 2;
-sprintfex(pTmpBuf2.data(), v25, v26);
+}
-goto LABEL_43;
-}
-return 0;
 }
 // 4EDEA0: using guessed type int dword_4EDEA0[];
 // 4EDEB4: using guessed type int dword_4EDEB4[];
 // 4EDEC4: using guessed type int dword_4EDEC4[];

Mercurial > mm7

comparison Player.cpp @ 1687:5f01f1ed97f4