diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 287f3a31d5..d959b996d3 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -88,7 +88,7 @@ std::vector Object::GetSourceGames() return _sourceGames; } -void Object::SetSourceGames(std::vector sourceGames) +void Object::SetSourceGames(const std::vector& sourceGames) { _sourceGames = sourceGames; } diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 13a57481aa..ae52845b65 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -153,7 +153,6 @@ interface IReadObjectContext class Object { private: -<<<<<<< HEAD char* _identifier; rct_object_entry _objectEntry{}; StringTable _stringTable; @@ -217,7 +216,7 @@ public: { } std::vector GetSourceGames(); - void SetSourceGames(std::vector sourceGames); + void SetSourceGames(const std::vector& sourceGames); const ImageTable& GetImageTable() const {