From 6e091c78b8c97b1f92a179ce70a5c14fb4b68f69 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 12 Apr 2023 19:34:55 +0100 Subject: [PATCH] Use SoftClamp in DrawAircraftEngine, DrawShipEngine, DrawTrainEngine --- src/aircraft_cmd.cpp | 2 +- src/ship_cmd.cpp | 2 +- src/train_cmd.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 03cd3b3c73..b08f90245e 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -237,7 +237,7 @@ void DrawAircraftEngine(int left, int right, int preferred_x, int y, EngineID en GetAircraftIcon(engine, image_type, &seq); Rect16 rect = seq.GetBounds(); - preferred_x = Clamp(preferred_x, + preferred_x = SoftClamp(preferred_x, left - UnScaleGUI(rect.left), right - UnScaleGUI(rect.right)); diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index e82ff32d96..c72b90f82e 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -107,7 +107,7 @@ void DrawShipEngine(int left, int right, int preferred_x, int y, EngineID engine GetShipIcon(engine, image_type, &seq); Rect16 rect = seq.GetBounds(); - preferred_x = Clamp(preferred_x, + preferred_x = SoftClamp(preferred_x, left - UnScaleGUI(rect.left), right - UnScaleGUI(rect.right)); diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 4bf31387d3..5ce3549cb9 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1386,7 +1386,7 @@ void DrawTrainEngine(int left, int right, int preferred_x, int y, EngineID engin GetRailIcon(engine, false, y, image_type, &seq); Rect16 rect = seq.GetBounds(); - preferred_x = Clamp(preferred_x, + preferred_x = SoftClamp(preferred_x, left - UnScaleGUI(rect.left), right - UnScaleGUI(rect.right));