From 29e77b147c412954b0d36b5b1bcece6e9f50f1fa Mon Sep 17 00:00:00 2001
From: Anonymous275 <theanonymous275@gmail.com>
Date: Fri, 10 Apr 2020 21:42:04 +0300
Subject: [PATCH] Fixed

---
 CMakeLists.txt         |  4 +++-
 src/Network/Server.cpp |  2 +-
 src/Settings.hpp       | 13 +++++++++++++
 src/heartbeat.cpp      |  4 +---
 src/main.cpp           | 26 ++++++++++++++++++--------
 src/settings.h         | 23 -----------------------
 6 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 src/Settings.hpp
 delete mode 100644 src/settings.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e25bc5..6da822d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,5 +6,7 @@ include_directories(${PROJECT_SOURCE_DIR}/curl)
 
 set(CMAKE_CXX_STANDARD 14)
 
-add_executable(BeamMP-Server src/main.cpp src/http.cpp src/logger.cpp src/config.cpp src/Network/Server.cpp src/Network/enet.h src/Network/DataParser.cpp src/heartbeat.cpp src/Network/ClientHandler.cpp src/Network/functions.cpp src/settings.h)
+add_executable(BeamMP-Server src/main.cpp src/http.cpp src/logger.cpp src/config.cpp src/Network/Server.cpp
+        src/Network/enet.h src/Network/DataParser.cpp src/heartbeat.cpp
+        src/Network/ClientHandler.cpp src/Network/functions.cpp src/Settings.hpp)
 target_link_libraries(BeamMP-Server winmm ws2_32 libcurl_a)
\ No newline at end of file
diff --git a/src/Network/Server.cpp b/src/Network/Server.cpp
index 9e4509f..c173b58 100644
--- a/src/Network/Server.cpp
+++ b/src/Network/Server.cpp
@@ -12,7 +12,7 @@ void ParseData(ENetPacket*packet,ENetPeer*peer); //Data Parser
 void OnConnect(ENetPeer*peer);
 
 ENetPacket* packet;
-static int PlayerCount;
+int PlayerCount = 0;
 
 void host_server(ENetHost *server) {
     ENetEvent event;
diff --git a/src/Settings.hpp b/src/Settings.hpp
new file mode 100644
index 0000000..5495c8f
--- /dev/null
+++ b/src/Settings.hpp
@@ -0,0 +1,13 @@
+///
+/// Created by Anonymous275 on 4/10/2020
+///
+extern std::string MapName;
+extern std::string Private;
+extern int MaxPlayers;
+extern int UDPPort;
+extern int TCPPort;
+extern std::string ServerName;
+extern std::string Resource;
+extern std::string ServerVersion;
+extern std::string ClientVersion;
+extern int PlayerCount;
diff --git a/src/heartbeat.cpp b/src/heartbeat.cpp
index a0e41ed..06dc30d 100644
--- a/src/heartbeat.cpp
+++ b/src/heartbeat.cpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <chrono>
 #include "logger.h"
-#include "settings.h"
+#include "Settings.hpp"
 
 using namespace std;
 
@@ -20,8 +20,6 @@ void Heartbeat()
     std::cout << "UUID GEN : " << UUID << std::endl;
     while(true)
     {
-        //"name=daniel&project=curl"
-        //player maxplayers port map private version
         PostHTTP("https://beamng-mp.com/heartbeat","uuid="+UUID+"&players="+to_string(PlayerCount)+"&maxplayers="+to_string(MaxPlayers)+"&port="
         + to_string(UDPPort) + "&map=" + MapName + "&private="+Private+"&serverversion="+ServerVersion+"&clientversion="+ClientVersion+"&name="+ServerName);
 
diff --git a/src/main.cpp b/src/main.cpp
index 54c308c..cf9d050 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <fstream>
 #include "logger.h"
-#include "settings.h"
 #include <chrono>
 #include <thread>
 
@@ -19,6 +18,17 @@ bool Debug = false;
 void addToLog(basic_string<char> Data);
 void HeartbeatInit();
 
+string MapName = "levels/gridmap/level.json";
+string Private = "false";
+int MaxPlayers = 10;
+int UDPPort = 30814;
+int TCPPort = 0;
+string ServerName = "BeamMP Server";
+string Resource = "/Resources";
+string ServerVersion = "0.1";
+string ClientVersion = "0.21";
+
+
 //Entry
 int main() {
     LogInit();
@@ -42,12 +52,12 @@ void DebugData(){
 }
 
 void SetMainValues(bool D, int P,int MP,string Name,string serverName,string filename){
-    bool Debug = D;
-    int UDPPort = P;
-    string MapName = Name;
-    string ServerName = serverName;
-    int MaxPlayers = MP;
-    string Resource = filename;
+    Debug = D;
+    UDPPort = P;
+    MapName = Name;
+    ServerName = serverName;
+    MaxPlayers = MP;
+    Resource = filename;
 }
 
 void LogInit(){
@@ -61,4 +71,4 @@ void addToLog(basic_string<char> Data){
     LFS.open ("Server.log", std::ios_base::app);
     LFS << Data.c_str();
     LFS.close();
-}
\ No newline at end of file
+}
diff --git a/src/settings.h b/src/settings.h
deleted file mode 100644
index e122d41..0000000
--- a/src/settings.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Created by Mitch on 10/04/2020.
-//
-
-#ifndef BEAMMP_SERVER_SETTINGS_H
-#define BEAMMP_SERVER_SETTINGS_H
-
-// This is a declaration of your variable, which tells the linker this value
-// is found elsewhere.  Anyone who wishes to use it must include settings.h,
-// either directly or indirectly.
-static string MapName = "";
-static string Private = "false";
-static string UUID = "";
-static int PlayerCount = 0;
-static int MaxPlayers = 10;
-static int UDPPort = 0;
-static int TCPPort = 0;
-static string ServerName = "BeamMP Server";
-static string Resource = "/Resources";
-static string ServerVersion = "0.1";
-static string ClientVersion = "0.21";
-
-#endif //BEAMMP_SERVER_SETTINGS_H