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

tedior_edit_side: remove controller=<number> option

Browse source
This commit is contained in:
Charles Dang 2015-07-22 22:28:04 +11:00
parent 6c2ef9f3a1
commit 4235d310a9
4 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
data/gui/default/window/editor_edit_side.cfg
View file

@ -410,39 +410,6 @@
[/row]
[row]
[column]
horizontal_alignment = "left"
[grid]
[row]
{_GUI_SIDE_CONTROLLER_OPTION number ( _ "controller^Player number:")}
[column]
border = "all"
border_size = 5
horizontal_grow = "true"
[slider]
id = "controller_number_player"
definition = "default"
best_slider_length = 100
minimum_value = 1
maximum_value = 9
step_size = 1
[/slider]
[/column]
[/row]
[/grid]
[/column]
[/row]
[/grid]
[/column]

4
src/editor/map/context_manager.cpp
View file

@ -197,7 +197,6 @@ void context_manager::edit_side_dialog(int side)
//t.support()
team::CONTROLLER controller = t.controller();
int controller_num = 0;
std::string user_team_name = t.user_team_name();
std::string team_name = t.team_name();
@ -217,8 +216,7 @@ void context_manager::edit_side_dialog(int side)
bool ok = gui2::teditor_edit_side::execute(side +1, team_name, user_team_name,
gold, income, village_gold, village_support,
fog, share_view, shroud, share_maps,
controller, controller_num,
no_leader, hidden,
controller, no_leader, hidden,
gui_.video());
if (ok) {

4
src/gui/dialogs/editor/editor_edit_side.cpp
View file

@ -62,7 +62,6 @@ teditor_edit_side::teditor_edit_side(int side,
bool& shroud,
bool& share_maps,
team::CONTROLLER& controller,
int& controller_num,
bool& no_leader,
bool& hidden)
: controller_(controller)
@ -80,8 +79,6 @@ teditor_edit_side::teditor_edit_side(int side,
register_integer("village_income", true, village_income);
register_integer("village_support", true, village_support);
register_integer("controller_number_player", true, controller_num);
register_bool("fog", true, fog);
register_bool("share_view", true, share_view);
@ -97,7 +94,6 @@ void teditor_edit_side::pre_show(CVideo& /*video*/, twindow& window)
register_controller_toggle(window, "human", team::CONTROLLER::HUMAN);
register_controller_toggle(window, "ai", team::CONTROLLER::AI);
register_controller_toggle(window, "null", team::CONTROLLER::EMPTY);
register_controller_toggle(window, "number", team::CONTROLLER::from_int(-1));
}
void teditor_edit_side::register_controller_toggle(twindow& window,

3
src/gui/dialogs/editor/editor_edit_side.hpp
View file

@ -39,7 +39,6 @@ public:
bool& shroud,
bool& share_maps,
team::CONTROLLER& controller,
int& controller_num,
bool& no_leader,
bool& hidden);
@ -56,7 +55,6 @@ public:
bool& shroud,
bool& share_maps,
team::CONTROLLER& controller,
int controller_num,
bool& no_leader,
bool& hidden,
CVideo& video)
@ -73,7 +71,6 @@ public:
shroud,
share_maps,
controller,
controller_num,
no_leader,
hidden).show(video);
}