From 6e099632c653dd42dbe1f719c5887844091da0cc Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 28 Mar 2011 00:24:47 +0000 Subject: Fix weapon cycling from the shotgun to the chaingun in Doom 1 (thanks Alexandre Xavier). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2311 --- src/g_game.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/g_game.c') 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]) -- cgit v1.2.3