Merge pull request #3422 from Ghabry/issue-3417

Fix #3417 + small FF cleanup

Author: carstene1ns

src/battle_animation.cpp

@@ -109,7 +109,7 @@ void BattleAnimation::DrawAt(Bitmap& dst, int x, int y) {
 			continue;
 		}
 
-		SetX(cell.x + x);
+		SetX(invert ? x - cell.x : cell.x + x);
 		SetY(cell.y + y);
 		int sx = cell.cell_id % 5;
 		int sy = cell.cell_id / 5;

src/player.cpp

@@ -132,8 +132,6 @@ namespace Player {
 	std::string replay_input_path;
 	std::string record_input_path;
 	std::string command_line;
-	int speed_modifier_a;
-	int speed_modifier_b;
 	int rng_seed = -1;
 	Game_ConfigPlayer player_config;
 	Game_ConfigGame game_config;
@@ -204,8 +202,6 @@ void Player::Init(std::vector<std::string> args) {
 	Input::AddRecordingData(Input::RecordingData::CommandLine, command_line);
 
 	player_config = std::move(cfg.player);
-	speed_modifier_a = cfg.input.speed_modifier_a.Get();
-	speed_modifier_b = cfg.input.speed_modifier_b.Get();
 
 	last_auto_screenshot = Game_Clock::now();
 }
@@ -326,10 +322,10 @@ void Player::UpdateInput() {
 	}
 	float speed = 1.0;
 	if (Input::IsSystemPressed(Input::FAST_FORWARD_A)) {
-		speed = speed_modifier_a;
+		speed = Input::GetInputSource()->GetConfig().speed_modifier_a.Get();
 	}
 	if (Input::IsSystemPressed(Input::FAST_FORWARD_B)) {
-		speed = speed_modifier_b;
+		speed = Input::GetInputSource()->GetConfig().speed_modifier_b.Get();
 	}
 	Game_Clock::SetGameSpeedFactor(speed);
 

src/player.h

@@ -424,14 +424,6 @@ namespace Player {
 	/** Translation manager, including list of languages and current translation. */
 	extern Translation translation;
 
-	/**
-	 * The default speed modifier applied when the speed up button is pressed
-	 *  Only used for configuring the speedup, don't read this var directly use
-	 *  GetSpeedModifier() instead.
-	 */
-	extern int speed_modifier_a;
-	extern int speed_modifier_b;
-
 	/**
 	 * The engine game logic configuration
 	 */

src/window_settings.cpp

@@ -628,8 +628,8 @@ void Window_Settings::RefreshInput() {
 	AddOption(cfg.gamepad_swap_ab_and_xy, [&cfg](){ cfg.gamepad_swap_ab_and_xy.Toggle(); Input::ResetTriggerKeys(); });
 	AddOption(cfg.gamepad_swap_analog, [&cfg](){ cfg.gamepad_swap_analog.Toggle(); Input::ResetTriggerKeys(); });
 	AddOption(cfg.gamepad_swap_dpad_with_buttons, [&cfg](){ cfg.gamepad_swap_dpad_with_buttons.Toggle(); Input::ResetTriggerKeys(); });
-	AddOption(cfg.speed_modifier_a, [this, &cfg](){ auto tmp = GetCurrentOption().current_value; Player::speed_modifier_a = tmp; cfg.speed_modifier_a.Set(tmp); });
-	AddOption(cfg.speed_modifier_b, [this, &cfg](){ auto tmp = GetCurrentOption().current_value; Player::speed_modifier_b = tmp; cfg.speed_modifier_b.Set(tmp); });
+	AddOption(cfg.speed_modifier_a, [this, &cfg](){ cfg.speed_modifier_a.Set(GetCurrentOption().current_value); });
+	AddOption(cfg.speed_modifier_b, [this, &cfg](){ cfg.speed_modifier_b.Set(GetCurrentOption().current_value); });
 }
 
 void Window_Settings::RefreshButtonCategory() {