kahrl

diff --git a/src/environment.cpp b/src/environment.cpp
index 166523a..56e7f5b 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1698,6 +1698,9 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 		/*infostream<<"Server: Creating an active object from "
 				<<"static data"<<std::endl;*/
 		StaticObject &s_obj = *i;
+		// Ignore objects of obsolete types (e.g. mobs from 0.3 era)
+		if (ServerActiveObject::isObsoleteType((ActiveObjectType) s_obj.type))

kahrl

WARNING: ServerActiveObject: No factory for type=
10:54:13: ERROR[ServerThread]: ServerEnvironment::activateObjects(): failed to create active object from static object in block (-8,-10.4995,13) type=3 data:
WARNING: ServerActiveObject: No factory for type=
10:54:13: ERROR[ServerThread]: ServerEnvironment::activateObjects(): failed to create active object from static object in block (-8,-10.4995,13) type=3 data:
WARNING: ServerActiveObject: No factory for type=
10:54:13: ERROR[ServerThread]: ServerEnvironment::activateObjects(): failed to create active object from static object in block (-8,-10.4995,13) type=3 data:
WARNING: ServerActiveObject: No factory for type=
10:54:15: ERROR[ServerThread]: ServerEnvironment::activateObjects(): failed to create active object from static object in block (4,0.5021,-22) type=3 data:
WARNING: ServerActiveObject: No factory for type=
10:54:15: ERROR[ServerThread]: ServerEnvironment::activateObjects(): failed to create active object from static object in block (4,0.5021,-

kahrl

diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
index bdce7c8..8210e0b 100644
--- a/src/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -99,7 +99,7 @@ GUIChatConsole::GUIChatConsole(
 	{
 		core::dimension2d<u32> dim = m_font->getDimension(L"M");
 		m_fontsize = v2u32(dim.Width, dim.Height);
-		dstream << "Font size: " << m_fontsize.X << " " << m_fontsize.Y << std::endl;
+		m_font->grab();

kahrl

diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 7faffb0..0679da9 100644
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -52,6 +52,7 @@ Database_SQLite3::Database_SQLite3(ServerMap *map, std::string savedir)
 	m_database_read = NULL;
 	m_database_write = NULL;
 	m_database_list = NULL;
+	m_database_delete = NULL;
 	m_savedir = savedir;

kahrl

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 4cc0abc..ecd9a01 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -526,11 +526,7 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
 		throw SerializationError("ERROR: Not writing dummy block.");
 	}
 
-	// Can't do this anymore; we have 16-bit dynamically allocated node IDs
-	// in memory; conversion just won't work in this direction.

kahrl

diff --git a/src/server.cpp b/src/server.cpp
index fba5120..2b5fe9b 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -194,7 +194,8 @@ Server::Server(
 	m_clients(&m_con),
 	m_shutdown_requested(false),
 	m_ignore_map_edit_events(false),
-	m_ignore_map_edit_events_peer_id(0)
+	m_ignore_map_edit_events_peer_id(0),

kahrl

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index b84b696..9af3be7 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -756,7 +756,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 			for(u32 j=0; j<6; j++)
 			{
 				// Check this neighbor
-				v3s16 n2p = blockpos_nodes + p + g_6dirs[j];
+				v3s16 dir = g_6dirs[j];

kahrl

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index b84b696..6ffd678 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -756,7 +756,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 			for(u32 j=0; j<6; j++)
 			{
 				// Check this neighbor
-				v3s16 n2p = blockpos_nodes + p + g_6dirs[j];
+				v3s16 dir = g_6dirs[j];

kahrl

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index b84b696..ec92c50 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -764,10 +764,10 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 
 				// The face at Z+
 				video::S3DVertex vertices[4] = {
-					video::S3DVertex(-BS/2,-BS/2,BS/2, 0,0,0, c, 1,1),
-					video::S3DVertex(BS/2,-BS/2,BS/2, 0,0,0, c, 0,1),

kahrl

diff --git a/src/porting.cpp b/src/porting.cpp
index 885b36e..286b4e1 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -602,7 +602,16 @@ float getDisplayDensity()
 	/* return manually specified dpi */
 	return g_settings->getFloat("screen_dpi")/96.0;
 }
-
+#elif defined(_WIN32)