From 82aec443825827cbc18fd190d2c6b14b23302422 Mon Sep 17 00:00:00 2001
From: ChrisL <ChrisL@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 6 May 2008 17:32:34 +0000
Subject: [PATCH] Fixed bug #82: SHIFT+N allowed both sun goggles and NVGs to
 be worn at the same time.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Turn Based Input.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index 7a9505cc..983a81dd 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -5448,6 +5448,14 @@ void SwapGoggles(SOLDIERTYPE *pTeamSoldier)
 	INT8		bSlot1;
 	int			bestBonus;
 	bool		itemFound = false;
+	//CHRISL: Before doing anything, we should look at both head slots to see if either slot has some sort of goggles
+	for(bSlot1 = HEAD1POS; bSlot1 <= HEAD2POS; bSlot1++)
+	{
+		if(Item[pTeamSoldier->inv[bSlot1].usItem].brightlightvisionrangebonus > 0)
+			itemFound = true;
+		if(Item[pTeamSoldier->inv[bSlot1].usItem].nightvisionrangebonus > 0)
+			itemFound = true;
+	}
 	//2 head slots
 	for (bSlot1 = HEAD1POS; bSlot1 <= HEAD2POS; bSlot1++)
 	{