mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Play sound when dragging something (Sounds\Misc\DragBody1.ogg .. DragBodyN.ogg).
Mercs always make movement noise when dragging. Stop dragging if another merc starts dragging this merc/body. Stop dragging if dragged merc gets up from collapsed state. Stop dragging when changing stance/cowering under suppression. Fixed grenade pin sound for signal smoke. CalcBestShot: if new opponent is dying and best opponent is ok, ignore new opponent. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2760,6 +2760,9 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
|
||||
PROFILLUA_ubDirectiono = pSoldier->ubDirection;
|
||||
PROFILLUA_bTeam = pSoldier->bTeam;
|
||||
|
||||
// sevenfm: reached new spot, enabled dragging sound
|
||||
pSoldier->usSoldierFlagMask2 &= ~SOLDIER_DRAG_SOUND;
|
||||
|
||||
// ATE; Handle bad guys, as they fade, to cancel it if
|
||||
// too long...
|
||||
// ONLY if fading IN!
|
||||
@@ -8825,6 +8828,9 @@ void HandleSuppressionFire( UINT8 ubTargetedMerc, UINT8 ubCausedAttacker )
|
||||
pSoldier->bScopeMode = USE_BEST_SCOPE;
|
||||
}
|
||||
|
||||
// sevenfm: stop dragging when changing stance/cowering under suppression
|
||||
pSoldier->CancelDrag();
|
||||
|
||||
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("HandleSuppressionFire: change stance"));
|
||||
pSoldier->ChangeSoldierStance( ubNewStance );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user