From 95482c25b1e0ec85c90a9150c6c1da4a6aff1046 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Thu, 9 Sep 2010 02:08:43 +0000
Subject: Changed mobj_t::allegiance to mobj_t::miscdata due to the fact it has
 two completely different uses. Finished P_DialogDoChoice; dialog is now
 virtually 100% functional (just needs finished inventory to really do much
 beyond initial dialogs or getting "no" messages from everybody).

Subversion-branch: /branches/strife-branch
Subversion-revision: 2048
---
 src/strife/p_enemy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/strife/p_enemy.c')

diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c
index 615930ba..c7c793d0 100644
--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -722,7 +722,7 @@ P_LookForPlayers
     sector_t*   sector;
     angle_t     an;
     fixed_t     dist;
-    mobj_t  *   master = players[actor->allegiance].mo;
+    mobj_t  *   master = players[actor->miscdata].mo;
 
     // haleyjd 09/05/10: handle Allies
     if(actor->flags & MF_ALLY)
@@ -734,7 +734,7 @@ P_LookForPlayers
             // allegiance. Other allies do it unconditionally.
             if(master && master->target && 
                (master->target->type != MT_REBEL1 ||
-                master->target->allegiance != actor->allegiance))
+                master->target->miscdata != actor->miscdata))
             {
                 actor->target = master->target;
             }
@@ -747,7 +747,7 @@ P_LookForPlayers
                 // friendly Rebel or the allied player.
                 if(!linetarget ||
                     actor->target->type == MT_REBEL1 &&
-                    actor->target->allegiance == actor->allegiance ||
+                    actor->target->miscdata == actor->miscdata ||
                     actor->target == master)
                 {
                     actor->target = NULL;
-- 
cgit v1.2.3