BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Spacing fixes

Browse Source
This commit is contained in:
ShadowNinja 2021-12-01 18:54:12 -05:00 committed by rubenwardy
parent 88b21a72f1
commit 7993909fab
31 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -69,7 +69,7 @@ if(NOT "${IRRLICHTMT_BUILD_DIR}" STREQUAL "")
find_package(IrrlichtMt QUIET find_package(IrrlichtMt QUIET
PATHS "${IRRLICHTMT_BUILD_DIR}" PATHS "${IRRLICHTMT_BUILD_DIR}"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
if(NOT TARGET IrrlichtMt::IrrlichtMt) if(NOT TARGET IrrlichtMt::IrrlichtMt)
# find_package() searches certain subdirectories. ${PATH}/cmake is not # find_package() searches certain subdirectories. ${PATH}/cmake is not

2
client/shaders/nodes_shader/opengl_fragment.glsl
View File

@ -557,6 +557,6 @@ void main(void)
- fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0); - fogShadingParameter * length(eyeVec) / fogDistance, 0.0, 1.0);
col = mix(skyBgColor, col, clarity); col = mix(skyBgColor, col, clarity);
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
gl_FragColor = col; gl_FragColor = col;
} }

4
client/shaders/nodes_shader/opengl_vertex.glsl
View File

@ -199,13 +199,13 @@ void main(void)
vec3 nNormal = normalize(vNormal); vec3 nNormal = normalize(vNormal);
cosLight = dot(nNormal, -v_LightDirection); cosLight = dot(nNormal, -v_LightDirection);
// Calculate normal offset scale based on the texel size adjusted for // Calculate normal offset scale based on the texel size adjusted for
// curvature of the SM texture. This code must be change together with // curvature of the SM texture. This code must be change together with
// getPerspectiveFactor or any light-space transformation. // getPerspectiveFactor or any light-space transformation.
vec3 eyeToVertex = worldPosition - eyePosition + cameraOffset; vec3 eyeToVertex = worldPosition - eyePosition + cameraOffset;
// Distance from the vertex to the player // Distance from the vertex to the player
float distanceToPlayer = length(eyeToVertex - v_LightDirection * dot(eyeToVertex, v_LightDirection)) / f_shadowfar; float distanceToPlayer = length(eyeToVertex - v_LightDirection * dot(eyeToVertex, v_LightDirection)) / f_shadowfar;
// perspective factor estimation according to the // perspective factor estimation according to the
float perspectiveFactor = distanceToPlayer * xyPerspectiveBias0 + xyPerspectiveBias1; float perspectiveFactor = distanceToPlayer * xyPerspectiveBias0 + xyPerspectiveBias1;
float texelSize = f_shadowfar * perspectiveFactor * perspectiveFactor / float texelSize = f_shadowfar * perspectiveFactor * perspectiveFactor /
(f_textureresolution * xyPerspectiveBias1 - perspectiveFactor * xyPerspectiveBias0); (f_textureresolution * xyPerspectiveBias1 - perspectiveFactor * xyPerspectiveBias0);

2
clientmods/preview/mod.conf
View File

@ -1 +1 @@
name = preview name = preview

2
cmake/Modules/FindSQLite3.cmake
View File

@ -1,4 +1,4 @@
mark_as_advanced(SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR) mark_as_advanced(SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
find_path(SQLITE3_INCLUDE_DIR sqlite3.h) find_path(SQLITE3_INCLUDE_DIR sqlite3.h)

17
cmake/Modules/FindVorbis.cmake
View File

@ -29,18 +29,17 @@ else(NOT GP2XWIZ)
find_package_handle_standard_args(Vorbis DEFAULT_MSG find_package_handle_standard_args(Vorbis DEFAULT_MSG
VORBIS_INCLUDE_DIR VORBIS_LIBRARY) VORBIS_INCLUDE_DIR VORBIS_LIBRARY)
endif(NOT GP2XWIZ) endif(NOT GP2XWIZ)
if(VORBIS_FOUND) if(VORBIS_FOUND)
if(NOT GP2XWIZ) if(NOT GP2XWIZ)
set(VORBIS_LIBRARIES ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} set(VORBIS_LIBRARIES ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY}
${OGG_LIBRARY}) ${OGG_LIBRARY})
else(NOT GP2XWIZ) else(NOT GP2XWIZ)
set(VORBIS_LIBRARIES ${VORBIS_LIBRARY}) set(VORBIS_LIBRARIES ${VORBIS_LIBRARY})
endif(NOT GP2XWIZ) endif(NOT GP2XWIZ)
else(VORBIS_FOUND) else(VORBIS_FOUND)
set(VORBIS_LIBRARIES) set(VORBIS_LIBRARIES)
endif(VORBIS_FOUND) endif(VORBIS_FOUND)
mark_as_advanced(OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR) mark_as_advanced(OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR)
mark_as_advanced(OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY) mark_as_advanced(OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)

