From 199ab96a9bf82b94d32e355101b9b43fd94cf96d Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 17 May 2018 17:38:15 +0000 Subject: [PATCH] remove the 64 bit bindables, and move that workaround to a sbtc branch because that server's data is screwed up --- .../application/LoginServer/src/shared/ClientConnection.cpp | 2 +- .../library/serverDatabase/src/shared/CharacterNameLocator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index dc5bd08f..8b43f6d8 100755 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -181,7 +181,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string & authOK = true; parentAccount = api.getString("mainAccount"); - childAccounts = api.getStringMap64("subAccounts"); + childAccounts = api.getStringMap("subAccounts"); if (!ConfigLoginServer::getUseOldSuidGenerator()) { user_id = static_cast(api.getNullableValue("user_id")); diff --git a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h index 0ca01332..6bbebe23 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h @@ -32,7 +32,7 @@ class CharacterNameLocator : public ObjectLocator struct CharacterNameRow { DB::BindableNetworkId character_id; - DB::BindableInt64 character_station_id; + DB::BindableLong character_station_id; DB::BindableString<127> character_name; DB::BindableString<127> character_full_name; DB::BindableInt64 character_create_time;