BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-03 08:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

reformat all

Browse Source
This commit is contained in:
Lion Kortlepel 2020-12-23 23:30:33 +01:00
parent f0ad3732f4
commit 0f4c08c068
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/Client.hpp
View File

@ -14,13 +14,13 @@
#define SOCKET int #define SOCKET int
#endif #endif
#include "CustomAssert.h" #include "CustomAssert.h"
#include <string> #include <algorithm>
#include <vector>
#include <chrono> #include <chrono>
#include <set> #include <set>
#include <algorithm> #include <string>
#include <vector>
struct VData{ struct VData {
int ID = -1; int ID = -1;
std::string Data; std::string Data;
}; };
@ -29,15 +29,16 @@ class Client {
private: private:
std::set<std::unique_ptr<VData>> VehicleData; //ID and Data; std::set<std::unique_ptr<VData>> VehicleData; //ID and Data;
std::string Name = "Unknown Client"; std::string Name = "Unknown Client";
SOCKET SOCK[2]{SOCKET(-1)}; SOCKET SOCK[2] { SOCKET(-1) };
sockaddr_in UDPADDR; sockaddr_in UDPADDR;
std::string Role; std::string Role;
std::string DID; std::string DID;
int Status = 0; int Status = 0;
int ID = -1; int ID = -1;
public: public:
void AddNewCar(int ident,const std::string& Data); void AddNewCar(int ident, const std::string& Data);
void SetCarData(int ident,const std::string&Data); void SetCarData(int ident, const std::string& Data);
std::set<std::unique_ptr<VData>>& GetAllCars(); std::set<std::unique_ptr<VData>>& GetAllCars();
void SetName(const std::string& name); void SetName(const std::string& name);
void SetRoles(const std::string& role); void SetRoles(const std::string& role);
@ -62,9 +63,9 @@ public:
int GetStatus(); int GetStatus();
int GetID(); int GetID();
}; };
struct ClientInterface{ struct ClientInterface {
std::set<std::unique_ptr<Client>> Clients; std::set<std::unique_ptr<Client>> Clients;
void RemoveClient(Client*& c){ void RemoveClient(Client*& c) {
Assert(c); Assert(c);
c->ClearCars(); c->ClearCars();
auto Iter = std::find_if(Clients.begin(), Clients.end(), [&](auto& ptr) { auto Iter = std::find_if(Clients.begin(), Clients.end(), [&](auto& ptr) {
@ -77,11 +78,11 @@ struct ClientInterface{
Clients.erase(Iter); Clients.erase(Iter);
c = nullptr; c = nullptr;
} }
void AddClient(Client*&& c){ void AddClient(Client*&& c) {
Assert(c); Assert(c);
Clients.insert(std::move(std::unique_ptr<Client>(c))); Clients.insert(std::move(std::unique_ptr<Client>(c)));
} }
int Size(){ int Size() {
return int(Clients.size()); return int(Clients.size());
} }
}; };

2
include/Json.h
View File

@ -6,7 +6,7 @@
/// Created by Anonymous275 on 11/27/2020 /// Created by Anonymous275 on 11/27/2020
/// ///
#pragma once #pragma once
#include "rapidjson/stringbuffer.h"
#include "rapidjson/document.h" #include "rapidjson/document.h"
#include "rapidjson/stringbuffer.h"
#include "rapidjson/writer.h" #include "rapidjson/writer.h"
namespace json = rapidjson; namespace json = rapidjson;

2
include/Network.h
View File

@ -20,6 +20,6 @@ void UDPSend(Client* c, std::string Data);
void SendLarge(Client* c, std::string Data); void SendLarge(Client* c, std::string Data);
bool TCPSend(Client* c, const std::string& Data); bool TCPSend(Client* c, const std::string& Data);
void GParser(Client* c, const std::string& Packet); void GParser(Client* c, const std::string& Packet);
std::string StaticReason(bool Set,const std::string& R); std::string StaticReason(bool Set, const std::string& R);
void Respond(Client* c, const std::string& MSG, bool Rel); void Respond(Client* c, const std::string& MSG, bool Rel);
void SendToAll(Client* c, const std::string& Data, bool Self, bool Rel); void SendToAll(Client* c, const std::string& Data, bool Self, bool Rel);