mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity

Get rid of using user_strings for interface

Browse Source
This commit is contained in:
zsilencer
2016-04-20 00:16:17 -06:00
parent ddedcf1d3b
commit b257e431d9
6 changed files with 43 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/network/network.cpp
View File

@@ -237,13 +237,12 @@ int NetworkActions::FindCommand(int command)
NetworkGroup::NetworkGroup()
{
name_string_id = STR_NONE;
actions_allowed = {0};
}
NetworkGroup::~NetworkGroup()
{
FreeNameStringId();
}
void NetworkGroup::Read(NetworkPacket& packet)
@@ -264,14 +263,6 @@ void NetworkGroup::Write(NetworkPacket& packet)
}
}
void NetworkGroup::FreeNameStringId()
{
if (name_string_id != STR_NONE) {
user_string_free(name_string_id);
name_string_id = STR_NONE;
}
}
void NetworkGroup::ToggleActionPermission(size_t index)
{
size_t byte = index / 8;
@@ -308,18 +299,9 @@ std::string& NetworkGroup::GetName()
void NetworkGroup::SetName(std::string name)
{
FreeNameStringId();
NetworkGroup::name = name;
}
rct_string_id NetworkGroup::GetNameStringId()
{
if (name_string_id == STR_NONE) {
name_string_id = user_string_allocate(128, name.c_str());
}
return name_string_id;
}
NetworkConnection::NetworkConnection()
{
authstatus = NETWORK_AUTH_NONE;
@@ -1302,13 +1284,6 @@ void Network::LoadGroups()
SDL_RWclose(file);
}
void Network::FreeStringIds()
{
for (auto it = group_list.begin(); it != group_list.end(); it++) {
(*it)->FreeNameStringId();
}
}
void Network::Client_Send_AUTH(const char* name, const char* password)
{
std::unique_ptr<NetworkPacket> packet = std::move(NetworkPacket::Allocate());
@@ -2217,11 +2192,6 @@ const char* network_get_group_name(unsigned int index)
return gNetwork.group_list[index]->GetName().c_str();
}
rct_string_id network_get_group_name_string_id(unsigned int index)
{
return gNetwork.group_list[index]->GetNameStringId();
}
void network_chat_show_connected_message()
{
char *templateString = (char*)language_get_string(STR_INDIVIDUAL_KEYS_BASE);
@@ -2436,11 +2406,6 @@ int network_get_current_player_group_index()
return network_get_group_index(gNetwork.GetPlayerByID(gNetwork.GetPlayerID())->group);
}
void network_free_string_ids()
{
gNetwork.FreeStringIds();
}
void network_send_map()
{
gNetwork.Server_Send_MAP();