1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Diving bottle is now worn in the combat pack position instead of vest position

Browse Source 
- 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
This commit is contained in:
Flugente
2012-12-08 18:54:30 +00:00
parent 7e6ec3659e
commit 87e0d82cdd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+5
View File
@@ -14151,6 +14151,11 @@ BOOLEAN OBJECTTYPE::TransformObject( SOLDIERTYPE * pSoldier, UINT8 ubStatusIndex
this->usItem = usResult[0]; this->usItem = usResult[0];
// Record the new itemclass // Record the new itemclass
UINT32 uiNewClass = Item[this->usItem].usItemClass; 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. // Make a clone of this object, so that we can point the DescBox to it later if we run into any problems.
gCloneItemDescObject = *(this); gCloneItemDescObject = *(this);
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
Tactical/Soldier Control.cpp
+1 -1
View File
@@ -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) ) ) 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; 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 FALSE;
return TRUE; return TRUE;