From 706c6378c2d5dda2cfdb781ec86f35f04917ac1b Mon Sep 17 00:00:00 2001
From: silversurfer <silversurfer@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 29 Jun 2019 16:35:28 +0000
Subject: [PATCH] Fix: Shift + R didn't work anymore to reload the weapons of
 all mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp               | 4 ++--
 Tactical/Turn Based Input.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 4e5538c0..2fe38446 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -55,8 +55,8 @@
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 19.06.28" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 19.06.29" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
-CHAR16		zRevisionNumber[16] = { L"Revision 8680" };
+CHAR16		zRevisionNumber[16] = { L"Revision 8681" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index ba72b857..37a645da 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -7936,7 +7936,7 @@ void HandleTBReloadAll( void )
 									UINT32 invsize = pTeamSoldier->inv.size();
 									for (UINT32 bLoop2 = 0; bLoop2 < invsize; ++bLoop2)
 									{
-										if ( (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass & (IC_GUN<IC_LAUNCHER)) )
+										if ( (Item[pTeamSoldier->inv[bLoop2].usItem].usItemClass & (IC_GUN | IC_LAUNCHER)) )
 										{
 											pGun	= &(pTeamSoldier->inv[bLoop2]);