From 751e07bfb5195b5853a8e2d45135614228336014 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter@fuzzle.org>
Date: Sun, 19 Jan 2025 12:58:43 +0000
Subject: [PATCH] Fix: Badge table should be defined before it is used.

---
 regression/042_badges.nml          |  10 +++++-----
 regression/expected/042_badges.grf | Bin 593 -> 593 bytes
 regression/expected/042_badges.nfo |  10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/regression/042_badges.nml b/regression/042_badges.nml
index 518b12e4..a5fc14ab 100644
--- a/regression/042_badges.nml
+++ b/regression/042_badges.nml
@@ -6,11 +6,6 @@ grf {
     min_compatible_version: 0;
 }
 
-switch (FEAT_TRAINS, SELF, sw_can_attach_wagon, has_badge("power/steam")) {
-    1: return CB_RESULT_ATTACH_ALLOW;
-    return string(STR_NO_BADGE);
-}
-
 badgetable {
     "flag/GB",
     "flag/US",
@@ -19,6 +14,11 @@ badgetable {
     "power/electric",
 }
 
+switch (FEAT_TRAINS, SELF, sw_can_attach_wagon, has_badge("power/electric")) {
+    1: return CB_RESULT_ATTACH_ALLOW;
+    return string(STR_NO_BADGE);
+}
+
 item (FEAT_TRAINS, default_train, 8) {
     property {
         badges: ["flag/GB", "power/steam"];
diff --git a/regression/expected/042_badges.grf b/regression/expected/042_badges.grf
index 9dd64f269920713c0654c7a9727f19518b999261..bd62f80166e50c71c25d39e90e921582430ff18f 100644
GIT binary patch
delta 44
ucmcb}a*<`io{2YIWhEFG82&Rc{O_z{VPFKZ85vu^6p+c#uvw1Lm=ORY%n9)T

delta 44
ucmcb}a*<`i9$5(n28RDk4F5Z;m>3v=Y(~ZwFa=~XG)&y%x>=6Vm=OT|2?^2w

diff --git a/regression/expected/042_badges.nfo b/regression/expected/042_badges.nfo
index 4cfbbe92..46559f77 100644
--- a/regression/expected/042_badges.nfo
+++ b/regression/expected/042_badges.nfo
@@ -18,16 +18,16 @@
 2 * 52 08 08 "NML\42" "NML regression test" 00 "A test newgrf testing NML" 00
 3 * 43 04 00 FF 01 \wxD000 "Can only attach power/steam vehicles" 00
 
+4 * 64 00 08 \b1 05 FF \wx0000
+18 "flag/GB" 00 "flag/US" 00 "power/steam" 00 "power/diesel" 00 "power/electric" 00
+
 // Name: sw_can_attach_wagon
-4 * 24 02 00 FF 89
-7A 02 00 \dx00000001
+5 * 24 02 00 FF 89
+7A 04 00 \dx00000001
 \b1
 \wx8401 \dx00000001 \dx00000001 	// 1 .. 1: return 1025;
 \wx8000 // default: return string(STR_NO_BADGE);
 
-5 * 64 00 08 \b1 05 FF \wx0000
-18 "flag/GB" 00 "flag/US" 00 "power/steam" 00 "power/diesel" 00 "power/electric" 00
-
 6 * 14 00 00 \b1 01 FF \wx0008
 33 \wx0002
 \wx0000 \wx0002