summaryrefslogtreecommitdiff
path: root/src/network/network.cpp
diff options
context:
space:
mode:
authorGravatar FearlessTobi2022-07-25 17:08:20 +0200
committerGravatar FearlessTobi2022-07-25 21:59:31 +0200
commit6a2dcc8b3d4ed0940e33d60fee701bcdb063eb6b (patch)
treeb70962e3698930c5b06d777bd912caa89a912391 /src/network/network.cpp
parentyuzu_cmd: Fix compilation (diff)
downloadyuzu-6a2dcc8b3d4ed0940e33d60fee701bcdb063eb6b.tar.gz
yuzu-6a2dcc8b3d4ed0940e33d60fee701bcdb063eb6b.tar.xz
yuzu-6a2dcc8b3d4ed0940e33d60fee701bcdb063eb6b.zip
network, yuzu: Improve variable naming and style consistency
Diffstat (limited to '')
-rw-r--r--src/network/network.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp
index e1401a403..36b70c36f 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -10,8 +10,8 @@
10namespace Network { 10namespace Network {
11 11
12RoomNetwork::RoomNetwork() { 12RoomNetwork::RoomNetwork() {
13 g_room = std::make_shared<Room>(); 13 m_room = std::make_shared<Room>();
14 g_room_member = std::make_shared<RoomMember>(); 14 m_room_member = std::make_shared<RoomMember>();
15} 15}
16 16
17bool RoomNetwork::Init() { 17bool RoomNetwork::Init() {
@@ -19,30 +19,30 @@ bool RoomNetwork::Init() {
19 LOG_ERROR(Network, "Error initalizing ENet"); 19 LOG_ERROR(Network, "Error initalizing ENet");
20 return false; 20 return false;
21 } 21 }
22 g_room = std::make_shared<Room>(); 22 m_room = std::make_shared<Room>();
23 g_room_member = std::make_shared<RoomMember>(); 23 m_room_member = std::make_shared<RoomMember>();
24 LOG_DEBUG(Network, "initialized OK"); 24 LOG_DEBUG(Network, "initialized OK");
25 return true; 25 return true;
26} 26}
27 27
28std::weak_ptr<Room> RoomNetwork::GetRoom() { 28std::weak_ptr<Room> RoomNetwork::GetRoom() {
29 return g_room; 29 return m_room;
30} 30}
31 31
32std::weak_ptr<RoomMember> RoomNetwork::GetRoomMember() { 32std::weak_ptr<RoomMember> RoomNetwork::GetRoomMember() {
33 return g_room_member; 33 return m_room_member;
34} 34}
35 35
36void RoomNetwork::Shutdown() { 36void RoomNetwork::Shutdown() {
37 if (g_room_member) { 37 if (m_room_member) {
38 if (g_room_member->IsConnected()) 38 if (m_room_member->IsConnected())
39 g_room_member->Leave(); 39 m_room_member->Leave();
40 g_room_member.reset(); 40 m_room_member.reset();
41 } 41 }
42 if (g_room) { 42 if (m_room) {
43 if (g_room->GetState() == Room::State::Open) 43 if (m_room->GetState() == Room::State::Open)
44 g_room->Destroy(); 44 m_room->Destroy();
45 g_room.reset(); 45 m_room.reset();
46 } 46 }
47 enet_deinitialize(); 47 enet_deinitialize();
48 LOG_DEBUG(Network, "shutdown OK"); 48 LOG_DEBUG(Network, "shutdown OK");