[Commits] [wesnoth/wesnoth] f15eed: mp create engine uses Team + # syntax when use_map...

GitHub noreply at github.com
Tue Jul 1 17:10:38 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f15eed147afbe69e234ab1aa73efad9a497ee46a
      https://github.com/wesnoth/wesnoth/commit/f15eed147afbe69e234ab1aa73efad9a497ee46a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_create_engine.cpp

  Log Message:
  -----------
  mp create engine uses Team + # syntax when use_map_settings=false

The old behavior was that when use_map_settings=false, every side
would have team=# for some number. This causes problems because
config might secretly decide that that is an int, and cause string
comparisons to fail.

Whether or not that is a bug is a separate issue, it seems clearly
desirable for sides to always have a team name of the form
"Team #", to side-step the potential problems.

This fixes up problems which appeared after
4d73031680b8889ec70e42607016269f7c421da5
852b6981329a96055249c513477be0d43b2fcaa0


  Commit: 810c482da4c7f95712b19655d21da7dbca07cea9
      https://github.com/wesnoth/wesnoth/commit/810c482da4c7f95712b19655d21da7dbca07cea9
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_create_engine.cpp

  Log Message:
  -----------
  Merge branch 'fixup_mp_connect_names'


  Commit: 35b2c1464305002e6f6a73707dbd971ea51b8a8b
      https://github.com/wesnoth/wesnoth/commit/35b2c1464305002e6f6a73707dbd971ea51b8a8b
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M src/multiplayer_connect_engine.cpp

  Log Message:
  -----------
  add a warning to mp_connect_engine

The code path indicated seems to cause corruption of the game
configuration -- it might be better to just assert(false) in this
case but I'll leave as a warning for now.


Compare: https://github.com/wesnoth/wesnoth/compare/ae095c58c459...35b2c1464305


More information about the Commits mailing list