From 9d784d0d9bbe448583cb5133b45acd5c855748d5 Mon Sep 17 00:00:00 2001 From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com> Date: Sun, 8 May 2022 01:43:28 -0400 Subject: [PATCH] [Bug Fix] Fix possible issue where variables have the same name. (#2156) * [Bug Fix] Fix possible issue where variables have the same name. * Naming. --- world/zoneserver.cpp | 6 +++--- world/zoneserver.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index d3967130f..e84061978 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -56,8 +56,8 @@ extern SharedTaskManager shared_task_manager; void CatchSignal(int sig_num); -ZoneServer::ZoneServer(std::shared_ptr connection, EQ::Net::ConsoleServer *console) - : tcpc(connection), zone_boot_timer(5000) { +ZoneServer::ZoneServer(std::shared_ptr in_connection, EQ::Net::ConsoleServer *in_console) + : tcpc(in_connection), zone_boot_timer(5000) { /* Set Process tracking variable defaults */ memset(zone_name, 0, sizeof(zone_name)); @@ -84,7 +84,7 @@ ZoneServer::ZoneServer(std::shared_ptr conn } }); - console = console; + console = in_console; } ZoneServer::~ZoneServer() { diff --git a/world/zoneserver.h b/world/zoneserver.h index 3298892ae..dac2e7afb 100644 --- a/world/zoneserver.h +++ b/world/zoneserver.h @@ -32,7 +32,7 @@ class ServerPacket; class ZoneServer : public WorldTCPConnection { public: - ZoneServer(std::shared_ptr connection, EQ::Net::ConsoleServer *console); + ZoneServer(std::shared_ptr in_connection, EQ::Net::ConsoleServer *in_console); ~ZoneServer(); virtual inline bool IsZoneServer() { return true; }