diff options
author | James Haley | 2010-09-09 02:08:43 +0000 |
---|---|---|
committer | James Haley | 2010-09-09 02:08:43 +0000 |
commit | 95482c25b1e0ec85c90a9150c6c1da4a6aff1046 (patch) | |
tree | e201f372602290b4d2396d4519dc7ed11dc6d571 /src/strife/p_enemy.c | |
parent | 4c569339b73b05a6bb3a0420ee88c06b30c726ad (diff) | |
download | chocolate-doom-95482c25b1e0ec85c90a9150c6c1da4a6aff1046.tar.gz chocolate-doom-95482c25b1e0ec85c90a9150c6c1da4a6aff1046.tar.bz2 chocolate-doom-95482c25b1e0ec85c90a9150c6c1da4a6aff1046.zip |
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
Diffstat (limited to 'src/strife/p_enemy.c')
-rw-r--r-- | src/strife/p_enemy.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |