Mercurial > mm7
comparison mm7_2.cpp @ 816:cfc65feef029
* Player Recovery Times
* Player Attack fixes
* Debug log to timers
author | Nomad |
---|---|
date | Tue, 26 Mar 2013 12:40:27 +0200 |
parents | f5156b8c61ad |
children | 448e6d979c7a |
comparison
equal
deleted
inserted
replaced
813:d37b03507b3b | 816:cfc65feef029 |
---|---|
10377 if ( !v14 ) | 10377 if ( !v14 ) |
10378 return; | 10378 return; |
10379 v22 = _this.uItemID; | 10379 v22 = _this.uItemID; |
10380 v50 = v22; | 10380 v50 = v22; |
10381 if ( v50 ) | 10381 if ( v50 ) |
10382 { | |
10383 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
10382 stru_A750F8[uActiveCharacter - 1]._494836( | 10384 stru_A750F8[uActiveCharacter - 1]._494836( |
10383 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), | 10385 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), |
10384 uActiveCharacter - 1 + 9); | 10386 uActiveCharacter - 1 + 9); |
10387 } | |
10385 break; | 10388 break; |
10386 } | 10389 } |
10387 v23 = v0->FindFreeInventorySlot(); | 10390 v23 = v0->FindFreeInventorySlot(); |
10388 if ( (v23 & 0x80000000u) != 0 ) | 10391 if ( (v23 & 0x80000000u) != 0 ) |
10389 return; | 10392 return; |
10395 if ( v52 != 12 ) | 10398 if ( v52 != 12 ) |
10396 return; | 10399 return; |
10397 v22 = *(int *)v50; | 10400 v22 = *(int *)v50; |
10398 v50 = v22; | 10401 v50 = v22; |
10399 if ( v50 ) | 10402 if ( v50 ) |
10403 { | |
10404 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
10400 stru_A750F8[uActiveCharacter - 1]._494836( | 10405 stru_A750F8[uActiveCharacter - 1]._494836( |
10401 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), | 10406 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), uActiveCharacter - 1 + 9); |
10402 uActiveCharacter - 1 + 9); | 10407 } |
10403 break; | 10408 break; |
10404 } | 10409 } |
10405 } | 10410 } |
10406 } | 10411 } |
10407 if ( !v53 ) | 10412 if ( !v53 ) |
10417 if ( v52 != 12 ) | 10422 if ( v52 != 12 ) |
10418 return; | 10423 return; |
10419 v22 = *(int *)v50; | 10424 v22 = *(int *)v50; |
10420 v50 = v22; | 10425 v50 = v22; |
10421 if ( v50 ) | 10426 if ( v50 ) |
10427 { | |
10428 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
10422 stru_A750F8[uActiveCharacter - 1]._494836( | 10429 stru_A750F8[uActiveCharacter - 1]._494836( |
10423 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), | 10430 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), |
10424 uActiveCharacter - 1 + 9); | 10431 uActiveCharacter - 1 + 9); |
10432 } | |
10425 break; | 10433 break; |
10426 } | 10434 } |
10427 --v53; | 10435 --v53; |
10428 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); | 10436 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); |
10429 v24 = (int)((char *)v0 + 36 * v53); | 10437 v24 = (int)((char *)v0 + 36 * v53); |
10438 if ( v14 ) | 10446 if ( v14 ) |
10439 v50 = _this.uItemID; | 10447 v50 = _this.uItemID; |
10440 if ( v51 ) | 10448 if ( v51 ) |
10441 v0->pEquipment.uOffHand = 0; | 10449 v0->pEquipment.uOffHand = 0; |
10442 if ( v50 ) | 10450 if ( v50 ) |
10451 { | |
10452 __debugbreak(); // looks like offset in player's inventory and wand_lut much like case in 0042ECB5 | |
10443 stru_A750F8[uActiveCharacter - 1]._494836( | 10453 stru_A750F8[uActiveCharacter - 1]._494836( |
10444 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), | 10454 *((int *)&pSpellDatas[66].uNormalLevelRecovery + v50), |
10445 uActiveCharacter - 1 + 9); | 10455 uActiveCharacter - 1 + 9); |
10456 } | |
10446 break; | 10457 break; |
10447 case 1u: | 10458 case 1u: |
10448 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(uActiveCharacter) ) | 10459 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(uActiveCharacter) ) |
10449 { | 10460 { |
10450 v46 = 0; | 10461 v46 = 0; |