Mercurial > mm7
comparison mm7_3.cpp @ 1912:3f0b9ffd788c
Слияние
author | Ritor1 |
---|---|
date | Tue, 22 Oct 2013 15:52:30 +0600 |
parents | af38275939cc 8d3723ca71e6 |
children | 524fe0810f32 |
comparison
equal
deleted
inserted
replaced
1911:af38275939cc | 1912:3f0b9ffd788c |
---|---|
6706 v10 = pMapStats->GetMapInfo(pCurrentMapName); | 6706 v10 = pMapStats->GetMapInfo(pCurrentMapName); |
6707 if ( v10 ) | 6707 if ( v10 ) |
6708 { | 6708 { |
6709 v11 = uNumActors; | 6709 v11 = uNumActors; |
6710 SpawnEncounter(&pMapStats->pInfos[v10], &v16, 0, count, 0); | 6710 SpawnEncounter(&pMapStats->pInfos[v10], &v16, 0, count, 0); |
6711 memcpy(&v15, Actor::GetDirectionInfo(PID(OBJECT_Actor, v11), 4u, &a3, 1), sizeof(v15)); | 6711 Actor::GetDirectionInfo(PID(OBJECT_Actor, v11), 4u, &v15, 1); |
6712 v12 = v11; | 6712 v12 = v11; |
6713 if ( (signed int)v11 < (signed int)uNumActors ) | 6713 if ( (signed int)v11 < (signed int)uNumActors ) |
6714 { | 6714 { |
6715 for ( pActor = &pActors[v11]; v12 < (signed int)uNumActors; ++pActor ) | 6715 for ( pActor = &pActors[v11]; v12 < (signed int)uNumActors; ++pActor ) |
6716 { | 6716 { |