Mercurial > mm7

comparison mm7_6.cpp @ 951:840b78f6c2d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 01 May 2013 23:36:54 +0600
parents 5e87b0c3f939 c0d0656aa662
children 9c2d08e42ed3
comparison
equal deleted inserted replaced
950:5e87b0c3f939 951:840b78f6c2d3
7289 case SPELL_DARK_SACRIFICE: 7289 case SPELL_DARK_SACRIFICE:
7290 { 7290 {
7291 if ( !pPlayer->CanCastSpell(uRequiredMana) ) 7291 if ( !pPlayer->CanCastSpell(uRequiredMana) )
7292 break; 7292 break;
7293 HIDWORD(v733) = 0; 7293 HIDWORD(v733) = 0;
7294 memset(&achievedAwardsIndex, 0, 4000); 7294 memset(&achieved_awards, 0, 4000);
7295 _this = 0; 7295 _this = 0;
7296 v605 = (char *)pParty->pHirelings; 7296 v605 = (char *)pParty->pHirelings;
7297 do 7297 do
7298 { 7298 {
7299 if ( *(int *)v605) 7299 if ( *(int *)v605)
7300 { 7300 {
7301 v606 = HIDWORD(v733)++; 7301 v606 = HIDWORD(v733)++;
7302 achievedAwardsIndex[v606] = (int)((char *)&_this->uItemID + 1); 7302 achieved_awards[v606] = (AwardType)(int)((char *)&_this->uItemID + 1);
7303 } 7303 }
7304 _this = (ItemGen *)((char *)_this + 1); 7304 _this = (ItemGen *)((char *)_this + 1);
7305 v605 += 76; 7305 v605 += 76;
7306 } 7306 }
7307 while ( (signed int)v605 < (signed int)&pParty->pPickedItem ); 7307 while ( (signed int)v605 < (signed int)&pParty->pPickedItem );
7308 _this = 0; 7308 _this = 0;
7309 if ( (signed int)pNPCStats->uNumNewNPCs > 0) 7309 if ( (signed int)pNPCStats->uNumNewNPCs > 0)
7310 { 7310 {
7311 v730 = (int)pNPCStats->pNewNPCData; 7311 v730 = (int)pNPCStats->pNewNPCData;
7312 __debugbreak(); // data offset
7312 HIDWORD(v733) = 4 * HIDWORD(v733) + 6043152; 7313 HIDWORD(v733) = 4 * HIDWORD(v733) + 6043152;
7313 do 7314 do
7314 { 7315 {
7315 if ( *(char *)(v730 + 8) & 0x80 7316 if ( *(char *)(v730 + 8) & 0x80
7316 && (!pParty->pHirelings[0].pName || strcmp(*(const char **)v730, pParty->pHirelings[0].pName)) 7317 && (!pParty->pHirelings[0].pName || strcmp(*(const char **)v730, pParty->pHirelings[0].pName))