mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
Fix: use of uninitialized variables
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2790,6 +2790,7 @@ void UIHandleMercAttack( SOLDIERTYPE *pSoldier , SOLDIERTYPE *pTargetSoldier, IN
|
|||||||
{
|
{
|
||||||
sTargetGridNo = pTargetSoldier->sGridNo;
|
sTargetGridNo = pTargetSoldier->sGridNo;
|
||||||
bTargetLevel = pTargetSoldier->pathing.bLevel;
|
bTargetLevel = pTargetSoldier->pathing.bLevel;
|
||||||
|
sGridNo = sTargetGridNo;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2817,7 +2818,7 @@ void UIHandleMercAttack( SOLDIERTYPE *pSoldier , SOLDIERTYPE *pTargetSoldier, IN
|
|||||||
if ( pIntNode != NULL )
|
if ( pIntNode != NULL )
|
||||||
{
|
{
|
||||||
// Are we in the same gridno?
|
// Are we in the same gridno?
|
||||||
if ( sGridNo == pSoldier->sGridNo && ubItemCursor != AIDCURS )
|
if ( sGridNo == pSoldier->sGridNo && ubItemCursor != AIDCURS && pStructure )
|
||||||
{
|
{
|
||||||
// Get orientation....
|
// Get orientation....
|
||||||
switch( pStructure->ubWallOrientation )
|
switch( pStructure->ubWallOrientation )
|
||||||
|
|||||||
Reference in New Issue
Block a user