Mercurial > mm7
comparison Actor.cpp @ 1205:8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
author | Grumpy7 |
---|---|
date | Sun, 09 Jun 2013 00:30:48 +0200 |
parents | 0dbf6c4dd029 |
children | fac7751b2dc9 |
comparison
equal
deleted
inserted
replaced
1204:832f09144726 | 1205:8c02e6f74b29 |
---|---|
2352 result = pPlayer->CanAct(); | 2352 result = pPlayer->CanAct(); |
2353 if ( result ) | 2353 if ( result ) |
2354 { | 2354 { |
2355 pCastSpellInfo.data()->_427D48(v1); | 2355 pCastSpellInfo.data()->_427D48(v1); |
2356 v4 = 0; | 2356 v4 = 0; |
2357 v5 = pMapStats->GetMapInfo(pCurrentMapName); | 2357 v5 = pMapStats->GetMapInfo(pCurrentMapName.data()); |
2358 if ( v5 ) | 2358 if ( v5 ) |
2359 v4 = pMapStats->pInfos[v5]._steal_perm; | 2359 v4 = pMapStats->pInfos[v5]._steal_perm; |
2360 v6 = &pOutdoor->ddm; | 2360 v6 = &pOutdoor->ddm; |
2361 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor) | 2361 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor) |
2362 v6 = &pIndoor->dlv; | 2362 v6 = &pIndoor->dlv; |