18
doc/lgpl-2.1.txt
View File

@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be author's reputation will not be affected by problems that might be
introduced by others. introduced by others.
Finally, software patents pose a constant threat to the existence of Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a effectively restrict the users of a free program by obtaining a
@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The "work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must former contains code derived from the library, whereas the latter must
be combined with the library in order to run. be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@ -158,7 +158,7 @@ Library.
You may charge a fee for the physical act of transferring a copy, You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a and you may at your option offer warranty protection in exchange for a
fee. fee.
2. You may modify your copy or copies of the Library or any portion 2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1 distribute such modifications or work under the terms of Section 1
@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in that version instead if you wish.) Do not make any other change in
these notices. these notices.
Once this change is made in a given copy, it is irreversible for Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy. subsequent copies and derivative works made from that copy.
@ -267,7 +267,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6. distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6, Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself. whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or 6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work work containing portions of the Library, and distribute that work
@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you use both them and the Library together in an executable that you
distribute. distribute.
7. You may place library facilities that are a work based on the 7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined facilities not covered by this License, and distribute such a combined
@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein. restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with You are not responsible for enforcing compliance by third parties with
this License. this License.
11. If, as a consequence of a court judgment or allegation of patent 11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues), infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or conditions are imposed on you (whether by court order, agreement or
@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by license version number, you may choose any version ever published by
the Free Software Foundation. the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free 14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these, programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is write to the author to ask for permission. For software which is
@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES. DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest If you develop a new library, and you want it to be of the greatest

58
minetest.conf.example
View File

@ -1385,7 +1385,7 @@
# ask_reconnect_on_crash = false # ask_reconnect_on_crash = false
# From how far clients know about objects, stated in mapblocks (16 nodes). # From how far clients know about objects, stated in mapblocks (16 nodes).
# #
# Setting this larger than active_block_range will also cause the server # Setting this larger than active_block_range will also cause the server
# to maintain active objects up to this distance in the direction the # to maintain active objects up to this distance in the direction the
# player is looking. (This can avoid mobs suddenly disappearing from view) # player is looking. (This can avoid mobs suddenly disappearing from view)
@ -1938,7 +1938,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Second of two 3D noises that together define tunnels. # Second of two 3D noises that together define tunnels.
@ -1951,7 +1951,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise defining giant caverns. # 3D noise defining giant caverns.
@ -1964,7 +1964,7 @@
# octaves = 5, # octaves = 5,
# persistence = 0.63, # persistence = 0.63,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise defining terrain. # 3D noise defining terrain.
@ -1990,7 +1990,7 @@
# octaves = 2, # octaves = 2,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
## Mapgen V6 ## Mapgen V6
@ -2377,7 +2377,7 @@
# octaves = 5, # octaves = 5,
# persistence = 0.63, # persistence = 0.63,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise defining structure of river canyon walls. # 3D noise defining structure of river canyon walls.
@ -2390,7 +2390,7 @@
# octaves = 4, # octaves = 4,
# persistence = 0.75, # persistence = 0.75,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise defining structure of floatlands. # 3D noise defining structure of floatlands.
@ -2406,7 +2406,7 @@
# octaves = 4, # octaves = 4,
# persistence = 0.75, # persistence = 0.75,
# lacunarity = 1.618, # lacunarity = 1.618,
# flags = # flags =
# } # }
# 3D noise defining giant caverns. # 3D noise defining giant caverns.
@ -2419,7 +2419,7 @@
# octaves = 5, # octaves = 5,
# persistence = 0.63, # persistence = 0.63,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# First of two 3D noises that together define tunnels. # First of two 3D noises that together define tunnels.
@ -2432,7 +2432,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Second of two 3D noises that together define tunnels. # Second of two 3D noises that together define tunnels.
@ -2445,7 +2445,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise that determines number of dungeons per mapchunk. # 3D noise that determines number of dungeons per mapchunk.
@ -2458,7 +2458,7 @@
# octaves = 2, # octaves = 2,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
## Mapgen Carpathian ## Mapgen Carpathian
@ -2701,7 +2701,7 @@
# octaves = 5, # octaves = 5,
# persistence = 0.55, # persistence = 0.55,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# First of two 3D noises that together define tunnels. # First of two 3D noises that together define tunnels.
@ -2714,7 +2714,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Second of two 3D noises that together define tunnels. # Second of two 3D noises that together define tunnels.
@ -2727,7 +2727,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise defining giant caverns. # 3D noise defining giant caverns.
@ -2740,7 +2740,7 @@
# octaves = 5, # octaves = 5,
# persistence = 0.63, # persistence = 0.63,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise that determines number of dungeons per mapchunk. # 3D noise that determines number of dungeons per mapchunk.
@ -2753,7 +2753,7 @@
# octaves = 2, # octaves = 2,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
## Mapgen Flat ## Mapgen Flat
@ -2875,7 +2875,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Second of two 3D noises that together define tunnels. # Second of two 3D noises that together define tunnels.
@ -2888,7 +2888,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise defining giant caverns. # 3D noise defining giant caverns.
@ -2901,7 +2901,7 @@
# octaves = 5, # octaves = 5,
# persistence = 0.63, # persistence = 0.63,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise that determines number of dungeons per mapchunk. # 3D noise that determines number of dungeons per mapchunk.
@ -2914,7 +2914,7 @@
# octaves = 2, # octaves = 2,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
## Mapgen Fractal ## Mapgen Fractal
@ -3088,7 +3088,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Second of two 3D noises that together define tunnels. # Second of two 3D noises that together define tunnels.
@ -3101,7 +3101,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# 3D noise that determines number of dungeons per mapchunk. # 3D noise that determines number of dungeons per mapchunk.
@ -3114,7 +3114,7 @@
# octaves = 2, # octaves = 2,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
## Mapgen Valleys ## Mapgen Valleys
@ -3204,7 +3204,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Second of two 3D noises that together define tunnels. # Second of two 3D noises that together define tunnels.
@ -3217,7 +3217,7 @@
# octaves = 3, # octaves = 3,
# persistence = 0.5, # persistence = 0.5,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# The depth of dirt or other biome filler node. # The depth of dirt or other biome filler node.
@ -3243,7 +3243,7 @@
# octaves = 6, # octaves = 6,
# persistence = 0.63, # persistence = 0.63,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Defines large-scale river channel structure. # Defines large-scale river channel structure.
@ -3295,7 +3295,7 @@
# octaves = 6, # octaves = 6,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
# Amplifies the valleys. # Amplifies the valleys.
@ -3334,7 +3334,7 @@
# octaves = 2, # octaves = 2,
# persistence = 0.8, # persistence = 0.8,
# lacunarity = 2.0, # lacunarity = 2.0,
# flags = # flags =
# } # }
## Advanced ## Advanced

2
src/CMakeLists.txt
View File

@ -711,7 +711,7 @@ else()
# Move text segment below LuaJIT's 47-bit limit (see issue #9367) # Move text segment below LuaJIT's 47-bit limit (see issue #9367)
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
# FreeBSD uses lld, and lld does not support -Ttext-segment, suggesting # 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 # but at least if fixes build on FreeBSD/aarch64
# XXX: the condition should also be changed to check for lld regardless of # 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 # os, bit CMake doesn't have anything like CMAKE_LINKER_IS_LLD yet

4
src/client/CMakeLists.txt
View File

@ -60,7 +60,7 @@ set(client_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/wieldmesh.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wieldmesh.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadows.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadowsrender.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shadows/dynamicshadowsrender.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsshadercallbacks.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsshadercallbacks.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsScreenQuad.cpp ${CMAKE_CURRENT_SOURCE_DIR}/shadows/shadowsScreenQuad.cpp
PARENT_SCOPE PARENT_SCOPE
) )

