From 7d82e57b91dee30e0fe6fed36550ea7cc9eb778e Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Fri, 22 Jul 2022 16:31:13 +0200
Subject: network: Move global state into a seperate class

Co-Authored-By: Narr the Reg <5944268+german77@users.noreply.github.com>
---
 src/network/network.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/network/network.cpp')

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 51b5d6a9f..e1401a403 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -9,11 +9,12 @@
 
 namespace Network {
 
-static std::shared_ptr<RoomMember> g_room_member; ///< RoomMember (Client) for network games
-static std::shared_ptr<Room> g_room;              ///< Room (Server) for network games
-// TODO(B3N30): Put these globals into a networking class
+RoomNetwork::RoomNetwork() {
+    g_room = std::make_shared<Room>();
+    g_room_member = std::make_shared<RoomMember>();
+}
 
-bool Init() {
+bool RoomNetwork::Init() {
     if (enet_initialize() != 0) {
         LOG_ERROR(Network, "Error initalizing ENet");
         return false;
@@ -24,15 +25,15 @@ bool Init() {
     return true;
 }
 
-std::weak_ptr<Room> GetRoom() {
+std::weak_ptr<Room> RoomNetwork::GetRoom() {
     return g_room;
 }
 
-std::weak_ptr<RoomMember> GetRoomMember() {
+std::weak_ptr<RoomMember> RoomNetwork::GetRoomMember() {
     return g_room_member;
 }
 
-void Shutdown() {
+void RoomNetwork::Shutdown() {
     if (g_room_member) {
         if (g_room_member->IsConnected())
             g_room_member->Leave();
-- 
cgit v1.2.3