[Commits] [wesnoth/wesnoth] 6e8c18: fix bug #22251 (map labels not appearing in mp)

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 6e8c186dc95a6290412afe1c79acc5689a8aca8c
      https://github.com/wesnoth/wesnoth/commit/6e8c186dc95a6290412afe1c79acc5689a8aca8c
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M src/map_label.cpp

  Log Message:
  -----------
  fix bug #22251 (map labels not appearing in mp)

This fixes a bug introduced in this commit:
90501cf87254d3d87f876beb504f8734535d1dea

If the variable "res" is redeclared inside the else clause, the
desired return value goes out of scope before the function ends,
and we always return NULL instead.

This commit makes the line assign the variable without redeclaring
it.


  Commit: 667d6eb7e874e096142f4ad62fb6e9711dc889f7
      https://github.com/wesnoth/wesnoth/commit/667d6eb7e874e096142f4ad62fb6e9711dc889f7
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M changelog

  Log Message:
  -----------
  update changelog


  Commit: 05bb3359319c4a33daa6ac71edd17913d4093813
      https://github.com/wesnoth/wesnoth/commit/05bb3359319c4a33daa6ac71edd17913d4093813
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M changelog
    M data/scenario-test.cfg
    M src/play_controller.cpp
    M src/team.hpp

  Log Message:
  -----------
  Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12

Conflicts:
	changelog


Compare: https://github.com/wesnoth/wesnoth/compare/cf253e2359f0...05bb3359319c