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

Merged from revision: 7262

Browse Source 
Fixes (by anv)
- fix: comparison feature would sometimes show comparison with empty sector inventory slots,
- fix: enemy taunts aimed at NOBODY could cause out of range,
- fix: list of boxers fought per day is properly reset when fight club reopens,
- fix: Van Haussen won't offer a fight or accept bets if all boxers are dead (even if our mercs stand on corpses),
- fix: boxing opponents won't try to call reinforcements any more.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-06-03 18:42:29 +00:00
parent 89deae89b2
commit 5d5e02f207
14 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Enhanced.cpp
+24 -12
View File
@@ -4229,7 +4229,8 @@ void DrawWeaponStats( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL && gpComparedItemDescObject->usItem )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & (IC_GUN|IC_LAUNCHER|IC_THROWING_KNIFE|IC_BLADE|IC_PUNCH) )
@@ -4685,7 +4686,8 @@ void DrawExplosiveStats( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & IC_EXPLOSV )
@@ -4874,7 +4876,8 @@ void DrawArmorStats( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & IC_ARMOUR )
@@ -4971,7 +4974,8 @@ void DrawAdvancedStats( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpItemDescObject->usItem ].usItemClass == Item[ gpComparedItemDescObject->usItem ].usItemClass )
@@ -5888,7 +5892,8 @@ void DrawMiscStats( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass == Item[ gpItemDescObject->usItem ].usItemClass )
@@ -5950,7 +5955,8 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpItemDescObject->usItem ].usItemClass == Item[ gpComparedItemDescObject->usItem ].usItemClass )
@@ -6537,7 +6543,8 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL && gpComparedItemDescObject->usItem )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & (IC_GUN|IC_LAUNCHER|IC_THROWING_KNIFE|IC_BLADE|IC_PUNCH) )
@@ -8665,7 +8672,8 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & IC_AMMO )
@@ -8946,7 +8954,8 @@ void DrawExplosiveValues( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & IC_EXPLOSV )
@@ -9594,7 +9603,8 @@ void DrawArmorValues( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass & IC_ARMOUR )
@@ -9834,7 +9844,8 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpItemDescObject->usItem ].usItemClass == Item[ gpComparedItemDescObject->usItem ].usItemClass )
@@ -14338,7 +14349,8 @@ void DrawMiscValues( OBJECTTYPE * gpItemDescObject )
BOOLEAN fComparisonMode = FALSE;
if( _KeyDown( CTRL ) && gfCheckForCursorOverMapSectorInventoryItem )
{
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object.usItem )
gpComparedItemDescObject = &pInventoryPoolList[ ( iCurrentInventoryPoolPage * MAP_INVENTORY_POOL_SLOT_COUNT ) + iCurrentlyHighLightedItem].object;// = pInventoryPoolList[ iCurrentSlot + iFirstSlotOnPage ].object;
if( gpComparedItemDescObject != NULL )
{
if( Item[ gpComparedItemDescObject->usItem ].usItemClass == Item[ gpItemDescObject->usItem ].usItemClass )