Merge branch 'master' of github.com:dragonblocks/dragonblocks_alpha

diff --cc src/CMakeLists.txt
index 71daf3eb69f22f66d412a78f3313a3d2483142c4,2cc9ad44c0917917364c1bcbff96d7d045093487..0adb599d915c118d2c7d9ad405172cd39b7a8c32
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -27,20 -29,19 +27,30 @@@ include_directories(BEFOR
        ${CMAKE_SOURCE_DIR}
  )
  
- add_compile_options(-Wall -Wextra -Wpedantic -Werror -fmax-errors=4)
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+       link_directories("/usr/local/lib")
+       include_directories("/usr/local/include")
+ endif()
+ 
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+       link_directories("/usr/X11R6/lib")
+       include_directories("/usr/X11R6/include")
+ endif()
+ 
+ add_compile_options(-Wall -Wextra -Wpedantic -Werror)
  
 -set(SOURCES_COMMON
 +set(DEPS_SOURCES
 +      "${DEPS_DIR}/dragontype/array.c"
 +      "${DEPS_DIR}/dragontype/bintree.c"
 +      "${DEPS_DIR}/dragontype/list.c"
 +      "${DEPS_DIR}/dragontype/number.c"
 +      "${DEPS_DIR}/dragontype/queue.c"
 +      "${DEPS_DIR}/dragonport/asprintf.c"
 +      "${DEPS_DIR}/perlin/perlin.c"
 +)
 +
 +set(COMMON_SOURCES
 +      ${DEPS_SOURCES}
        day.c
        environment.c
        map.c

diff --cc src/server/server_map.c
Simple merge

diff --cc src/util.c
Simple merge

diff --cc src/util.h
Simple merge