4
src/client/clientmap.cpp
View File

@ -847,12 +847,12 @@ void ClientMap::renderMapShadows(video::IVideoDriver *driver,
vertex_count += buf->getIndexCount(); vertex_count += buf->getIndexCount();
} }
// restore the driver material state // restore the driver material state
video::SMaterial clean; video::SMaterial clean;
clean.BlendOperation = video::EBO_ADD; clean.BlendOperation = video::EBO_ADD;
driver->setMaterial(clean); // reset material to defaults driver->setMaterial(clean); // reset material to defaults
driver->draw3DLine(v3f(), v3f(), video::SColor(0)); driver->draw3DLine(v3f(), v3f(), video::SColor(0));
g_profiler->avg(prefix + "draw meshes [ms]", draw.stop(true)); g_profiler->avg(prefix + "draw meshes [ms]", draw.stop(true));
g_profiler->avg(prefix + "vertices drawn [#]", vertex_count); g_profiler->avg(prefix + "vertices drawn [#]", vertex_count);
g_profiler->avg(prefix + "drawcalls [#]", drawcall_count); g_profiler->avg(prefix + "drawcalls [#]", drawcall_count);

2
src/client/imagefilters.cpp
View File

@ -124,7 +124,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
// Ignore pixels we haven't processed // Ignore pixels we haven't processed
if (!bitmap.get(sx, sy)) if (!bitmap.get(sx, sy))
continue; continue;
// Add RGB values weighted by alpha IF the pixel is opaque, otherwise // Add RGB values weighted by alpha IF the pixel is opaque, otherwise
// use full weight since we want to propagate colors. // use full weight since we want to propagate colors.
video::SColor d = src->getPixel(sx, sy); video::SColor d = src->getPixel(sx, sy);

