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

Fixed San Mona mine crash when trying to leave the sector with Kingpin's money -- CheckForKingpinsMoneyMissing function wasn't defined in the lua call

Browse Source 
Fixed threading crash when hovering mouse over stairs in rebel hideout (in WF maps at least) - removed unnecessary temporary SOLDIERTYPE variable

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2012-04-30 22:04:14 +00:00
parent 145c437857
commit dbe87b94b1
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+7 -4
View File
@@ -13499,10 +13499,13 @@ BOOLEAN OBJECTTYPE::TransformObject( SOLDIERTYPE * pSoldier, UINT8 ubStatusIndex
//Madd: Common Attachment Framework - check if a given point is acceptable
bool IsAttachmentPointAvailable( OBJECTTYPE * pObject, UINT8 subObject, UINT32 attachmentID )
{
if (Item[pObject->usItem].ulAvailableAttachmentPoint > 0 && (Item[attachmentID].attachment || Item[attachmentID].usItemClass & IC_GRENADE || Item[attachmentID].usItemClass & IC_BOMB)&& Item[attachmentID].ulAttachmentPoint & GetAvailableAttachmentPoint(pObject, subObject))
return true;
else
return false;
if (pObject)
{
if (Item[pObject->usItem].ulAvailableAttachmentPoint > 0 && (Item[attachmentID].attachment || Item[attachmentID].usItemClass & IC_GRENADE || Item[attachmentID].usItemClass & IC_BOMB)&& Item[attachmentID].ulAttachmentPoint & GetAvailableAttachmentPoint(pObject, subObject))
return true;
}
return false;
}
//Madd: Common Attachment Framework - if we already know the point