Fixes.

Author: Jonathan-R0

CMakeLists.txt

@@ -155,8 +155,6 @@ find_package(PkgConfig)
 pkg_check_modules(YAMLCPP REQUIRED yaml-cpp>=0.5)
 include_directories(${YAMLCPP_INCLUDE_DIRS})
 
-add_executable(WolfensteinTest ${SOURCE_FILES_SERVER} test/test.cpp)
 add_executable(ServerMain ${SOURCE_FILES_SERVER} serverMain.cpp)
 
-target_link_libraries(WolfensteinTest ${YAMLCPP_LIBRARIES})
 target_link_libraries(ServerMain ${YAMLCPP_LIBRARIES})

client/src/Lua/LuaClient.cpp

@@ -64,7 +64,7 @@ int Client::run(std::string& host, std::string& port, uint32_t lobbyID, std::str
     return ERROR;
   }
 
-  std::string mapFile = "../../common/src/YAML/map";
+  std::string mapFile = "../../common/src/YAML/Maps/map";
   mapFile = mapFile + std::to_string(mapID) + ".yaml";
 
   if(!fileExists(mapFile)){

client/src/Lua/lua_main.cpp

@@ -1,11 +1,12 @@
 #include "LuaClient.h"
+#include <cstdlib>
 #include <string>
 
 #define INVALID_ARGS_ERR "Error, no hostname and/or port given."
 
 int main(int argc, char* argv[]){
 
-  if (argc != 4) {
+  if (argc != 5) {
     LOG(INVALID_ARGS_ERR);
   }
 
@@ -14,6 +15,7 @@ int main(int argc, char* argv[]){
   std::string host = argv[1];
   std::string port = argv[2];
   std::string scriptName = argv[3];
+  int matchID = atoi(argv[4]);
 
-  return client.run(host, port, 1, scriptName);
+  return client.run(host, port, matchID, scriptName);
 }