Skip to content

Commit fc9eb6b

Browse files
committed
Apply code style fixes (clang-format)
1 parent c6021ce commit fc9eb6b

6 files changed

Lines changed: 29 additions & 46 deletions

File tree

libs/s25main/addons/AddonForesterReachRadius.h

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,20 @@
88
#include "mygettext/mygettext.h"
99

1010
const std::array<unsigned, 6> foresterRadiusValues = {
11-
6, // Default
12-
8, // +33%
13-
10, // +66%
14-
12, // +100%
15-
15, // +150%
16-
18 // +200%
11+
6, // Default
12+
8, // +33%
13+
10, // +66%
14+
12, // +100%
15+
15, // +150%
16+
18 // +200%
1717
};
1818

1919
class AddonForesterReachRadius : public AddonList
2020
{
2121
public:
2222
AddonForesterReachRadius()
23-
: AddonList(AddonId::FORESTER_REACH_RADIUS, AddonGroup::GamePlay,
24-
_("Adjust forester's range"),
23+
: AddonList(AddonId::FORESTER_REACH_RADIUS, AddonGroup::GamePlay, _("Adjust forester's range"),
2524
_("Increase the radius in which the forester plants trees."),
26-
{
27-
_("Default"),
28-
_("+33%"),
29-
_("+66%"),
30-
_("+100%"),
31-
_("+150%"),
32-
_("+200%"),
33-
})
25+
{_("Default"), _("+33%"), _("+66%"), _("+100%"), _("+150%"), _("+200%")})
3426
{}
3527
};

libs/s25main/addons/AddonStonemasonReachRadius.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@
88
#include "mygettext/mygettext.h"
99

1010
const std::array<unsigned, 7> stonemasonRadiusValues = {
11-
8, // Default
12-
10, // +25%
13-
12, // +50%
14-
14, // +75%
15-
16, // +100%
16-
20, // +150%
17-
24 // +200%
11+
8, // Default
12+
10, // +25%
13+
12, // +50%
14+
14, // +75%
15+
16, // +100%
16+
20, // +150%
17+
24 // +200%
1818
};
1919

2020
class AddonStonemasonReachRadius : public AddonList
2121
{
2222
public:
2323
AddonStonemasonReachRadius()
24-
: AddonList(AddonId::STONEMASON_REACH_RADIUS, AddonGroup::GamePlay,
25-
_("Adjust stonemason's range"),
24+
: AddonList(AddonId::STONEMASON_REACH_RADIUS, AddonGroup::GamePlay, _("Adjust stonemason's range"),
2625
_("Increase the radius in which the stonemason searches for stone."),
2726
{
2827
_("Default"),

libs/s25main/addons/AddonWoodcutterReachRadius.h

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,20 @@
88
#include "mygettext/mygettext.h"
99

1010
const std::array<unsigned, 6> woodcutterRadiusValues = {
11-
6, // Default
12-
8, // +33%
13-
10, // +66%
14-
12, // +100%
15-
15, // +150%
16-
18 // +200%
11+
6, // Default
12+
8, // +33%
13+
10, // +66%
14+
12, // +100%
15+
15, // +150%
16+
18 // +200%
1717
};
1818

1919
class AddonWoodcutterReachRadius : public AddonList
2020
{
2121
public:
2222
AddonWoodcutterReachRadius()
23-
: AddonList(AddonId::WOODCUTTER_REACH_RADIUS, AddonGroup::GamePlay,
24-
_("Adjust woodcutter's range"),
23+
: AddonList(AddonId::WOODCUTTER_REACH_RADIUS, AddonGroup::GamePlay, _("Adjust woodcutter's range"),
2524
_("Increase the radius in which the woodcutter searches for trees."),
26-
{
27-
_("Default"),
28-
_("+33%"),
29-
_("+66%"),
30-
_("+100%"),
31-
_("+150%"),
32-
_("+200%")
33-
})
25+
{_("Default"), _("+33%"), _("+66%"), _("+100%"), _("+150%"), _("+200%")})
3426
{}
3527
};

libs/s25main/addons/Addons.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,5 @@
6868
#include "addons/AddonWine.h"
6969

7070
#include "addons/AddonForesterReachRadius.h"
71-
#include "addons/AddonWoodcutterReachRadius.h"
7271
#include "addons/AddonStonemasonReachRadius.h"
73-
72+
#include "addons/AddonWoodcutterReachRadius.h"

libs/s25main/addons/const_addons.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ ENUM_WITH_STRING(AddonId, LIMIT_CATAPULTS = 0x00000000, INEXHAUSTIBLE_MINES = 0x
8080
ARMOR_CAPTURED_BLD = 0x01000003,
8181

8282
FORESTER_FARM_FIELD_AVOIDANCE = 0x01100000,
83-
84-
FORESTER_REACH_RADIUS = 0x01200000, WOODCUTTER_REACH_RADIUS = 0x01200001, STONEMASON_REACH_RADIUS = 0x01200002)
83+
84+
FORESTER_REACH_RADIUS = 0x01200000, WOODCUTTER_REACH_RADIUS = 0x01200001,
85+
STONEMASON_REACH_RADIUS = 0x01200002)
8586
//-V:AddonId:801
8687

8788
enum class AddonGroup : unsigned

libs/s25main/figures/nofFarmhand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include "GlobalGameSettings.h"
1616
#include "addons/AddonForesterReachRadius.h"
17-
#include "addons/AddonWoodcutterReachRadius.h"
1817
#include "addons/AddonStonemasonReachRadius.h"
18+
#include "addons/AddonWoodcutterReachRadius.h"
1919

2020
nofFarmhand::nofFarmhand(const Job job, const MapPoint pos, const unsigned char player, nobUsual* workplace)
2121
: nofBuildingWorker(job, pos, player, workplace), dest(0, 0)

0 commit comments

Comments
 (0)