Mercurial > mm7
diff mm7_2.cpp @ 1202:0dbf6c4dd029
arrays to std::arrays phase 1
author | Grumpy7 |
---|---|
date | Sat, 08 Jun 2013 21:33:22 +0200 |
parents | 15ad868d972f |
children | 1eed3e0ab666 |
line wrap: on
line diff
--- a/mm7_2.cpp Sat Jun 08 19:34:33 2013 +0200 +++ b/mm7_2.cpp Sat Jun 08 21:33:22 2013 +0200 @@ -388,7 +388,7 @@ v0 = 0; if ( (signed int)uNumActors > 0 ) { - v1 = pActors;//[0].uAIState; + v1 = pActors.data();//[0].uAIState; v7 = uNumActors; do { @@ -2728,7 +2728,7 @@ v20 = uNumActors; if ( (signed int)uNumActors > 0 ) { - v4 = pActors;//[0].uAIState; + v4 = pActors.data();//[0].uAIState; while ( v4->uAIState != Removed ) { ++v3; @@ -3059,7 +3059,7 @@ v2 = 0; if ( (signed int)uNumActors <= 0 ) goto LABEL_8; - v3 = pActors; + v3 = pActors.data(); while ( 1 ) { v22 = v3->pMonsterInfo.uID - 1; @@ -3306,7 +3306,7 @@ uint decorEventIdx = 0; for (uint i = 0; i < uNumLevelDecorations; ++i) { - auto decor = pLevelDecorations + i; + auto decor = &pLevelDecorations[i]; if (!decor->field_16_event_id) { @@ -5270,7 +5270,7 @@ for (uint i = 0; i < uNumActors; ++i) //if ( (signed int)uNumActors > 0 ) { - auto pActor = pActors + i; + auto pActor = &pActors[i]; //v2 = (char *)&pActors[0].uNPC_ID; //do //{ @@ -5322,7 +5322,7 @@ for (uint i = 0; i < uNumActors; ++i) { - auto pActor = pActors + i; + auto pActor = &pActors[i]; //v7 = (char *)&pActors[0].pMonsterInfo; //do //{ @@ -5421,7 +5421,7 @@ result = 0; if ( (signed int)uNumLevelDecorations > 0 ) { - v4 = pLevelDecorations; + v4 = pLevelDecorations.data(); do { if ( v4->uDecorationDescID == v2 ) @@ -6800,7 +6800,7 @@ pEventTimer->Pause(); pMiscTimer->Pause(); pParty->uFlags = 2; - pCastSpellInfo->_427D48(1); + pCastSpellInfo.data()->_427D48(1); ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows(); DoPrepareWorld(0, (v1 == 0) + 1); pMiscTimer->Resume(); @@ -9610,7 +9610,7 @@ v19 = 0; if ( (signed int)uNumActors > 0 ) { - v4 = pActors;//[0].uAIState; + v4 = pActors.data();//[0].uAIState; do { v5 = abs(v4->vPosition.x - pParty->vPosition.x); @@ -9961,7 +9961,7 @@ v1 = this; if ( (signed int)uNumActors > 0 ) { - v2 = pActors;//[0].vPosition.y; + v2 = pActors.data();//[0].vPosition.y; do { if ( v2->CanAct() )