Project restructuring [PART.2]

CMakeLists.txt

@@ -28,7 +28,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 set(AC_PATH_ROOT "${CMAKE_SOURCE_DIR}")
 
 # set macro-directory
-set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/modules/acore/cmake/macros")
+set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/modules/worldengine/nucleus/src/cmake/macros")
 
 include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
@@ -87,6 +87,26 @@ include(src/cmake/genrev.cmake)
 # print out the results before continuing
 include(src/cmake/showoptions.cmake)
 
+
+#
+# Loading framework
+#
+
+add_subdirectory(modules/worldengine/deps)
+
+if( SERVERS OR TOOLS)
+  add_subdirectory(modules/worldengine/nucleus)
+  add_subdirectory(modules/worldengine/lib-collision)
+endif()
+
+if( TOOLS )
+  add_subdirectory(modules/acore/extractors)
+endif()
+
+#
+# Loading dyn modules
+#
+
 # add modules and dependencies
 CU_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
 FOREACH(subdir ${sub_DIRS})
@@ -97,6 +117,10 @@ FOREACH(subdir ${sub_DIRS})
     endif()
 ENDFOREACH()
 
+#
+# Loading application sources
+#
+
 CU_RUN_HOOK("BEFORE_SRC_LOAD")
 
 # add core sources

modules/acore/CMakeLists.txt

@@ -1,17 +0,0 @@
-CU_RUN_HOOK("BEFORE_ACORE_LOAD")
-
-add_subdirectory(deps)
-
-if( SERVERS )
-  add_subdirectory(framework)
-  add_subdirectory(world-engine/collision)
-else()
-  if( TOOLS )
-    add_subdirectory(extractors)
-    add_subdirectory(world-engine/collision)
-    add_subdirectory(framework)
-  endif()
-endif()
-
-CU_RUN_HOOK("AFTER_ACORE_LOAD")
-

modules/acore/extractors/map_extractor/CMakeLists.txt

@@ -12,8 +12,8 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/acore/framework
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
 )
@@ -21,7 +21,7 @@ set(include_Dirs
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
   )
 endif()
 

modules/acore/extractors/mesh_extractor/CMakeLists.txt

