[wesnoth-commits] [wesnoth/wesnoth] 97b561: ignore [delay] during preload, prestart and initial...

GitHub noreply at github.com
Tue Jul 31 20:59:39 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 97b561269101e5e6d1637d00b44363fc6a1728fd
      https://github.com/wesnoth/wesnoth/commit/97b561269101e5e6d1637d00b44363fc6a1728fd
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/scripting/game_lua_kernel.cpp

  Log Message:
  -----------
  ignore [delay] during preload,prestart and initial lua.

as the ingame ui is not shown yet, [delay] would only result in showing a black screen,

Also in the case of initial lua it might result in crashes because of the threaded loadingscren, or simply because parts of the ui are not initialized yet.


  Commit: 44734570dd1824a098252d78dafc0f5a561c13cf
      https://github.com/wesnoth/wesnoth/commit/44734570dd1824a098252d78dafc0f5a561c13cf
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/mouse_events.cpp

  Log Message:
  -----------
  fix attacks beein wrongly disabled

as said in the comment, that get_special_bool might return the wrong value, as since https://github.com/wesnoth/wesnoth/commit/5f58cd7c6d39c35dcefa6fb9f71777a42ea5cb5e the bc_vector no longer contains disabled attacks we can just remove this code.

fixes #3324


  Commit: c4aacbe31f31799861e03f4b7f7b241bee64aa65
      https://github.com/wesnoth/wesnoth/commit/c4aacbe31f31799861e03f4b7f7b241bee64aa65
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/server/simple_wml.cpp
    M src/server/simple_wml.hpp

  Log Message:
  -----------
  don't use std::pair

instead we use a custom struct. std::pair is bad becasue you never know
what "first" or "second" mean.


  Commit: eb23ac56461c8d57dc5d1aee018832c2dc7dcf36
      https://github.com/wesnoth/wesnoth/commit/eb23ac56461c8d57dc5d1aee018832c2dc7dcf36
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/server/simple_wml.cpp
    M src/server/simple_wml.hpp

  Log Message:
  -----------
  preserve traslatable strings in simple_wml.

previously it would happen that for example an attribute like
`side_name=_"female^Footpads"` in side would get its translatable mark (_)
removed after the game has started. This meant that observers that enterd
the game after it started would see the literal string "female^Footpads"
in the status side overview window.

The new code marks all translatable simple_wml attributes to make sure their
translatable mark is preserved along with their textdomain. It can still
happen though that attributes will appear in the the wrong textdomain area
after simple_wml processing though because in some cases note::output
might skip over textdomain markers. It is still not as bad as string like
"female^Footpads" appearing in the ui though.

An alterntive appraoch to fix this issue would be to carefully make sure
not to change any atributes of wml tags that can also contain translatable
attributes, which would probably imply not editing the wml objects received
by the client at all and instead storing the new information (in particular
side information like is_local=yes/no) in a seperate wml object. (that would
then be sended to the clients along with the original scenario wml objects.)

fixes #1420


  Commit: edc57d2388f798b392736bcf8b6e6b75bc4d68d6
      https://github.com/wesnoth/wesnoth/commit/edc57d2388f798b392736bcf8b6e6b75bc4d68d6
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/game_initialization/lobby_info.cpp

  Log Message:
  -----------
  add comment


  Commit: 367aec2bb2d5fc5f5acbb53842441c6190c9d452
      https://github.com/wesnoth/wesnoth/commit/367aec2bb2d5fc5f5acbb53842441c6190c9d452
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/game_initialization/lobby_info.cpp
    M src/game_initialization/lobby_info.hpp
    M src/gui/dialogs/multiplayer/lobby.cpp

  Log Message:
  -----------
  don't process a corrupted gamelist_diff further

fixes #3017, assuming that the error is actually casued by the
'process_gamelist_diff failed'

