Mercurial > mm7

comparison mm7_2.cpp @ 303:3dcc9d945eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DamageMonsterFromParty
author Nomad
date Tue, 19 Feb 2013 15:39:50 +0200
parents af7e848d6def
children 2a09e1d6fc8f
comparison
equal deleted inserted replaced
296:af7e848d6def 303:3dcc9d945eeb
8063 a1a.field_50 = 0; 8063 a1a.field_50 = 0;
8064 a1a.field_4C = 0; 8064 a1a.field_4C = 0;
8065 a1a.field_48 = 0; 8065 a1a.field_48 = 0;
8066 v30 = pIndoor->GetSector(v28, v27, v29); 8066 v30 = pIndoor->GetSector(v28, v27, v29);
8067 a1a.field_5C = 0; 8067 a1a.field_5C = 0;
8068 a1a.field_58 = 0; 8068 a1a.field_58_pid = 0;
8069 a1a.uSpriteFrameID = 0; 8069 a1a.uSpriteFrameID = 0;
8070 a1a.uSectorID = v30; 8070 a1a.uSectorID = v30;
8071 return a1a.Create(0, 0, 0, 0); 8071 return a1a.Create(0, 0, 0, 0);
8072 } 8072 }
8073 8073
16032 v3 = &pObjectList->pObjects[v2->uObjectDescID]; 16032 v3 = &pObjectList->pObjects[v2->uObjectDescID];
16033 v145 = a2; 16033 v145 = a2;
16034 v151 = a2 & 7; 16034 v151 = a2 & 7;
16035 if ( (a2 & 7) == OBJECT_Actor) 16035 if ( (a2 & 7) == OBJECT_Actor)
16036 { 16036 {
16037 if ( (v2->field_58 & 7) == OBJECT_Actor && !pActors[v2->field_58 >> 3].GetActorsRelation(&pActors[a2 >> 3]) ) 16037 if ( (v2->field_58_pid & 7) == OBJECT_Actor && !pActors[v2->field_58_pid >> 3].GetActorsRelation(&pActors[a2 >> 3]) )
16038 return 1; 16038 return 1;
16039 } 16039 }
16040 else 16040 else
16041 { 16041 {
16042 if ( (a2 & 7) == OBJECT_Player && (v2->field_58 & 7) == OBJECT_Player) 16042 if ( (a2 & 7) == OBJECT_Player && (v2->field_58_pid & 7) == OBJECT_Player)
16043 return 1; 16043 return 1;
16044 } 16044 }
16045 if ( pParty->bTurnBasedModeOn == 1 ) 16045 if ( pParty->bTurnBasedModeOn == 1 )
16046 { 16046 {
16047 v5 = v2->uAttributes; 16047 v5 = v2->uAttributes;
16049 { 16049 {
16050 --pTurnEngine->field_1C; 16050 --pTurnEngine->field_1C;
16051 v2->uAttributes = v5 & 0xFFFB; 16051 v2->uAttributes = v5 & 0xFFFB;
16052 } 16052 }
16053 } 16053 }
16054 if ( v151 == OBJECT_BModel && (v2->field_58 & 7) != OBJECT_Player) 16054 if ( v151 == OBJECT_BModel && (v2->field_58_pid & 7) != OBJECT_Player)
16055 BYTE2(pActors[v2->field_58 >> 3].uAttributes) |= 4u; 16055 BYTE2(pActors[v2->field_58_pid >> 3].uAttributes) |= 4u;
16056 v6 = v2->uItemType; 16056 v6 = v2->uItemType;
16057 v7 = v2->uItemType; 16057 v7 = v2->uItemType;
16058 if ( v7 > 3060 ) 16058 if ( v7 > 3060 )
16059 { 16059 {
16060 if ( v7 > 6090 ) 16060 if ( v7 > 6090 )