diff options
| author | Simon Howard | 2011-06-13 22:21:37 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-06-13 22:21:37 +0000 |
| commit | 391e7466b1efb7cbede4a1c356a210d9e7ee616b (patch) | |
| tree | 90d13346d9cd3636df44290ded13d59ae3712543 /src/doom/g_game.c | |
| parent | fa328faf056affa216f2f3a8764ca0d56262efe9 (diff) | |
| parent | 822664b4ff873d462370e9e96a9d91e6066c221d (diff) | |
| download | chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.gz chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.bz2 chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2347
Diffstat (limited to 'src/doom/g_game.c')
| -rw-r--r-- | src/doom/g_game.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/doom/g_game.c b/src/doom/g_game.c index 5662d3f2..598f1c5e 100644 --- a/src/doom/g_game.c +++ b/src/doom/g_game.c @@ -361,6 +361,13 @@ int G_CmdChecksum (ticcmd_t* cmd) static boolean WeaponSelectable(weapontype_t weapon) { + // Can't select the super shotgun in Doom 1. + + if (weapon == wp_supershotgun && gamemission == doom) + { + return false; + } + // Can't select a weapon if we don't own it. if (!players[consoleplayer].weaponowned[weapon]) |