mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Merge pull request #13379 from Gymnasiast/json-id-in-repo

Browse Source 
Allow object lookup using new JSON id
This commit is contained in:
Michael Steenbeek
2020-11-06 14:48:56 +01:00
committed by GitHub
parent 4ff412dfe1 880a267252
commit 3c1aaa97d7
10 changed files with 110 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/network/NetworkBase.cpp
View File

@@ -2340,7 +2340,7 @@ void NetworkBase::Client_Handle_OBJECTS_LIST(NetworkConnection& connection, Netw
uint32_t flags = 0;
packet >> checksum >> flags;
const auto* object = repo.FindObject(objectName);
const auto* object = repo.FindObjectLegacy(objectName);
// This could potentially request the object if checksums don't match, but since client
// won't replace its version with server-provided one, we don't do that.
if (object == nullptr)
@@ -2482,7 +2482,7 @@ void NetworkBase::Server_Handle_MAPREQUEST(NetworkConnection& connection, Networ
// This is required, as packet does not have null terminator
std::string s(name, name + 8);
log_verbose("Client requested object %s", s.c_str());
const ObjectRepositoryItem* item = repo.FindObject(s.c_str());
const ObjectRepositoryItem* item = repo.FindObjectLegacy(s.c_str());
if (item == nullptr)
{
log_warning("Client tried getting non-existent object %s from us.", s.c_str());