Skip to content

Commit f0cd5da

Browse files
kwolekrkwolekr
committedOct 4, 2015
Define and use limit constants for Irrlicht fixed-width types
·
5.11.00.4.14
1 parent b12bdcc commit f0cd5da

11 files changed

+31
-16
lines changed
 

‎src/irrlichttypes.h

+15
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,19 @@ using namespace irr;
4848
#endif
4949
#endif
5050

51+
#define S8_MIN (-0x7F - 1)
52+
#define S16_MIN (-0x7FFF - 1)
53+
#define S32_MIN (-0x7FFFFFFF - 1)
54+
#define S64_MIN (-0x7FFFFFFFFFFFFFFF - 1)
55+
56+
#define S8_MAX 0x7F
57+
#define S16_MAX 0x7FFF
58+
#define S32_MAX 0x7FFFFFFF
59+
#define S64_MAX 0x7FFFFFFFFFFFFFFF
60+
61+
#define U8_MAX 0xFF
62+
#define U16_MAX 0xFFFF
63+
#define U32_MAX 0xFFFFFFFF
64+
#define U64_MAX 0xFFFFFFFFFFFFFFFF
65+
5166
#endif

‎src/map.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
14341434
beginSave();
14351435

14361436
// If there is no practical limit, we spare creation of mapblock_queue
1437-
if (max_loaded_blocks == (u32)-1) {
1437+
if (max_loaded_blocks == U32_MAX) {
14381438
for (std::map<v2s16, MapSector*>::iterator si = m_sectors.begin();
14391439
si != m_sectors.end(); ++si) {
14401440
MapSector *sector = si->second;

‎src/mapgen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ void MapgenParams::save(Settings &settings) const
441441
settings.setU64("seed", seed);
442442
settings.setS16("water_level", water_level);
443443
settings.setS16("chunksize", chunksize);
444-
settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, (u32)-1);
444+
settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, U32_MAX);
445445
settings.setNoiseParams("mg_biome_np_heat", np_biome_heat);
446446
settings.setNoiseParams("mg_biome_np_heat_blend", np_biome_heat_blend);
447447
settings.setNoiseParams("mg_biome_np_humidity", np_biome_humidity);

‎src/mapgen_v5.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void MapgenV5Params::readParams(const Settings *settings)
160160

161161
void MapgenV5Params::writeParams(Settings *settings) const
162162
{
163-
settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, (u32)-1);
163+
settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, U32_MAX);
164164

165165
settings->setNoiseParams("mgv5_np_filler_depth", np_filler_depth);
166166
settings->setNoiseParams("mgv5_np_factor", np_factor);
@@ -429,7 +429,7 @@ MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
429429

430430
// If there is air or water above enable top/filler placement, otherwise force
431431
// nplaced to stone level by setting a number exceeding any possible filler depth.
432-
u16 nplaced = (air_above || water_above) ? 0 : (u16)-1;
432+
u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
433433

434434
for (s16 y = node_max.Y; y >= node_min.Y; y--) {
435435
content_t c = vm->m_data[vi].getContent();
@@ -466,7 +466,7 @@ MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
466466
// This is done by aborting the cycle of top/filler placement
467467
// immediately by forcing nplaced to stone level.
468468
if (c_below == CONTENT_AIR || c_below == c_water_source)
469-
nplaced = (u16)-1;
469+
nplaced = U16_MAX;
470470

471471
if (nplaced < depth_top) {
472472
vm->m_data[vi] = MapNode(biome->c_top);
@@ -491,7 +491,7 @@ MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
491491
air_above = true;
492492
water_above = false;
493493
} else { // Possible various nodes overgenerated from neighbouring mapchunks
494-
nplaced = (u16)-1; // Disable top/filler placement
494+
nplaced = U16_MAX; // Disable top/filler placement
495495
air_above = false;
496496
water_above = false;
497497
}

‎src/mapgen_v6.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void MapgenV6Params::readParams(const Settings *settings)
175175

176176
void MapgenV6Params::writeParams(Settings *settings) const
177177
{
178-
settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6, (u32)-1);
178+
settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6, U32_MAX);
179179
settings->setFloat("mgv6_freq_desert", freq_desert);
180180
settings->setFloat("mgv6_freq_beach", freq_beach);
181181

