diff options
| author | Simon Howard | 2011-03-28 00:24:47 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-03-28 00:24:47 +0000 |
| commit | 6e099632c653dd42dbe1f719c5887844091da0cc (patch) | |
| tree | f57d3941d214840aede964a93e62b4d55a4d07b5 | |
| parent | a69af94b58ac491c8a215ebe2f81b3a521b833f4 (diff) | |
| download | chocolate-doom-6e099632c653dd42dbe1f719c5887844091da0cc.tar.gz chocolate-doom-6e099632c653dd42dbe1f719c5887844091da0cc.tar.bz2 chocolate-doom-6e099632c653dd42dbe1f719c5887844091da0cc.zip | |
Fix weapon cycling from the shotgun to the chaingun in Doom 1 (thanks
Alexandre Xavier).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2311
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/g_game.c | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -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]) |