DW: ditch the ENABLE_KRAKEN macro

wesnoth · Jan 16, 2021 · e2e5064 · e2e5064
1 parent bf153a1
commit e2e5064
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/data/campaigns/Dead_Water/_main.cfg b/data/campaigns/Dead_Water/_main.cfg
@@ -58,6 +58,12 @@
             comment = "Attack icons"
         [/entry]
     [/about]
+
+    [modify_unit_type]
+        type="Cuttle Fish"
+        add_advancement="Kraken"
+        set_experience=80
+    [/modify_unit_type]
 [/campaign]
 
 #ifdef CAMPAIGN_DEAD_WATER
@@ -71,13 +77,6 @@
     {campaigns/Dead_Water/units}
 [/units]
 
-# wmllint bug: wmllint is not smart enough to realise that the campaign already has an id
-# wmllint: validate-off
-[+campaign]
-    {ENABLE_KRAKEN}
-[/campaign]
-# wmllint: validate-on
-
 {campaigns/Dead_Water/scenarios}
 
 [lua]

diff --git a/data/campaigns/Dead_Water/units/Kraken.cfg b/data/campaigns/Dead_Water/units/Kraken.cfg
@@ -1,13 +1,5 @@
 #textdomain wesnoth-dw
 
-#define ENABLE_KRAKEN
-    [modify_unit_type]
-        type="Cuttle Fish"
-        add_advancement="Kraken"
-        set_experience=80
-    [/modify_unit_type]
-#enddef
-
 [unit_type]
     id=Kraken
     name= _ "Kraken"