Mercurial > mm7

diff TurnEngine.cpp @ 1972:3ef25d06b9b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Actor::special_ability_use_check moved to Actor and cleaned up
author Grumpy7
date Sat, 26 Oct 2013 00:18:52 -0700
parents 524fe0810f32
children 28cb79ae2f6f
line wrap: on
line diff
--- a/TurnEngine.cpp	Sat Oct 26 00:09:30 2013 -0700
+++ b/TurnEngine.cpp	Sat Oct 26 00:18:52 2013 -0700
@@ -727,7 +727,7 @@
                          switch (v3)
                          {
                            case  AIState::AttackingMelee:
-                             v19 = stru_50C198.special_ability_use_check(&pActors[v4], v4);
+                             v19 = pActors[v4].special_ability_use_check(v4);
                              stru_50FE08.Add( v28->uPackedID,  5120,  v5->vPosition.x, v5->vPosition.y, v5->vPosition.z + ((signed int)v5->uActorHeight >> 1), v19,  1);
                              Actor::AI_Stand(v4, a2a, 0, &a4);
                              break;
@@ -848,7 +848,7 @@
                 
                 if ( v5->pMonsterInfo.uHostilityType == 4 && v22 && (signed int)v9 < 5120 )
                     {
-                    v14 = stru_50C198.special_ability_use_check(v5, actor_id);
+                    v14 = v5->special_ability_use_check(actor_id);
                     v21->AI_action_type = TE_AI_STAND;
                     switch (v14)
                         {