kahrl

diff --git a/cmake/Modules/FindJthread.cmake b/cmake/Modules/FindJthread.cmake
index 302a3c2..2138d90 100644
--- a/cmake/Modules/FindJthread.cmake
+++ b/cmake/Modules/FindJthread.cmake
@@ -1,6 +1,7 @@
 # Look for jthread, use our own if not found
 
-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
+FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h
+	PATHS /usr/include/jthread /usr/local/include/jthread)

kahrl

/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,

kahrl

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fae23b8..7932398 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -272,6 +272,7 @@ set(common_SRCS
 	serverlist.cpp
 	pathfinder.cpp
 	convert_json.cpp
+	httpfetch.cpp
 	${SCRIPT_SRCS}

kahrl

diff --git a/src/tile.cpp b/src/tile.cpp
index 027e3ad..3c4989e 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -555,7 +555,7 @@ static void blit_with_alpha_overlay(video::IImage *src, video::IImage *dst,
 
 // Draw or overlay a crack
 static void draw_crack(video::IImage *crack, video::IImage *dst,
-		bool use_overlay, u32 frame_count, u32 progression,
+		bool use_overlay, s32 frame_count, s32 progression,

kahrl

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index e826c22..45b0fe2 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -803,8 +803,11 @@ void GUIFormSpecMenu::parsePwdField(parserData* data,std::string element) {
 		e->setPasswordBox(true,L'*');
 
 		irr::SEvent evt;
-		evt.KeyInput.Key = KEY_END;
-		evt.EventType = EET_KEY_INPUT_EVENT;

kahrl

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 799c279..ed660cf 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -943,8 +943,11 @@ bool LuaEntitySAO::collideWithObjects(){
 	m_properties_sent(true),
 	m_privs(privs),
 	m_is_singleplayer(is_singleplayer),
+	m_animation_speed(0),
+	m_animation_blend(0),

kahrl

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 5247b24..7628fe8 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1448,6 +1448,19 @@ minetest.place_schematic(pos, schematic, rotation, replacements)
 ^ If the rotation parameter is omitted, the schematic is not rotated.
 ^ replacements = {{"oldname", "convert_to"}, ...}
 
+HTTP:
+minetest.httpfetch(request, func(HTTPFetchResult))

kahrl

diff --git a/minetest.conf.example b/minetest.conf.example
index 1d32bac..b1732fa 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -127,10 +127,6 @@
 #fast_move = false
 # Invert mouse
 #invert_mouse = false
-# FarMesh thingy
-#enable_farmesh = false

kahrl

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index d2509ad..bd03b3b 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -653,47 +653,29 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 				// -Z towards +Z, thus the direction is +Z.
 				// Rotate texture to make animation go in flow direction
 				// Positive if liquid moves towards +Z
-				int dz = (corner_levels[side_corners[3][0]] +
+				f32 dz = (corner_levels[side_corners[3][0]] +

kahrl

diff --git a/src/emerge.h b/src/emerge.h
index 458a366..d2ab689 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -75,6 +75,7 @@ class IBackgroundBlockEmerger
 public:
 	virtual bool enqueueBlockEmerge(u16 peer_id, v3s16 p,
 			bool allow_generate) = 0;
+	virtual ~IBackgroundBlockEmerger() {}
 };