pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-06 02:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix possible issue where variables have the same name. (#2156)

Browse Source 
* [Bug Fix] Fix possible issue where variables have the same name.

* Naming.
This commit is contained in:
Kinglykrab 2022-05-08 01:43:28 -04:00 committed by GitHub
parent fd7b15abb1
commit 9d784d0d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
world/zoneserver.cpp
View File

@ -56,8 +56,8 @@ extern SharedTaskManager shared_task_manager;
void CatchSignal(int sig_num); void CatchSignal(int sig_num);
ZoneServer::ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> connection, EQ::Net::ConsoleServer *console) ZoneServer::ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> in_connection, EQ::Net::ConsoleServer *in_console)
: tcpc(connection), zone_boot_timer(5000) { : tcpc(in_connection), zone_boot_timer(5000) {
/* Set Process tracking variable defaults */ /* Set Process tracking variable defaults */
memset(zone_name, 0, sizeof(zone_name)); memset(zone_name, 0, sizeof(zone_name));
@ -84,7 +84,7 @@ ZoneServer::ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> conn
} }
}); });
console = console; console = in_console;
} }
ZoneServer::~ZoneServer() { ZoneServer::~ZoneServer() {

2
world/zoneserver.h
View File

@ -32,7 +32,7 @@ class ServerPacket;
class ZoneServer : public WorldTCPConnection { class ZoneServer : public WorldTCPConnection {
public: public:
ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> connection, EQ::Net::ConsoleServer *console); ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> in_connection, EQ::Net::ConsoleServer *in_console);
~ZoneServer(); ~ZoneServer();
virtual inline bool IsZoneServer() { return true; } virtual inline bool IsZoneServer() { return true; }