mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-19 21:02:41 +00:00
Renamed "larion" to "steam latest"
This commit is contained in:
parent
16ec08e71c
commit
780dcdab5a
@ -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<EQ::Net::EQStream> 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);
|
||||
}
|
||||
);
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -88,7 +88,7 @@ struct PlayEverquestResponse {
|
||||
enum LSClientVersion {
|
||||
cv_titanium,
|
||||
cv_sod,
|
||||
cv_larion
|
||||
cv_steam_latest
|
||||
};
|
||||
|
||||
enum LSClientStatus {
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user