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 ce33ba394a
commit da8f3c824c
3 changed files with 18 additions and 1 deletions

View file

@ -27,6 +27,9 @@ Version 1.13.0-dev:
* Eastern Invasion:
* In 'Captured', stolen gold won't be mentioned if the player had no
carryover gold.
* 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: some minor changes
* S2: adjusted starting villages; scenario now ends if Kapou'e is already
on the signpost when the messenger comes back

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

@ -4,6 +4,9 @@ changelog: https://github.com/wesnoth/wesnoth/blob/master/changelog
Version 1.13.0-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.
* The Hammer of Thursagan:
* Rebalanced scenarios 'Invaders', 'Mages and Drakes' and 'Fear'.