Mercurial > mm7
diff Actor.cpp @ 107:23b213c3f8e1
Слияние
author | Ritor1 |
---|---|
date | Fri, 08 Feb 2013 18:34:09 +0600 |
parents | 81e93310f73c |
children | cca78efb377e |
line wrap: on
line diff
--- a/Actor.cpp Fri Feb 08 18:33:54 2013 +0600 +++ b/Actor.cpp Fri Feb 08 18:34:09 2013 +0600 @@ -3930,11 +3930,11 @@ if ( !v7 ) { if ( (!v2 || (signed __int64)v2->pActorBuffs[12].uExpireTime > 0 || !(v2->uAttributes & 0x80000)) - && !*((unsigned char *)&pFactionTable->relations + 89 * v8) ) + && !pFactionTable->relations[v8][0]) { LABEL_56: if ( v8 < 89 ) - return *((unsigned char *)&pFactionTable->relations + 89 * v7 + v8); + return pFactionTable->relations[v7][v8]; return 0; } return 4;