From 88c65fa8926d6776bbbede3b1aaafd76b501b0cd Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Thu, 24 May 2018 09:39:56 +1100 Subject: [PATCH] TRoW: revert workaround for #2912 [ci skip] Reverts e41cd0b, 4d92cc2, and 1b04b9d. (cherry picked from commit 489fbccba15fafe2c1a4a3b22ec2c2007bddcdfe) --- changelog.md | 3 --- .../campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg | 2 +- .../The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index eacee965f824..59a286c41655 100644 --- a/changelog.md +++ b/changelog.md @@ -308,9 +308,6 @@ * S05 The Pursuit: removed a bottleneck and tweaked Rod of Justice. * Sceptre of Fire: * In 'Caverns of Flame', fixed various issues with the volcano eruption. - * The Rise of Wesnoth: - * Work around a portrait size-related crash-to-titlescreen on Return to - Oldwood (issue #2912). * Under the Burning Suns: * Various Quenoth unit graphics updates. * Descent into Darkness: diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg index df50d7acc225..25c49ababa3e 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg @@ -100,7 +100,7 @@ id=Elilmaldur-Rithrandil # wmllint: directory spelling Elilmaldur-Rithrandil name= _ "Elilmaldur-Rithrandil" - profile="portraits/rithrandil.png~SCALE(481,700)" + profile="portraits/rithrandil.png" canrecruit=yes recruit=Wose Sapling {GOLD 160 100 60} diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg index 7251caf6a1d3..66738c7230f0 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg @@ -54,7 +54,7 @@ type=Ancient Wose id=Elilmaldur-Rithrandil name= _ "Elilmaldur-Rithrandil" - profile="portraits/rithrandil-winter.png~SCALE(481,700)" + profile="portraits/rithrandil-winter.png" canrecruit=yes team_name=treefolk user_team_name=_"Treefolk"