diff options
| author | James Haley | 2010-10-05 05:01:15 +0000 |
|---|---|---|
| committer | James Haley | 2010-10-05 05:01:15 +0000 |
| commit | 3b45e5ce842144016d43238547436bd7324d52e0 (patch) | |
| tree | 174e7e9bd502747e84a029ea08f311fe32963b27 | |
| parent | cb76368326d70bd8708a8180f75740e580c1312d (diff) | |
| download | chocolate-doom-3b45e5ce842144016d43238547436bd7324d52e0.tar.gz chocolate-doom-3b45e5ce842144016d43238547436bd7324d52e0.tar.bz2 chocolate-doom-3b45e5ce842144016d43238547436bd7324d52e0.zip | |
Fix for menu messages - unpause when dismissed.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2159
| -rw-r--r-- | src/strife/m_menu.c | 1 | ||||
| -rw-r--r-- | src/strife/p_inter.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c index 84d37129..26e808dc 100644 --- a/src/strife/m_menu.c +++ b/src/strife/m_menu.c @@ -1735,6 +1735,7 @@ boolean M_Responder (event_t* ev) if (messageRoutine) messageRoutine(key); + menupause = false; // [STRIFE] unpause menuactive = false; S_StartSound(NULL, sfx_mtalht); // [STRIFE] sound return true; diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index 3800d844..e42b58ba 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -1140,7 +1140,7 @@ void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage) else if(inflictor->type == MT_PFLAME) { damage /= 2; - // robots deal very little damage + // robots take very little damage if(target->flags & MF_NOBLOOD) damage = temp / 2; } |