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

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: dc861ea13200bbc976192ea34ab3a2e33bcf043d
      https://github.com/wesnoth/wesnoth/commit/dc861ea13200bbc976192ea34ab3a2e33bcf043d
  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: a0a597a266d36561047abfa76c567f903b50869c
      https://github.com/wesnoth/wesnoth/commit/a0a597a266d36561047abfa76c567f903b50869c
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M changelog

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


  Commit: bbb0c8a926ef93b3701fe76617a00194ba46020e
      https://github.com/wesnoth/wesnoth/commit/bbb0c8a926ef93b3701fe76617a00194ba46020e
  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/gui/dialogs/gamestate_inspector.cpp
    M src/play_controller.cpp
    M src/team.hpp

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

Conflicts:
	changelog


Compare: https://github.com/wesnoth/wesnoth/compare/fd9cda9cd223...bbb0c8a926ef