Mercurial > mm7
comparison Party.cpp @ 1202:0dbf6c4dd029
arrays to std::arrays phase 1
author | Grumpy7 |
---|---|
date | Sat, 08 Jun 2013 21:33:22 +0200 |
parents | 15ad868d972f |
children | 8c02e6f74b29 |
comparison
equal
deleted
inserted
replaced
1196:44f37efc159c | 1202:0dbf6c4dd029 |
---|---|
847 if ( pParty->bTurnBasedModeOn != 1 ) | 847 if ( pParty->bTurnBasedModeOn != 1 ) |
848 { | 848 { |
849 v4 = 0; | 849 v4 = 0; |
850 if ( (signed int)uNumActors > 0 ) | 850 if ( (signed int)uNumActors > 0 ) |
851 { | 851 { |
852 v0 = pActors;//[0].pMonsterInfo.uMovementType; | 852 v0 = pActors.data();//[0].pMonsterInfo.uMovementType; |
853 do | 853 do |
854 { | 854 { |
855 if ( v0->Actor::CanAct() && v0->pMonsterInfo.uHostilityType != MonsterInfo::Hostility_Long && v0->pMonsterInfo.uMovementType != 5 ) | 855 if ( v0->Actor::CanAct() && v0->pMonsterInfo.uHostilityType != MonsterInfo::Hostility_Long && v0->pMonsterInfo.uMovementType != 5 ) |
856 { | 856 { |
857 v1 = abs(v0->vPosition.x - pParty->vPosition.x); | 857 v1 = abs(v0->vPosition.x - pParty->vPosition.x); |