[Commits] [wesnoth/wesnoth] 042b72: rename scripting/lua.?pp to game_lua_kernel.?pp

GitHub noreply at github.com
Mon Nov 10 02:31:55 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 042b72a4b880219a464d8824fc1c6a61e55d5766
      https://github.com/wesnoth/wesnoth/commit/042b72a4b880219a464d8824fc1c6a61e55d5766
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/composite/aspect.hpp
    M src/ai/composite/engine_lua.cpp
    M src/ai/composite/goal.cpp
    M src/ai/lua/core.cpp
    M src/game_config_manager.cpp
    M src/game_events/handlers.cpp
    M src/game_events/pump.cpp
    M src/menu_events.cpp
    M src/play_controller.cpp
    A src/scripting/game_lua_kernel.cpp
    A src/scripting/game_lua_kernel.hpp
    R src/scripting/lua.cpp
    R src/scripting/lua.hpp
    M src/unit.cpp
    M src/unit_filter.cpp

  Log Message:
  -----------
  rename scripting/lua.?pp to game_lua_kernel.?pp


  Commit: 4541412ebce317f0706bfb6578a4cd51dc6c14e9
      https://github.com/wesnoth/wesnoth/commit/4541412ebce317f0706bfb6578a4cd51dc6c14e9
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    A src/scripting/lua_kernel_base.cpp
    A src/scripting/lua_kernel_base.hpp

  Log Message:
  -----------
  add lua_kernel_base as a super class of game_lua_kernel

This class holds some "basic" initialization and methods that we
would want in any lua kernel. It is not pure virtual, it could
be instantiated.


  Commit: ca309d98b2a50dbb72d6e4756f7529e0b9ed9f62
      https://github.com/wesnoth/wesnoth/commit/ca309d98b2a50dbb72d6e4756f7529e0b9ed9f62
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/scripting/game_lua_kernel.cpp
    A src/scripting/lua_common.cpp
    A src/scripting/lua_common.hpp

  Log Message:
  -----------
  branch off "lua_common" functions from api defn file

This includes the gettext and vconfig impl functions, and many
macros used to write lua callbacks. This code can't properly go in
the lua_kernel_base files, so it goes here.


  Commit: cd3e8cf333d4efac3ebb1d5c37e55c9225f6bfa3
      https://github.com/wesnoth/wesnoth/commit/cd3e8cf333d4efac3ebb1d5c37e55c9225f6bfa3
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

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

  Log Message:
  -----------
  add function to generate config from cmd line opts, for lua


  Commit: ecc714e41e8ff85f67d0df984118b713e1814924
      https://github.com/wesnoth/wesnoth/commit/ecc714e41e8ff85f67d0df984118b713e1814924
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/game_launcher.hpp
    A src/scripting/application_lua_kernel.cpp
    A src/scripting/application_lua_kernel.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/game_lua_kernel.hpp
    M src/scripting/lua_api.cpp
    A src/scripting/lua_game_launcher.cpp
    A src/scripting/lua_game_launcher.hpp
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/lua_kernel_base.hpp
    M src/scripting/lua_types.cpp
    M src/scripting/lua_types.hpp

  Log Message:
  -----------
  add application lua kernel and game launcher lua wrapper object

The application lua kernel is meant to interpret scripts to drive
the client. Its main features are, it stores a script in its
registry and provides a C++ function to call it with a config
as its argument. Its initialization also creates a "game_launcher"
object, which stands as a limited lua proxy for the C++
game_launcher object.

The game_launcher object is a table, holding a pointer to the
actual game_launcher it represents, and with metamethods to return
version info and the command line arguments. It also holds
callbacks to set the script for the current application lua kernel,
and to call the "play_multiplayer" function of game_launcher.
Currently it is readonly and you cannot write to its fields,
although that may change to allow the target server to be reset,
etc.

Some minor changes that are included in this commit:
- the actual C++ game launcher object provides an accessor to the
command line options.
- the scripting/lua_types.hpp file now has include guards


  Commit: 4164a24a59b75b3d5a7d5a9d4bd91ec7be30724a
      https://github.com/wesnoth/wesnoth/commit/4164a24a59b75b3d5a7d5a9d4bd91ec7be30724a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/game_launcher.cpp
    M src/game_launcher.hpp
    M src/resources.cpp
    M src/resources.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  take cmdline arg for lua scripts to execute at application start

If a lua script is passed as an argument to wesnoth, wesnoth will
actually instantiate the application_lua_kernel defined in the
previous commits, initialize it, and run the script in that
environment.


  Commit: 3193a67ce9cdecf341d5a7d774a5cf8af8683d4a
      https://github.com/wesnoth/wesnoth/commit/3193a67ce9cdecf341d5a7d774a5cf8af8683d4a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/game_launcher.cpp

  Log Message:
  -----------
  add option to allow "unsafe" lua scripts, with "package" package

This allows lua scripts to access the OS, the network, etc.


  Commit: ca62a8f7bfa8cfa8d26b62078e2e25cbbfc1dadf
      https://github.com/wesnoth/wesnoth/commit/ca62a8f7bfa8cfa8d26b62078e2e25cbbfc1dadf
  Author: Chris Beck <beck.ct at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/ai/composite/aspect.hpp
    M src/ai/composite/engine_lua.cpp
    M src/ai/composite/goal.cpp
    M src/ai/lua/core.cpp
    M src/commandline_options.cpp
    M src/commandline_options.hpp
    M src/game_config_manager.cpp
    M src/game_events/handlers.cpp
    M src/game_events/pump.cpp
    M src/game_launcher.cpp
    M src/game_launcher.hpp
    M src/menu_events.cpp
    M src/play_controller.cpp
    M src/resources.cpp
    M src/resources.hpp
    A src/scripting/application_lua_kernel.cpp
    A src/scripting/application_lua_kernel.hpp
    A src/scripting/game_lua_kernel.cpp
    A src/scripting/game_lua_kernel.hpp
    R src/scripting/lua.cpp
    R src/scripting/lua.hpp
    M src/scripting/lua_api.cpp
    A src/scripting/lua_common.cpp
    A src/scripting/lua_common.hpp
    A src/scripting/lua_game_launcher.cpp
    A src/scripting/lua_game_launcher.hpp
    A src/scripting/lua_kernel_base.cpp
    A src/scripting/lua_kernel_base.hpp
    M src/scripting/lua_types.cpp
    M src/scripting/lua_types.hpp
    M src/unit.cpp
    M src/unit_filter.cpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Merge pull request #330 from cbeck88/new_lua_kernel_i

New lua kernel i


Compare: https://github.com/wesnoth/wesnoth/compare/c293e20d25dc...ca62a8f7bfa8


More information about the Commits mailing list