upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-22 01:43:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove make_unit_ptr

Browse Source 
Only used in one place anymore which already included unit.hpp anyway, so there's no benefit here.
This commit is contained in:
Charles Dang 2024-10-18 12:51:01 -04:00
parent 995d67cf77
commit 5e4728d69e
8 changed files with 13 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projectfiles/CodeBlocks/tests.cbp
View File

@ -1242,8 +1242,6 @@
<Unit filename="../../src/units/helper.hpp" /> <Unit filename="../../src/units/helper.hpp" />
<Unit filename="../../src/units/id.cpp" /> <Unit filename="../../src/units/id.cpp" />
<Unit filename="../../src/units/id.hpp" /> <Unit filename="../../src/units/id.hpp" />
<Unit filename="../../src/units/make.cpp" />
<Unit filename="../../src/units/make.hpp" />
<Unit filename="../../src/units/map.cpp" /> <Unit filename="../../src/units/map.cpp" />
<Unit filename="../../src/units/map.hpp" /> <Unit filename="../../src/units/map.hpp" />
<Unit filename="../../src/units/orb_status.cpp" /> <Unit filename="../../src/units/orb_status.cpp" />

2
projectfiles/CodeBlocks/wesnoth.cbp
View File

@ -1230,8 +1230,6 @@
<Unit filename="../../src/units/helper.hpp" /> <Unit filename="../../src/units/helper.hpp" />
<Unit filename="../../src/units/id.cpp" /> <Unit filename="../../src/units/id.cpp" />
<Unit filename="../../src/units/id.hpp" /> <Unit filename="../../src/units/id.hpp" />
<Unit filename="../../src/units/make.cpp" />
<Unit filename="../../src/units/make.hpp" />
<Unit filename="../../src/units/map.cpp" /> <Unit filename="../../src/units/map.cpp" />
<Unit filename="../../src/units/map.hpp" /> <Unit filename="../../src/units/map.hpp" />
<Unit filename="../../src/units/orb_status.cpp" /> <Unit filename="../../src/units/orb_status.cpp" />

24
projectfiles/Xcode/The Battle for Wesnoth.xcodeproj/project.pbxproj
View File

