- bug fix 'j' key was not working properly

- check for invalid sector in GetCurrentBattleSectorXYZAndReturnTRUEIfThereIsABattle


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-06-04 17:52:58 +00:00
parent 07afe5f389
commit 5259bdeee2
5 changed files with 46 additions and 46 deletions
+7 -6
View File
@@ -2321,26 +2321,27 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
}
else
{
if ( gpSMCurrentMerc != NULL )
SOLDIERTYPE *pjSoldier;
if ( GetSoldier( &pjSoldier, gusSelectedSoldier ) )
{
BOOLEAN fNearHeigherLevel;
BOOLEAN fNearLowerLevel;
INT8 bDirection;
GetMercClimbDirection( gpSMCurrentMerc->ubID, &fNearLowerLevel, &fNearHeigherLevel );
GetMercClimbDirection( pjSoldier->ubID, &fNearLowerLevel, &fNearHeigherLevel );
if ( fNearLowerLevel )
{
BeginSoldierClimbDownRoof( gpSMCurrentMerc );
BeginSoldierClimbDownRoof( pjSoldier );
}
if ( fNearHeigherLevel )
{
BeginSoldierClimbUpRoof( gpSMCurrentMerc );
BeginSoldierClimbUpRoof( pjSoldier );
}
if ( FindFenceJumpDirection( gpSMCurrentMerc, gpSMCurrentMerc->sGridNo, gpSMCurrentMerc->bDirection, &bDirection ) )
if ( FindFenceJumpDirection( pjSoldier, pjSoldier->sGridNo, pjSoldier->bDirection, &bDirection ) )
{
BeginSoldierClimbFence( gpSMCurrentMerc );
BeginSoldierClimbFence( pjSoldier );
}
}
}