summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2011-11-26 22:09:42 +0000
committerSimon Howard2011-11-26 22:09:42 +0000
commit01e91aab21ad457dc7cd04d4288d38eaf46286df (patch)
tree898b1486c499cf9cf489a2dda1e88997b9fb4164 /src
parent14b478969763b156c50498570f768f50e7bb755c (diff)
downloadchocolate-doom-01e91aab21ad457dc7cd04d4288d38eaf46286df.tar.gz
chocolate-doom-01e91aab21ad457dc7cd04d4288d38eaf46286df.tar.bz2
chocolate-doom-01e91aab21ad457dc7cd04d4288d38eaf46286df.zip
Fix weapon cycling keys when using IDKFA in Shareware Doom (thanks
Alexandre Xavier). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2478
Diffstat (limited to 'src')
-rw-r--r--src/g_game.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/g_game.c b/src/g_game.c
index 933a1b7b..c68f40ad 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -435,6 +435,14 @@ static boolean WeaponSelectable(weapontype_t weapon)
return false;
}
+ // These weapons aren't available in shareware.
+
+ if ((weapon == wp_plasma || weapon == wp_bfg)
+ && gamemission == doom && gamemode == shareware)
+ {
+ return false;
+ }
+
// Can't select a weapon if we don't own it.
if (!players[consoleplayer].weaponowned[weapon])