mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Little Alien
- Game version string changed Added changes from Madd Mugsy 2006.05.24 - Fixed tracer bullet firing during daytime bug - Made camobonus not depend on gear status - Items with coolness = 0 are "illegal" - Made wirecutter cursor appear for utility knife when able to cut fences - Made autofire-only guns not work if they're in the secondary hand git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@80 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+10
-10
@@ -206,17 +206,17 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, UINT16 usGridNo, INT8 bLevel, UINT16 us
|
||||
{
|
||||
pTargetSoldier = MercPtrs[ usSoldierIndex ];
|
||||
|
||||
if ( fFromUI )
|
||||
{
|
||||
// ATE: Check if we are targeting an interactive tile, and adjust gridno accordingly...
|
||||
pIntNode = GetCurInteractiveTileGridNoAndStructure( &sGridNo, &pStructure );
|
||||
if ( fFromUI )
|
||||
{
|
||||
// ATE: Check if we are targeting an interactive tile, and adjust gridno accordingly...
|
||||
pIntNode = GetCurInteractiveTileGridNoAndStructure( &sGridNo, &pStructure );
|
||||
|
||||
if ( pIntNode != NULL && pTargetSoldier == pSoldier )
|
||||
{
|
||||
// Truncate target sioldier
|
||||
pTargetSoldier = NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
// Truncate target sioldier
|
||||
pTargetSoldier = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ATE: If in realtime, set attacker count to 0...
|
||||
@@ -769,7 +769,7 @@ INT32 HandleItem( SOLDIERTYPE *pSoldier, UINT16 usGridNo, INT8 bLevel, UINT16 us
|
||||
}
|
||||
}
|
||||
|
||||
if ( Item[usHandItem].wirecutters )
|
||||
if ( Item[usHandItem].wirecutters && pTargetSoldier == NULL ) // Madd: quick fix to allow wirecutter/knives
|
||||
{
|
||||
// See if we can get there to stab
|
||||
sActionGridNo = FindAdjacentGridEx( pSoldier, usGridNo, &ubDirection, &sAdjustedGridNo, TRUE, FALSE );
|
||||
|
||||
Reference in New Issue
Block a user