Commit
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -20,6 +20,8 @@ | |||||||||||
{CAMPAIGN_DIFFICULTY HARD "units/merfolk/warrior.png~RC(magenta>red)" ( _ "Warrior") ( _ "Challenging")} | ||||||||||||
{CAMPAIGN_DIFFICULTY NIGHTMARE "units/merfolk/triton.png~RC(magenta>red)" ( _ "Triton") ( _ "Difficult")} | ||||||||||||
|
||||||||||||
{ENABLE_KRAKEN} | ||||||||||||
|
||||||||||||
description= _ "You are Kai Krellis, son and heir of the last merman king but only a child. A necromancer is turning your subjects into undead slaves! Lead your people on a mission to convince a powerful mer-sorceress to help you repel the invasion. The oceans near the Northern Lands are perilous, so you will need cunning and bravery to survive. But first you need to gain the respect of your troops! | ||||||||||||
" + _ "(Intermediate level, 10 scenarios.)" | ||||||||||||
|
@@ -71,13 +73,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} | ||||||||||||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
soliton-
Author
Member
|
{ENABLE_DWARVISH_RUNESMITH} |
which is defined here
#define ENABLE_DWARVISH_RUNESMITH |
{ENABLE_KRAKEN}
on the other hand is a campaign-specific macro
#define ENABLE_KRAKEN |
data/campaigns/Dead_Water/_main.cfg is parsed in two contexts:
- one where CAMPAIGN_DEAD_WATER is not defined (e.g. to retrieve the list of all campaigns)
- one where CAMPAIGN_DEAD_WATER is defined
In the first context data/campaigns/Dead_Water/units/Kraken.cfg is never included which means the macro ENABLE_KRAKEN is never defined.
Additionally the line
{ENABLE_KRAKEN} |
precedes the line
{campaigns/Dead_Water/utils} |
which means that even in the second context the macro is used before it is defined
This comment has been minimized.
This comment has been minimized.
Sorry, something went wrong.
soliton-
Jan 16, 2021
Author
Member
Yeah, my mistake. I thought there was any point to the macro and it was with the other optional advancements. Didn't check closely enough. Instead there is no point to the macro at all.
Are you sure this will not cause errors?
{ENABLE_KRAKEN}
was inside of an#ifdef CAMPAIGN_DEAD_WATER
because Kraken is a campaign-specific unit.wesnoth/data/campaigns/Dead_Water/units/Kraken.cfg
Lines 3 to 12 in 6a0baa5