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

Apply review requests

Browse Source
This commit is contained in:
Gymnasiast
2025-03-19 15:31:29 +01:00
parent 79514bbb79
commit 13be47f389
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/management/NewsItem.cpp
View File

@@ -485,7 +485,7 @@ void News::RemoveItem(int32_t index)
}
void News::importNewsItems(
GameState_t& gameState, const std::vector<News::Item>& recent, const std::vector<News::Item>& archived)
GameState_t& gameState, const std::span<const News::Item> recent, const std::span<const News::Item> archived)
{
gameState.NewsItems.Clear();

23
src/openrct2/management/NewsItem.h
View File

@@ -17,8 +17,8 @@
#include <array>
#include <iterator>
#include <optional>
#include <span>
#include <string>
#include <vector>
struct CoordsXYZ;
class Formatter;
@@ -64,13 +64,13 @@ namespace OpenRCT2::News
*/
struct Item
{
News::ItemType Type;
uint8_t Flags;
uint32_t Assoc;
uint16_t Ticks;
uint16_t MonthYear;
uint8_t Day;
std::string Text;
News::ItemType Type = News::ItemType::Null;
uint8_t Flags{};
uint32_t Assoc{};
uint16_t Ticks{};
uint16_t MonthYear{};
uint8_t Day{};
std::string Text{};
constexpr bool IsEmpty() const noexcept
{
@@ -241,10 +241,7 @@ namespace OpenRCT2::News
void clear() noexcept
{
for (size_t i = 0; i < N; i++)
{
Queue[i].Type = News::ItemType::Null;
}
std::fill(Queue.begin(), Queue.end(), News::Item{});
}
private:
@@ -326,5 +323,5 @@ namespace OpenRCT2::News
void RemoveItem(int32_t index);
void importNewsItems(
GameState_t& gameState, const std::vector<News::Item>& recent, const std::vector<News::Item>& archived);
GameState_t& gameState, const std::span<const News::Item> recent, const std::span<const News::Item> archived);
} // namespace OpenRCT2::News