Fix Lua-invoked dialogs not showing before prestart

Instead of passing the video object to the Lua kernel, the game now simply
fetches the video singleton when displaying dialogs. This means there is
no longer any need to store a reference to the video object.

Author: CelticMinstrel

src/game_state.cpp

@@ -48,7 +48,7 @@ game_state::game_state(const config & level, play_controller & pc, const tdata_c
 	tod_manager_(level),
 	pathfind_manager_(new pathfind::manager(level)),
 	reports_(new reports()),
-	lua_kernel_(new game_lua_kernel(nullptr, *this, pc, *reports_)),
+	lua_kernel_(new game_lua_kernel(*this, pc, *reports_)),
 	events_manager_(new game_events::manager()),
 	//TODO: this construct units (in dimiss undo action) but resrouces:: are not available yet,
 	//      so we might want to move the innitialisation of undo_stack_ to game_state::init
@@ -66,13 +66,14 @@ game_state::game_state(const config & level, play_controller & pc, const tdata_c
 		end_level_data_ = el_data;
 	}
 }
+
 game_state::game_state(const config & level, play_controller & pc, game_board& board) :
 	gamedata_(level),
 	board_(board),
 	tod_manager_(level),
 	pathfind_manager_(new pathfind::manager(level)),
 	reports_(new reports()),
-	lua_kernel_(new game_lua_kernel(nullptr, *this, pc, *reports_)),
+	lua_kernel_(new game_lua_kernel(*this, pc, *reports_)),
 	events_manager_(new game_events::manager()),
 	player_number_(level["playing_team"].to_int() + 1),
 	end_level_data_(),

src/generators/lua_map_generator.cpp

@@ -40,9 +40,8 @@ lua_map_generator::lua_map_generator(const config & cfg)
 	}
 }
 