‎src/mapgen_v7.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void MapgenV7Params::readParams(const Settings *settings)
181181

182182
void MapgenV7Params::writeParams(Settings *settings) const
183183
{
184-
settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, (u32)-1);
184+
settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, U32_MAX);
185185

186186
settings->setNoiseParams("mgv7_np_terrain_base", np_terrain_base);
187187
settings->setNoiseParams("mgv7_np_terrain_alt", np_terrain_alt);
@@ -636,7 +636,7 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
636636

637637
// If there is air or water above enable top/filler placement, otherwise force
638638
// nplaced to stone level by setting a number exceeding any possible filler depth.
639-
u16 nplaced = (air_above || water_above) ? 0 : (u16)-1;
639+
u16 nplaced = (air_above || water_above) ? 0 : U16_MAX;
640640

641641
for (s16 y = node_max.Y; y >= node_min.Y; y--) {
642642
content_t c = vm->m_data[vi].getContent();
@@ -673,7 +673,7 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
673673
// This is done by aborting the cycle of top/filler placement
674674
// immediately by forcing nplaced to stone level.
675675
if (c_below == CONTENT_AIR || c_below == c_water_source)
676-
nplaced = (u16)-1;
676+
nplaced = U16_MAX;
677677

678678
if (nplaced < depth_top) {
679679
vm->m_data[vi] = MapNode(biome->c_top);
@@ -698,7 +698,7 @@ MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
698698
air_above = true;
699699
water_above = false;
700700
} else { // Possible various nodes overgenerated from neighbouring mapchunks
701-
nplaced = (u16)-1; // Disable top/filler placement
701+
nplaced = U16_MAX; // Disable top/filler placement
702702
air_above = false;
703703
water_above = false;
704704
}

‎src/script/lua_api/l_mapgen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ int ModApiMapgen::l_get_mapgen_params(lua_State *L)
604604
lua_pushinteger(L, params->chunksize);
605605
lua_setfield(L, -2, "chunksize");
606606

607-
std::string flagstr = writeFlagString(params->flags, flagdesc_mapgen, (u32)-1);
607+
std::string flagstr = writeFlagString(params->flags, flagdesc_mapgen, U32_MAX);
608608
lua_pushstring(L, flagstr.c_str());
609609
lua_setfield(L, -2, "flags");
610610

‎src/script/lua_api/l_object.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ int ObjectRef::l_hud_add(lua_State *L)
11871187
}
11881188

11891189
u32 id = getServer(L)->hudAdd(player, elem);
1190-
if (id == (u32)-1) {
1190+
if (id == U32_MAX) {
11911191
delete elem;
11921192
return 0;
11931193
}

‎src/server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ void Server::AsyncRunStep(bool initial_step)
589589
ScopeProfiler sp(g_profiler, "Server: map timer and unload");
590590
m_env->getMap().timerUpdate(map_timer_and_unload_dtime,
591591
g_settings->getFloat("server_unload_unused_data_timeout"),
592-
(u32)-1);
592+
U32_MAX);
593593
}
594594

595595
/*

‎src/staticobject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void StaticObjectList::serialize(std::ostream &os)
5050
size_t count = m_stored.size() + m_active.size();
5151
// Make sure it fits into u16, else it would get truncated and cause e.g.
5252
// issue #2610 (Invalid block data in database: unsupported NameIdMapping version).
53-
if (count > (u16)-1) {
53+
if (count > U16_MAX) {
5454
errorstream << "StaticObjectList::serialize(): "
5555
<< "too many objects (" << count << ") in list, "
5656
<< "not writing them to disk." << std::endl;

‎src/unittest/test_utilities.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void TestUtilities::testIsPowerOfTwo()
282282
UASSERT(is_power_of_two((1 << exponent)) == true);
283283
UASSERT(is_power_of_two((1 << exponent) + 1) == false);
284284
}
285-
UASSERT(is_power_of_two((u32)-1) == false);
285+
UASSERT(is_power_of_two(U32_MAX) == false);
286286
}
287287

288288
void TestUtilities::testMyround()

0 commit comments

Comments
 (0)
Please sign in to comment.