Mercurial > mm7
diff Actor.cpp @ 1288:7adc8b9b6a25
Слияние
author | Ritor1 |
---|---|
date | Mon, 10 Jun 2013 09:30:21 +0600 |
parents | 8c02e6f74b29 |
children | fac7751b2dc9 |
line wrap: on
line diff
--- a/Actor.cpp Mon Jun 10 09:30:12 2013 +0600 +++ b/Actor.cpp Mon Jun 10 09:30:21 2013 +0600 @@ -40,7 +40,7 @@ -Actor pActors[500]; +std::array<Actor, 500> pActors; int uNumActors; stru319 stru_50C198; // idb @@ -1362,13 +1362,13 @@ int v5; // ST1C_4@8 int v6; // eax@8 - auto victim = pActors + uActorID; + auto victim = &pActors[uActorID]; if ( a2 == 1 ) BYTE2(victim->uAttributes) |= 8u; for (uint i = 0; i < uNumActors; ++i) { - auto actor = pActors + i; + auto actor = &pActors[i]; if (!actor->CanAct() || i == uActorID) continue; @@ -1935,7 +1935,7 @@ void Actor::AI_Stand(unsigned int uActorID, unsigned int object_to_face_pid, unsigned int uActionLength, AIDirection *a4) { assert(uActorID < uNumActors); - auto actor = pActors + uActorID; + auto actor = &pActors[uActorID]; AIDirection a3; if (!a4) @@ -2352,9 +2352,9 @@ result = pPlayer->CanAct(); if ( result ) { - pCastSpellInfo->_427D48(v1); + pCastSpellInfo.data()->_427D48(v1); v4 = 0; - v5 = pMapStats->GetMapInfo(pCurrentMapName); + v5 = pMapStats->GetMapInfo(pCurrentMapName.data()); if ( v5 ) v4 = pMapStats->pInfos[v5]._steal_perm; v6 = &pOutdoor->ddm; @@ -2972,7 +2972,7 @@ unsigned int v9; // eax@3 assert(uActorID < uNumActors); - auto actor = pActors + uActorID; + auto actor = &pActors[uActorID]; AIDirection a3; // [sp+Ch] [bp-5Ch]@2 if (!a4) @@ -3476,11 +3476,11 @@ //v24 = v3->uLastCharacterIDToHit; //v26 = 0; assert(uActorID < uNumActors); - auto _this = pActors + uActorID; + auto _this = &pActors[uActorID]; for (uint i = 0; i < uNumActors; ++i) { - auto actor = pActors + i; + auto actor = &pActors[i]; //v7 = pActors; //do //{