NR: Search for White Magi respawn locs only within map edges (bug #22097)

Without this, the engine may match map borders and send the respawnee
back to the player's recall list as those count as invalid locations
like "recall","recall".
This commit is contained in:
Ignacio R. Morelle 2014-06-21 10:12:56 -04:00
parent 00d7b06faf
commit 5e57bcaab2
3 changed files with 20 additions and 1 deletions

View file

@ -5,6 +5,9 @@ Version 1.11.15+dev:
* Legend of Wesmere
* Disabled the non finished chapters 4 and 5 in the mp port.
* Fix scenario 3 which was broken after a map change.
* Northern Rebirth:
* Fixed Sister Thera and Father Morvin respawning into the recall list if
the other is on the north or west map edges.
* Son of the Black Eye: minor balance tweaks to scenarios 15, 17 and 18
* Editor:
* Added an entry for the terrain description help to the context menu.

View file

@ -229,6 +229,11 @@
{VARIABLE respawn_hub (Tallin)}
[/else]
[/if]
[store_map_dimensions]
variable=respawn_map
[/store_map_dimensions]
[while]
[variable]
name=respawn_point.length
@ -253,11 +258,17 @@
terrain=Wo,*^Xm,X*,Q*
[/not]
[/and]
# Exclude map edges, otherwise the unit gets sent to the recall list
[and]
x=1-$respawn_map.width
y=1-$respawn_map.height
[/and]
[/store_locations]
{VARIABLE_OP current_radius add 1}
[/do]
[/while]
{CLEAR_VARIABLE current_radius,respawn_hub}
{CLEAR_VARIABLE current_radius,respawn_hub,respawn_map}
#enddef
# Sister Thera death, seven randomly chosen dialogues

View file

@ -3,6 +3,11 @@ changes may be omitted). For a complete list of changes, see the main
changelog: https://github.com/wesnoth/wesnoth/blob/1.12/changelog
Version 1.11.15+dev:
* Campaigns:
* Northern Rebirth:
* Fixed Sister Thera and Father Morvin respawning into the recall list if
the other is on the north or west map edges.
* Language and i18n:
* Updated translations: German.