From 87e0d82cddbdea841539db35c7acdabf2f4a1340 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 8 Dec 2012 18:54:30 +0000 Subject: [PATCH] - Diving bottle is now worn in the combat pack position instead of vest position - Fix: the first food item created via item transformation was spawned rotten if the base item was no food item git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5719 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Items.cpp | 5 +++++ Tactical/Soldier Control.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 44c25b99..cfb55f01 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -14151,6 +14151,11 @@ BOOLEAN OBJECTTYPE::TransformObject( SOLDIERTYPE * pSoldier, UINT8 ubStatusIndex this->usItem = usResult[0]; // Record the new itemclass UINT32 uiNewClass = Item[this->usItem].usItemClass; + + // Flugente: if the new item is a food item (and the old one wasn't), we define it to be fresh, so adjust its temperature + if ( Item[usOldItem].foodtype == 0 && Item[this->usItem].foodtype > 0 ) + (*this)[0]->data.bTemperature = OVERHEATING_MAX_TEMPERATURE; + // Make a clone of this object, so that we can point the DescBox to it later if we run into any problems. gCloneItemDescObject = *(this); /////////////////////////////////////////////////////////////// diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index c847a610..11216635 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -15345,7 +15345,7 @@ BOOLEAN SOLDIERTYPE::UsesScubaGear() if ( !( this->inv[ HEAD1POS ].exists() && HasItemFlag(this->inv[ HEAD1POS ].usItem, SCUBA_MASK) ) && !( this->inv[ HEAD2POS ].exists() && HasItemFlag(this->inv[ HEAD2POS ].usItem, SCUBA_MASK) ) ) return FALSE; - if ( !this->inv[VESTPOCKPOS].exists() || !HasItemFlag( this->inv[VESTPOCKPOS].usItem, SCUBA_BOTTLE ) ) + if ( !this->inv[ CPACKPOCKPOS ].exists() || !HasItemFlag( this->inv[CPACKPOCKPOS].usItem, SCUBA_BOTTLE ) ) return FALSE; return TRUE;