diff options
author | Simon Howard | 2010-09-28 18:51:07 +0000 |
---|---|---|
committer | Simon Howard | 2010-09-28 18:51:07 +0000 |
commit | edf7efbea35087a6f56ed71ed6f5db613386d39d (patch) | |
tree | 39c0e0dca58bae3a518ea7b5463ce78741f00985 /src/strife/p_dialog.c | |
parent | af6ee1723e009ff55e42fd257da03712ba7099f1 (diff) | |
download | chocolate-doom-edf7efbea35087a6f56ed71ed6f5db613386d39d.tar.gz chocolate-doom-edf7efbea35087a6f56ed71ed6f5db613386d39d.tar.bz2 chocolate-doom-edf7efbea35087a6f56ed71ed6f5db613386d39d.zip |
Fix compile warnings.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2149
Diffstat (limited to 'src/strife/p_dialog.c')
-rw-r--r-- | src/strife/p_dialog.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c index 7b993f8d..a3a3b6e3 100644 --- a/src/strife/p_dialog.c +++ b/src/strife/p_dialog.c @@ -1145,8 +1145,11 @@ 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_NODIALOG)
+ if ((angle > ANG45 && angle < (ANG270+ANG45))
+ || (dialogtalker->flags & MF_NODIALOG) != 0)
+ {
P_DialogDoChoice(dialogmenu.numitems - 1);
+ }
dialogtalker->reactiontime = 2;
@@ -1466,6 +1469,7 @@ void P_DialogStart(player_t *player) case 1:
byetext = DEH_String("Thanks, Bye!");
break;
+ default:
case 0:
byetext = DEH_String("See you later!");
break;
|