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

Rename some bits to allow unity builds of libopenrct2 (#9944)

Browse Source 
* Rename some bits to allow unity builds of libopenrct2

Some names are clashing when doing a unity build, renaming them solves
the problem.
This commit is contained in:
Michał Janiszewski
2019-08-29 23:03:56 +02:00
committed by GitHub
parent 1db18d4778
commit 8637eb6c57
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@@ -151,7 +151,7 @@ private:
void DownloadObject(const rct_object_entry& entry, const std::string name, const std::string url)
{
using namespace OpenRCT2::Network;
using namespace OpenRCT2::Networking;
try
{
std::printf("Downloading %s\n", url.c_str());
@@ -190,7 +190,7 @@ private:
void NextDownload()
{
using namespace OpenRCT2::Network;
using namespace OpenRCT2::Networking;
if (!_downloadingObjects || _currentDownloadIndex >= _entries.size())
{