From 52eaaf4fcd9a3fb49ed32bcc2f7c653d6b5c589b Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Tue, 29 Aug 2006 16:41:10 +0000 Subject: [PATCH] -quick fix: enemies don't wear sun goggles at night anymore git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@490 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 4 ++-- Tactical/Inventory Choosing.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 6ffa6041..8feec02e 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.489" }; + INT16 zVersionLabel[256] = { L"Release v1.13.490" }; #endif -INT8 czVersionNumber[16] = { "Build 06.08.28" }; +INT8 czVersionNumber[16] = { "Build 06.08.29" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 4de84631..988b27eb 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -2995,8 +2995,8 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo } usItem = gArmyItemChoices[ typeIndex ].bItemNo[ uiChoice ]; - //Madd: quickfix: don't use NVGs during the day - if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && ( NightTime() || Item[usItem].nightvisionrangebonus == 0 ) ) + //Madd: quickfix: don't use NVGs during the day, and no sungoggles at night either + if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 ))) { // pick a default item in case we don't find anything with a matching coolness, but pick the coolest item we can find if ( defaultItem == 0 || Item[usItem].ubCoolness > Item[defaultItem].ubCoolness )