-void lua_map_generator::user_config(CVideo & v)
+void lua_map_generator::user_config()
 {
-	lk_.set_video(&v);
 	try {
 		lk_.user_config(user_config_.c_str(), generator_data_);
 	} catch (game::lua_error & e) {

src/generators/lua_map_generator.hpp

@@ -41,7 +41,7 @@ class lua_map_generator : public map_generator {
 
 	std::string config_name() const { return config_name_; }
 
-	virtual void user_config(CVideo & v);
+	virtual void user_config();
 	virtual std::string create_map(boost::optional<uint32_t> randomseed);
 	virtual config create_scenario(boost::optional<uint32_t> randomseed);
 

src/scripting/application_lua_kernel.cpp

@@ -98,8 +98,8 @@ static int intf_delay(lua_State* L)
 	return 0;
 }
 
-application_lua_kernel::application_lua_kernel(CVideo * ptr)
- : lua_kernel_base(ptr)
+application_lua_kernel::application_lua_kernel()
+ : lua_kernel_base()
 {
 	lua_getglobal(mState, "wesnoth");
 	lua_pushcfunction(mState, intf_delay);

src/scripting/application_lua_kernel.hpp

@@ -29,7 +29,7 @@ struct lua_State;
 
 class application_lua_kernel : public lua_kernel_base {
 public:
-	application_lua_kernel(CVideo *);
+	application_lua_kernel();
 
 	virtual std::string my_name() { return "Application Lua Kernel"; }
 

src/scripting/game_lua_kernel.cpp

@@ -4055,8 +4055,8 @@ const game_events::queued_event & game_lua_kernel::get_event_info() {
 }
 
 
-game_lua_kernel::game_lua_kernel(CVideo * video, game_state & gs, play_controller & pc, reports & reports_object)
-	: lua_kernel_base(video)
+game_lua_kernel::game_lua_kernel(game_state & gs, play_controller & pc, reports & reports_object)
+	: lua_kernel_base()
 	, game_display_(nullptr)
 	, game_state_(gs)
 	, play_controller_(pc)
@@ -4372,9 +4372,6 @@ void game_lua_kernel::initialize(const config& level)
 
 void game_lua_kernel::set_game_display(game_display * gd) {
 	game_display_ = gd;
-	if (gd) {
-		set_video(&gd->video());
-	}
 }
 
 /// These are the child tags of [scenario] (and the like) that are handled

src/scripting/game_lua_kernel.hpp

@@ -189,7 +189,7 @@ class game_lua_kernel : public lua_kernel_base
 		lua_unit* userdata in its stack that prevents it from beeing collected.
 	*/
 	int map_locked_;
-	game_lua_kernel(CVideo *, game_state &, play_controller &, reports &);
+	game_lua_kernel(game_state &, play_controller &, reports &);
 
 	void set_game_display(game_display * gd);
 

src/scripting/lua_kernel_base.cpp

@@ -37,6 +37,7 @@
 #include "scripting/push_check.hpp"
 
 #include "version.hpp"                  // for do_version_check, etc
+#include "video.hpp"
 
 #include "serialization/string_utils.hpp"
 #include "utils/functional.hpp"
@@ -122,32 +123,20 @@ int video_dispatch(lua_State *L) {
 // The show-dialog call back is here implemented as a method of lua kernel, since it needs a pointer to external object CVideo
 int lua_kernel_base::video_dispatch_impl(lua_State* L, lua_kernel_base::video_function callback)
 {
-	if (!video_) {
-		ERR_LUA << "Cannot show dialog, no video object is available to this lua kernel.";
-		lua_error(L);
-		return 0;
-	}
-
-	return callback(L, *video_);
+	return callback(L, CVideo::get_singleton());
 }
 
 // The show lua console callback is similarly a method of lua kernel
 int lua_kernel_base::intf_show_lua_console(lua_State *L)
 {
-	if (!video_) {
-		ERR_LUA << "Cannot show dialog, no video object is available to this lua kernel.";
-		lua_error(L);
-		return 0;
-	}
-
 	if (cmd_log_.external_log_) {
 		std::string message = "There is already an external logger attached to this lua kernel, you cannot open the lua console right now.";
 		log_error(message.c_str());
 		cmd_log_ << message << "\n";
 		return 0;
 	}
 
-	return lua_gui2::show_lua_console(L, *video_, this);
+	return lua_gui2::show_lua_console(L, CVideo::get_singleton(), this);
 }
 
 static int impl_name_generator_call(lua_State *L)
@@ -237,9 +226,8 @@ int dispatch(lua_State *L) {
 extern void push_error_handler(lua_State *L);
 
 // Ctor, initialization
-lua_kernel_base::lua_kernel_base(CVideo * video)
+lua_kernel_base::lua_kernel_base()
  : mState(luaL_newstate())
- , video_(video)
  , cmd_log_()
 {
 	get_lua_kernel_base_ptr(mState) = this;

src/scripting/lua_kernel_base.hpp

@@ -27,7 +27,7 @@ class config;
 
 class lua_kernel_base {
 public:
-	lua_kernel_base(CVideo * ptr);
+	lua_kernel_base();
 	virtual ~lua_kernel_base();
 
 	/** Runs a [lua] tag. Doesn't throw lua_error.*/
@@ -65,8 +65,6 @@ class lua_kernel_base {
 
 	typedef std::function<void(char const*, char const*)> error_handler;
 
-	void set_video(CVideo * ptr) { video_ = ptr; }
-
 	template<typename T>
 	static T& get_lua_kernel(lua_State *L)
 	{
@@ -78,8 +76,6 @@ class lua_kernel_base {
 protected:
 	lua_State *mState;
 
-	CVideo * video_;
-
 	/** Log implementation */
 	struct command_log {
 

src/scripting/mapgen_lua_kernel.cpp

@@ -118,7 +118,7 @@ static int intf_find_path(lua_State *L)
 
 
 mapgen_lua_kernel::mapgen_lua_kernel()
-	: lua_kernel_base(nullptr)
+	: lua_kernel_base()
 	, random_seed_()
 	, default_rng_()
 {

src/wesnoth.cpp

@@ -662,7 +662,7 @@ static int do_gameloop(const std::vector<std::string>& args)
 
 	LOG_CONFIG << "time elapsed: "<<  (SDL_GetTicks() - start_ticks) << " ms\n";
 
-	plugins_manager plugins_man(new application_lua_kernel(&game->video()));
+	plugins_manager plugins_man(new application_lua_kernel);
 
 	plugins_context::Reg const callbacks[] = {
 		{ "play_multiplayer",		std::bind(&game_launcher::play_multiplayer, game.get(), game_launcher::MP_CONNECT)},