diff options
| author | Samuel Villareal | 2010-09-19 18:03:38 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-09-19 18:03:38 +0000 |
| commit | 2ca389a5e23bb45ac5fcc093776a51a1f1fbeb47 (patch) | |
| tree | 635acb0b98b049c4df8dc30fc897df5c4f668331 /src/strife/p_dialog.c | |
| parent | 6528c14df3fa13bd3d5aed1e715205975b724f14 (diff) | |
| download | chocolate-doom-2ca389a5e23bb45ac5fcc093776a51a1f1fbeb47.tar.gz chocolate-doom-2ca389a5e23bb45ac5fcc093776a51a1f1fbeb47.tar.bz2 chocolate-doom-2ca389a5e23bb45ac5fcc093776a51a1f1fbeb47.zip | |
+ Renaming MF_INCOMBAT to MF_NODIALOG
Subversion-branch: /branches/strife-branch
Subversion-revision: 2116
Diffstat (limited to 'src/strife/p_dialog.c')
| -rw-r--r-- | src/strife/p_dialog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c index 554b0729..acd5a420 100644 --- a/src/strife/p_dialog.c +++ b/src/strife/p_dialog.c @@ -1080,7 +1080,7 @@ static void P_DialogDrawer(void) // Dismiss the dialog if the player is out of alignment, or the thing he was
// talking to is now engaged in battle.
- if(angle > ANG45 && angle < (ANG270+ANG45) || dialogtalker->flags & MF_INCOMBAT)
+ if(angle > ANG45 && angle < (ANG270+ANG45) || dialogtalker->flags & MF_NODIALOG)
P_DialogDoChoice(dialogmenu.numitems - 1);
dialogtalker->reactiontime = 2;
@@ -1283,7 +1283,7 @@ void P_DialogStart(player_t *player) return;
// already in combat, can't talk to it
- if(linetarget->flags & MF_INCOMBAT)
+ if(linetarget->flags & MF_NODIALOG)
return;
// set pointer to the character talking
|