Make things build again

.gitmodules

@@ -6,7 +6,7 @@
 	url = https://github.com/akrzemi1/Optional.git
 [submodule "ext/enet"]
 	path = ext/enet
-	url = https://github.com/ElementW/enet.git
+	url = https://github.com/lsalzman/enet.git
 [submodule "ext/torch7"]
 	path = ext/torch7
 	url = https://github.com/torch/torch7.git

ext/etc/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project(ETC C CXX)
 
@@ -9,8 +9,6 @@ set(ETC_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
 set(ETC_INCLUDE_DIRS ${ETC_INCLUDE_DIRS} PARENT_SCOPE)
 include_directories(${ETC_INCLUDE_DIRS})
 
-add_library(stb_c_lexer STATIC stb_c_lexer.c)
-
 add_library(stb_image STATIC stb_image.c)
 target_compile_definitions(stb_image PUBLIC
   -DSTBI_ONLY_PNG
@@ -25,5 +23,6 @@ add_library(stb_vorbis STATIC stb_vorbis.c)
 
 add_library(simplexnoise STATIC simplexnoise.cpp)
 
+add_library(stb_c_lexer STATIC stb_c_lexer)
 
 set(ETC_LIBRARIES stb_c_lexer stb_image stb_perlin stb_vorbis simplexnoise PARENT_SCOPE)

ext/lzo/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project(lzo C)
 

src/CMakeLists.txt

@@ -6,6 +6,7 @@ add_subdirectory("content")
 add_subdirectory("render")
 add_subdirectory("scripting")
 add_subdirectory("util")
+add_subdirectory("world")
 
 set(CSD ${CMAKE_CURRENT_SOURCE_DIR})
 diggler_add_sources(

src/network/Network.cpp

@@ -268,8 +268,7 @@ void Host::create(Port port, uint maxconn) {
     host = enet_host_create(nullptr, 1, static_cast<size_t>(Channels::MAX), 0, 0);
   } else { // Server
     ENetAddress address;
-    address.host = in6addr_any;
-    address.sin6_scope_id = 0;
+    address.host = 0;
     address.port = port;
     host = enet_host_create(&address, maxconn, static_cast<size_t>(Channels::MAX), 0, 0);
   }

src/util/Tipsify.hpp

@@ -1,6 +1,7 @@
 #ifndef DIGGLER_TIPSIFY_HPP
 #define DIGGLER_TIPSIFY_HPP
 
+#include <cstddef>
 #include <vector>
 
 namespace diggler {

src/world/Emerger.cpp

@@ -10,6 +10,9 @@ using namespace Util::Logging::LogLevels;
 
 namespace world {
 
+Emerger::Worker::Worker(unsigned id) : util::Worker<ChunkWeakRef>(id) {
+}
+
 Emerger::Worker::~Worker() {
 }
 

src/world/Emerger.hpp

@@ -11,9 +11,8 @@ class Emerger final {
 private:
   class Worker : public util::Worker<ChunkWeakRef> {
   public:
-    using util::Worker<ChunkWeakRef>::Worker;
-
-    ~Worker();
+    Worker(unsigned id);
+    virtual ~Worker();
 
     void processTask(Task&&) final override;
   };