1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various Bugfixes by Headrock:

Browse Source 
- Fixed: NPC and PC movement errors
- Fixed: Boxers in San Mona do not leave the boxing ring after the fight
- Fixed: Darren does not pay the cash after you won the boxing fight 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-18 19:16:57 +00:00
parent c8bf95490a
commit 53821fcf49
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+6 -3
View File
@@ -6616,18 +6616,21 @@ void SOLDIERTYPE::EVENT_BeginMercTurn( BOOLEAN fFromRealTime, INT32 iRealTimeCou
// in the previous turn, then the player has apparently forgotten that he was moving.
// In this case, abort the character's action.
// If haven't moved since the start of last round
if (!this->bTilesMoved)
// If hasn't moved since the start of last round
// AND this function is being executed in Turn Based mode
// AND character is a player-controlled merc
if (!fFromRealTime && !this->bTilesMoved && this->bTeam == OUR_TEAM )
{
// but are doing a movement animation
if ( !( gAnimControl[ this->usAnimState ].uiFlags & ANIM_STATIONARY ) )
{
// Stop the merc
this->EVENT_StopMerc( this->sGridNo, this->ubDirection );
this->pathing.sFinalDestination = NOWHERE;
}
// Reset destination
this->pathing.sFinalDestination = this->sGridNo;
//this->pathing.sFinalDestination = this->sGridNo;
}
this->bTilesMoved = 0;