@ -82,7 +82,6 @@
46406DF1230DA73E0069492E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C58BBDF21822A930078D25A /* Security.framework */; }; 46406DF1230DA73E0069492E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C58BBDF21822A930078D25A /* Security.framework */; };
4649B87A202886F000827CFB /* test_irdya_date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4649B879202886F000827CFB /* test_irdya_date.cpp */; }; 4649B87A202886F000827CFB /* test_irdya_date.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4649B879202886F000827CFB /* test_irdya_date.cpp */; };
4649B87B20288CBB00827CFB /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA556251E7B5DA5006E907D /* manager.cpp */; }; 4649B87B20288CBB00827CFB /* manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECA556251E7B5DA5006E907D /* manager.cpp */; };
4649B87C20288D2F00827CFB /* make.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF44F681FC8A82A00B404D6 /* make.cpp */; };
4649B87D20288D8300827CFB /* irdya_datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46DF5BCC1F46173700BE6D24 /* irdya_datetime.cpp */; }; 4649B87D20288D8300827CFB /* irdya_datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46DF5BCC1F46173700BE6D24 /* irdya_datetime.cpp */; };
4649B87E20288DC000827CFB /* random_deterministic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC0680231EA920A300EEE03B /* random_deterministic.cpp */; }; 4649B87E20288DC000827CFB /* random_deterministic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC0680231EA920A300EEE03B /* random_deterministic.cpp */; };
4649B87F20288DC300827CFB /* random_synced.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC0680251EA920A300EEE03B /* random_synced.cpp */; }; 4649B87F20288DC300827CFB /* random_synced.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC0680251EA920A300EEE03B /* random_synced.cpp */; };
@ -1447,7 +1446,6 @@
ECF0F80123A09929004A2011 /* lua_stringx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF0F80023A09929004A2011 /* lua_stringx.cpp */; }; ECF0F80123A09929004A2011 /* lua_stringx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF0F80023A09929004A2011 /* lua_stringx.cpp */; };
ECF0F80323A09933004A2011 /* lua_wml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF0F80223A09932004A2011 /* lua_wml.cpp */; }; ECF0F80323A09933004A2011 /* lua_wml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF0F80223A09932004A2011 /* lua_wml.cpp */; };
ECF2393426B5935F00F2884F /* lobby_player_list_helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF2393126B592C800F2884F /* lobby_player_list_helper.cpp */; }; ECF2393426B5935F00F2884F /* lobby_player_list_helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF2393126B592C800F2884F /* lobby_player_list_helper.cpp */; };
ECF44F6A1FC8A82B00B404D6 /* make.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF44F681FC8A82A00B404D6 /* make.cpp */; };
ECF9D43D19F3FF9400E6C9D9 /* filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */; }; ECF9D43D19F3FF9400E6C9D9 /* filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */; };
ECF9D43E19F3FF9400E6C9D9 /* filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */; }; ECF9D43E19F3FF9400E6C9D9 /* filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */; };
ECFA82E3184E59F3006782FB /* command_executor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82DA184E59F3006782FB /* command_executor.cpp */; }; ECFA82E3184E59F3006782FB /* command_executor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82DA184E59F3006782FB /* command_executor.cpp */; };
@ -2979,8 +2977,6 @@
ECF0F80223A09932004A2011 /* lua_wml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_wml.cpp; sourceTree = "<group>"; }; ECF0F80223A09932004A2011 /* lua_wml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_wml.cpp; sourceTree = "<group>"; };
ECF2393126B592C800F2884F /* lobby_player_list_helper.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = lobby_player_list_helper.cpp; sourceTree = "<group>"; }; ECF2393126B592C800F2884F /* lobby_player_list_helper.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = lobby_player_list_helper.cpp; sourceTree = "<group>"; };
ECF2393226B5933800F2884F /* lobby_player_list_helper.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = lobby_player_list_helper.hpp; sourceTree = "<group>"; }; ECF2393226B5933800F2884F /* lobby_player_list_helper.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = lobby_player_list_helper.hpp; sourceTree = "<group>"; };
ECF44F681FC8A82A00B404D6 /* make.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = make.cpp; sourceTree = "<group>"; };
ECF44F691FC8A82A00B404D6 /* make.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = make.hpp; sourceTree = "<group>"; };
ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filesystem.cpp; sourceTree = "<group>"; }; ECF9D43C19F3FF9400E6C9D9 /* filesystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filesystem.cpp; sourceTree = "<group>"; };
ECFA82DA184E59F3006782FB /* command_executor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command_executor.cpp; sourceTree = "<group>"; }; ECFA82DA184E59F3006782FB /* command_executor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command_executor.cpp; sourceTree = "<group>"; };
ECFA82DB184E59F3006782FB /* command_executor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = command_executor.hpp; sourceTree = "<group>"; }; ECFA82DB184E59F3006782FB /* command_executor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = command_executor.hpp; sourceTree = "<group>"; };
@ -3086,13 +3082,6 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
9107AE111DB32862001927B0 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
91C548C21D8866ED00FE6A7B /* Frameworks */ = { 91C548C21D8866ED00FE6A7B /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -4624,8 +4613,6 @@
B52EE8C8121359A600CFBDAB /* helper.hpp */, B52EE8C8121359A600CFBDAB /* helper.hpp */,
B55999750EC62181008DD061 /* id.cpp */, B55999750EC62181008DD061 /* id.cpp */,
B55999740EC62181008DD061 /* id.hpp */, B55999740EC62181008DD061 /* id.hpp */,
ECF44F681FC8A82A00B404D6 /* make.cpp */,
ECF44F691FC8A82A00B404D6 /* make.hpp */,
B55999730EC62181008DD061 /* map.cpp */, B55999730EC62181008DD061 /* map.cpp */,
B55999720EC62181008DD061 /* map.hpp */, B55999720EC62181008DD061 /* map.hpp */,
469CA21C253C522C0045A0B3 /* orb_status.cpp */, 469CA21C253C522C0045A0B3 /* orb_status.cpp */,
@ -5255,13 +5242,6 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
9107AE121DB32862001927B0 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */ /* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
@ -5295,8 +5275,6 @@
buildConfigurationList = 9107AE151DB32862001927B0 /* Build configuration list for PBXNativeTarget "liblua" */; buildConfigurationList = 9107AE151DB32862001927B0 /* Build configuration list for PBXNativeTarget "liblua" */;
buildPhases = ( buildPhases = (
9107AE101DB32862001927B0 /* Sources */, 9107AE101DB32862001927B0 /* Sources */,
9107AE111DB32862001927B0 /* Frameworks */,
9107AE121DB32862001927B0 /* Headers */,
); );
buildRules = ( buildRules = (
); );
@ -5580,7 +5558,6 @@
ECC84C1D1B973C5900A5F451 /* quit_confirmation.cpp in Sources */, ECC84C1D1B973C5900A5F451 /* quit_confirmation.cpp in Sources */,
B559A0160EC8FE2E008DD061 /* editor_main.cpp in Sources */, B559A0160EC8FE2E008DD061 /* editor_main.cpp in Sources */,
6295C3C2150FC9750077D8C5 /* editor_map.cpp in Sources */, 6295C3C2150FC9750077D8C5 /* editor_map.cpp in Sources */,
ECF44F6A1FC8A82B00B404D6 /* make.cpp in Sources */,
6295C3D6150FC9EB0077D8C5 /* editor_palettes.cpp in Sources */, 6295C3D6150FC9EB0077D8C5 /* editor_palettes.cpp in Sources */,
46F92E7D2174F6A400602C1C /* label.cpp in Sources */, 46F92E7D2174F6A400602C1C /* label.cpp in Sources */,
46685C97219D518B0009CFFE /* key.cpp in Sources */, 46685C97219D518B0009CFFE /* key.cpp in Sources */,
@ -6625,7 +6602,6 @@
916718FF1CADAA1D00B055A9 /* fire_event.cpp in Sources */, 916718FF1CADAA1D00B055A9 /* fire_event.cpp in Sources */,
916719001CADAA1D00B055A9 /* iterator.cpp in Sources */, 916719001CADAA1D00B055A9 /* iterator.cpp in Sources */,
916719021CADAA1D00B055A9 /* test_gui2.cpp in Sources */, 916719021CADAA1D00B055A9 /* test_gui2.cpp in Sources */,
4649B87C20288D2F00827CFB /* make.cpp in Sources */,
46F92DD82174F6A300602C1C /* attack_predictions.cpp in Sources */, 46F92DD82174F6A300602C1C /* attack_predictions.cpp in Sources */,
916719041CADAA1D00B055A9 /* visitor.cpp in Sources */, 916719041CADAA1D00B055A9 /* visitor.cpp in Sources */,
916719061CADABEA00B055A9 /* game_data.cpp in Sources */, 916719061CADABEA00B055A9 /* game_data.cpp in Sources */,

1
source_lists/wesnoth
View File

@ -382,7 +382,6 @@ units/formula_manager.cpp
units/frame.cpp units/frame.cpp
units/helper.cpp units/helper.cpp
units/id.cpp units/id.cpp
units/make.cpp
units/map.cpp units/map.cpp
units/orb_status.cpp units/orb_status.cpp
units/race.cpp units/race.cpp

11
src/actions/undo_dismiss_action.cpp
View File

@ -22,6 +22,17 @@ namespace actions
{ {
namespace undo namespace undo
{ {
dismiss_action::dismiss_action(const unit_const_ptr dismissed)
: undo_action()
, dismissed_unit(dismissed->clone())
{
}
dismiss_action::dismiss_action(const config& cfg, const config& unit_cfg)
: undo_action(cfg)
, dismissed_unit(unit::create(unit_cfg))
{
}
/** /**
* Writes this into the provided config. * Writes this into the provided config.

13
src/actions/undo_dismiss_action.hpp
View File

@ -15,7 +15,6 @@
#pragma once #pragma once
#include "undo_action.hpp" #include "undo_action.hpp"
#include "units/make.hpp"
namespace actions namespace actions
{ {
@ -26,17 +25,9 @@ struct dismiss_action : undo_action
{ {
unit_ptr dismissed_unit; unit_ptr dismissed_unit;
explicit dismiss_action(const unit_const_ptr dismissed);
explicit dismiss_action(const config& cfg, const config& unit_cfg);
explicit dismiss_action(const unit_const_ptr dismissed)
: undo_action()
, dismissed_unit(make_unit_ptr(*dismissed))
{
}
explicit dismiss_action(const config & cfg, const config & unit_cfg)
: undo_action(cfg)
, dismissed_unit(make_unit_ptr(unit_cfg))
{
}
virtual const char* get_type() const { return "dismiss"; } virtual const char* get_type() const { return "dismiss"; }
virtual ~dismiss_action() {} virtual ~dismiss_action() {}

30
src/units/make.cpp
View File

@ -1,30 +0,0 @@
/*
Copyright (C) 2014 - 2024
by Chris Beck <render787@gmail.com>
Part of the Battle for Wesnoth Project https://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#include "units/make.hpp"
#include "units/unit.hpp"
unit_ptr make_unit_ptr(const config& cfg, bool use_traits, const vconfig* vcfg)
{
return unit::create(cfg, use_traits, vcfg);
}
unit_ptr make_unit_ptr(const unit_type& t, int side, bool real_unit, unit_race::GENDER gender)
{
return unit::create(t, side, real_unit, gender);
}
unit_ptr make_unit_ptr(const unit& u)
{
return u.clone();
}

26
src/units/make.hpp
View File

@ -1,26 +0,0 @@
/*
Copyright (C) 2014 - 2024
by Chris Beck <render787@gmail.com>
Part of the Battle for Wesnoth Project https://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#include "units/race.hpp"
#include "units/ptr.hpp"
class config;
class unit_type;
class vconfig;
//file to allow creating units without including unit.hpp
unit_ptr make_unit_ptr(const config& cfg, bool use_traits = false, const vconfig* vcfg = nullptr);
unit_ptr make_unit_ptr(const unit_type& t, int side, bool real_unit, unit_race::GENDER gender = unit_race::NUM_GENDERS);
unit_ptr make_unit_ptr(const unit& u);