commit 6e099632c653dd42dbe1f719c5887844091da0cc
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Mar 28 00:24:47 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Mar 28 00:24:47 2011 +0000

    Fix weapon cycling from the shotgun to the chaingun in Doom 1 (thanks
    Alexandre Xavier).

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 2311
---
 NEWS         | 2 ++
 src/g_game.c | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 003c35a5..b7c5922e 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,8 @@
      * The default sfx/music volume set by the setup tool is now 8
        instead of 15, matching the game itself. (thanks Alexandre
        Xavier).
+     * Weapon cycling from the shotgun to the chaingun in Doom 1 now
+       works properly (thanks Alexandre Xavier).

     libtextscreen:
      * It is now possible to type a '+' in input boxes (thanks
diff --git a/src/g_game.c b/src/g_game.c
index f91e630e..933a1b7b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -428,6 +428,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])