From 573dbee6c2e77f0914ea0fd20e37acb1ffd974b8 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 3 Jun 2006 18:08:08 +0000
Subject: [PATCH] -fixed battle scope / sniper scope conflict in Inventory
 Choosing.cpp

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

diff --git a/GameVersion.cpp b/GameVersion.cpp
index c2ffa430..a3932adc 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,7 +23,7 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.162" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.164" };
 
 
 #endif
diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp
index e087ac0f..b59ef366 100644
--- a/Tactical/Inventory Choosing.cpp	
+++ b/Tactical/Inventory Choosing.cpp	
@@ -670,7 +670,40 @@ void ChooseWeaponForSoldierCreateStruct( SOLDIERCREATE_STRUCT *pp, INT8 bWeaponC
 	{
 		usAttachIndex = PickARandomAttachment(ATTACHMENTS,usGunIndex,bAttachClass,FALSE);
 
-		if ( usScopeIndex > 0 )
+		if ( Item[usGunIndex].defaultattachment > 0 )
+		{
+			//check for incompatibilities 
+			for(i = 0;i<sizeof(IncompatibleAttachments);i++)
+			{
+				if ( IncompatibleAttachments[i][0] == NONE )
+					break;
+			
+				if ( IncompatibleAttachments[i][0] == usAttachIndex && IncompatibleAttachments[i][1] == Item[usGunIndex].defaultattachment )
+				{
+					// default attachment wins
+					usAttachIndex = 0;
+					break;
+				}
+			}
+
+			if ( usScopeIndex > 0 )
+			{
+				//check for incompatibilities w/scope
+				for(i = 0;i<sizeof(IncompatibleAttachments);i++)
+				{
+					if ( IncompatibleAttachments[i][0] == NONE )
+						break;
+				
+					if ( IncompatibleAttachments[i][0] == usScopeIndex && IncompatibleAttachments[i][1] == Item[usGunIndex].defaultattachment )
+					{
+						// default attachment wins
+						usScopeIndex = 0;
+						break;
+					}
+				}
+			}
+		}
+		else if ( usScopeIndex > 0 )
 		{
 			//check for incompatibilities with scope
 			for(i = 0;i<sizeof(IncompatibleAttachments);i++)