As process_gamelist_diff simply returns after getting an error its quite
likeley that the gamelist is then in a  corrupted state so we stop
processing it until we get a fresh gamelist.


  Commit: 15c59037d32e956741243cdd0d33c293ea1e72b7
      https://github.com/wesnoth/wesnoth/commit/15c59037d32e956741243cdd0d33c293ea1e72b7
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/game_initialization/lobby_data.cpp

  Log Message:
  -----------
  mplobby: add debug info


  Commit: eec8b674de6d04f13f5b875c1b1e6b953e45ef9e
      https://github.com/wesnoth/wesnoth/commit/eec8b674de6d04f13f5b875c1b1e6b953e45ef9e
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/game_initialization/lobby_data.cpp
    M src/server/server.cpp

  Log Message:
  -----------
  fix require_scenario & require_era

previously both were broken:
1) 'require_scenario' was only checked if the scenario was installed
which obviously doesn't make any sense at all.
2) 'require_scenario' was read from the local scenario data instead from
the remote scenario.
3) 'require_era' was only checked when the scenario was not installed,
so people who do have an outated version of the era installed could not
join bacause it assumed require_era=yes in that case.
4) the server tried to read 'require_scenario' from the wrong wml node,
'require_scenario' is an attribute of [scenario] and not of savefile
toplevel.


  Commit: f84d79e0339cbde7c80194abc5c814ae634263c2
      https://github.com/wesnoth/wesnoth/commit/f84d79e0339cbde7c80194abc5c814ae634263c2
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/game_initialization/playcampaign.cpp

  Log Message:
  -----------
  fix skip replay being active in later scenarios

in mp campaigns.


  Commit: 610e4f2969cc8f0b87a537a09138d64efbbf3a2b
      https://github.com/wesnoth/wesnoth/commit/610e4f2969cc8f0b87a537a09138d64efbbf3a2b
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/server/server.cpp
    M src/server/server.hpp

  Log Message:
  -----------
  add server notifications about outdated wesnoth versions.


  Commit: ba18e17e433bec13db77b82a5fdeaeaffa765fe4
      https://github.com/wesnoth/wesnoth/commit/ba18e17e433bec13db77b82a5fdeaeaffa765fe4
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  improve wesnoth version warning.


  Commit: 90fb50d70fc1a4847ea0098cb356798935b6bda8
      https://github.com/wesnoth/wesnoth/commit/90fb50d70fc1a4847ea0098cb356798935b6bda8
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/server/server.cpp

  Log Message:
  -----------
  improve wesnoth version warning further


  Commit: 936516c83b6e0a6e76938c65158d2d6d98f94fba
      https://github.com/wesnoth/wesnoth/commit/936516c83b6e0a6e76938c65158d2d6d98f94fba
  Author: gfgtdf <daniel.gfgtdf at gmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M data/gui/window/tooltip_floating.cfg

  Log Message:
  -----------
  fix game crashing when showing a too large tooltip

previously the game would go into an infinite loop at
https://github.com/wesnoth/wesnoth/blob/1.14.4/src/gui/widgets/window.cpp#L1046
when a tooltip doesn't fit on screen, this could in particular happen in
the mp lobby when hovering over the 'i' of a game that uses a ridiculous
amount of modifications.

I currently don't see any case where the game is actually able to 'fix'
a bad height that was reported from reevaluate_best_size. so i just
disable reevaluate_best_size for floating tooltips.

If there exists such a case, an alternative fix could be to change the
reevaluate loop in window::layout to also stop when a new iteration
returned the same size as the previous iteration.


  Commit: 0f520ad8a6638a77ec6e56eb97ef001ae3adc324
      https://github.com/wesnoth/wesnoth/commit/0f520ad8a6638a77ec6e56eb97ef001ae3adc324
  Author: josteph <josteph at fastmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/menu_events.cpp

  Log Message:
  -----------
  debug: Fix ":droid" always toggling droid on/off even when given two arguments (":droid <side> off").


  Commit: 55e41472130829d6b322a68c7556a126e93b70b3
      https://github.com/wesnoth/wesnoth/commit/55e41472130829d6b322a68c7556a126e93b70b3
  Author: josteph <josteph at fastmail.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M src/menu_events.cpp

  Log Message:
  -----------
  debug: Give feedback for :droid.

#2819


Compare: https://github.com/wesnoth/wesnoth/compare/12a3b973b9f3...55e414721308
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the Commits mailing list