Mercurial > mm7
changeset 407:1a992c413b2f
Слияние
author | Ritor1 |
---|---|
date | Sat, 23 Feb 2013 18:33:47 +0600 |
parents | 0be4df624d62 (current diff) ff964014159f (diff) |
children | f660fc16ceb6 |
files | |
diffstat | 1 files changed, 6 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/mm7_3.cpp Sat Feb 23 18:33:39 2013 +0600 +++ b/mm7_3.cpp Sat Feb 23 18:33:47 2013 +0600 @@ -17280,7 +17280,6 @@ //----- (004014E6) -------------------------------------------------------- void MakeActorAIList_ODM() { - //Actor *v0; // esi@2 int v1; // eax@4 int v2; // ebx@4 unsigned int v3; // ecx@4 @@ -17288,39 +17287,18 @@ int v5; // edx@7 unsigned int v6; // edx@9 unsigned int v7; // ST20_4@10 - //int v8; // eax@10 int v9; // edi@10 int v10; // ebx@14 - //char v11; // zf@16 - //int v12; // eax@22 - //int result; // eax@24 - //int v14; // edx@25 - //int v15; // ecx@25 - //int v16; // ebx@26 - //unsigned int *v17; // ecx@27 - //unsigned int v18; // esi@27 - //int i; // edx@33 - //char *v20; // ecx@34 int v21; // [sp+Ch] [bp-14h]@4 int v22; // [sp+10h] [bp-10h]@4 - //int v23; // [sp+14h] [bp-Ch]@10 - //int v24; // [sp+14h] [bp-Ch]@29 - //signed int v25; // [sp+18h] [bp-8h]@1 - //signed int v26; // [sp+18h] [bp-8h]@25 - //int v27; // [sp+1Ch] [bp-4h]@1 pParty->uFlags &= 0xFFFFFFCFu; - //v27 = 0; - - //v25 = 0; + ai_arrays_size = 0; for (uint i = 0; i < uNumActors; ++i) { auto actor = pActors + i; - //v0 = pActors;//[0].uAttributes; - //do - //{ - //*(char *)(v0 + 1) &= 0xFBu; + actor->uAttributes &= 0xFFFFFBFF; if (!actor->CanAct()) { @@ -17858,6 +17836,8 @@ pTurnEngine->_405E14(); return; } + + uActorID = v0; if ( (signed int)uNumActors > (signed int)v0 ) { @@ -17943,6 +17923,8 @@ } while ( (signed int)uActorID < (signed int)uNumActors ); } + + v78 = 0; if ( ai_arrays_size > 0 ) {