mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-15 18:57:08 +00:00
Spacing fixes
This commit is contained in:
parent
88b21a72f1
commit
7993909fab
31 changed files with 82 additions and 83 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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; }
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -752,8 +752,8 @@ protected:
|
|||
void putEvent(ConnectionEventPtr e);
|
||||
|
||||
void TriggerSend();
|
||||
|
||||
bool ConnectedToServer()
|
||||
|
||||
bool ConnectedToServer()
|
||||
{
|
||||
return getPeerNoEx(PEER_ID_SERVER) != nullptr;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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() :
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue