Mercurial > mm7

comparison mm7_2.cpp @ 1286:d8033eb56d7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 15 Jun 2013 23:58:32 +0600
parents 62f4cdaa726b 89210052dbb4
children c423f946dc99 dcc52e17b517
comparison
equal deleted inserted replaced
1285:62f4cdaa726b 1286:d8033eb56d7e
9633 --pTurnEngine->field_1C; 9633 --pTurnEngine->field_1C;
9634 v2->uAttributes = v5 & 0xFFFB; 9634 v2->uAttributes = v5 & 0xFFFB;
9635 } 9635 }
9636 } 9636 }
9637 if ( v151 == OBJECT_BModel && PID_TYPE(v2->spell_caster_pid) != OBJECT_Player) 9637 if ( v151 == OBJECT_BModel && PID_TYPE(v2->spell_caster_pid) != OBJECT_Player)
9638 BYTE2(pActors[PID_ID(v2->spell_caster_pid)].uAttributes) |= 4u; 9638 {
9639 if (PID_ID(v2->spell_caster_pid)<500) //bugfix PID_ID(v2->spell_caster_pid)==1000
9640 BYTE2(pActors[PID_ID(v2->spell_caster_pid)].uAttributes) |= 4;
9641 }
9642
9639 v6 = v2->uType; 9643 v6 = v2->uType;
9640 v7 = v2->uType; 9644 v7 = v2->uType;
9641 if ( v7 > 3060 ) 9645 if ( v7 > 3060 )
9642 { 9646 {
9643 if ( v7 > 6090 ) 9647 if ( v7 > 6090 )