diff --git a/loginserver/client_manager.cpp b/loginserver/client_manager.cpp index 87ea3ecd5..6aa25d03b 100644 --- a/loginserver/client_manager.cpp +++ b/loginserver/client_manager.cpp @@ -57,7 +57,7 @@ void CheckSoDOpcodeFile(const std::string &path) } } -void CheckLarionOpcodeFile(const std::string &path) +void CheckSteamLatestOpcodeFile(const std::string &path) { if (File::Exists(path)) { return; @@ -160,40 +160,40 @@ ClientManager::ClientManager() } ); - int larion_port = server.config.GetVariableInt("client_configuration", "larion_port", 15900); + int steam_latest_port = server.config.GetVariableInt("client_configuration", "steam_latest_port", 15900); - EQStreamManagerInterfaceOptions larion_opts(larion_port, false, false); + EQStreamManagerInterfaceOptions steam_latest_opts(steam_latest_port, false, false); - m_larion_stream = new EQ::Net::EQStreamManager(larion_opts); - m_larion_ops = new RegularOpcodeManager; + m_steam_latest_stream = new EQ::Net::EQStreamManager(steam_latest_opts); + m_steam_latest_ops = new RegularOpcodeManager; opcodes_path = fmt::format( "{}/{}", PathManager::Instance()->GetOpcodePath(), - "login_opcodes_larion.conf" + "login_opcodes_steam_latest.conf" ); - CheckLarionOpcodeFile(opcodes_path); + CheckSteamLatestOpcodeFile(opcodes_path); - if (!m_larion_ops->LoadOpcodes(opcodes_path.c_str())) { + if (!m_steam_latest_ops->LoadOpcodes(opcodes_path.c_str())) { LogError( - "ClientManager fatal error: couldn't load opcodes for Larion file [{}]", - server.config.GetVariableString("client_configuration", "larion_opcodes", "login_opcodes.conf") + "ClientManager fatal error: couldn't load opcodes for Steam Latest file [{}]", + server.config.GetVariableString("client_configuration", "steam_latest_opcodes", "login_opcodes.conf") ); run_server = false; } - m_larion_stream->OnNewConnection( + m_steam_latest_stream->OnNewConnection( [this](std::shared_ptr stream) { LogInfo( - "New Larion client connection from [{}:{}]", + "New Steam Latest client connection from [{}:{}]", long2ip(stream->GetRemoteIP()), stream->GetRemotePort() ); - stream->SetOpcodeManager(&m_larion_ops); - Client *c = new Client(stream, cv_larion); + stream->SetOpcodeManager(&m_steam_latest_ops); + Client *c = new Client(stream, cv_steam_latest); m_clients.push_back(c); } ); diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h index c98313fbf..2df374bb7 100644 --- a/loginserver/client_manager.h +++ b/loginserver/client_manager.h @@ -20,6 +20,6 @@ private: EQ::Net::EQStreamManager *m_titanium_stream; OpcodeManager *m_sod_ops; EQ::Net::EQStreamManager *m_sod_stream; - OpcodeManager *m_larion_ops; - EQ::Net::EQStreamManager *m_larion_stream; + OpcodeManager *m_steam_latest_ops; + EQ::Net::EQStreamManager *m_steam_latest_stream; }; diff --git a/loginserver/login_types.h b/loginserver/login_types.h index b760eb7fe..580b597ec 100644 --- a/loginserver/login_types.h +++ b/loginserver/login_types.h @@ -88,7 +88,7 @@ struct PlayEverquestResponse { enum LSClientVersion { cv_titanium, cv_sod, - cv_larion + cv_steam_latest }; enum LSClientStatus { diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp index 85b9d6c74..90c5346ce 100644 --- a/loginserver/world_server.cpp +++ b/loginserver/world_server.cpp @@ -697,7 +697,7 @@ void WorldServer::SerializeForClientServerList(SerializeBuffer &out, bool use_lo out.WriteString(m_remote_ip_address); } - if (version == cv_larion) { + if (version == cv_steam_latest) { out.WriteUInt32(9000); } @@ -712,7 +712,7 @@ void WorldServer::SerializeForClientServerList(SerializeBuffer &out, bool use_lo out.WriteInt32(LS::ServerTypeFlags::Standard); break; } - if (version == cv_larion) { + if (version == cv_steam_latest) { auto server_id = m_server_id; //if this is 0, the client will not show the server in the list out.WriteUInt32(1);