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

Editor/Palette: remove unused cfg param from ctor

Browse source
This commit is contained in:
Charles Dang 2024-10-16 02:41:22 -04:00
parent c507e60b73
commit c33bb1fca3
10 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/editor/palette/editor_palettes.hpp
View file

@ -28,8 +28,7 @@ class editor_palette : public tristate_palette {
public:
editor_palette(editor_display &gui, const game_config_view& /*cfg*/
, int item_size, std::size_t columns, editor_toolkit &toolkit)
editor_palette(editor_display &gui, int item_size, std::size_t columns, editor_toolkit &toolkit)
: tristate_palette()
, groups_()
, gui_(gui)
@ -49,8 +48,6 @@ public:
{
}
virtual sdl_handler_vector handler_members() override;
void set_start_item(std::size_t index) override { items_start_ = index; }

5
src/editor/palette/item_palette.cpp
View file

@ -83,10 +83,9 @@ void item_palette::setup_item(
tooltip_text << item.name;
}
item_palette::item_palette(editor_display &gui, const game_config_view& cfg,
editor_toolkit &toolkit)
item_palette::item_palette(editor_display &gui, editor_toolkit &toolkit)
//TODO avoid magic numbers
: editor_palette<overlay>(gui, cfg, 36, 4, toolkit)
: editor_palette<overlay>(gui, 36, 4, toolkit)
{
}

4
src/editor/palette/item_palette.hpp
View file

@ -33,9 +33,7 @@ class editor_toolkit;
class item_palette : public editor_palette<overlay> {
public:
item_palette(editor_display &gui,
const game_config_view& cfg,
editor_toolkit &toolkit);
item_palette(editor_display &gui, editor_toolkit &toolkit);
virtual void setup(const game_config_view& cfg) override;

3
src/editor/palette/location_palette.cpp
View file

@ -157,8 +157,7 @@ protected:
};
namespace editor {
location_palette::location_palette(editor_display &gui, const game_config_view& /*cfg*/,
editor_toolkit &toolkit)
location_palette::location_palette(editor_display &gui, editor_toolkit &toolkit)
: common_palette()
, item_size_(20)
//TODO avoid magic number

3
src/editor/palette/location_palette.hpp
View file

@ -33,8 +33,7 @@ class location_palette : public common_palette {
public:
location_palette(editor_display &gui, const game_config_view& /*cfg*/,
editor_toolkit &toolkit);
location_palette(editor_display &gui, editor_toolkit &toolkit);
virtual sdl_handler_vector handler_members() override;

8
src/editor/palette/palette_manager.cpp
View file

@ -28,11 +28,11 @@ palette_manager::palette_manager(editor_display& gui, const game_config_view& cf
gui_(gui),
palette_start_(0),
toolkit_(toolkit),
terrain_palette_(new terrain_palette(gui, cfg, toolkit)),
unit_palette_(new unit_palette(gui, cfg, toolkit)),
terrain_palette_(new terrain_palette(gui, toolkit)),
unit_palette_(new unit_palette(gui, toolkit)),
empty_palette_(new empty_palette(gui)),
item_palette_(new item_palette(gui, cfg, toolkit))
, location_palette_(new location_palette(gui, cfg, toolkit))
item_palette_(new item_palette(gui, toolkit))
, location_palette_(new location_palette(gui, toolkit))
{
unit_palette_->setup(cfg);
terrain_palette_->setup(cfg);

4
src/editor/palette/terrain_palettes.cpp
View file

@ -206,9 +206,9 @@ void terrain_palette::setup_item(
}
}
terrain_palette::terrain_palette(editor_display &gui, const game_config_view& cfg, editor_toolkit &toolkit)
terrain_palette::terrain_palette(editor_display &gui, editor_toolkit &toolkit)
//TODO avoid magic numbers
: editor_palette<t_translation::terrain_code>(gui, cfg, 36, 4, toolkit)
: editor_palette<t_translation::terrain_code>(gui, 36, 4, toolkit)
{
}

3
src/editor/palette/terrain_palettes.hpp
View file

@ -34,8 +34,7 @@ class terrain_palette : public editor_palette<t_translation::terrain_code> {
public:
terrain_palette(editor_display &gui, const game_config_view& cfg,
editor_toolkit &toolkit);
terrain_palette(editor_display &gui, editor_toolkit &toolkit);
const gamemap& map() const { return gui_.get_map(); }

5
src/editor/palette/unit_palette.cpp
View file

@ -93,10 +93,9 @@ void unit_palette::setup_item(
tooltip_text << u.type_name();
}
unit_palette::unit_palette(editor_display &gui, const game_config_view& cfg,
editor_toolkit &toolkit)
unit_palette::unit_palette(editor_display &gui, editor_toolkit &toolkit)
//TODO avoid magic numbers
: editor_palette<const unit_type&>(gui, cfg, 36, 4, toolkit)
: editor_palette<const unit_type&>(gui, 36, 4, toolkit)
, selected_bg_items_()
{
}

4
src/editor/palette/unit_palette.hpp
View file

@ -33,9 +33,7 @@ class editor_toolkit;
class unit_palette : public editor_palette<const unit_type&> {
public:
unit_palette(editor_display &gui,
const game_config_view& cfg,
editor_toolkit &toolkit);
unit_palette(editor_display &gui, editor_toolkit &toolkit);
virtual void setup(const game_config_view& cfg) override;