GAMES: added new subdirectory

2021-01-28 17:44:39 +01:00 · 2021-01-28 17:44:39 +01:00 · e669f2cd42
parent b0e8860eca
commit e669f2cd42
88 changed files with 8 additions and 6 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -24,12 +24,7 @@ set(CMAKE_CXX_CPPCHECK "")
 endif()

 add_subdirectory(modules)
-if (CLIENT)
-	add_subdirectory(client)
-endif()
-if (SERVER)
-	add_subdirectory(server)
-endif()
+add_subdirectory(games)
 add_subdirectory(tools)
 if (VISUALTESTS)
 	add_subdirectory(tests)
--- a/src/games/CMakeLists.txt
+++ b/src/games/CMakeLists.txt
@ -0,0 +1 @@
+add_subdirectory(openworld)
--- a/src/games/openworld/CMakeLists.txt
+++ b/src/games/openworld/CMakeLists.txt
@ -0,0 +1,6 @@
+if (CLIENT)
+	add_subdirectory(client)
+endif()
+if (SERVER)
+	add_subdirectory(server)
+endif()
--- a/src/games/openworld/client/CMakeLists.txt
+++ b/src/games/openworld/client/CMakeLists.txt
--- a/src/games/openworld/client/Client.cpp
+++ b/src/games/openworld/client/Client.cpp
--- a/src/games/openworld/client/Client.h
+++ b/src/games/openworld/client/Client.h
--- a/src/games/openworld/client/ClientLUA.cpp
+++ b/src/games/openworld/client/ClientLUA.cpp
--- a/src/games/openworld/client/ClientLUA.h
+++ b/src/games/openworld/client/ClientLUA.h
--- a/src/games/openworld/client/lua/ui/client.lua
+++ b/src/games/openworld/client/lua/ui/client.lua
--- a/src/games/openworld/client/lua/ui/shared.lua
+++ b/src/games/openworld/client/lua/ui/shared.lua
--- a/src/games/openworld/client/lua/ui/style.lua
+++ b/src/games/openworld/client/lua/ui/style.lua
--- a/src/games/openworld/client/lua/ui/window/auth_failed.lua
+++ b/src/games/openworld/client/lua/ui/window/auth_failed.lua
--- a/src/games/openworld/client/lua/ui/window/disconnect.lua
+++ b/src/games/openworld/client/lua/ui/window/disconnect.lua
--- a/src/games/openworld/client/lua/ui/window/hud.lua
+++ b/src/games/openworld/client/lua/ui/window/hud.lua
--- a/src/games/openworld/client/lua/ui/window/main.lua
+++ b/src/games/openworld/client/lua/ui/window/main.lua
--- a/src/games/openworld/client/lua/ui/window/options.lua
+++ b/src/games/openworld/client/lua/ui/window/options.lua
--- a/src/games/openworld/client/lua/ui/window/popup.lua
+++ b/src/games/openworld/client/lua/ui/window/popup.lua
--- a/src/games/openworld/client/lua/ui/window/style.lua
+++ b/src/games/openworld/client/lua/ui/window/style.lua
--- a/src/games/openworld/client/lua/ui/window/validation_failed.lua
+++ b/src/games/openworld/client/lua/ui/window/validation_failed.lua
--- a/src/games/openworld/client/modules/CMakeLists.txt
+++ b/src/games/openworld/client/modules/CMakeLists.txt
--- a/src/games/openworld/client/modules/cooldown/CMakeLists.txt
+++ b/src/games/openworld/client/modules/cooldown/CMakeLists.txt
--- a/src/games/openworld/client/modules/cooldown/CooldownHandler.cpp
+++ b/src/games/openworld/client/modules/cooldown/CooldownHandler.cpp
--- a/src/games/openworld/client/modules/cooldown/CooldownHandler.h
+++ b/src/games/openworld/client/modules/cooldown/CooldownHandler.h
--- a/src/games/openworld/client/modules/network/AttribUpdateHandler.h
+++ b/src/games/openworld/client/modules/network/AttribUpdateHandler.h
--- a/src/games/openworld/client/modules/network/AuthFailedHandler.h
+++ b/src/games/openworld/client/modules/network/AuthFailedHandler.h
--- a/src/games/openworld/client/modules/network/CMakeLists.txt
+++ b/src/games/openworld/client/modules/network/CMakeLists.txt
--- a/src/games/openworld/client/modules/network/ClientMessageSender.cpp
+++ b/src/games/openworld/client/modules/network/ClientMessageSender.cpp
--- a/src/games/openworld/client/modules/network/ClientMessageSender.h
+++ b/src/games/openworld/client/modules/network/ClientMessageSender.h
--- a/src/games/openworld/client/modules/network/ClientNetwork.cpp
+++ b/src/games/openworld/client/modules/network/ClientNetwork.cpp
--- a/src/games/openworld/client/modules/network/ClientNetwork.h
+++ b/src/games/openworld/client/modules/network/ClientNetwork.h
--- a/src/games/openworld/client/modules/network/EntityRemoveHandler.h
+++ b/src/games/openworld/client/modules/network/EntityRemoveHandler.h
--- a/src/games/openworld/client/modules/network/EntitySpawnHandler.h
+++ b/src/games/openworld/client/modules/network/EntitySpawnHandler.h
--- a/src/games/openworld/client/modules/network/EntityUpdateHandler.h
+++ b/src/games/openworld/client/modules/network/EntityUpdateHandler.h
--- a/src/games/openworld/client/modules/network/IClientProtocolHandler.h
+++ b/src/games/openworld/client/modules/network/IClientProtocolHandler.h
--- a/src/games/openworld/client/modules/network/SignupValidationStateHandler.h
+++ b/src/games/openworld/client/modules/network/SignupValidationStateHandler.h
--- a/src/games/openworld/client/modules/network/StartCooldownHandler.h
+++ b/src/games/openworld/client/modules/network/StartCooldownHandler.h
--- a/src/games/openworld/client/modules/network/StopCooldownHandler.h
+++ b/src/games/openworld/client/modules/network/StopCooldownHandler.h
--- a/src/games/openworld/client/modules/network/UserInfoHandler.h
+++ b/src/games/openworld/client/modules/network/UserInfoHandler.h
--- a/src/games/openworld/client/modules/network/UserSpawnHandler.h
+++ b/src/games/openworld/client/modules/network/UserSpawnHandler.h
--- a/src/games/openworld/client/modules/network/VarUpdateHandler.h
+++ b/src/games/openworld/client/modules/network/VarUpdateHandler.h
--- a/src/games/openworld/client/modules/network/tests/ConnectTest.cpp
+++ b/src/games/openworld/client/modules/network/tests/ConnectTest.cpp
--- a/src/games/openworld/client/modules/voxel/CMakeLists.txt
+++ b/src/games/openworld/client/modules/voxel/CMakeLists.txt
--- a/src/games/openworld/client/modules/voxel/ClientPager.cpp
+++ b/src/games/openworld/client/modules/voxel/ClientPager.cpp
--- a/src/games/openworld/client/modules/voxel/ClientPager.h
+++ b/src/games/openworld/client/modules/voxel/ClientPager.h
--- a/src/games/openworld/server/CMakeLists.txt
+++ b/src/games/openworld/server/CMakeLists.txt
--- a/src/games/openworld/server/Dockerfile.in
+++ b/src/games/openworld/server/Dockerfile.in
--- a/src/games/openworld/server/Server.cpp
+++ b/src/games/openworld/server/Server.cpp
--- a/src/games/openworld/server/Server.h
+++ b/src/games/openworld/server/Server.h
--- a/src/games/openworld/server/deployment/postgres-config.yaml.in
+++ b/src/games/openworld/server/deployment/postgres-config.yaml.in
--- a/src/games/openworld/server/deployment/postgres-deployment.yaml.in
+++ b/src/games/openworld/server/deployment/postgres-deployment.yaml.in
--- a/src/games/openworld/server/deployment/postgres-secrets.yaml.in
+++ b/src/games/openworld/server/deployment/postgres-secrets.yaml.in
--- a/src/games/openworld/server/deployment/postgres-service.yaml.in
+++ b/src/games/openworld/server/deployment/postgres-service.yaml.in
--- a/src/games/openworld/server/deployment/postgres-storage.yaml.in
+++ b/src/games/openworld/server/deployment/postgres-storage.yaml.in
--- a/src/games/openworld/server/deployment/server-deployment.yaml.in
+++ b/src/games/openworld/server/deployment/server-deployment.yaml.in
--- a/src/games/openworld/server/deployment/server-ingress.yaml.in
+++ b/src/games/openworld/server/deployment/server-ingress.yaml.in
--- a/src/games/openworld/server/deployment/server-service.yaml.in
+++ b/src/games/openworld/server/deployment/server-service.yaml.in
--- a/src/games/openworld/server/docker-compose.yml.in
+++ b/src/games/openworld/server/docker-compose.yml.in
--- a/src/games/openworld/server/lua/ai/README.md
+++ b/src/games/openworld/server/lua/ai/README.md
--- a/src/games/openworld/server/lua/ai/animal-rabbit.lua
+++ b/src/games/openworld/server/lua/ai/animal-rabbit.lua
--- a/src/games/openworld/server/lua/ai/animal-wolf.lua
+++ b/src/games/openworld/server/lua/ai/animal-wolf.lua
--- a/src/games/openworld/server/lua/ai/dwarf-male-blacksmith.lua
+++ b/src/games/openworld/server/lua/ai/dwarf-male-blacksmith.lua
--- a/src/games/openworld/server/lua/ai/human-female-worker.lua
+++ b/src/games/openworld/server/lua/ai/human-female-worker.lua
--- a/src/games/openworld/server/lua/ai/human-male-blacksmith.lua
+++ b/src/games/openworld/server/lua/ai/human-male-blacksmith.lua
--- a/src/games/openworld/server/lua/ai/human-male-knight.lua
+++ b/src/games/openworld/server/lua/ai/human-male-knight.lua
--- a/src/games/openworld/server/lua/ai/human-male-shepherd.lua
+++ b/src/games/openworld/server/lua/ai/human-male-shepherd.lua
--- a/src/games/openworld/server/lua/ai/human-male-worker.lua
+++ b/src/games/openworld/server/lua/ai/human-male-worker.lua
--- a/src/games/openworld/server/lua/ai/shared.lua
+++ b/src/games/openworld/server/lua/ai/shared.lua
--- a/src/games/openworld/server/lua/ai/undead-male-skeleton.lua
+++ b/src/games/openworld/server/lua/ai/undead-male-skeleton.lua
--- a/src/games/openworld/server/lua/ai/undead-male-zombie.lua
+++ b/src/games/openworld/server/lua/ai/undead-male-zombie.lua
--- a/src/games/openworld/server/lua/attrib/animal-rabbit.lua
+++ b/src/games/openworld/server/lua/attrib/animal-rabbit.lua
--- a/src/games/openworld/server/lua/attrib/animal-wolf.lua
+++ b/src/games/openworld/server/lua/attrib/animal-wolf.lua
--- a/src/games/openworld/server/lua/attrib/dwarf-male-blacksmith.lua
+++ b/src/games/openworld/server/lua/attrib/dwarf-male-blacksmith.lua
--- a/src/games/openworld/server/lua/attrib/human-female-worker.lua
+++ b/src/games/openworld/server/lua/attrib/human-female-worker.lua
--- a/src/games/openworld/server/lua/attrib/human-male-blacksmith.lua
+++ b/src/games/openworld/server/lua/attrib/human-male-blacksmith.lua
--- a/src/games/openworld/server/lua/attrib/human-male-knight.lua
+++ b/src/games/openworld/server/lua/attrib/human-male-knight.lua
--- a/src/games/openworld/server/lua/attrib/human-male-shepherd.lua
+++ b/src/games/openworld/server/lua/attrib/human-male-shepherd.lua
--- a/src/games/openworld/server/lua/attrib/human-male-worker.lua
+++ b/src/games/openworld/server/lua/attrib/human-male-worker.lua
--- a/src/games/openworld/server/lua/attrib/shared.lua
+++ b/src/games/openworld/server/lua/attrib/shared.lua
--- a/src/games/openworld/server/lua/attrib/undead-male-skeleton.lua
+++ b/src/games/openworld/server/lua/attrib/undead-male-skeleton.lua
--- a/src/games/openworld/server/lua/attrib/undead-male-zombie.lua
+++ b/src/games/openworld/server/lua/attrib/undead-male-zombie.lua
--- a/src/games/openworld/server/lua/attributes.lua
+++ b/src/games/openworld/server/lua/attributes.lua
--- a/src/games/openworld/server/lua/behaviourtreenodes.lua
+++ b/src/games/openworld/server/lua/behaviourtreenodes.lua
--- a/src/games/openworld/server/lua/behaviourtrees.lua
+++ b/src/games/openworld/server/lua/behaviourtrees.lua
--- a/src/games/openworld/server/lua/event/generic.lua
+++ b/src/games/openworld/server/lua/event/generic.lua
--- a/src/games/openworld/server/lua/events.lua
+++ b/src/games/openworld/server/lua/events.lua
--- a/src/games/openworld/server/lua/map/map001.lua
+++ b/src/games/openworld/server/lua/map/map001.lua
--- a/src/games/openworld/server/lua/shared/entities.lua
+++ b/src/games/openworld/server/lua/shared/entities.lua
--- a/src/games/openworld/server/telegraf.conf
+++ b/src/games/openworld/server/telegraf.conf