Skip to content

Commit

Permalink
Use Pos
Browse files Browse the repository at this point in the history
  • Loading branch information
@proller
proller committed Dec 31, 2022
1 parent d361e59 commit 5466830
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions src/client/game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@ void Game::toggleUpdateCamera()

void Game::increaseViewRange()
{
pos_t range = g_settings->getPOS("viewing_range");
pos_t range = g_settings->getPos("viewing_range");
pos_t range_new = range + 10;

if (range_new > 4000) {
Expand All @@ -2371,7 +2371,7 @@ void Game::increaseViewRange()

void Game::decreaseViewRange()
{
pos_t range = g_settings->getPOS("viewing_range");
pos_t range = g_settings->getPos("viewing_range");
pos_t range_new = range - 10;

if (range_new < 20) {
Expand Down
2 changes: 1 addition & 1 deletion src/database/database-sqlite3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ MapDatabaseSQLite3::MapDatabaseSQLite3(const std::string &savedir):
MapDatabase()
{
#if USE_POS32
pos_t mapgen_limit = g_settings->getPOS("mapgen_limit");
pos_t mapgen_limit = g_settings->getPos("mapgen_limit");
if (mapgen_limit > 31000) {
throw DatabaseException("Database_SQLite3: mapgen_limit is too big (" + std::to_string(mapgen_limit) + "). Please set mapgen_limit = 31000");
}
Expand Down
8 changes: 4 additions & 4 deletions src/mapgen/mapgen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,8 @@ void MapgenParams::readParams(const Settings *settings)
mgtype = MAPGEN_DEFAULT;
}

settings->getPOSNoEx("water_level", water_level);
settings->getPOSNoEx("mapgen_limit", mapgen_limit);
settings->getPosNoEx("water_level", water_level);
settings->getPosNoEx("mapgen_limit", mapgen_limit);
settings->getS16NoEx("chunksize", chunksize);
settings->getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);

Expand All @@ -1053,8 +1053,8 @@ void MapgenParams::writeParams(Settings *settings) const
{
settings->set("mg_name", Mapgen::getMapgenName(mgtype));
settings->setU64("seed", seed);
settings->setPOS("water_level", water_level);
settings->setPOS("mapgen_limit", mapgen_limit);
settings->setPos("water_level", water_level);
settings->setPos("mapgen_limit", mapgen_limit);
settings->setS16("chunksize", chunksize);
settings->setFlagStr("mg_flags", flags, flagdesc_mapgen);

Expand Down
16 changes: 8 additions & 8 deletions src/mapgen/mapgen_carpathian.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,17 @@ void MapgenCarpathianParams::readParams(const Settings *settings)
settings->getFloatNoEx("mgcarpathian_valley_width", valley_width);

settings->getFloatNoEx("mgcarpathian_cave_width", cave_width);
settings->getPOSNoEx("mgcarpathian_large_cave_depth", large_cave_depth);
settings->getPosNoEx("mgcarpathian_large_cave_depth", large_cave_depth);
settings->getU16NoEx("mgcarpathian_small_cave_num_min", small_cave_num_min);
settings->getU16NoEx("mgcarpathian_small_cave_num_max", small_cave_num_max);
settings->getU16NoEx("mgcarpathian_large_cave_num_min", large_cave_num_min);
settings->getU16NoEx("mgcarpathian_large_cave_num_max", large_cave_num_max);
settings->getFloatNoEx("mgcarpathian_large_cave_flooded", large_cave_flooded);
settings->getPOSNoEx("mgcarpathian_cavern_limit", cavern_limit);
settings->getPOSNoEx("mgcarpathian_cavern_taper", cavern_taper);
settings->getPosNoEx("mgcarpathian_cavern_limit", cavern_limit);
settings->getPosNoEx("mgcarpathian_cavern_taper", cavern_taper);
settings->getFloatNoEx("mgcarpathian_cavern_threshold", cavern_threshold);
settings->getPOSNoEx("mgcarpathian_dungeon_ymin", dungeon_ymin);
settings->getPOSNoEx("mgcarpathian_dungeon_ymax", dungeon_ymax);
settings->getPosNoEx("mgcarpathian_dungeon_ymin", dungeon_ymin);
settings->getPosNoEx("mgcarpathian_dungeon_ymax", dungeon_ymax);

settings->getNoiseParams("mgcarpathian_np_filler_depth", np_filler_depth);
settings->getNoiseParams("mgcarpathian_np_height1", np_height1);
Expand Down Expand Up @@ -194,7 +194,7 @@ void MapgenCarpathianParams::writeParams(Settings *settings) const
settings->setFloat("mgcarpathian_valley_width", valley_width);

settings->setFloat("mgcarpathian_cave_width", cave_width);
settings->setPOS("mgcarpathian_large_cave_depth", large_cave_depth);
settings->setPos("mgcarpathian_large_cave_depth", large_cave_depth);
settings->setU16("mgcarpathian_small_cave_num_min", small_cave_num_min);
settings->setU16("mgcarpathian_small_cave_num_max", small_cave_num_max);
settings->setU16("mgcarpathian_large_cave_num_min", large_cave_num_min);
Expand All @@ -203,8 +203,8 @@ void MapgenCarpathianParams::writeParams(Settings *settings) const
settings->setS16("mgcarpathian_cavern_limit", cavern_limit);
settings->setS16("mgcarpathian_cavern_taper", cavern_taper);
settings->setFloat("mgcarpathian_cavern_threshold", cavern_threshold);
settings->setPOS("mgcarpathian_dungeon_ymin", dungeon_ymin);
settings->setPOS("mgcarpathian_dungeon_ymax", dungeon_ymax);
settings->setPos("mgcarpathian_dungeon_ymin", dungeon_ymin);
settings->setPos("mgcarpathian_dungeon_ymax", dungeon_ymax);

settings->setNoiseParams("mgcarpathian_np_filler_depth", np_filler_depth);
settings->setNoiseParams("mgcarpathian_np_height1", np_height1);
Expand Down
24 changes: 12 additions & 12 deletions src/mapgen/mapgen_flat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ MapgenFlatParams::MapgenFlatParams():
void MapgenFlatParams::readParams(const Settings *settings)
{
settings->getFlagStrNoEx("mgflat_spflags", spflags, flagdesc_mapgen_flat);
settings->getPOSNoEx("mgflat_ground_level", ground_level);
settings->getPOSNoEx("mgflat_large_cave_depth", large_cave_depth);
settings->getPosNoEx("mgflat_ground_level", ground_level);
settings->getPosNoEx("mgflat_large_cave_depth", large_cave_depth);
settings->getU16NoEx("mgflat_small_cave_num_min", small_cave_num_min);
settings->getU16NoEx("mgflat_small_cave_num_max", small_cave_num_max);
settings->getU16NoEx("mgflat_large_cave_num_min", large_cave_num_min);
Expand All @@ -120,11 +120,11 @@ void MapgenFlatParams::readParams(const Settings *settings)
settings->getFloatNoEx("mgflat_lake_steepness", lake_steepness);
settings->getFloatNoEx("mgflat_hill_threshold", hill_threshold);
settings->getFloatNoEx("mgflat_hill_steepness", hill_steepness);
settings->getPOSNoEx("mgflat_cavern_limit", cavern_limit);
settings->getPOSNoEx("mgflat_cavern_taper", cavern_taper);
settings->getPosNoEx("mgflat_cavern_limit", cavern_limit);
settings->getPosNoEx("mgflat_cavern_taper", cavern_taper);
settings->getFloatNoEx("mgflat_cavern_threshold", cavern_threshold);
settings->getPOSNoEx("mgflat_dungeon_ymin", dungeon_ymin);
settings->getPOSNoEx("mgflat_dungeon_ymax", dungeon_ymax);
settings->getPosNoEx("mgflat_dungeon_ymin", dungeon_ymin);
settings->getPosNoEx("mgflat_dungeon_ymax", dungeon_ymax);

settings->getNoiseParams("mgflat_np_terrain", np_terrain);
settings->getNoiseParams("mgflat_np_filler_depth", np_filler_depth);
Expand All @@ -138,8 +138,8 @@ void MapgenFlatParams::readParams(const Settings *settings)
void MapgenFlatParams::writeParams(Settings *settings) const
{
settings->setFlagStr("mgflat_spflags", spflags, flagdesc_mapgen_flat);
settings->setPOS("mgflat_ground_level", ground_level);
settings->setPOS("mgflat_large_cave_depth", large_cave_depth);
settings->setPos("mgflat_ground_level", ground_level);
settings->setPos("mgflat_large_cave_depth", large_cave_depth);
settings->setU16("mgflat_small_cave_num_min", small_cave_num_min);
settings->setU16("mgflat_small_cave_num_max", small_cave_num_max);
settings->setU16("mgflat_large_cave_num_min", large_cave_num_min);
Expand All @@ -150,11 +150,11 @@ void MapgenFlatParams::writeParams(Settings *settings) const
settings->setFloat("mgflat_lake_steepness", lake_steepness);
settings->setFloat("mgflat_hill_threshold", hill_threshold);
settings->setFloat("mgflat_hill_steepness", hill_steepness);
settings->setPOS("mgflat_cavern_limit", cavern_limit);
settings->setPOS("mgflat_cavern_taper", cavern_taper);
settings->setPos("mgflat_cavern_limit", cavern_limit);
settings->setPos("mgflat_cavern_taper", cavern_taper);
settings->setFloat("mgflat_cavern_threshold", cavern_threshold);
settings->setPOS("mgflat_dungeon_ymin", dungeon_ymin);
settings->setPOS("mgflat_dungeon_ymax", dungeon_ymax);
settings->setPos("mgflat_dungeon_ymin", dungeon_ymin);
settings->setPos("mgflat_dungeon_ymax", dungeon_ymax);

settings->setNoiseParams("mgflat_np_terrain", np_terrain);
settings->setNoiseParams("mgflat_np_filler_depth", np_filler_depth);
Expand Down
12 changes: 6 additions & 6 deletions src/mapgen/mapgen_fractal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ void MapgenFractalParams::readParams(const Settings *settings)
{
settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal);
settings->getFloatNoEx("mgfractal_cave_width", cave_width);
settings->getPOSNoEx("mgfractal_large_cave_depth", large_cave_depth);
settings->getPosNoEx("mgfractal_large_cave_depth", large_cave_depth);
settings->getU16NoEx("mgfractal_small_cave_num_min", small_cave_num_min);
settings->getU16NoEx("mgfractal_small_cave_num_max", small_cave_num_max);
settings->getU16NoEx("mgfractal_large_cave_num_min", large_cave_num_min);
settings->getU16NoEx("mgfractal_large_cave_num_max", large_cave_num_max);
settings->getFloatNoEx("mgfractal_large_cave_flooded", large_cave_flooded);
settings->getPOSNoEx("mgfractal_dungeon_ymin", dungeon_ymin);
settings->getPOSNoEx("mgfractal_dungeon_ymax", dungeon_ymax);
settings->getPosNoEx("mgfractal_dungeon_ymin", dungeon_ymin);
settings->getPosNoEx("mgfractal_dungeon_ymax", dungeon_ymax);
settings->getU16NoEx("mgfractal_fractal", fractal);
settings->getU16NoEx("mgfractal_iterations", iterations);
settings->getV3FNoEx("mgfractal_scale", scale);
Expand All @@ -139,14 +139,14 @@ void MapgenFractalParams::writeParams(Settings *settings) const
{
settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal);
settings->setFloat("mgfractal_cave_width", cave_width);
settings->setPOS("mgfractal_large_cave_depth", large_cave_depth);
settings->setPos("mgfractal_large_cave_depth", large_cave_depth);
settings->setU16("mgfractal_small_cave_num_min", small_cave_num_min);
settings->setU16("mgfractal_small_cave_num_max", small_cave_num_max);
settings->setU16("mgfractal_large_cave_num_min", large_cave_num_min);
settings->setU16("mgfractal_large_cave_num_max", large_cave_num_max);
settings->setFloat("mgfractal_large_cave_flooded", large_cave_flooded);
settings->setPOS("mgfractal_dungeon_ymin", dungeon_ymin);
settings->setPOS("mgfractal_dungeon_ymax", dungeon_ymax);
settings->setPos("mgfractal_dungeon_ymin", dungeon_ymin);
settings->setPos("mgfractal_dungeon_ymax", dungeon_ymax);
settings->setU16("mgfractal_fractal", fractal);
settings->setU16("mgfractal_iterations", iterations);
settings->setV3F("mgfractal_scale", scale);
Expand Down
20 changes: 10 additions & 10 deletions src/mapgen/mapgen_v5.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ void MapgenV5Params::readParams(const Settings *settings)
{
settings->getFlagStrNoEx("mgv5_spflags", spflags, flagdesc_mapgen_v5);
settings->getFloatNoEx("mgv5_cave_width", cave_width);
settings->getPOSNoEx("mgv5_large_cave_depth", large_cave_depth);
settings->getPosNoEx("mgv5_large_cave_depth", large_cave_depth);
settings->getU16NoEx("mgv5_small_cave_num_min", small_cave_num_min);
settings->getU16NoEx("mgv5_small_cave_num_max", small_cave_num_max);
settings->getU16NoEx("mgv5_large_cave_num_min", large_cave_num_min);
settings->getU16NoEx("mgv5_large_cave_num_max", large_cave_num_max);
settings->getFloatNoEx("mgv5_large_cave_flooded", large_cave_flooded);
settings->getPOSNoEx("mgv5_cavern_limit", cavern_limit);
settings->getPOSNoEx("mgv5_cavern_taper", cavern_taper);
settings->getPosNoEx("mgv5_cavern_limit", cavern_limit);
settings->getPosNoEx("mgv5_cavern_taper", cavern_taper);
settings->getFloatNoEx("mgv5_cavern_threshold", cavern_threshold);
settings->getPOSNoEx("mgv5_dungeon_ymin", dungeon_ymin);
settings->getPOSNoEx("mgv5_dungeon_ymax", dungeon_ymax);
settings->getPosNoEx("mgv5_dungeon_ymin", dungeon_ymin);
settings->getPosNoEx("mgv5_dungeon_ymax", dungeon_ymax);

settings->getNoiseParams("mgv5_np_filler_depth", np_filler_depth);
settings->getNoiseParams("mgv5_np_factor", np_factor);
Expand All @@ -130,17 +130,17 @@ void MapgenV5Params::writeParams(Settings *settings) const
{
settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5);
settings->setFloat("mgv5_cave_width", cave_width);
settings->setPOS("mgv5_large_cave_depth", large_cave_depth);
settings->setPos("mgv5_large_cave_depth", large_cave_depth);
settings->setU16("mgv5_small_cave_num_min", small_cave_num_min);
settings->setU16("mgv5_small_cave_num_max", small_cave_num_max);
settings->setU16("mgv5_large_cave_num_min", large_cave_num_min);
settings->setU16("mgv5_large_cave_num_max", large_cave_num_max);
settings->setFloat("mgv5_large_cave_flooded", large_cave_flooded);
settings->setPOS("mgv5_cavern_limit", cavern_limit);
settings->setPOS("mgv5_cavern_taper", cavern_taper);
settings->setPos("mgv5_cavern_limit", cavern_limit);
settings->setPos("mgv5_cavern_taper", cavern_taper);
settings->setFloat("mgv5_cavern_threshold", cavern_threshold);
settings->setPOS("mgv5_dungeon_ymin", dungeon_ymin);
settings->setPOS("mgv5_dungeon_ymax", dungeon_ymax);
settings->setPos("mgv5_dungeon_ymin", dungeon_ymin);
settings->setPos("mgv5_dungeon_ymax", dungeon_ymax);

settings->setNoiseParams("mgv5_np_filler_depth", np_filler_depth);
settings->setNoiseParams("mgv5_np_factor", np_factor);
Expand Down
8 changes: 4 additions & 4 deletions src/mapgen/mapgen_v6.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ void MapgenV6Params::readParams(const Settings *settings)
settings->getFlagStrNoEx("mgv6_spflags", spflags, flagdesc_mapgen_v6);
settings->getFloatNoEx("mgv6_freq_desert", freq_desert);
settings->getFloatNoEx("mgv6_freq_beach", freq_beach);
settings->getPOSNoEx("mgv6_dungeon_ymin", dungeon_ymin);
settings->getPOSNoEx("mgv6_dungeon_ymax", dungeon_ymax);
settings->getPosNoEx("mgv6_dungeon_ymin", dungeon_ymin);
settings->getPosNoEx("mgv6_dungeon_ymax", dungeon_ymax);

settings->getNoiseParams("mgv6_np_terrain_base", np_terrain_base);
settings->getNoiseParams("mgv6_np_terrain_higher", np_terrain_higher);
Expand All @@ -208,8 +208,8 @@ void MapgenV6Params::writeParams(Settings *settings) const
settings->setFlagStr("mgv6_spflags", spflags, flagdesc_mapgen_v6);
settings->setFloat("mgv6_freq_desert", freq_desert);
settings->setFloat("mgv6_freq_beach", freq_beach);
settings->setPOS("mgv6_dungeon_ymin", dungeon_ymin);
settings->setPOS("mgv6_dungeon_ymax", dungeon_ymax);
settings->setPos("mgv6_dungeon_ymin", dungeon_ymin);
settings->setPos("mgv6_dungeon_ymax", dungeon_ymax);

settings->setNoiseParams("mgv6_np_terrain_base", np_terrain_base);
settings->setNoiseParams("mgv6_np_terrain_higher", np_terrain_higher);
Expand Down
40 changes: 20 additions & 20 deletions src/mapgen/mapgen_v7.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,26 +172,26 @@ MapgenV7Params::MapgenV7Params():
void MapgenV7Params::readParams(const Settings *settings)
{
settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7);
settings->getPOSNoEx("mgv7_mount_zero_level", mount_zero_level);
settings->getPOSNoEx("mgv7_floatland_ymin", floatland_ymin);
settings->getPOSNoEx("mgv7_floatland_ymax", floatland_ymax);
settings->getPOSNoEx("mgv7_floatland_taper", floatland_taper);
settings->getPosNoEx("mgv7_mount_zero_level", mount_zero_level);
settings->getPosNoEx("mgv7_floatland_ymin", floatland_ymin);
settings->getPosNoEx("mgv7_floatland_ymax", floatland_ymax);
settings->getPosNoEx("mgv7_floatland_taper", floatland_taper);
settings->getFloatNoEx("mgv7_float_taper_exp", float_taper_exp);
settings->getFloatNoEx("mgv7_floatland_density", floatland_density);
settings->getPOSNoEx("mgv7_floatland_ywater", floatland_ywater);
settings->getPosNoEx("mgv7_floatland_ywater", floatland_ywater);

settings->getFloatNoEx("mgv7_cave_width", cave_width);
settings->getPOSNoEx("mgv7_large_cave_depth", large_cave_depth);
settings->getPosNoEx("mgv7_large_cave_depth", large_cave_depth);
settings->getU16NoEx("mgv7_small_cave_num_min", small_cave_num_min);
settings->getU16NoEx("mgv7_small_cave_num_max", small_cave_num_max);
settings->getU16NoEx("mgv7_large_cave_num_min", large_cave_num_min);
settings->getU16NoEx("mgv7_large_cave_num_max", large_cave_num_max);
settings->getFloatNoEx("mgv7_large_cave_flooded", large_cave_flooded);
settings->getPOSNoEx("mgv7_cavern_limit", cavern_limit);
settings->getPOSNoEx("mgv7_cavern_taper", cavern_taper);
settings->getPosNoEx("mgv7_cavern_limit", cavern_limit);
settings->getPosNoEx("mgv7_cavern_taper", cavern_taper);
settings->getFloatNoEx("mgv7_cavern_threshold", cavern_threshold);
settings->getPOSNoEx("mgv7_dungeon_ymin", dungeon_ymin);
settings->getPOSNoEx("mgv7_dungeon_ymax", dungeon_ymax);
settings->getPosNoEx("mgv7_dungeon_ymin", dungeon_ymin);
settings->getPosNoEx("mgv7_dungeon_ymax", dungeon_ymax);

settings->getNoiseParams("mgv7_np_terrain_base", np_terrain_base);
settings->getNoiseParams("mgv7_np_terrain_alt", np_terrain_alt);
Expand All @@ -213,26 +213,26 @@ void MapgenV7Params::readParams(const Settings *settings)
void MapgenV7Params::writeParams(Settings *settings) const
{
settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7);
settings->setPOS("mgv7_mount_zero_level", mount_zero_level);
settings->setPOS("mgv7_floatland_ymin", floatland_ymin);
settings->setPOS("mgv7_floatland_ymax", floatland_ymax);
settings->setPOS("mgv7_floatland_taper", floatland_taper);
settings->setPos("mgv7_mount_zero_level", mount_zero_level);
settings->setPos("mgv7_floatland_ymin", floatland_ymin);
settings->setPos("mgv7_floatland_ymax", floatland_ymax);
settings->setPos("mgv7_floatland_taper", floatland_taper);
settings->setFloat("mgv7_float_taper_exp", float_taper_exp);
settings->setFloat("mgv7_floatland_density", floatland_density);
settings->setPOS("mgv7_floatland_ywater", floatland_ywater);
settings->setPos("mgv7_floatland_ywater", floatland_ywater);

settings->setFloat("mgv7_cave_width", cave_width);
settings->setPOS("mgv7_large_cave_depth", large_cave_depth);
settings->setPos("mgv7_large_cave_depth", large_cave_depth);
settings->setU16("mgv7_small_cave_num_min", small_cave_num_min);
settings->setU16("mgv7_small_cave_num_max", small_cave_num_max);
settings->setU16("mgv7_large_cave_num_min", large_cave_num_min);
settings->setU16("mgv7_large_cave_num_max", large_cave_num_max);
settings->setFloat("mgv7_large_cave_flooded", large_cave_flooded);
settings->setPOS("mgv7_cavern_limit", cavern_limit);
settings->setPOS("mgv7_cavern_taper", cavern_taper);
settings->setPos("mgv7_cavern_limit", cavern_limit);
settings->setPos("mgv7_cavern_taper", cavern_taper);
settings->setFloat("mgv7_cavern_threshold", cavern_threshold);
settings->setPOS("mgv7_dungeon_ymin", dungeon_ymin);
settings->setPOS("mgv7_dungeon_ymax", dungeon_ymax);
settings->setPos("mgv7_dungeon_ymin", dungeon_ymin);
settings->setPos("mgv7_dungeon_ymax", dungeon_ymax);

settings->setNoiseParams("mgv7_np_terrain_base", np_terrain_base);
settings->setNoiseParams("mgv7_np_terrain_alt", np_terrain_alt);
Expand Down
Loading

0 comments on commit 5466830

Please sign in to comment.