2
src/client/render/core.cpp
View File

@ -103,7 +103,7 @@ void RenderingCore::drawHUD()
if (show_hud) { if (show_hud) {
if (draw_crosshair) if (draw_crosshair)
hud->drawCrosshair(); hud->drawCrosshair();
hud->drawHotbar(client->getEnv().getLocalPlayer()->getWieldIndex()); hud->drawHotbar(client->getEnv().getLocalPlayer()->getWieldIndex());
hud->drawLuaElements(camera->getOffset()); hud->drawLuaElements(camera->getOffset());
camera->drawNametags(); camera->drawNametags();

2
src/clientiface.h
View File

@ -341,7 +341,7 @@ public:
u8 getMinor() const { return m_version_minor; } u8 getMinor() const { return m_version_minor; }
u8 getPatch() const { return m_version_patch; } u8 getPatch() const { return m_version_patch; }
const std::string &getFullVer() const { return m_full_version; } const std::string &getFullVer() const { return m_full_version; }
void setLangCode(const std::string &code) { m_lang_code = code; } void setLangCode(const std::string &code) { m_lang_code = code; }
const std::string &getLangCode() const { return m_lang_code; } const std::string &getLangCode() const { return m_lang_code; }

4
src/collision.cpp
View File

@ -153,7 +153,7 @@ CollisionAxis axisAlignedCollision(
(std::max(movingbox.MaxEdge.Z + speed.Z * time, staticbox.MaxEdge.Z) (std::max(movingbox.MaxEdge.Z + speed.Z * time, staticbox.MaxEdge.Z)
- std::min(movingbox.MinEdge.Z + speed.Z * time, staticbox.MinEdge.Z) - std::min(movingbox.MinEdge.Z + speed.Z * time, staticbox.MinEdge.Z)
- relbox.MinEdge.Z < 0) - relbox.MinEdge.Z < 0)
) )
return COLLISION_AXIS_X; return COLLISION_AXIS_X;
} }
} else { } else {
@ -180,7 +180,7 @@ CollisionAxis axisAlignedCollision(
(std::max(movingbox.MaxEdge.Y + speed.Y * time, staticbox.MaxEdge.Y) (std::max(movingbox.MaxEdge.Y + speed.Y * time, staticbox.MaxEdge.Y)
- std::min(movingbox.MinEdge.Y + speed.Y * time, staticbox.MinEdge.Y) - std::min(movingbox.MinEdge.Y + speed.Y * time, staticbox.MinEdge.Y)
- relbox.MinEdge.Y < 0) - relbox.MinEdge.Y < 0)
) )
return COLLISION_AXIS_Z; return COLLISION_AXIS_Z;
} }
} }

