1 files changed, 21 insertions, 20 deletions

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 6652a186bb..0314b51d2c 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "enet/enet.h"
@@ -8,40 +11,38 @@
 
 namespace Network {
 
-RoomNetwork::RoomNetwork() {
-    m_room = std::make_shared<Room>();
-    m_room_member = std::make_shared<RoomMember>();
-}
+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
 
-bool RoomNetwork::Init() {
+bool Init() {
     if (enet_initialize() != 0) {
         LOG_ERROR(Network, "Error initializing ENet");
         return false;
     }
-    m_room = std::make_shared<Room>();
-    m_room_member = std::make_shared<RoomMember>();
+    g_room = std::make_shared<Room>();
+    g_room_member = std::make_shared<RoomMember>();
     LOG_DEBUG(Network, "initialized OK");
     return true;
 }
 
-std::weak_ptr<Room> RoomNetwork::GetRoom() {
-    return m_room;
+std::weak_ptr<Room> GetRoom() {
+    return g_room;
 }
 
-std::weak_ptr<RoomMember> RoomNetwork::GetRoomMember() {
-    return m_room_member;
+std::weak_ptr<RoomMember> GetRoomMember() {
+    return g_room_member;
 }
 
-void RoomNetwork::Shutdown() {
-    if (m_room_member) {
-        if (m_room_member->IsConnected())
-            m_room_member->Leave();
-        m_room_member.reset();
+void Shutdown() {
+    if (g_room_member) {
+        if (g_room_member->IsConnected())
+            g_room_member->Leave();
+        g_room_member.reset();
     }
-    if (m_room) {
-        if (m_room->GetState() == Room::State::Open)
-            m_room->Destroy();
-        m_room.reset();
+    if (g_room) {
+        if (g_room->GetState() == Room::State::Open)
+            g_room->Destroy();
+        g_room.reset();
     }
     enet_deinitialize();
     LOG_DEBUG(Network, "shutdown OK");