Mercurial > mm7

comparison mm7_6.cpp @ 1160:502b8b2e36b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
font cleaning
author Gloval
date Tue, 04 Jun 2013 01:37:23 +0400
parents 45a8862d8b6e
children 29a8defbad9e
comparison
equal deleted inserted replaced
1154:8ce08eea96ed 1160:502b8b2e36b4
2597 NPCData *pNPCData; // eax@1089 2597 NPCData *pNPCData; // eax@1089
2598 int v606; // edx@1091 2598 int v606; // edx@1091
2599 AwardType *v607; // ecx@1100 2599 AwardType *v607; // ecx@1100
2600 __int16 v608; // ax@1102 2600 __int16 v608; // ax@1102
2601 signed int v609; // eax@1104 2601 signed int v609; // eax@1104
2602 //int v610; // edi@1106 2602 int v610; // edi@1106
2603 unsigned int v611; // eax@1106 2603 unsigned int v611; // eax@1106
2604 Player *v612; // edi@1106 2604 Player *v612; // edi@1106
2605 DDM_DLV_Header *v613; // eax@1108 2605 DDM_DLV_Header *v613; // eax@1108
2606 int v615; // edi@1119 2606 int v615; // edi@1119
2607 Player *v619; // edi@1123 2607 Player *v619; // edi@1123
6205 } 6205 }
6206 while ( (signed int)i < (signed int)pNPCStats->uNumNewNPCs ); 6206 while ( (signed int)i < (signed int)pNPCStats->uNumNewNPCs );
6207 } 6207 }
6208 v608 = pCastSpell->uPlayerID_2; 6208 v608 = pCastSpell->uPlayerID_2;
6209 if ( v608 != 4 && v608 != 5 6209 if ( v608 != 4 && v608 != 5
6210 //|| (v609 = (signed int)*(&pFontCChar + v608 + (unsigned __int8)pParty->field_709), v609 <= 0) 6210 || (v609 = (signed int)*(&pFontCChar + v608 + (unsigned __int8)pParty->field_709), v609 <= 0)
6211 || (v609 = achieved_awards[v608 + (unsigned __int8)pParty->field_709 - 4], v609 <= 0)
6212 || v609 >= 3 ) 6211 || v609 >= 3 )
6213 { 6212 {
6214 ShowStatusBarString(pGlobalTXT_LocalizationStrings[428], 2); // Spell failed 6213 ShowStatusBarString(pGlobalTXT_LocalizationStrings[428], 2); // Spell failed
6215 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0); 6214 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, 0, 0, -1, 0, 0, 0, 0);
6216 pCastSpell->spellnum = 0; 6215 pCastSpell->spellnum = 0;
6217 continue; 6216 continue;
6218 } 6217 }
6219 //v610 = 76 * v609; 6218 v610 = 76 * v609;
6220 //*((int *)&pParty->pPlayers[3].pInstalledBeacons[4].uBeaconTime + 19 * v609) = 0; 6219 //*((int *)&pParty->pPlayers[3].pInstalledBeacons[4].uBeaconTime + 19 * v609) = 0;
6221 pParty->pHirelings[v609-1].evt_B = 0; 6220 pParty->pHirelings[v609-1].evt_B = 0;
6222 v611 = pIconsFrameTable->FindIcon("spell96"); 6221 v611 = pIconsFrameTable->FindIcon("spell96");
6223 //*(int *)((char *)&pParty->pPlayers[3].pInstalledBeacons[4].uBeaconTime + v610 + 4) = pIconsFrameTable->GetIconAnimLength(v611); 6222 //*(int *)((char *)&pParty->pPlayers[3].pInstalledBeacons[4].uBeaconTime + v610 + 4) = pIconsFrameTable->GetIconAnimLength(v611);
6224 pParty->pHirelings[v609-1].evt_C = pIconsFrameTable->GetIconAnimLength(v611); 6223 pParty->pHirelings[v609-1].evt_C = pIconsFrameTable->GetIconAnimLength(v611);