2
src/config.h
View File

@ -16,7 +16,7 @@
#define PROJECT_NAME_C "Minetest" #define PROJECT_NAME_C "Minetest"
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA) #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA)
#ifdef NDEBUG #ifdef NDEBUG
#define BUILD_TYPE "Release" #define BUILD_TYPE "Release"
#else #else
#define BUILD_TYPE "Debug" #define BUILD_TYPE "Debug"

2
src/database/database-leveldb.cpp
View File

@ -74,7 +74,7 @@ void Database_LevelDB::loadBlock(const v3s16 &pos, std::string *block)
i64tos(getBlockAsInteger(pos)), block); i64tos(getBlockAsInteger(pos)), block);
if (!status.ok()) if (!status.ok())
block->clear(); block->clear();
} }
bool Database_LevelDB::deleteBlock(const v3s16 &pos) bool Database_LevelDB::deleteBlock(const v3s16 &pos)

2
src/inventorymanager.cpp
View File

@ -172,7 +172,7 @@ void IMoveAction::onPutAndOnTake(const ItemStack &src_item, ServerActiveObject *
sa->player_inventory_OnPut(*this, src_item, player); sa->player_inventory_OnPut(*this, src_item, player);
else else
assert(false); assert(false);
if (from_inv.type == InventoryLocation::DETACHED) if (from_inv.type == InventoryLocation::DETACHED)
sa->detached_inventory_OnTake(*this, src_item, player); sa->detached_inventory_OnTake(*this, src_item, player);
else if (from_inv.type == InventoryLocation::NODEMETA) else if (from_inv.type == InventoryLocation::NODEMETA)

2
src/irrlicht_changes/CGUITTFont.cpp
View File

@ -478,7 +478,7 @@ CGUITTGlyphPage* CGUITTFont::getLastGlyphPage() const
CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode)
{ {
CGUITTGlyphPage* page = 0; CGUITTGlyphPage* page = 0;
// Name of our page. // Name of our page.
io::path name("TTFontGlyphPage_"); io::path name("TTFontGlyphPage_");
name += tt_face->family_name; name += tt_face->family_name;

2
src/mapgen/dungeongen.cpp
View File

@ -71,7 +71,7 @@ DungeonGen::DungeonGen(const NodeDefManager *ndef,
dp.num_dungeons = 1; dp.num_dungeons = 1;
dp.notifytype = GENNOTIFY_DUNGEON; 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); NoiseParams(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0);
} }
} }

2
src/mapgen/mapgen_flat.cpp
View File

@ -177,7 +177,7 @@ void MapgenFlatParams::setDefaultSettings(Settings *settings)
int MapgenFlat::getSpawnLevelAtPoint(v2s16 p) int MapgenFlat::getSpawnLevelAtPoint(v2s16 p)
{ {
s16 stone_level = ground_level; s16 stone_level = ground_level;
float n_terrain = float n_terrain =
((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS)) ? ((spflags & MGFLAT_LAKES) || (spflags & MGFLAT_HILLS)) ?
NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed) : NoisePerlin2D(&noise_terrain->np, p.X, p.Y, seed) :
0.0f; 0.0f;

2
src/mapgen/mg_biome.cpp
View File

@ -273,7 +273,7 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 po
pos.Y - biome_closest_blend->max_pos.Y) pos.Y - biome_closest_blend->max_pos.Y)
return biome_closest_blend; 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);
} }

4
src/mapgen/mg_ore.cpp
View File

@ -498,8 +498,8 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
} }
// randval ranges from -1..1 // 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. 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; float randval = (float)pr.next() / float(pr.RANDOM_RANGE / 2) - 1.f;

4
src/network/connection.h
View File

@ -752,8 +752,8 @@ protected:
void putEvent(ConnectionEventPtr e); void putEvent(ConnectionEventPtr e);
void TriggerSend(); void TriggerSend();
bool ConnectedToServer() bool ConnectedToServer()
{ {
return getPeerNoEx(PEER_ID_SERVER) != nullptr; return getPeerNoEx(PEER_ID_SERVER) != nullptr;
} }

4
src/script/cpp_api/s_env.cpp
View File

