Mercurial > mm7

comparison Outdoor.cpp @ 872:2db21a810d48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 01 Apr 2013 13:39:39 +0200
parents 710cf848ad24 0b4fc79351b6
children 062788391c88
comparison
equal deleted inserted replaced
871:710cf848ad24 872:2db21a810d48
2795 pActors[i].uAIState = AIState::Dead; 2795 pActors[i].uAIState = AIState::Dead;
2796 pActors[i].vVelocity.x = 0; 2796 pActors[i].vVelocity.x = 0;
2797 pActors[i].vVelocity.y = 0; 2797 pActors[i].vVelocity.y = 0;
2798 pActors[i].vVelocity.z = 0; 2798 pActors[i].vVelocity.z = 0;
2799 pActors[i].UpdateAnimation(); 2799 pActors[i].UpdateAnimation();
2800 pActors[i].pMonsterInfo.uHostilityType = (MonsterInfo::HostilityRadius)0; 2800 pActors[i].pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
2801 pActors[i].PrepareSprites(0); 2801 pActors[i].PrepareSprites(0);
2802 } 2802 }
2803 else 2803 else
2804 { 2804 {
2805 pActors[i].uAIState = AIState::Disabled; 2805 pActors[i].uAIState = AIState::Disabled;
2823 pActors[i].uAIState = AIState::Dead; 2823 pActors[i].uAIState = AIState::Dead;
2824 pActors[i].vVelocity.x = 0; 2824 pActors[i].vVelocity.x = 0;
2825 pActors[i].vVelocity.y = 0; 2825 pActors[i].vVelocity.y = 0;
2826 pActors[i].vVelocity.z = 0; 2826 pActors[i].vVelocity.z = 0;
2827 pActors[i].UpdateAnimation(); 2827 pActors[i].UpdateAnimation();
2828 pActors[i].pMonsterInfo.uHostilityType = (MonsterInfo::HostilityRadius)0; 2828 pActors[i].pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
2829 pActors[i].PrepareSprites(0); 2829 pActors[i].PrepareSprites(0);
2830 } 2830 }
2831 else 2831 else
2832 { 2832 {
2833 pActors[i].uAIState = AIState::Disabled; 2833 pActors[i].uAIState = AIState::Disabled;