upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 23:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

move [print] to game_lua_kernel

Browse Source
This commit is contained in:
Chris Beck 2015-04-11 22:55:14 -04:00
parent a5d3c64d10
commit f3a639fc62
4 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/lua/wml-tags.lua
View File

@ -1452,3 +1452,7 @@ function wml_actions.redraw(cfg)
wesnoth.redraw(cfg, clear_shroud)
end
function wml_actions.print(cfg)
wesnoth.print(cfg)
end

31
src/game_events/action_wml.cpp
View File

@ -169,10 +169,6 @@ namespace { // Types
};
} // end anonymous namespace (types)
namespace { // Variables
int floating_label = 0;
} // end anonymous namespace (variables)
namespace { // Support functions
/**
@ -874,33 +870,6 @@ WML_HANDLER_FUNCTION(object, event_info, cfg)
}
}
WML_HANDLER_FUNCTION(print, /*event_info*/, cfg)
{
// Remove any old message.
if (floating_label)
font::remove_floating_label(floating_label);
// Display a message on-screen
std::string text = cfg["text"];
if(text.empty())
return;
int size = cfg["size"].to_int(font::SIZE_SMALL);
int lifetime = cfg["duration"].to_int(50);
SDL_Color color = create_color(cfg["red"], cfg["green"], cfg["blue"]);
const SDL_Rect& rect = resources::screen->map_outside_area();
font::floating_label flabel(text);
flabel.set_font_size(size);
flabel.set_color(color);
flabel.set_position(rect.w/2,rect.h/2);
flabel.set_lifetime(lifetime);
flabel.set_clip_rect(rect);
floating_label = font::add_floating_label(flabel);
}
/// If we should recall units that match a certain description.
WML_HANDLER_FUNCTION(recall, /*event_info*/, cfg)
{

32
src/scripting/game_lua_kernel.cpp
View File

@ -2275,6 +2275,37 @@ int game_lua_kernel::intf_heal_unit(lua_State *L)
return 0;
}
int game_lua_kernel::intf_print(lua_State *L) {
vconfig cfg(luaW_checkvconfig(L, 1));
// Remove any old message.
static int floating_label = 0;
if (floating_label)
font::remove_floating_label(floating_label);
// Display a message on-screen
std::string text = cfg["text"];
if(text.empty() || !game_display_)
return 0;
int size = cfg["size"].to_int(font::SIZE_SMALL);
int lifetime = cfg["duration"].to_int(50);
SDL_Color color = create_color(cfg["red"], cfg["green"], cfg["blue"]);
const SDL_Rect& rect = game_display_->map_outside_area();
font::floating_label flabel(text);
flabel.set_font_size(size);
flabel.set_color(color);
flabel.set_position(rect.w/2,rect.h/2);
flabel.set_lifetime(lifetime);
flabel.set_clip_rect(rect);
floating_label = font::add_floating_label(flabel);
return 0;
}
/**
* Places a unit on the map.
* - Args 1,2: (optional) location.
@ -4044,6 +4075,7 @@ game_lua_kernel::game_lua_kernel(const config &cfg, CVideo * video, game_state &
{ "modify_side", &dispatch<&game_lua_kernel::intf_modify_side > },
{ "open_help", &dispatch<&game_lua_kernel::intf_open_help > },
{ "play_sound", &dispatch<&game_lua_kernel::intf_play_sound > },
{ "print", &dispatch<&game_lua_kernel::intf_print > },
{ "put_recall_unit", &dispatch<&game_lua_kernel::intf_put_recall_unit > },
{ "put_unit", &dispatch<&game_lua_kernel::intf_put_unit > },
{ "redraw", &dispatch<&game_lua_kernel::intf_redraw > },

1
src/scripting/game_lua_kernel.hpp
View File

@ -113,6 +113,7 @@ class game_lua_kernel : public lua_kernel_base
int intf_message(lua_State *L);
int intf_open_help(lua_State *L);
int intf_play_sound(lua_State *L);
int intf_print(lua_State *L);
int intf_put_unit(lua_State *L);
int intf_put_recall_unit(lua_State *L);
int intf_extract_unit(lua_State *L);