@ -140,10 +140,10 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
bool simple_catch_up = true; bool simple_catch_up = true;
getboolfield(L, current_abm, "catch_up", simple_catch_up); getboolfield(L, current_abm, "catch_up", simple_catch_up);
s16 min_y = INT16_MIN; s16 min_y = INT16_MIN;
getintfield(L, current_abm, "min_y", min_y); getintfield(L, current_abm, "min_y", min_y);
s16 max_y = INT16_MAX; s16 max_y = INT16_MAX;
getintfield(L, current_abm, "max_y", max_y); getintfield(L, current_abm, "max_y", max_y);

4
src/script/lua_api/l_env.cpp
View File

@ -757,7 +757,7 @@ int ModApiEnvMod::l_get_objects_in_area(lua_State *L)
{ {
GET_ENV_PTR; GET_ENV_PTR;
ScriptApiBase *script = getScriptApiBase(L); ScriptApiBase *script = getScriptApiBase(L);
v3f minp = read_v3f(L, 1) * BS; v3f minp = read_v3f(L, 1) * BS;
v3f maxp = read_v3f(L, 2) * BS; v3f maxp = read_v3f(L, 2) * BS;
aabb3f box(minp, maxp); aabb3f box(minp, maxp);
@ -1409,7 +1409,7 @@ int ModApiEnvMod::l_compare_block_status(lua_State *L)
v3s16 nodepos = check_v3s16(L, 1); v3s16 nodepos = check_v3s16(L, 1);
std::string condition_s = luaL_checkstring(L, 2); std::string condition_s = luaL_checkstring(L, 2);
auto status = env->getBlockStatus(getNodeBlockPos(nodepos)); auto status = env->getBlockStatus(getNodeBlockPos(nodepos));
int condition_i = -1; int condition_i = -1;
if (!string_to_enum(es_BlockStatusType, condition_i, condition_s)) if (!string_to_enum(es_BlockStatusType, condition_i, condition_s))
return 0; // Unsupported return 0; // Unsupported

2
src/script/lua_api/l_env.h
View File

@ -114,7 +114,7 @@ private:
// get_objects_inside_radius(pos, radius) // get_objects_inside_radius(pos, radius)
static int l_get_objects_inside_radius(lua_State *L); static int l_get_objects_inside_radius(lua_State *L);
// get_objects_in_area(pos, minp, maxp) // get_objects_in_area(pos, minp, maxp)
static int l_get_objects_in_area(lua_State *L); static int l_get_objects_in_area(lua_State *L);

2
src/serverenvironment.cpp
View File

@ -892,7 +892,7 @@ public:
for (ActiveABM &aabm : *m_aabms[c]) { for (ActiveABM &aabm : *m_aabms[c]) {
if ((p.Y < aabm.min_y) || (p.Y > aabm.max_y)) if ((p.Y < aabm.min_y) || (p.Y > aabm.max_y))
continue; continue;
if (myrand() % aabm.chance != 0) if (myrand() % aabm.chance != 0)
continue; continue;

2
src/util/ieee_float.cpp
View File

@ -39,7 +39,7 @@ f32 u32Tof32Slow(u32 i)
if (exp == 0xFF) { if (exp == 0xFF) {
// Inf/NaN // Inf/NaN
if (imant == 0) { if (imant == 0) {
if (std::numeric_limits<f32>::has_infinity) if (std::numeric_limits<f32>::has_infinity)
return sign ? -std::numeric_limits<f32>::infinity() : return sign ? -std::numeric_limits<f32>::infinity() :
std::numeric_limits<f32>::infinity(); std::numeric_limits<f32>::infinity();
return sign ? std::numeric_limits<f32>::max() : return sign ? std::numeric_limits<f32>::max() :

2
src/util/string.h
View File

@ -410,7 +410,7 @@ DEFINE_STD_TOSTRING_FLOATINGPOINT(long double)
template <typename T> template <typename T>
inline wstring to_wstring(T val) inline wstring to_wstring(T val)
{ {
return utf8_to_wide(to_string(val)); return utf8_to_wide(to_string(val));
} }
} }
#endif #endif

2
util/generate-texture-normals.sh
View File

@ -197,7 +197,7 @@ normalMap()
(gimp-convert-rgb image) () (gimp-convert-rgb image) ()
) )
(plug-in-normalmap (plug-in-normalmap
RUN-NONINTERACTIVE RUN-NONINTERACTIVE
image image
drawable drawable