aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/client/CMakeLists.txt4
-rw-r--r--src/client/clientmap.cpp4
-rw-r--r--src/client/imagefilters.cpp2
-rw-r--r--src/client/render/core.cpp2
-rw-r--r--src/clientiface.h2
-rw-r--r--src/collision.cpp4
-rw-r--r--src/config.h2
-rw-r--r--src/database/database-leveldb.cpp2
-rw-r--r--src/inventorymanager.cpp2
-rw-r--r--src/irrlicht_changes/CGUITTFont.cpp2
-rw-r--r--src/mapgen/dungeongen.cpp2
-rw-r--r--src/mapgen/mapgen_flat.cpp2
-rw-r--r--src/mapgen/mg_biome.cpp2
-rw-r--r--src/mapgen/mg_ore.cpp4
-rw-r--r--src/network/connection.h4
-rw-r--r--src/script/cpp_api/s_env.cpp4
-rw-r--r--src/script/lua_api/l_env.cpp4
-rw-r--r--src/script/lua_api/l_env.h2
-rw-r--r--src/serverenvironment.cpp2
-rw-r--r--src/util/ieee_float.cpp2
-rw-r--r--src/util/string.h2
22 files changed, 29 insertions, 29 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2de68a8f0..0323603fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -711,7 +711,7 @@ else()
# Move text segment below LuaJIT's 47-bit limit (see issue #9367)
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
# FreeBSD uses lld, and lld does not support -Ttext-segment, suggesting
- # --image-base instead. Not sure if it's equivalent change for the purpose
+ # --image-base instead. Not sure if it's equivalent change for the purpose
# but at least if fixes build on FreeBSD/aarch64
# XXX: the condition should also be changed to check for lld regardless of
# os, bit CMake doesn't have anything like CMAKE_LINKER_IS_LLD yet
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 8d058852a..656ad45ce 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -60,7 +60,7 @@ set(client_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/wieldmesh.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadowsrender.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsshadercallbacks.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsScreenQuad.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsshadercallbacks.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsScreenQuad.cpp
PARENT_SCOPE
)
diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
index 99ff0aefb..10967c0cb 100644
--- a/src/client/clientmap.cpp
+++ b/src/client/clientmap.cpp
@@ -847,12 +847,12 @@ void ClientMap::renderMapShadows(video::IVideoDriver *driver,
vertex_count += buf->getIndexCount();
}
- // restore the driver material state
+ // restore the driver material state
video::SMaterial clean;
clean.BlendOperation = video::EBO_ADD;
driver->setMaterial(clean); // reset material to defaults
driver->draw3DLine(v3f(), v3f(), video::SColor(0));
-
+
g_profiler->avg(prefix + "draw meshes [ms]", draw.stop(true));
g_profiler->avg(prefix + "vertices drawn [#]", vertex_count);
g_profiler->avg(prefix + "drawcalls [#]", drawcall_count);
diff --git a/src/client/imagefilters.cpp b/src/client/imagefilters.cpp
index b62e336f7..c9d1504ad 100644
--- a/src/client/imagefilters.cpp
+++ b/src/client/imagefilters.cpp
@@ -124,7 +124,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
// Ignore pixels we haven't processed
if (!bitmap.get(sx, sy))
continue;
-
+
// Add RGB values weighted by alpha IF the pixel is opaque, otherwise
// use full weight since we want to propagate colors.
video::SColor d = src->getPixel(sx, sy);
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index f151832f3..c67f297c4 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -103,7 +103,7 @@ void RenderingCore::drawHUD()
if (show_hud) {
if (draw_crosshair)
hud->drawCrosshair();
-
+
hud->drawHotbar(client->getEnv().getLocalPlayer()->getWieldIndex());
hud->drawLuaElements(camera->getOffset());
camera->drawNametags();
diff --git a/src/clientiface.h b/src/clientiface.h
index 1be9c972a..947952e82 100644
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -341,7 +341,7 @@ public:
u8 getMinor() const { return m_version_minor; }
u8 getPatch() const { return m_version_patch; }
const std::string &getFullVer() const { return m_full_version; }
-
+
void setLangCode(const std::string &code) { m_lang_code = code; }
const std::string &getLangCode() const { return m_lang_code; }
diff --git a/src/collision.cpp b/src/collision.cpp
index ccc3a058d..be135a225 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -153,7 +153,7 @@ CollisionAxis axisAlignedCollision(
(std::max(movingbox.MaxEdge.Z + speed.Z * time, staticbox.MaxEdge.Z)
- std::min(movingbox.MinEdge.Z + speed.Z * time, staticbox.MinEdge.Z)
- relbox.MinEdge.Z < 0)
- )
+ )
return COLLISION_AXIS_X;
}
} else {
@@ -180,7 +180,7 @@ CollisionAxis axisAlignedCollision(
(std::max(movingbox.MaxEdge.Y + speed.Y * time, staticbox.MaxEdge.Y)
- std::min(movingbox.MinEdge.Y + speed.Y * time, staticbox.MinEdge.Y)
- relbox.MinEdge.Y < 0)
- )
+ )
return COLLISION_AXIS_Z;
}
}
diff --git a/src/config.h b/src/config.h
index 5e1164642..8d920b150 100644
--- a/src/config.h
+++ b/src/config.h
@@ -16,7 +16,7 @@
#define PROJECT_NAME_C "Minetest"
#define STATIC_SHAREDIR ""
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA)
-#ifdef NDEBUG
+ #ifdef NDEBUG
#define BUILD_TYPE "Release"
#else
#define BUILD_TYPE "Debug"
diff --git a/src/database/database-leveldb.cpp b/src/database/database-leveldb.cpp
index 39f4c8442..6e59daab3 100644
--- a/src/database/database-leveldb.cpp
+++ b/src/database/database-leveldb.cpp
@@ -74,7 +74,7 @@ void Database_LevelDB::loadBlock(const v3s16 &pos, std::string *block)
i64tos(getBlockAsInteger(pos)), block);
if (!status.ok())
- block->clear();
+ block->clear();
}
bool Database_LevelDB::deleteBlock(const v3s16 &pos)
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index a159bf786..ecdb56a97 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -172,7 +172,7 @@ void IMoveAction::onPutAndOnTake(const ItemStack &src_item, ServerActiveObject *
sa->player_inventory_OnPut(*this, src_item, player);
else
assert(false);
-
+
if (from_inv.type == InventoryLocation::DETACHED)
sa->detached_inventory_OnTake(*this, src_item, player);
else if (from_inv.type == InventoryLocation::NODEMETA)
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
index e785ea837..787f4cd5a 100644
--- a/src/irrlicht_changes/CGUITTFont.cpp
+++ b/src/irrlicht_changes/CGUITTFont.cpp
@@ -478,7 +478,7 @@ CGUITTGlyphPage* CGUITTFont::getLastGlyphPage() const
CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode)
{
CGUITTGlyphPage* page = 0;
-
+
// Name of our page.
io::path name("TTFontGlyphPage_");
name += tt_face->family_name;
diff --git a/src/mapgen/dungeongen.cpp b/src/mapgen/dungeongen.cpp
index acdb1a0f0..1d439abeb 100644
--- a/src/mapgen/dungeongen.cpp
+++ b/src/mapgen/dungeongen.cpp
@@ -71,7 +71,7 @@ DungeonGen::DungeonGen(const NodeDefManager *ndef,
dp.num_dungeons = 1;
dp.notifytype = GENNOTIFY_DUNGEON;
- dp.np_alt_wall =
+ dp.np_alt_wall =
NoiseParams(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0);
}
}
diff --git a/src/mapgen/mapgen_flat.cpp b/src/mapgen/mapgen_flat.cpp
index 342455029..6b249ea1f 100644
--- a/src/mapgen/mapgen_flat.cpp
+++ b/src/mapgen/mapgen_flat.cpp
@@ -177,7 +177,7 @@ void MapgenFlatParams::setDefaultSettings(Settings *settings)
int MapgenFlat::getSpawnLevelAtPoint(v2s16 p)
{
s16 stone_level = ground_level;
- float n_terrain =
+ float n_terrain =
((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS)) ?
NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed) :
0.0f;
diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp
index f08cc190f..8b4c96cd5 100644
--- a/src/mapgen/mg_biome.cpp
+++ b/src/mapgen/mg_biome.cpp
@@ -273,7 +273,7 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 po
pos.Y - biome_closest_blend->max_pos.Y)
return biome_closest_blend;
- return (biome_closest) ? biome_closest : (Biome *)m_bmgr->getRaw(BIOME_NONE);
+ return (biome_closest) ? biome_closest : (Biome *)m_bmgr->getRaw(BIOME_NONE);
}
diff --git a/src/mapgen/mg_ore.cpp b/src/mapgen/mg_ore.cpp
index 5814f433a..4f0c35548 100644
--- a/src/mapgen/mg_ore.cpp
+++ b/src/mapgen/mg_ore.cpp
@@ -498,8 +498,8 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
}
// randval ranges from -1..1
- /*
- Note: can generate values slightly larger than 1
+ /*
+ Note: can generate values slightly larger than 1
but this can't be changed as mapgen must be deterministic accross versions.
*/
float randval = (float)pr.next() / float(pr.RANDOM_RANGE / 2) - 1.f;
diff --git a/src/network/connection.h b/src/network/connection.h
index 1afb4ae84..88e323bb1 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -752,8 +752,8 @@ protected:
void putEvent(ConnectionEventPtr e);
void TriggerSend();
-
- bool ConnectedToServer()
+
+ bool ConnectedToServer()
{
return getPeerNoEx(PEER_ID_SERVER) != nullptr;
}
diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
index 874c37b6e..af68f689f 100644
--- a/src/script/cpp_api/s_env.cpp
+++ b/src/script/cpp_api/s_env.cpp
@@ -140,10 +140,10 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
bool simple_catch_up = true;
getboolfield(L, current_abm, "catch_up", simple_catch_up);
-
+
s16 min_y = INT16_MIN;
getintfield(L, current_abm, "min_y", min_y);
-
+
s16 max_y = INT16_MAX;
getintfield(L, current_abm, "max_y", max_y);
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 54821df24..7640f2782 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -757,7 +757,7 @@ int ModApiEnvMod::l_get_objects_in_area(lua_State *L)
{
GET_ENV_PTR;
ScriptApiBase *script = getScriptApiBase(L);
-
+
v3f minp = read_v3f(L, 1) * BS;
v3f maxp = read_v3f(L, 2) * BS;
aabb3f box(minp, maxp);
@@ -1409,7 +1409,7 @@ int ModApiEnvMod::l_compare_block_status(lua_State *L)
v3s16 nodepos = check_v3s16(L, 1);
std::string condition_s = luaL_checkstring(L, 2);
auto status = env->getBlockStatus(getNodeBlockPos(nodepos));
-
+
int condition_i = -1;
if (!string_to_enum(es_BlockStatusType, condition_i, condition_s))
return 0; // Unsupported
diff --git a/src/script/lua_api/l_env.h b/src/script/lua_api/l_env.h
index 67c76faae..a7d406d2a 100644
--- a/src/script/lua_api/l_env.h
+++ b/src/script/lua_api/l_env.h
@@ -114,7 +114,7 @@ private:
// get_objects_inside_radius(pos, radius)
static int l_get_objects_inside_radius(lua_State *L);
-
+
// get_objects_in_area(pos, minp, maxp)
static int l_get_objects_in_area(lua_State *L);
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index f3711652c..34a1e33e5 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -892,7 +892,7 @@ public:
for (ActiveABM &aabm : *m_aabms[c]) {
if ((p.Y < aabm.min_y) || (p.Y > aabm.max_y))
continue;
-
+
if (myrand() % aabm.chance != 0)
continue;
diff --git a/src/util/ieee_float.cpp b/src/util/ieee_float.cpp
index 887258921..b73763c55 100644
--- a/src/util/ieee_float.cpp
+++ b/src/util/ieee_float.cpp
@@ -39,7 +39,7 @@ f32 u32Tof32Slow(u32 i)
if (exp == 0xFF) {
// Inf/NaN
if (imant == 0) {
- if (std::numeric_limits<f32>::has_infinity)
+ if (std::numeric_limits<f32>::has_infinity)
return sign ? -std::numeric_limits<f32>::infinity() :
std::numeric_limits<f32>::infinity();
return sign ? std::numeric_limits<f32>::max() :
diff --git a/src/util/string.h b/src/util/string.h
index 8a9e83f22..f4ca1a7de 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -410,7 +410,7 @@ DEFINE_STD_TOSTRING_FLOATINGPOINT(long double)
template <typename T>
inline wstring to_wstring(T val)
{
- return utf8_to_wide(to_string(val));
+ return utf8_to_wide(to_string(val));
}
}
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 18:15:05 +0000