0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #3699 village colors after side.color setter

Browse source
This commit is contained in:
gfgtdf 2018-11-10 22:46:29 +01:00
parent ed49d27511
commit 0aaf959260
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/scripting/game_lua_kernel.hpp
View file

@ -183,6 +183,7 @@ public:
game_board & board();
std::vector<team> & teams();
const gamemap & map() const;
game_display * get_display() const { return game_display_; }
/**
A value != 0 means that the shouldn't remove any units from the map, usually because
we are currently operating on a unit& and removing it might cause memory corruptions

10
src/scripting/lua_team.cpp
View file

@ -15,9 +15,11 @@
#include "scripting/lua_team.hpp"
#include "scripting/lua_common.hpp"
#include "scripting/game_lua_kernel.hpp"
#include "team.hpp"
#include "resources.hpp" // for gameboard
#include "game_board.hpp"
#include "game_display.hpp"
#include <string>
@ -142,7 +144,13 @@ static int impl_side_set(lua_State *L)
modify_tstring_attrib("user_team_name", t.change_team(t.team_name(), value));
modify_string_attrib("team_name", t.change_team(value, t.user_team_name()));
modify_string_attrib("controller", t.change_controller_by_wml(value));
modify_string_attrib("color", t.set_color(value));
modify_string_attrib("color", {
auto* disp = lua_kernel_base::get_lua_kernel<game_lua_kernel>(L).get_display();
t.set_color(value);
if(disp) {
disp->reinit_flags_for_side(t.side());
}
});
modify_string_attrib("defeat_condition", t.set_defeat_condition_string(value));
modify_int_attrib("carryover_percentage", t.set_carryover_percentage(value));
modify_bool_attrib("carryover_add", t.set_carryover_add(value));