[Commits] [wesnoth/wesnoth] a6e632: fix "player_id" during mp_connect/mp_wait

GitHub noreply at github.com
Thu Nov 13 13:19:36 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: a6e632607226419f1b1fd1b36adc55ec707c0d6a
      https://github.com/wesnoth/wesnoth/commit/a6e632607226419f1b1fd1b36adc55ec707c0d6a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/multiplayer_wait.cpp

  Log Message:
  -----------
  fix "player_id" during mp_connect/mp_wait

the value of "player_id" is only used to set the userlist in mpwait in
case there is no other userlist available (usualy there is another list
available) adding a side number doesn't make sense.

We also use a std::set for gathering the player_id values to make sure
there is no player_id twice.


  Commit: 005c99fc2350efe353714b25ac0b866270c7b368
      https://github.com/wesnoth/wesnoth/commit/005c99fc2350efe353714b25ac0b866270c7b368
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp

  Log Message:
  -----------
  dont read "player_id" attribute

its not persistent in savefiles nor it's a documented [side] attribute


  Commit: d0623f16dae17ccd7db26acbc130dd46c1f80f5a
      https://github.com/wesnoth/wesnoth/commit/d0623f16dae17ccd7db26acbc130dd46c1f80f5a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M src/game_initialization/connect_engine.cpp
    M src/game_initialization/connect_engine.hpp
    M src/game_initialization/multiplayer_connect.cpp

  Log Message:
  -----------
  rename "current_player" -> "reserved_for"

Conflicts:
	src/game_initialization/connect_engine.cpp
	src/game_initialization/connect_engine.hpp


  Commit: c64a1925df4df1bdc44892012c8e81dc406ded8a
      https://github.com/wesnoth/wesnoth/commit/c64a1925df4df1bdc44892012c8e81dc406ded8a
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M src/variable_info.cpp

  Log Message:
  -----------
  fix variable_info.cpp

variable_as_array_h::operator() expects the range to be passed as a pair (startindex, endindex). We accidentally passed the range as (startindex, size) instead.

Shadowm reported bugs related to global variables but most likely this can also lead to segfaults in other situations (some uses of [set_variables]).


Compare: https://github.com/wesnoth/wesnoth/compare/9d5504da336d...c64a1925df4d


More information about the Commits mailing list