@@ -13,11 +13,11 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
 
 set(include_Base
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
   ${ACE_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -25,7 +25,7 @@ set(include_Base
 if( WIN32 )
   set(include_Base
     ${include_Base}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
     )
 endif()
 

modules/acore/extractors/mmaps_generator/CMakeLists.txt

@@ -15,29 +15,29 @@ set(mmap_gen_Includes
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
   ${CMAKE_SOURCE_DIR}/src/game
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements
@@ -111,7 +111,7 @@ set(mmap_gen_Includes
 if( WIN32 )
   set(mmap_gen_Includes
     ${mmap_gen_Includes}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
     )
 endif()
 

modules/acore/extractors/vmap4_assembler/CMakeLists.txt

@@ -10,12 +10,12 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
   ${ACE_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
 )

modules/acore/extractors/vmap4_extractor/CMakeLists.txt

@@ -12,13 +12,13 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
 )
 
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
   )
 endif()
 

modules/worldengine/deps/acelite/ace/CMakeLists.txt

@@ -328,9 +328,9 @@ if (USE_COREPCH)
 endif()
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/acelite
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
 )
 
 # Needed for PCH support

modules/worldengine/deps/bzip2/CMakeLists.txt

@@ -15,7 +15,7 @@ set(bzip2_STAT_SRCS
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 

modules/worldengine/deps/g3dlite/CMakeLists.txt

@@ -57,7 +57,7 @@ set(g3dlib_STAT_SRCS
 if(WIN32)
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   )
 else()
   include_directories(

modules/worldengine/deps/g3dlite/include/G3D/Intersect.h

@@ -30,7 +30,7 @@ public:
 	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
 
       \cite "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan M<>ller and Marcus Magnor
+      by Martin Eisemann, Thorsten Grosch, Stefan M<>ller and Marcus Magnor
       Computer Graphics Lab, TU Braunschweig, Germany and
       University of Koblenz-Landau, Germany
     */
@@ -43,7 +43,7 @@ public:
      \a time is not set if there is no intersection.
           
      \cite Slope-Mul method from "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan M<>ller and Marcus Magnor
+      by Martin Eisemann, Thorsten Grosch, Stefan M<>ller and Marcus Magnor
       Computer Graphics Lab, TU Braunschweig, Germany and
       University of Koblenz-Landau, Germany
       */

modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h

@@ -312,7 +312,7 @@ public:
     // "You might be tempted to write [...] them as inline functions 
     // inside their respective header files, but this is something you 
     // must definitely not do. An inline function can be duplicated 
-    // in every file in which it appears <20><><EFBFBD><EFBFBD> and this duplication 
+    // in every file in which it appears <20><><EFBFBD><EFBFBD> and this duplication 
     // includes the static object definition. Because inline functions 
     // automatically default to internal linkage, this would result in 
     // having multiple static objects across the various translation 

modules/worldengine/deps/g3dlite/include/G3D/Ray.h

@@ -36,7 +36,7 @@ private:
 
 	// The following are for the "ray slope" optimization from
 	//  "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-	//  by Martin Eisemann, Thorsten Grosch, Stefan M<>ller and Marcus Magnor
+	//  by Martin Eisemann, Thorsten Grosch, Stefan M<>ller and Marcus Magnor
 	//  Computer Graphics Lab, TU Braunschweig, Germany and
 	//  University of Koblenz-Landau, Germany*/
 	enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO};	Classification classification;

modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp

@@ -2267,7 +2267,7 @@ bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// AABB-triangle overlap test code based on Tomas Akenine-M<><4D>ller's
+// AABB-triangle overlap test code based on Tomas Akenine-M<><4D>ller's
 // http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/tribox3.txt
 // Ported 2008-12-28
 

modules/worldengine/deps/g3dlite/source/license.cpp

@@ -24,7 +24,7 @@ std::string license() {
 "%s"
 "This program uses the G3D Library (http://g3d.sf.net), which\n"
 "is licensed under the \"Modified BSD\" Open Source license.  The G3D library\n"
-"source code is Copyright <20> 2000-2010, Morgan McGuire, All rights reserved.\n"
+"source code is Copyright <20> 2000-2010, Morgan McGuire, All rights reserved.\n"
 "This program uses The OpenGL Extension Wrangler Library, which \n"
 "is licensed under the \"Modified BSD\" Open Source license.  \n"
 "The OpenGL Extension Wrangler Library source code is\n"

modules/worldengine/deps/jemalloc/CMakeLists.txt

@@ -19,7 +19,7 @@ endif()
 
 # Create the header, so we can use it
 configure_file(
-  "${CMAKE_SOURCE_DIR}/modules/acore/deps/jemalloc/jemalloc_defs.h.in.cmake"
+  "${CMAKE_SOURCE_DIR}/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake"
   "${BUILDDIR}/jemalloc_defs.h"
   @ONLY
 )

modules/worldengine/deps/libmpq/CMakeLists.txt

@@ -17,15 +17,15 @@ set(mpq_STAT_SRCS
 if( UNIX )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
   )
 elseif( WIN32 )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/win
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
   )
 endif()
 

modules/worldengine/deps/mysqllite/CMakeLists.txt

@@ -54,7 +54,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
   ${CMAKE_CURRENT_SOURCE_DIR}/dbug

modules/worldengine/deps/mysqllite/strings/ctype-czech.c

@@ -21,13 +21,13 @@
 	solution was needed than the one-to-one conversion table. To
 	note a few, here is an example of a Czech sorting sequence:
 
-		co < hlaska < hl<68>ska < hlava < chlapec < krtek
+		co < hlaska < hl<68>ska < hlava < chlapec < krtek
 
 	It because some of the rules are: double char 'ch' is sorted
-	between 'h' and 'i'. Accented character '<27>' (a with acute) is
+	between 'h' and 'i'. Accented character '<27>' (a with acute) is
 	sorted after 'a' and before 'b', but only if the word is
 	otherwise the same. However, because 's' is sorted before 'v'
-	in hlava, the accentness of '<27>' is overridden. There are many
+	in hlava, the accentness of '<27>' is overridden. There are many
 	more rules.
 
 	This file defines functions my_strxfrm and my_strcoll for
@@ -138,30 +138,30 @@ static struct wordvalue doubles[] = {
 
 	We append 0 to the end.
 ---
-	Neform<72>ln<6C> popis algoritmu:
+	Neform<72>ln<6C> popis algoritmu:
 
-	Proch<63>z<EFBFBD>me <20>et<65>zec zleva doprava.
+	Proch<63>z<EFBFBD>me <20>et<65>zec zleva doprava.
 
-	Konec <20>et<65>zce je p<>ed<65>n bu<62> jako parametr, nebo je to *p == 0.
-	Toto je o<>et<65>eno makrem IS_END.
+	Konec <20>et<65>zce je p<>ed<65>n bu<62> jako parametr, nebo je to *p == 0.
+	Toto je o<>et<65>eno makrem IS_END.
 
-	Pokud jsme do<64>li na konec <20>et<65>zce p<>i pr<70>chodu 0, nejdeme na
-	za<7A><61>tek, ale na ulo<6C>enou pozici, proto<74>e prvn<76> a druh<75> pr<70>chod
-	b<><62><EFBFBD> sou<6F>asn<73>.
+	Pokud jsme do<64>li na konec <20>et<65>zce p<>i pr<70>chodu 0, nejdeme na
+	za<7A><61>tek, ale na ulo<6C>enou pozici, proto<74>e prvn<76> a druh<75> pr<70>chod
+	b<><62><EFBFBD> sou<6F>asn<73>.
 
-	Konec vstupu (pr<70>chodu) ozna<6E><61>me na v<>stupu hodnotou 1.
+	Konec vstupu (pr<70>chodu) ozna<6E><61>me na v<>stupu hodnotou 1.
 
-	Pro ka<6B>d<EFBFBD> znak <20>et<65>zce na<6E>teme hodnotu z t<><74>d<EFBFBD>c<EFBFBD> tabulky.
+	Pro ka<6B>d<EFBFBD> znak <20>et<65>zce na<6E>teme hodnotu z t<><74>d<EFBFBD>c<EFBFBD> tabulky.
 
-	Jde-li o hodnotu ignorovat (0), sko<6B><6F>me ihned na dal<61><6C> znak..
+	Jde-li o hodnotu ignorovat (0), sko<6B><6F>me ihned na dal<61><6C> znak..
 
-	Jde-li o hodnotu konec slova (2) a je to pr<70>chod 0 nebo 1,
-	p<>esko<6B><6F>me v<>echny dal<61><6C> 0 -- 2 a prohod<6F>me pr<70>chody.
+	Jde-li o hodnotu konec slova (2) a je to pr<70>chod 0 nebo 1,
+	p<>esko<6B><6F>me v<>echny dal<61><6C> 0 -- 2 a prohod<6F>me pr<70>chody.
 
-	Jde-li o kompozitn<74> znak (255), otestujeme, zda n<>sleduje
-	spr<70>vn<76> do dvojice, dohled<65>me spr<70>vnou hodnotu.
+	Jde-li o kompozitn<74> znak (255), otestujeme, zda n<>sleduje
+	spr<70>vn<76> do dvojice, dohled<65>me spr<70>vnou hodnotu.
 
-	Na konci p<>ipoj<6F>me znak 0
+	Na konci p<>ipoj<6F>me znak 0
  */
 
 #define ADD_TO_RESULT(dest, len, totlen, value)			\
@@ -315,24 +315,24 @@ static size_t my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
 
 
 /*
-	Neform<72>ln<6C> popis algoritmu:
+	Neform<72>ln<6C> popis algoritmu:
 
-	proch<63>z<EFBFBD>me <20>et<65>zec zleva doprava
-	konec <20>et<65>zce pozn<7A>me podle *p == 0
-	pokud jsme do<64>li na konec <20>et<65>zce p<>i pr<70>chodu 0, nejdeme na
-		za<7A><61>tek, ale na ulo<6C>enou pozici, proto<74>e prvn<76> a druh<75>
-		pr<70>chod b<><62><EFBFBD> sou<6F>asn<73>
-	konec vstupu (pr<70>chodu) ozna<6E><61>me na v<>stupu hodnotou 1
+	proch<63>z<EFBFBD>me <20>et<65>zec zleva doprava
+	konec <20>et<65>zce pozn<7A>me podle *p == 0
+	pokud jsme do<64>li na konec <20>et<65>zce p<>i pr<70>chodu 0, nejdeme na
+		za<7A><61>tek, ale na ulo<6C>enou pozici, proto<74>e prvn<76> a druh<75>
+		pr<70>chod b<><62><EFBFBD> sou<6F>asn<73>
+	konec vstupu (pr<70>chodu) ozna<6E><61>me na v<>stupu hodnotou 1
 
-	na<6E>teme hodnotu z t<><74>d<EFBFBD>c<EFBFBD> tabulky
-	jde-li o hodnotu ignorovat (0), sko<6B><6F>me na dal<61><6C> pr<70>chod
-	jde-li o hodnotu konec slova (2) a je to pr<70>chod 0 nebo 1,
-		p<>esko<6B><6F>me v<>echny dal<61><6C> 0 -- 2 a prohod<6F>me
-		pr<70>chody
-	jde-li o kompozitn<74> znak (255), otestujeme, zda n<>sleduje
-		spr<70>vn<76> do dvojice, dohled<65>me spr<70>vnou hodnotu
+	na<6E>teme hodnotu z t<><74>d<EFBFBD>c<EFBFBD> tabulky
+	jde-li o hodnotu ignorovat (0), sko<6B><6F>me na dal<61><6C> pr<70>chod
+	jde-li o hodnotu konec slova (2) a je to pr<70>chod 0 nebo 1,
+		p<>esko<6B><6F>me v<>echny dal<61><6C> 0 -- 2 a prohod<6F>me
+		pr<70>chody
+	jde-li o kompozitn<74> znak (255), otestujeme, zda n<>sleduje
+		spr<70>vn<76> do dvojice, dohled<65>me spr<70>vnou hodnotu
 
-	na konci p<>ipoj<6F>me znak 0
+	na konci p<>ipoj<6F>me znak 0
  */
 
 

modules/worldengine/deps/mysqllite/strings/ctype-latin1.c

@@ -456,19 +456,19 @@ CHARSET_INFO my_charset_latin1=
  *
  * The modern sort order is used, where:
  *
- * '<27>'  ->  "ae"
- * '<27>'  ->  "oe"
- * '<27>'  ->  "ue"
- * '<27>'  ->  "ss"
+ * '<27>'  ->  "ae"
+ * '<27>'  ->  "oe"
+ * '<27>'  ->  "ue"
+ * '<27>'  ->  "ss"
  */
 
 
 /*
  * This is a simple latin1 mapping table, which maps all accented
  * characters to their non-accented equivalents.  Note: in this
- * table, '<27>' is mapped to 'A', '<27>' is mapped to 'Y', etc. - all
+ * table, '<27>' is mapped to 'A', '<27>' is mapped to 'Y', etc. - all
  * accented characters except the following are treated the same way.
- * <20>, <20>, <20>, <20>, <20>, <20>
+ * <20>, <20>, <20>, <20>, <20>, <20>
  */
 
 static uchar sort_order_latin1_de[] = {
@@ -534,7 +534,7 @@ uchar combo2map[]={
   my_strnxfrm_latin_de() on both strings and compared the result strings.
 
   This means that:
-  <20> must also matches <20>E and A<>, because my_strxn_frm_latin_de() will convert
+  <20> must also matches <20>E and A<>, because my_strxn_frm_latin_de() will convert
   both to AE.
 
   The other option would be to not do any accent removal in
@@ -681,7 +681,7 @@ void my_hash_sort_latin1_de(CHARSET_INFO *cs __attribute__((unused)),
   const uchar *end;
   /*
     Remove end space. We have to do this to be able to compare
-    'AE' and '<27>' as identical
+    'AE' and '<27>' as identical
   */
   end= skip_trailing_space(key, len);
 

modules/worldengine/deps/mysqllite/strings/decimal.c

@@ -30,7 +30,7 @@
   integer that determines the number of significant digits in a
   particular radix R, where R is either 2 or 10. S is a non-negative
   integer. Every value of an exact numeric type of scale S is of the
-  form n*10^{-S}, where n is an integer such that <20>-R^P <= n <= R^P.
+  form n*10^{-S}, where n is an integer such that <20>-R^P <= n <= R^P.
 
   [...]
 

modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt

@@ -19,7 +19,7 @@ set(Detour_STAT_SRCS
 
 if(WIN32)
   include_directories(
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   )
 endif()
 

modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt

@@ -22,7 +22,7 @@ set(Recast_STAT_SRCS
 
 if(WIN32)
   include_directories(
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   )
 endif()
 

modules/worldengine/lib-collision/CMakeLists.txt

@@ -32,20 +32,20 @@ set(collision_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
   ${CMAKE_SOURCE_DIR}/src/game/Addons
   ${CMAKE_SOURCE_DIR}/src/game/Conditions
   ${CMAKE_SOURCE_DIR}/src/game/Entities/Item

modules/worldengine/nucleus/cmake/macros/CheckPlatform.cmake

@@ -1,18 +0,0 @@
-# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P
-if(CMAKE_SIZEOF_VOID_P MATCHES 8)
-    set(PLATFORM 64)
-    MESSAGE(STATUS "Detected 64-bit platform")
-else()
-    set(PLATFORM 32)
-    MESSAGE(STATUS "Detected 32-bit platform")
-endif()
-
-include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/settings.cmake")
-
-if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/win/settings.cmake")
-elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/unix/settings.cmake")
-endif()
-
-include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/after_platform.cmake")

modules/worldengine/nucleus/src/CMakeLists.txt

@@ -56,10 +56,10 @@ set(shared_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/sockets/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/utf8cpp
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/utf8cpp
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Configuration