From 855b5f467541358bc162c377bf0449db58452138 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Wed, 25 Jul 2001 16:54:29 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 9a8e1ef91..e01aab168 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -794,7 +794,7 @@ if(PadGetDown(0)&PAD_TRIANGLE)
 				// over an item whilst unarmed, he automatically picks it up
 				m_tryingToAutomaticallyPickupWeapon=true;
 			}
-			if(getPadInputDown()&PI_WEAPONCHANGE)
+			if(m_currentMode!=PLAYER_MODE_CART && getPadInputDown()&PI_WEAPONCHANGE)
 			{
 				// If already armed then drop current weapon
 				if(m_currentMode!=PLAYER_MODE_BASICUNARMED&&