From 0c99913cc143eff3cee8d0ec93fa6c51823b91aa Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 1 May 2013 10:09:59 +0000 Subject: [PATCH] - MP: Disabled (set to FALSE) the NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT (ja2_options.ini entry) in a MP game, because it leads to problems on the pure client o If ON, the ALWAYS tries to scroll to the AI soldier which is in running stance and therefore you are unable to do anyting and cannot play git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6043 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 817f1ad2c..dd9cc2ca0 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1273,9 +1273,13 @@ void LoadGameExternalOptions() // Penalty for fire when you don't see enemy (when you see enemy because his see militya or ather merc) gGameExternalOptions.iPenaltyShootUnSeen = iniReader.ReadInteger("Tactical Interface Settings","SHOOT_UNSEEN_PENALTY",0,0,255); - // Flugente: in turnbased combat, do not adjust animation after arriving at target location - gGameExternalOptions.fNoStandingAnimAdjustInCombat = iniReader.ReadBoolean("Tactical Interface Settings","NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT", TRUE); - + if (!is_networked) + // Flugente: in turnbased combat, do not adjust animation after arriving at target location + gGameExternalOptions.fNoStandingAnimAdjustInCombat = iniReader.ReadBoolean("Tactical Interface Settings","NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT", TRUE); + else + // WANNE: This makes problem for the AI soldiers on the pure client, so why is is set to false + gGameExternalOptions.fNoStandingAnimAdjustInCombat = FALSE; + //Inventory AP Weight Divisor gGameExternalOptions.uWeightDivisor = iniReader.ReadFloat("Tactical Interface Settings","INV_AP_WEIGHT_DIVISOR",5,0,100);