Skip to content

Commit f0bad0e

Browse files
sfan5sfan5
authoredApr 5, 2021
Reserve vectors before pushing and other code quality changes (#11161)
·
5.11.05.5.0
1 parent 3e1904f commit f0bad0e

20 files changed

+106
-108
lines changed
 

‎src/client/clientmap.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -499,12 +499,12 @@ int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor,
499499
static v3f z_directions[50] = {
500500
v3f(-100, 0, 0)
501501
};
502-
static f32 z_offsets[sizeof(z_directions)/sizeof(*z_directions)] = {
502+
static f32 z_offsets[50] = {
503503
-1000,
504504
};
505505

506-
if(z_directions[0].X < -99){
507-
for(u32 i=0; i<sizeof(z_directions)/sizeof(*z_directions); i++){
506+
if (z_directions[0].X < -99) {
507+
for (u32 i = 0; i < ARRLEN(z_directions); i++) {
508508
// Assumes FOV of 72 and 16/9 aspect ratio
509509
z_directions[i] = v3f(
510510
0.02 * myrand_range(-100, 100),
@@ -520,7 +520,8 @@ int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor,
520520
if(sunlight_min_d > 35*BS)
521521
sunlight_min_d = 35*BS;
522522
std::vector<int> values;
523-
for(u32 i=0; i<sizeof(z_directions)/sizeof(*z_directions); i++){
523+
values.reserve(ARRLEN(z_directions));
524+
for (u32 i = 0; i < ARRLEN(z_directions); i++) {
524525
v3f z_dir = z_directions[i];
525526
core::CMatrix4<f32> a;
526527
a.buildRotateFromTo(v3f(0,1,0), z_dir);

‎src/client/clouds.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void Clouds::render()
170170

171171
// Read noise
172172

173-
std::vector<char> grid(m_cloud_radius_i * 2 * m_cloud_radius_i * 2); // vector<bool> is broken
173+
std::vector<bool> grid(m_cloud_radius_i * 2 * m_cloud_radius_i * 2);
174174
std::vector<video::S3DVertex> vertices;
175175
vertices.reserve(16 * m_cloud_radius_i * m_cloud_radius_i);
176176

‎src/client/hud.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -336,22 +336,22 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
336336
irr::gui::IGUIFont* font = g_fontengine->getFont();
337337

338338
// Reorder elements by z_index
339-
std::vector<size_t> ids;
339+
std::vector<HudElement*> elems;
340+
elems.reserve(player->maxHudId());
340341

341342
for (size_t i = 0; i != player->maxHudId(); i++) {
342343
HudElement *e = player->getHud(i);
343344
if (!e)
344345
continue;
345346

346-
auto it = ids.begin();
347-
while (it != ids.end() && player->getHud(*it)->z_index <= e->z_index)
347+
auto it = elems.begin();
348+
while (it != elems.end() && (*it)->z_index <= e->z_index)
348349
++it;
349350

350-
ids.insert(it, i);
351+
elems.insert(it, e);
351352
}
352353

353-
for (size_t i : ids) {
354-
HudElement *e = player->getHud(i);
354+
for (HudElement *e : elems) {
355355

356356
v2s32 pos(floor(e->pos.X * (float) m_screensize.X + 0.5),
357357
floor(e->pos.Y * (float) m_screensize.Y + 0.5));
@@ -522,8 +522,8 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
522522
client->getMinimap()->drawMinimap(rect);
523523
break; }
524524
default:
525-
infostream << "Hud::drawLuaElements: ignoring drawform " << e->type <<
526-
" of hud element ID " << i << " due to unrecognized type" << std::endl;
525+
infostream << "Hud::drawLuaElements: ignoring drawform " << e->type
526+
<< " due to unrecognized type" << std::endl;
527527
}
528528
}
529529
}

‎src/client/sky.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ Sky::Sky(s32 id, ITextureSource *tsrc, IShaderSource *ssrc) :
8282
// Ensures that sun and moon textures and tonemaps are correct.
8383
setSkyDefaults();
8484
m_sun_texture = tsrc->isKnownSourceImage(m_sun_params.texture) ?
85-
tsrc->getTextureForMesh(m_sun_params.texture) : NULL;
85+
tsrc->getTextureForMesh(m_sun_params.texture) : nullptr;
8686
m_moon_texture = tsrc->isKnownSourceImage(m_moon_params.texture) ?
87-
tsrc->getTextureForMesh(m_moon_params.texture) : NULL;
87+
tsrc->getTextureForMesh(m_moon_params.texture) : nullptr;
8888
m_sun_tonemap = tsrc->isKnownSourceImage(m_sun_params.tonemap) ?
89-
tsrc->getTexture(m_sun_params.tonemap) : NULL;
89+
tsrc->getTexture(m_sun_params.tonemap) : nullptr;
9090
m_moon_tonemap = tsrc->isKnownSourceImage(m_moon_params.tonemap) ?
91-
tsrc->getTexture(m_moon_params.tonemap) : NULL;
91+
tsrc->getTexture(m_moon_params.tonemap) : nullptr;
9292

9393
if (m_sun_texture) {
9494
m_materials[3] = baseMaterial();
@@ -744,14 +744,14 @@ void Sky::place_sky_body(
744744
}
745745
}
746746

747-
void Sky::setSunTexture(std::string sun_texture,
748-
std::string sun_tonemap, ITextureSource *tsrc)
747+
void Sky::setSunTexture(const std::string &sun_texture,
748+
const std::string &sun_tonemap, ITextureSource *tsrc)
749749
{
750750
// Ignore matching textures (with modifiers) entirely,
751751
// but lets at least update the tonemap before hand.
752752
m_sun_params.tonemap = sun_tonemap;
753753
m_sun_tonemap = tsrc->isKnownSourceImage(m_sun_params.tonemap) ?
754-
tsrc->getTexture(m_sun_params.tonemap) : NULL;
754+
tsrc->getTexture(m_sun_params.tonemap) : nullptr;
755755
m_materials[3].Lighting = !!m_sun_tonemap;
756756

757757
if (m_sun_params.texture == sun_texture)
@@ -780,7 +780,7 @@ void Sky::setSunTexture(std::string sun_texture,
780780
}
781781
}
782782

783-
void Sky::setSunriseTexture(std::string sunglow_texture,
783+
void Sky::setSunriseTexture(const std::string &sunglow_texture,
784784
ITextureSource* tsrc)
785785
{
786786
// Ignore matching textures (with modifiers) entirely.
@@ -792,14 +792,14 @@ void Sky::setSunriseTexture(std::string sunglow_texture,
792792
);
793793
}
794794

795-
void Sky::setMoonTexture(std::string moon_texture,
796-
std::string moon_tonemap, ITextureSource *tsrc)
795+
void Sky::setMoonTexture(const std::string &moon_texture,
796+
const std::string &moon_tonemap, ITextureSource *tsrc)
797797
{
798798
// Ignore matching textures (with modifiers) entirely,
799799
// but lets at least update the tonemap before hand.
800800
m_moon_params.tonemap = moon_tonemap;
801801
m_moon_tonemap = tsrc->isKnownSourceImage(m_moon_params.tonemap) ?
802-
tsrc->getTexture(m_moon_params.tonemap) : NULL;
802+
tsrc->getTexture(m_moon_params.tonemap) : nullptr;
803803
m_materials[4].Lighting = !!m_moon_tonemap;
804804

805805
if (m_moon_params.texture == moon_texture)
@@ -893,7 +893,7 @@ void Sky::setSkyColors(const SkyColor &sky_color)
893893
}
894894

895895
void Sky::setHorizonTint(video::SColor sun_tint, video::SColor moon_tint,
896-
std::string use_sun_tint)
896+
const std::string &use_sun_tint)
897897
{
898898
// Change sun and moon tinting:
899899
m_sky_params.fog_sun_tint = sun_tint;
@@ -907,7 +907,7 @@ void Sky::setHorizonTint(video::SColor sun_tint, video::SColor moon_tint,
907907
m_default_tint = true;
908908
}
909909

910-
void Sky::addTextureToSkybox(std::string texture, int material_id,
910+
void Sky::addTextureToSkybox(const std::string &texture, int material_id,
911911
ITextureSource *tsrc)
912912
{
913913
// Sanity check for more than six textures.

‎src/client/sky.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ class Sky : public scene::ISceneNode
6565
}
6666

6767
void setSunVisible(bool sun_visible) { m_sun_params.visible = sun_visible; }
68-
void setSunTexture(std::string sun_texture,
69-
std::string sun_tonemap, ITextureSource *tsrc);
68+
void setSunTexture(const std::string &sun_texture,
69+
const std::string &sun_tonemap, ITextureSource *tsrc);
7070
void setSunScale(f32 sun_scale) { m_sun_params.scale = sun_scale; }
7171
void setSunriseVisible(bool glow_visible) { m_sun_params.sunrise_visible = glow_visible; }
72-
void setSunriseTexture(std::string sunglow_texture, ITextureSource* tsrc);
72+
void setSunriseTexture(const std::string &sunglow_texture, ITextureSource* tsrc);
7373

7474
void setMoonVisible(bool moon_visible) { m_moon_params.visible = moon_visible; }
75-
void setMoonTexture(std::string moon_texture,
76-
std::string moon_tonemap, ITextureSource *tsrc);
75+
void setMoonTexture(const std::string &moon_texture,
76+
const std::string &moon_tonemap, ITextureSource *tsrc);
7777
void setMoonScale(f32 moon_scale) { m_moon_params.scale = moon_scale; }
7878

7979
void setStarsVisible(bool stars_visible) { m_star_params.visible = stars_visible; }
@@ -87,21 +87,21 @@ class Sky : public scene::ISceneNode
8787
void setVisible(bool visible) { m_visible = visible; }
8888
// Set only from set_sky API
8989
void setCloudsEnabled(bool clouds_enabled) { m_clouds_enabled = clouds_enabled; }
90-
void setFallbackBgColor(const video::SColor &fallback_bg_color)
90+
void setFallbackBgColor(video::SColor fallback_bg_color)
9191
{
9292
m_fallback_bg_color = fallback_bg_color;
9393
}
94-
void overrideColors(const video::SColor &bgcolor, const video::SColor &skycolor)
94+
void overrideColors(video::SColor bgcolor, video::SColor skycolor)
9595
{
9696
m_bgcolor = bgcolor;
9797
m_skycolor = skycolor;
9898
}
9999
void setSkyColors(const SkyColor &sky_color);
100100
void setHorizonTint(video::SColor sun_tint, video::SColor moon_tint,
101-
std::string use_sun_tint);
101+
const std::string &use_sun_tint);
102102
void setInClouds(bool clouds) { m_in_clouds = clouds; }
103103
void clearSkyboxTextures() { m_sky_params.textures.clear(); }
104-
void addTextureToSkybox(std::string texture, int material_id,
104+
void addTextureToSkybox(const std::string &texture, int material_id,
105105
ITextureSource *tsrc);
106106
const video::SColorf &getCurrentStarColor() const { return m_star_color; }
107107

@@ -126,7 +126,7 @@ class Sky : public scene::ISceneNode
126126
}
127127

128128
// Mix two colors by a given amount
129-
video::SColor m_mix_scolor(video::SColor col1, video::SColor col2, f32 factor)
129+
static video::SColor m_mix_scolor(video::SColor col1, video::SColor col2, f32 factor)
130130
{
131131
video::SColor result = video::SColor(
132132
col1.getAlpha() * (1 - factor) + col2.getAlpha() * factor,
@@ -135,7 +135,7 @@ class Sky : public scene::ISceneNode
135135
col1.getBlue() * (1 - factor) + col2.getBlue() * factor);
136136
return result;
137137
}
138-
video::SColorf m_mix_scolorf(video::SColorf col1, video::SColorf col2, f32 factor)
138+
static video::SColorf m_mix_scolorf(video::SColorf col1, video::SColorf col2, f32 factor)
139139
{
140140
video::SColorf result =
141141
video::SColorf(col1.r * (1 - factor) + col2.r * factor,

‎src/clientiface.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ void ClientInterface::UpdatePlayerList()
671671
std::vector<session_t> clients = getClientIDs();
672672
m_clients_names.clear();
673673

674-
675674
if (!clients.empty())
676675
infostream<<"Players:"<<std::endl;
677676

‎src/gui/guiButtonItemImage.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using namespace gui;
3030

3131
GUIButtonItemImage::GUIButtonItemImage(gui::IGUIEnvironment *environment,
3232
gui::IGUIElement *parent, s32 id, core::rect<s32> rectangle,
33-
ISimpleTextureSource *tsrc, std::string item, Client *client,
33+
ISimpleTextureSource *tsrc, const std::string &item, Client *client,
3434
bool noclip)
3535
: GUIButton (environment, parent, id, rectangle, tsrc, noclip)
3636
{
@@ -44,7 +44,7 @@ GUIButtonItemImage::GUIButtonItemImage(gui::IGUIEnvironment *environment,
4444

4545
GUIButtonItemImage *GUIButtonItemImage::addButton(IGUIEnvironment *environment,
4646
const core::rect<s32> &rectangle, ISimpleTextureSource *tsrc,
47-
IGUIElement *parent, s32 id, const wchar_t *text, std::string item,
47+
IGUIElement *parent, s32 id, const wchar_t *text, const std::string &item,
4848
Client *client)
4949
{
5050
GUIButtonItemImage *button = new GUIButtonItemImage(environment,

‎src/gui/guiButtonItemImage.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ class GUIButtonItemImage : public GUIButton
3333
//! constructor
3434
GUIButtonItemImage(gui::IGUIEnvironment *environment, gui::IGUIElement *parent,
3535
s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
36-
std::string item, Client *client, bool noclip = false);
36+
const std::string &item, Client *client, bool noclip = false);
3737

3838
//! Do not drop returned handle
3939
static GUIButtonItemImage *addButton(gui::IGUIEnvironment *environment,
4040
const core::rect<s32> &rectangle, ISimpleTextureSource *tsrc,
41-
IGUIElement *parent, s32 id, const wchar_t *text, std::string item,
42-
Client *client);
41+
IGUIElement *parent, s32 id, const wchar_t *text,
42+
const std::string &item, Client *client);
4343

4444
private:
4545
Client *m_client;

‎src/inventory.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -965,13 +965,14 @@ InventoryList * Inventory::getList(const std::string &name)
965965
{
966966
s32 i = getListIndex(name);
967967
if(i == -1)
968-
return NULL;
968+
return nullptr;
969969
return m_lists[i];
970970
}
971971

972972
std::vector<const InventoryList*> Inventory::getLists()
973973
{
974974
std::vector<const InventoryList*> lists;
975+
lists.reserve(m_lists.size());
975976
for (auto list : m_lists) {
976977
lists.push_back(list);
977978
}
@@ -990,11 +991,11 @@ bool Inventory::deleteList(const std::string &name)
990991
return true;
991992
}
992993

993-
const InventoryList * Inventory::getList(const std::string &name) const
994+
const InventoryList *Inventory::getList(const std::string &name) const
994995
{
995996
s32 i = getListIndex(name);
996997
if(i == -1)
997-
return NULL;
998+
return nullptr;
998999
return m_lists[i];
9991000
}
10001001

‎src/nodedef.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1544,10 +1544,10 @@ void NodeDefManager::deSerialize(std::istream &is)
15441544
}
15451545

15461546

1547-
void NodeDefManager::addNameIdMapping(content_t i, std::string name)
1547+
void NodeDefManager::addNameIdMapping(content_t i, const std::string &name)
15481548
{
15491549
m_name_id_mapping.set(i, name);
1550-
m_name_id_mapping_with_aliases.insert(std::make_pair(name, i));
1550+
m_name_id_mapping_with_aliases.emplace(name, i);
15511551
}
15521552

15531553

‎src/nodedef.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ class NodeDefManager {
725725
* @param i a content ID
726726
* @param name a node name
727727
*/
728-
void addNameIdMapping(content_t i, std::string name);
728+
void addNameIdMapping(content_t i, const std::string &name);
729729

730730
/*!
731731
* Removes a content ID from all groups.

‎src/nodemetadata.cpp

+7-9
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,9 @@ NodeMetadataList::~NodeMetadataList()
206206
std::vector<v3s16> NodeMetadataList::getAllKeys()
207207
{
208208
std::vector<v3s16> keys;
209-
210-
NodeMetadataMap::const_iterator it;
211-
for (it = m_data.begin(); it != m_data.end(); ++it)
212-
keys.push_back(it->first);
209+
keys.reserve(m_data.size());
210+
for (const auto &it : m_data)
211+
keys.push_back(it.first);
213212

214213
return keys;
215214
}
@@ -218,7 +217,7 @@ NodeMetadata *NodeMetadataList::get(v3s16 p)
218217
{
219218
NodeMetadataMap::const_iterator n = m_data.find(p);
220219
if (n == m_data.end())
221-
return NULL;
220+
return nullptr;
222221
return n->second;
223222
}
224223

@@ -235,7 +234,7 @@ void NodeMetadataList::remove(v3s16 p)
235234
void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
236235
{
237236
remove(p);
238-
m_data.insert(std::make_pair(p, d));
237+
m_data.emplace(p, d);
239238
}
240239

241240
void NodeMetadataList::clear()
@@ -251,9 +250,8 @@ void NodeMetadataList::clear()
251250
int NodeMetadataList::countNonEmpty() const
252251
{
253252
int n = 0;
254-
NodeMetadataMap::const_iterator it;
255-
for (it = m_data.begin(); it != m_data.end(); ++it) {
256-
if (!it->second->empty())
253+
for (const auto &it : m_data) {
254+
if (!it.second->empty())
257255
n++;
258256
}
259257
return n;

‎src/pathfinder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ std::string Pathfinder::dirToName(PathDirections dir)
14281428
}
14291429

14301430
/******************************************************************************/
1431-
void Pathfinder::printPath(std::vector<v3s16> path)
1431+
void Pathfinder::printPath(const std::vector<v3s16> &path)
14321432
{
14331433
unsigned int current = 0;
14341434
for (std::vector<v3s16>::iterator i = path.begin();

‎src/settings.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ std::unordered_map<std::string, const FlagDesc *> Settings::s_flags;
4343
Settings *Settings::createLayer(SettingsLayer sl, const std::string &end_tag)
4444
{
4545
if ((int)sl < 0 || sl >= SL_TOTAL_COUNT)
46-
throw new BaseException("Invalid settings layer");
46+
throw BaseException("Invalid settings layer");
4747

4848
Settings *&pos = s_layers[(size_t)sl];
4949
if (pos)
50-
throw new BaseException("Setting layer " + std::to_string(sl) + " already exists");
50+
throw BaseException("Setting layer " + std::to_string(sl) + " already exists");
5151

5252
pos = new Settings(end_tag);
5353
pos->m_settingslayer = sl;
@@ -638,6 +638,7 @@ std::vector<std::string> Settings::getNames() const
638638
MutexAutoLock lock(m_mutex);
639639

640640
std::vector<std::string> names;
641+
names.reserve(m_settings.size());
641642
for (const auto &settings_it : m_settings) {
642643
names.push_back(settings_it.first);
643644
}

‎src/util/areastore.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,15 @@ void AreaStore::deserialize(std::istream &is)
9696

9797
u16 num_areas = readU16(is);
9898
std::vector<Area> areas;
99+
areas.reserve(num_areas);
99100
for (u32 i = 0; i < num_areas; ++i) {
100101
Area a(U32_MAX);
101102
a.minedge = readV3S16(is);
102103
a.maxedge = readV3S16(is);
103104
u16 data_len = readU16(is);
104-
char *data = new char[data_len];
105-
is.read(data, data_len);
106-
a.data = std::string(data, data_len);
107-
areas.emplace_back(a);
108-
delete [] data;
105+
a.data = std::string(data_len, '\0');
106+
is.read(&a.data[0], data_len);
107+
areas.emplace_back(std::move(a));
109108
}
110109

111110
bool read_ids = is.good(); // EOF for old formats

‎src/util/container.h

+10-13
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class MutexedMap
9090
bool get(const Key &name, Value *result) const
9191
{
9292
MutexAutoLock lock(m_mutex);
93-
typename std::map<Key, Value>::const_iterator n =
94-
m_values.find(name);
93+
auto n = m_values.find(name);
9594
if (n == m_values.end())
9695
return false;
9796
if (result)
@@ -103,11 +102,9 @@ class MutexedMap
103102
{
104103
MutexAutoLock lock(m_mutex);
105104
std::vector<Value> result;
106-
for (typename std::map<Key, Value>::const_iterator
107-
it = m_values.begin();
108-
it != m_values.end(); ++it){
105+
result.reserve(m_values.size());
106+
for (auto it = m_values.begin(); it != m_values.end(); ++it)
109107
result.push_back(it->second);
110-
}
111108
return result;
112109
}
113110

@@ -136,7 +133,7 @@ class MutexedQueue
136133
return m_queue.empty();
137134
}
138135

139-
void push_back(T t)
136+
void push_back(const T &t)
140137
{
141138
MutexAutoLock lock(m_mutex);
142139
m_queue.push_back(t);
@@ -151,7 +148,7 @@ class MutexedQueue
151148
if (m_signal.wait(wait_time_max_ms)) {
152149
MutexAutoLock lock(m_mutex);
153150

154-
T t = m_queue.front();
151+
T t = std::move(m_queue.front());
155152
m_queue.pop_front();
156153
return t;
157154
}
@@ -164,7 +161,7 @@ class MutexedQueue
164161
if (m_signal.wait(wait_time_max_ms)) {
165162
MutexAutoLock lock(m_mutex);
166163

167-
T t = m_queue.front();
164+
T t = std::move(m_queue.front());
168165
m_queue.pop_front();
169166
return t;
170167
}
@@ -178,7 +175,7 @@ class MutexedQueue
178175

179176
MutexAutoLock lock(m_mutex);
180177

181-
T t = m_queue.front();
178+
T t = std::move(m_queue.front());
182179
m_queue.pop_front();
183180
return t;
184181
}
@@ -188,7 +185,7 @@ class MutexedQueue
188185
if (m_signal.wait(wait_time_max_ms)) {
189186
MutexAutoLock lock(m_mutex);
190187

191-
T t = m_queue.back();
188+
T t = std::move(m_queue.back());
192189
m_queue.pop_back();
193190
return t;
194191
}
@@ -204,7 +201,7 @@ class MutexedQueue
204201
if (m_signal.wait(wait_time_max_ms)) {
205202
MutexAutoLock lock(m_mutex);
206203

207-
T t = m_queue.back();
204+
T t = std::move(m_queue.back());
208205
m_queue.pop_back();
209206
return t;
210207
}
@@ -218,7 +215,7 @@ class MutexedQueue
218215

219216
MutexAutoLock lock(m_mutex);
220217

221-
T t = m_queue.back();
218+
T t = std::move(m_queue.back());
222219
m_queue.pop_back();
223220
return t;
224221
}

‎src/util/enriched_string.cpp

+3-7
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ void EnrichedString::operator=(const wchar_t *str)
6565
addAtEnd(translate_string(std::wstring(str)), m_default_color);
6666
}
6767

68-
void EnrichedString::addAtEnd(const std::wstring &s, const SColor &initial_color)
68+
void EnrichedString::addAtEnd(const std::wstring &s, SColor initial_color)
6969
{
7070
SColor color(initial_color);
7171
bool use_default = (m_default_length == m_string.size() &&
7272
color == m_default_color);
7373

74+
m_colors.reserve(m_colors.size() + s.size());
75+
7476
size_t i = 0;
7577
while (i < s.length()) {
7678
if (s[i] != L'\x1b') {
@@ -200,12 +202,6 @@ const std::wstring &EnrichedString::getString() const
200202
return m_string;
201203
}
202204

203-
void EnrichedString::setDefaultColor(const irr::video::SColor &color)
204-
{
205-
m_default_color = color;
206-
updateDefaultColor();
207-
}
208-
209205
void EnrichedString::updateDefaultColor()
210206
{
211207
sanity_check(m_default_length <= m_colors.size());

‎src/util/enriched_string.h

+21-13
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2323
#include <vector>
2424
#include <SColor.h>
2525

26+
using namespace irr;
27+
2628
class EnrichedString {
2729
public:
2830
EnrichedString();
2931
EnrichedString(const std::wstring &s,
30-
const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255));
32+
const video::SColor &color = video::SColor(255, 255, 255, 255));
3133
EnrichedString(const wchar_t *str,
32-
const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255));
34+
const video::SColor &color = video::SColor(255, 255, 255, 255));
3335
EnrichedString(const std::wstring &string,
34-
const std::vector<irr::video::SColor> &colors);
35-
void clear();
36+
const std::vector<video::SColor> &colors);
3637
void operator=(const wchar_t *str);
37-
void addAtEnd(const std::wstring &s, const irr::video::SColor &color);
38+
39+
void clear();
40+
41+
void addAtEnd(const std::wstring &s, video::SColor color);
3842

3943
// Adds the character source[i] at the end.
4044
// An EnrichedString should always be able to be copied
@@ -49,12 +53,16 @@ class EnrichedString {
4953
EnrichedString operator+(const EnrichedString &other) const;
5054
void operator+=(const EnrichedString &other);
5155
const wchar_t *c_str() const;
52-
const std::vector<irr::video::SColor> &getColors() const;
56+
const std::vector<video::SColor> &getColors() const;
5357
const std::wstring &getString() const;
5458

55-
void setDefaultColor(const irr::video::SColor &color);
59+
inline void setDefaultColor(video::SColor color)
60+
{
61+
m_default_color = color;
62+
updateDefaultColor();
63+
}
5664
void updateDefaultColor();
57-
inline const irr::video::SColor &getDefaultColor() const
65+
inline const video::SColor &getDefaultColor() const
5866
{
5967
return m_default_color;
6068
}
@@ -80,22 +88,22 @@ class EnrichedString {
8088
{
8189
return m_has_background;
8290
}
83-
inline irr::video::SColor getBackground() const
91+
inline video::SColor getBackground() const
8492
{
8593
return m_background;
8694
}
87-
inline void setBackground(const irr::video::SColor &color)
95+
inline void setBackground(video::SColor color)
8896
{
8997
m_background = color;
9098
m_has_background = true;
9199
}
92100

93101
private:
94102
std::wstring m_string;
95-
std::vector<irr::video::SColor> m_colors;
103+
std::vector<video::SColor> m_colors;
96104
bool m_has_background;
97-
irr::video::SColor m_default_color;
98-
irr::video::SColor m_background;
105+
video::SColor m_default_color;
106+
video::SColor m_background;
99107
// This variable defines the length of the default-colored text.
100108
// Change this to a std::vector if an "end coloring" tag is wanted.
101109
size_t m_default_length = 0;

‎src/voxelalgorithms.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct ChangingLight {
6565

6666
ChangingLight() = default;
6767

68-
ChangingLight(const relative_v3 &rel_pos, const mapblock_v3 &block_pos,
68+
ChangingLight(relative_v3 rel_pos, mapblock_v3 block_pos,
6969
MapBlock *b, direction source_dir) :
7070
rel_position(rel_pos),
7171
block_position(block_pos),
@@ -125,8 +125,8 @@ struct LightQueue {
125125
* The parameters are the same as in ChangingLight's constructor.
126126
* \param light light level of the ChangingLight
127127
*/
128-
inline void push(u8 light, const relative_v3 &rel_pos,
129-
const mapblock_v3 &block_pos, MapBlock *block,
128+
inline void push(u8 light, relative_v3 rel_pos,
129+
mapblock_v3 block_pos, MapBlock *block,
130130
direction source_dir)
131131
{
132132
assert(light <= LIGHT_SUN);
@@ -467,7 +467,7 @@ bool is_sunlight_above(Map *map, v3s16 pos, const NodeDefManager *ndef)
467467
static const LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
468468

469469
void update_lighting_nodes(Map *map,
470-
std::vector<std::pair<v3s16, MapNode> > &oldnodes,
470+
const std::vector<std::pair<v3s16, MapNode>> &oldnodes,
471471
std::map<v3s16, MapBlock*> &modified_blocks)
472472
{
473473
const NodeDefManager *ndef = map->getNodeDefManager();
@@ -482,8 +482,7 @@ void update_lighting_nodes(Map *map,
482482
// won't change, since they didn't get their light from a
483483
// modified node.
484484
u8 min_safe_light = 0;
485-
for (std::vector<std::pair<v3s16, MapNode> >::iterator it =
486-
oldnodes.begin(); it < oldnodes.end(); ++it) {
485+
for (auto it = oldnodes.cbegin(); it < oldnodes.cend(); ++it) {
487486
u8 old_light = it->second.getLight(bank, ndef);
488487
if (old_light > min_safe_light) {
489488
min_safe_light = old_light;
@@ -495,8 +494,7 @@ void update_lighting_nodes(Map *map,
495494
min_safe_light++;
496495
}
497496
// For each changed node process sunlight and initialize
498-
for (std::vector<std::pair<v3s16, MapNode> >::iterator it =
499-
oldnodes.begin(); it < oldnodes.end(); ++it) {
497+
for (auto it = oldnodes.cbegin(); it < oldnodes.cend(); ++it) {
500498
// Get position and block of the changed node
501499
v3s16 p = it->first;
502500
relative_v3 rel_pos;

‎src/voxelalgorithms.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace voxalgo
4545
*/
4646
void update_lighting_nodes(
4747
Map *map,
48-
std::vector<std::pair<v3s16, MapNode> > &oldnodes,
48+
const std::vector<std::pair<v3s16, MapNode>> &oldnodes,
4949
std::map<v3s16, MapBlock*> &modified_blocks);
5050

5151
/*!

0 commit comments

Comments
 (0)
Please sign in to comment.