Fix #74: update ottd_display_speed to match changes from OpenTTD r239…

…45. (#75) Co-authored-by: juzza1 <juzza1@gmail.com>
OpenTTD · May 5, 2020 · 7affc55 · 7affc55
1 parent 5434ef4
commit 7affc55
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/nml/actions/action0properties.py b/nml/actions/action0properties.py
@@ -255,7 +255,7 @@ def cargo_list(value, max_num_cargos):
 }
 
 def ottd_display_speed(value, divisor, unit):
-    return int(value.value / divisor) * 10 // 16 * unit.ottd_mul >> unit.ottd_shift
+    return (round(value.value / divisor * 10 * unit.ottd_mul) >> unit.ottd_shift) // 16
 
 class VariableListProp(BaseAction0Property):
     """

diff --git a/regression/expected/006_vehicle.grf b/regression/expected/006_vehicle.grf
diff --git a/regression/expected/006_vehicle.nfo b/regression/expected/006_vehicle.nfo
@@ -49,7 +49,7 @@ FF
 0A \dx00004C48 
 09 87 
 11 8F 
-08 98 
+08 96 
 13 16 
 14 58 
 0E FF 

diff --git a/regression/expected/013_train_callback.grf b/regression/expected/013_train_callback.grf
diff --git a/regression/expected/013_train_callback.nfo b/regression/expected/013_train_callback.nfo
@@ -198,7 +198,7 @@ FF
 FF 
 
 64 * 22 00 00 \b5 01 FF \wx0074 
-09 \wx0025 
+09 \wx0024 
 09 \wx0000 
 09 \wx0000 
 09 \wx0000