[Commits] [wesnoth/wesnoth] 561e30: 2p Dark Forceast cleanups

GitHub noreply at github.com
Thu Feb 18 22:09:01 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 561e30bc7de221a6748c53c0b34564a6d8b35308
      https://github.com/wesnoth/wesnoth/commit/561e30bc7de221a6748c53c0b34564a6d8b35308
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg

  Log Message:
  -----------
  2p Dark Forceast cleanups


  Commit: 3e2dfed89db4a530339126019c932636ce54331f
      https://github.com/wesnoth/wesnoth/commit/3e2dfed89db4a530339126019c932636ce54331f
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
    M data/ai/micro_ais/scenarios/simple_attack.cfg
    R data/multiplayer/maps/Dark_Forecast.map
    A data/multiplayer/maps/Dark_Forecast_basic.map
    R data/multiplayer/maps/Dark_Forecast_basic.mask
    A data/multiplayer/maps/Dark_Forecast_drought.map
    R data/multiplayer/maps/Dark_Forecast_drought.mask
    A data/multiplayer/maps/Dark_Forecast_firstsnow.map
    R data/multiplayer/maps/Dark_Forecast_firstsnow.mask
    A data/multiplayer/maps/Dark_Forecast_rain.map
    R data/multiplayer/maps/Dark_Forecast_rain.mask
    A data/multiplayer/maps/Dark_Forecast_secondsnow.map
    R data/multiplayer/maps/Dark_Forecast_secondsnow.mask
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg

  Log Message:
  -----------
  added border to dark forecast map

this adds borders to the 2p dark forecast survival map, it also removes
the big empty space in the upper third of the map.

This also renames the mask files to map files, becasue they are actually
just normal maps, and the [terrain_mask] just replaces the current map
with these.


  Commit: 322a2f7141f6826af9b510d29d49fad838a79e7c
      https://github.com/wesnoth/wesnoth/commit/322a2f7141f6826af9b510d29d49fad838a79e7c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M src/scripting/lua_fileops.cpp

  Log Message:
  -----------
  allow .. in relative filenames in wesnoth.dofile/require

This changes the lua loadfile code to store relative filenames (like
~add-ons/campaign1/lua/code.lua) the in descriptions attributes of lua
codechunks. This not only makes the lua error messages easier to read
(previously: 'error in C:\users\... ...ign1/lua/code.lua", now: "Error
in ~add-ons/campaign1/lua/code.lua").
This also removes the possiblity for wml authors to query the wesnoth
install directory path by using lua debug functions.

We have to use a custom function resolve_filename() to resolve filenames
that begin with "./" becasue get_wml_location() expects a abolsute
directoy ("C:\users\....") as second parameter, and i didnt want to
change it becasue it is also used by the wml proprocessor which i don't
want to look at right now.

Since i had to write a custom function resolve_filename() function
anyway i decided to also put support for ../ and  ./ in it, note that
the results is passed to get_wml_location() anyway so all security
checks that were there previously are still there.


  Commit: 9c59311b41cf0adca409a4c64b4197b8f5027a51
      https://github.com/wesnoth/wesnoth/commit/9c59311b41cf0adca409a4c64b4197b8f5027a51
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M src/scripting/lua_fileops.cpp
    M src/scripting/lua_fileops.hpp
    M src/scripting/lua_kernel_base.cpp

  Log Message:
  -----------
  add function wesnoth.read_file

It can for example used to read map files.


  Commit: 6623641ebbdfd48a0bc88a04b8e791fb1c570979
      https://github.com/wesnoth/wesnoth/commit/6623641ebbdfd48a0bc88a04b8e791fb1c570979
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M src/scripting/lua_fileops.cpp

  Log Message:
  -----------
  remove unused code


  Commit: 8ee34c39b2cfd30cf0ba49dadaa8643d438a1fa9
      https://github.com/wesnoth/wesnoth/commit/8ee34c39b2cfd30cf0ba49dadaa8643d438a1fa9
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    A data/multiplayer/scenarios/2p_Dark_Forecast.lua

  Log Message:
  -----------
  move most dark forecast code to lua

This has multiple advantages:
1) It makes the code easier to understand because we now can use local
variables and return values.
2) It makes the code easier to debug because we don't have to reload the
wml cache anymore for changes to have an effect
3) It makes loading the multiplayer wml faster, specially dark forecasts
wml codes is now so short that we don't need to guard it inside its own
preprocessor marco anymore.
4) It decreases the save file size.

This commit also does other improvements to the code, for example:
1) We don't create temporary units anymore just to query the costs of
a unittype.
2) We now load the weather maps dynamically at runtime with
wesnoth.read_file, this decreased the prorocessor paring time and savefile
size further.
3) When creating the new spawns we use temporary objects to decrease
the units movement, instead of changing and resetting the unit stats
manually.

This also has a disadvantage:
1) It now requires all players to have this scenario installed, since it
it a mainline scenario i see no problems with that.


  Commit: f5074186554cb49ad552c62033d498442d30dad1
      https://github.com/wesnoth/wesnoth/commit/f5074186554cb49ad552c62033d498442d30dad1
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M src/widgets/slider.cpp

  Log Message:
  -----------
  fix gui1 sliders

this fixes issued with gui1 sliders beeing unable to handle negative min
values.


  Commit: 39eb8feaf1d063d88e8d9fd64c7133c5105320ed
      https://github.com/wesnoth/wesnoth/commit/39eb8feaf1d063d88e8d9fd64c7133c5105320ed
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2016-02-18 (Thu, 18 Feb 2016)

  Changed paths:
    M data/multiplayer/scenarios/2p_Dark_Forecast.cfg
    M data/multiplayer/scenarios/2p_Dark_Forecast.lua

  Log Message:
  -----------
  add difficulcy level slider to dark forecast mp scenario

unfortunateley the 'description' (the tooltip of the widget in the mp
configure dialog) doesn't show in current master. This is likeley to be
a bug related to gui internals.


Compare: https://github.com/wesnoth/wesnoth/compare/7bbb18452e76...39eb8feaf1d0


More information about the Commits mailing list