mirror of https://github.com/OpenRCT2/OpenRCT2.git
Replace snakes in Class names OpenRCT2/N*-P* (#19227)
* Replace snakes in Class names OpenRCT2/N*-P* * Rename PODDate (and TimeOfDay for good measure) Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
This commit is contained in:
Duncan
GitHub
parent
e110c631f1
commit
9deed6d98a
|
|
@ -92,7 +92,7 @@ enum
|
|||
struct ObjectListItem
|
||||
{
|
||||
const ObjectRepositoryItem* repositoryItem;
|
||||
std::unique_ptr<rct_object_filters> filter;
|
||||
std::unique_ptr<RideFilters> filter;
|
||||
uint8_t* flags;
|
||||
};
|
||||
|
||||
|
|
@ -1132,10 +1132,10 @@ private:
|
|||
if (item->Type == GetSelectedObjectType() && !(selectionFlags & ObjectSelectionFlags::Flag6) && FilterSource(item)
|
||||
&& FilterString(*item) && FilterChunks(item) && FilterSelected(selectionFlags))
|
||||
{
|
||||
auto filter = std::make_unique<rct_object_filters>();
|
||||
filter->ride.category[0] = 0;
|
||||
filter->ride.category[1] = 0;
|
||||
filter->ride.ride_type = 0;
|
||||
auto filter = std::make_unique<RideFilters>();
|
||||
filter->category[0] = 0;
|
||||
filter->category[1] = 0;
|
||||
filter->ride_type = 0;
|
||||
|
||||
ObjectListItem currentListItem;
|
||||
currentListItem.repositoryItem = item;
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ static Widget window_object_load_error_widgets[] = {
|
|||
// clang-format on
|
||||
|
||||
/**
|
||||
* Returns an StringId that represents an rct_object_entry's type.
|
||||
* Returns an StringId that represents an RCTObjectEntry's type.
|
||||
*
|
||||
* Could possibly be moved out of the window file if other
|
||||
* uses exist and a suitable location is found.
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ int32_t CmdLineForSprite(const char** argv, int32_t argc)
|
|||
return -1;
|
||||
}
|
||||
|
||||
const rct_object_entry* entry = &ori->ObjectEntry;
|
||||
const RCTObjectEntry* entry = &ori->ObjectEntry;
|
||||
const auto* loadedObject = ObjectManagerLoadObject(entry);
|
||||
if (loadedObject == nullptr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ public:
|
|||
param = TIdentifier<T, TNull, TTag>::FromUnderlying(value);
|
||||
}
|
||||
|
||||
template<typename T, size_t _TypeID> void Visit(std::string_view name, NetworkObjectId_t<T, _TypeID>& param)
|
||||
template<typename T, size_t _TypeID> void Visit(std::string_view name, NetworkObjectId<T, _TypeID>& param)
|
||||
{
|
||||
Visit(name, param.id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ GameActions::Result StaffHireNewAction::QueryExecute(bool execute) const
|
|||
newPeep->Name = nullptr;
|
||||
newPeep->SpriteType = spriteType;
|
||||
|
||||
const rct_sprite_bounds* spriteBounds = &GetSpriteBounds(spriteType);
|
||||
const SpriteBounds* spriteBounds = &GetSpriteBounds(spriteType);
|
||||
newPeep->sprite_width = spriteBounds->sprite_width;
|
||||
newPeep->sprite_height_negative = spriteBounds->sprite_height_negative;
|
||||
newPeep->sprite_height_positive = spriteBounds->sprite_height_positive;
|
||||
|
|
|
|||
|
|
@ -605,15 +605,15 @@ template<> struct DataSerializerTraitsT<NetworkCheatType_t>
|
|||
}
|
||||
};
|
||||
|
||||
template<> struct DataSerializerTraitsT<rct_object_entry>
|
||||
template<> struct DataSerializerTraitsT<RCTObjectEntry>
|
||||
{
|
||||
static void encode(OpenRCT2::IStream* stream, const rct_object_entry& val)
|
||||
static void encode(OpenRCT2::IStream* stream, const RCTObjectEntry& val)
|
||||
{
|
||||
uint32_t temp = ByteSwapBE(val.flags);
|
||||
stream->Write(&temp);
|
||||
stream->WriteArray(val.nameWOC, 12);
|
||||
}
|
||||
static void decode(OpenRCT2::IStream* stream, rct_object_entry& val)
|
||||
static void decode(OpenRCT2::IStream* stream, RCTObjectEntry& val)
|
||||
{
|
||||
uint32_t temp;
|
||||
stream->Read(&temp);
|
||||
|
|
@ -621,7 +621,7 @@ template<> struct DataSerializerTraitsT<rct_object_entry>
|
|||
auto str = stream->ReadArray<char>(12);
|
||||
memcpy(val.nameWOC, str.get(), 12);
|
||||
}
|
||||
static void log(OpenRCT2::IStream* stream, const rct_object_entry& val)
|
||||
static void log(OpenRCT2::IStream* stream, const RCTObjectEntry& val)
|
||||
{
|
||||
stream->WriteArray(val.name, 8);
|
||||
}
|
||||
|
|
@ -634,7 +634,7 @@ template<> struct DataSerializerTraitsT<ObjectEntryDescriptor>
|
|||
stream->WriteValue<uint8_t>(static_cast<uint8_t>(val.Generation));
|
||||
if (val.Generation == ObjectGeneration::DAT)
|
||||
{
|
||||
DataSerializerTraits<rct_object_entry> s;
|
||||
DataSerializerTraits<RCTObjectEntry> s;
|
||||
s.encode(stream, val.Entry);
|
||||
}
|
||||
else
|
||||
|
|
@ -649,8 +649,8 @@ template<> struct DataSerializerTraitsT<ObjectEntryDescriptor>
|
|||
auto generation = static_cast<ObjectGeneration>(stream->ReadValue<uint8_t>());
|
||||
if (generation == ObjectGeneration::DAT)
|
||||
{
|
||||
DataSerializerTraits<rct_object_entry> s;
|
||||
rct_object_entry entry;
|
||||
DataSerializerTraits<RCTObjectEntry> s;
|
||||
RCTObjectEntry entry;
|
||||
s.decode(stream, entry);
|
||||
val = ObjectEntryDescriptor(entry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7013,7 +7013,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords)
|
|||
peep->FavouriteRide = RideId::GetNull();
|
||||
peep->FavouriteRideRating = 0;
|
||||
|
||||
const rct_sprite_bounds* spriteBounds = &GetSpriteBounds(peep->SpriteType, peep->ActionSpriteType);
|
||||
const SpriteBounds* spriteBounds = &GetSpriteBounds(peep->SpriteType, peep->ActionSpriteType);
|
||||
peep->sprite_width = spriteBounds->sprite_width;
|
||||
peep->sprite_height_negative = spriteBounds->sprite_height_negative;
|
||||
peep->sprite_height_positive = spriteBounds->sprite_height_positive;
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ void Peep::UpdateCurrentActionSpriteType()
|
|||
Invalidate();
|
||||
ActionSpriteType = newActionSpriteType;
|
||||
|
||||
const rct_sprite_bounds* spriteBounds = &GetSpriteBounds(SpriteType, ActionSpriteType);
|
||||
const SpriteBounds* spriteBounds = &GetSpriteBounds(SpriteType, ActionSpriteType);
|
||||
sprite_width = spriteBounds->sprite_width;
|
||||
sprite_height_negative = spriteBounds->sprite_height_negative;
|
||||
sprite_height_positive = spriteBounds->sprite_height_positive;
|
||||
|
|
@ -484,7 +484,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
|
|||
CoordsXY loc = { x, y };
|
||||
loc += word_981D7C[nextDirection / 8];
|
||||
WalkingFrameNum++;
|
||||
const rct_peep_animation* peepAnimation = &GetPeepAnimation(SpriteType);
|
||||
const PeepAnimation* peepAnimation = &GetPeepAnimation(SpriteType);
|
||||
const uint8_t* imageOffset = peepAnimation[EnumValue(ActionSpriteType)].frame_offsets;
|
||||
if (WalkingFrameNum >= peepAnimation[EnumValue(ActionSpriteType)].num_frames)
|
||||
{
|
||||
|
|
@ -494,7 +494,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
|
|||
return loc;
|
||||
}
|
||||
|
||||
const rct_peep_animation* peepAnimation = &GetPeepAnimation(SpriteType);
|
||||
const PeepAnimation* peepAnimation = &GetPeepAnimation(SpriteType);
|
||||
ActionFrame++;
|
||||
|
||||
// If last frame of action
|
||||
|
|
@ -1669,7 +1669,7 @@ void Peep::SwitchNextActionSpriteType()
|
|||
{
|
||||
Invalidate();
|
||||
ActionSpriteType = NextActionSpriteType;
|
||||
const rct_sprite_bounds* spriteBounds = &GetSpriteBounds(SpriteType, NextActionSpriteType);
|
||||
const SpriteBounds* spriteBounds = &GetSpriteBounds(SpriteType, NextActionSpriteType);
|
||||
sprite_width = spriteBounds->sprite_width;
|
||||
sprite_height_negative = spriteBounds->sprite_height_negative;
|
||||
sprite_height_positive = spriteBounds->sprite_height_positive;
|
||||
|
|
|
|||
|
|
@ -427,24 +427,24 @@ private:
|
|||
void UpdatePicked();
|
||||
};
|
||||
|
||||
struct rct_sprite_bounds
|
||||
struct SpriteBounds
|
||||
{
|
||||
uint8_t sprite_width; // 0x00
|
||||
uint8_t sprite_height_negative; // 0x01
|
||||
uint8_t sprite_height_positive; // 0x02
|
||||
};
|
||||
|
||||
struct rct_peep_animation
|
||||
struct PeepAnimation
|
||||
{
|
||||
uint32_t base_image; // 0x00
|
||||
size_t num_frames;
|
||||
const uint8_t* frame_offsets;
|
||||
};
|
||||
|
||||
struct rct_peep_animation_entry
|
||||
struct PeepAnimationEntry
|
||||
{
|
||||
const rct_peep_animation* sprite_animation; // 0x00
|
||||
const rct_sprite_bounds* sprite_bounds; // 0x04
|
||||
const PeepAnimation* sprite_animation; // 0x00
|
||||
const SpriteBounds* sprite_bounds; // 0x04
|
||||
};
|
||||
|
||||
enum
|
||||
|
|
@ -456,7 +456,7 @@ enum
|
|||
};
|
||||
|
||||
// rct2: 0x00982708
|
||||
extern const rct_peep_animation_entry g_peep_animation_entries[EnumValue(PeepSpriteType::Count)];
|
||||
extern const PeepAnimationEntry g_peep_animation_entries[EnumValue(PeepSpriteType::Count)];
|
||||
extern const bool gSpriteTypeToSlowWalkMap[48];
|
||||
|
||||
extern uint8_t gPeepWarningThrottle[16];
|
||||
|
|
@ -482,13 +482,13 @@ void PeepUpdateNames(bool realNames);
|
|||
|
||||
StringId GetRealNameStringIDFromPeepID(uint32_t id);
|
||||
|
||||
inline const rct_peep_animation& GetPeepAnimation(
|
||||
inline const PeepAnimation& GetPeepAnimation(
|
||||
PeepSpriteType spriteType, PeepActionSpriteType actionSpriteType = PeepActionSpriteType::None)
|
||||
{
|
||||
return g_peep_animation_entries[EnumValue(spriteType)].sprite_animation[EnumValue(actionSpriteType)];
|
||||
};
|
||||
|
||||
inline const rct_sprite_bounds& GetSpriteBounds(
|
||||
inline const SpriteBounds& GetSpriteBounds(
|
||||
PeepSpriteType spriteType, PeepActionSpriteType actionSpriteType = PeepActionSpriteType::None)
|
||||
{
|
||||
return g_peep_animation_entries[EnumValue(spriteType)].sprite_bounds[EnumValue(actionSpriteType)];
|
||||
|
|
|
|||
|
|
@ -1213,7 +1213,7 @@ static int32_t ConsoleCommandLoadObject(InteractiveConsole& console, const argum
|
|||
return 1;
|
||||
}
|
||||
|
||||
const rct_object_entry* entry = &ori->ObjectEntry;
|
||||
const RCTObjectEntry* entry = &ori->ObjectEntry;
|
||||
const auto* loadedObject = ObjectManagerGetLoadedObject(ObjectEntryDescriptor(*ori));
|
||||
if (loadedObject != nullptr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ static std::string ScreenshotGetDirectory()
|
|||
return env->GetDirectoryPath(DIRBASE::USER, DIRID::SCREENSHOT);
|
||||
}
|
||||
|
||||
static std::pair<rct2_date, rct2_time> ScreenshotGetDateTime()
|
||||
static std::pair<RealWorldDate, RealWorldTime> ScreenshotGetDateTime()
|
||||
{
|
||||
auto date = Platform::GetDateLocal();
|
||||
auto time = Platform::GetTimeLocal();
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
enum class TileInspectorPage : int16_t;
|
||||
|
||||
struct ResearchItem;
|
||||
struct rct_object_entry;
|
||||
struct RCTObjectEntry;
|
||||
|
||||
#ifdef __WARN_SUGGEST_FINAL_METHODS__
|
||||
# pragma GCC diagnostic push
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ enum
|
|||
DATE_FORMAT_YEAR_DAY_MONTH
|
||||
};
|
||||
|
||||
struct TimeOfDay
|
||||
struct RealWorldTime
|
||||
{
|
||||
uint8_t second;
|
||||
uint8_t minute;
|
||||
|
|
@ -50,7 +50,7 @@ extern const StringId DateFormatStringFormatIds[];
|
|||
extern uint16_t gDateMonthTicks;
|
||||
extern int32_t gDateMonthsElapsed;
|
||||
|
||||
extern TimeOfDay gRealTimeOfDay;
|
||||
extern RealWorldTime gRealTimeOfDay;
|
||||
|
||||
int32_t DateGetMonth(int32_t months);
|
||||
int32_t DateGetYear(int32_t months);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ const StringId DateFormatStringFormatIds[] = {
|
|||
STR_DATE_FORMAT_YDM,
|
||||
};
|
||||
|
||||
TimeOfDay gRealTimeOfDay;
|
||||
RealWorldTime gRealTimeOfDay;
|
||||
|
||||
int32_t DateGetMonth(int32_t months)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -752,7 +752,7 @@ bool NetworkBase::CheckSRAND(uint32_t tick, uint32_t srand0)
|
|||
if (itTickData == std::end(_serverTickData))
|
||||
return true;
|
||||
|
||||
const ServerTickData_t storedTick = itTickData->second;
|
||||
const ServerTickData storedTick = itTickData->second;
|
||||
_serverTickData.erase(itTickData);
|
||||
|
||||
if (storedTick.srand0 != srand0)
|
||||
|
|
@ -777,16 +777,16 @@ bool NetworkBase::CheckSRAND(uint32_t tick, uint32_t srand0)
|
|||
|
||||
bool NetworkBase::IsDesynchronised() const noexcept
|
||||
{
|
||||
return _serverState.state == NetworkServerState::Desynced;
|
||||
return _serverState.state == NetworkServerStatus::Desynced;
|
||||
}
|
||||
|
||||
bool NetworkBase::CheckDesynchronizaton()
|
||||
{
|
||||
// Check synchronisation
|
||||
if (GetMode() == NETWORK_MODE_CLIENT && _serverState.state != NetworkServerState::Desynced
|
||||
if (GetMode() == NETWORK_MODE_CLIENT && _serverState.state != NetworkServerStatus::Desynced
|
||||
&& !CheckSRAND(gCurrentTicks, ScenarioRandState().s0))
|
||||
{
|
||||
_serverState.state = NetworkServerState::Desynced;
|
||||
_serverState.state = NetworkServerStatus::Desynced;
|
||||
_serverState.desyncTick = gCurrentTicks;
|
||||
|
||||
char str_desync[256];
|
||||
|
|
@ -814,7 +814,7 @@ void NetworkBase::RequestStateSnapshot()
|
|||
Client_Send_RequestGameState(_serverState.desyncTick);
|
||||
}
|
||||
|
||||
NetworkServerState_t NetworkBase::GetServerState() const noexcept
|
||||
NetworkServerState NetworkBase::GetServerState() const noexcept
|
||||
{
|
||||
return _serverState;
|
||||
}
|
||||
|
|
@ -1226,7 +1226,7 @@ void NetworkBase::Client_Send_MAPREQUEST(const std::vector<ObjectEntryDescriptor
|
|||
if (object.Generation == ObjectGeneration::DAT)
|
||||
{
|
||||
packet << static_cast<uint8_t>(0);
|
||||
packet.Write(&object.Entry, sizeof(rct_object_entry));
|
||||
packet.Write(&object.Entry, sizeof(RCTObjectEntry));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1271,7 +1271,7 @@ void NetworkBase::ServerSendObjectsList(
|
|||
// DAT
|
||||
LOG_VERBOSE("Object %.8s (checksum %x)", object->ObjectEntry.name, object->ObjectEntry.checksum);
|
||||
packet << static_cast<uint8_t>(0);
|
||||
packet.Write(&object->ObjectEntry, sizeof(rct_object_entry));
|
||||
packet.Write(&object->ObjectEntry, sizeof(RCTObjectEntry));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1330,9 +1330,9 @@ void NetworkBase::Client_Send_HEARTBEAT(NetworkConnection& connection) const
|
|||
connection.QueuePacket(std::move(packet));
|
||||
}
|
||||
|
||||
NetworkStats_t NetworkBase::GetStats() const
|
||||
NetworkStats NetworkBase::GetStats() const
|
||||
{
|
||||
NetworkStats_t stats = {};
|
||||
NetworkStats stats = {};
|
||||
if (mode == NETWORK_MODE_CLIENT)
|
||||
{
|
||||
stats = _serverConnection->Stats;
|
||||
|
|
@ -2337,7 +2337,7 @@ void NetworkBase::Client_Handle_OBJECTS_LIST(NetworkConnection& connection, Netw
|
|||
if (objectType == 0)
|
||||
{
|
||||
// DAT
|
||||
auto entry = reinterpret_cast<const rct_object_entry*>(packet.Read(sizeof(rct_object_entry)));
|
||||
auto entry = reinterpret_cast<const RCTObjectEntry*>(packet.Read(sizeof(RCTObjectEntry)));
|
||||
if (entry != nullptr)
|
||||
{
|
||||
const auto* object = repo.FindObject(entry);
|
||||
|
|
@ -2487,7 +2487,7 @@ void NetworkBase::ServerHandleMapRequest(NetworkConnection& connection, NetworkP
|
|||
const ObjectRepositoryItem* item{};
|
||||
if (generation == static_cast<uint8_t>(ObjectGeneration::DAT))
|
||||
{
|
||||
const auto* entry = reinterpret_cast<const rct_object_entry*>(packet.Read(sizeof(rct_object_entry)));
|
||||
const auto* entry = reinterpret_cast<const RCTObjectEntry*>(packet.Read(sizeof(RCTObjectEntry)));
|
||||
objectName = std::string(entry->GetName());
|
||||
LOG_VERBOSE("Client requested object %s", objectName.c_str());
|
||||
item = repo.FindObject(entry);
|
||||
|
|
@ -2698,7 +2698,7 @@ void NetworkBase::Client_Handle_MAP([[maybe_unused]] NetworkConnection& connecti
|
|||
GameNotifyMapChanged();
|
||||
_serverState.tick = gCurrentTicks;
|
||||
// WindowNetworkStatusOpen("Loaded new map from network");
|
||||
_serverState.state = NetworkServerState::Ok;
|
||||
_serverState.state = NetworkServerStatus::Ok;
|
||||
_clientMapLoaded = true;
|
||||
gFirstTimeSaving = true;
|
||||
|
||||
|
|
@ -2960,7 +2960,7 @@ void NetworkBase::Client_Handle_TICK([[maybe_unused]] NetworkConnection& connect
|
|||
|
||||
packet >> serverTick >> srand0 >> flags;
|
||||
|
||||
ServerTickData_t tickData;
|
||||
ServerTickData tickData;
|
||||
tickData.srand0 = srand0;
|
||||
tickData.tick = serverTick;
|
||||
|
||||
|
|
@ -3926,13 +3926,13 @@ std::string NetworkGetVersion()
|
|||
return NETWORK_STREAM_ID;
|
||||
}
|
||||
|
||||
NetworkStats_t NetworkGetStats()
|
||||
NetworkStats NetworkGetStats()
|
||||
{
|
||||
auto& network = OpenRCT2::GetContext()->GetNetwork();
|
||||
return network.GetStats();
|
||||
}
|
||||
|
||||
NetworkServerState_t NetworkGetServerState()
|
||||
NetworkServerState NetworkGetServerState()
|
||||
{
|
||||
auto& network = OpenRCT2::GetContext()->GetNetwork();
|
||||
return network.GetServerState();
|
||||
|
|
@ -4200,13 +4200,13 @@ std::string NetworkGetVersion()
|
|||
{
|
||||
return "Multiplayer disabled";
|
||||
}
|
||||
NetworkStats_t NetworkGetStats()
|
||||
NetworkStats NetworkGetStats()
|
||||
{
|
||||
return NetworkStats_t{};
|
||||
return NetworkStats{};
|
||||
}
|
||||
NetworkServerState_t NetworkGetServerState()
|
||||
NetworkServerState NetworkGetServerState()
|
||||
{
|
||||
return NetworkServerState_t{};
|
||||
return NetworkServerState{};
|
||||
}
|
||||
json_t NetworkGetServerInfoAsJson()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public: // Common
|
|||
void BeginChatLog();
|
||||
void AppendChatLog(std::string_view s);
|
||||
void CloseChatLog();
|
||||
NetworkStats_t GetStats() const;
|
||||
NetworkStats GetStats() const;
|
||||
json_t GetServerInfoAsJson() const;
|
||||
bool ProcessConnection(NetworkConnection& connection);
|
||||
void CloseConnection();
|
||||
|
|
@ -128,7 +128,7 @@ public: // Client
|
|||
bool CheckDesynchronizaton();
|
||||
void RequestStateSnapshot();
|
||||
bool IsDesynchronised() const noexcept;
|
||||
NetworkServerState_t GetServerState() const noexcept;
|
||||
NetworkServerState GetServerState() const noexcept;
|
||||
void ServerClientDisconnected();
|
||||
bool LoadMap(OpenRCT2::IStream* stream);
|
||||
void UpdateClient();
|
||||
|
|
@ -210,7 +210,7 @@ private: // Client Data
|
|||
std::vector<NetworkPlayer> players;
|
||||
};
|
||||
|
||||
struct ServerTickData_t
|
||||
struct ServerTickData
|
||||
{
|
||||
uint32_t srand0;
|
||||
uint32_t tick;
|
||||
|
|
@ -221,14 +221,14 @@ private: // Client Data
|
|||
std::unique_ptr<NetworkConnection> _serverConnection;
|
||||
std::map<uint32_t, PlayerListUpdate> _pendingPlayerLists;
|
||||
std::multimap<uint32_t, NetworkPlayer> _pendingPlayerInfo;
|
||||
std::map<uint32_t, ServerTickData_t> _serverTickData;
|
||||
std::map<uint32_t, ServerTickData> _serverTickData;
|
||||
std::vector<ObjectEntryDescriptor> _missingObjects;
|
||||
std::string _host;
|
||||
std::string _chatLogPath;
|
||||
std::string _chatLogFilenameFormat = "%Y%m%d-%H%M%S.txt";
|
||||
std::string _password;
|
||||
OpenRCT2::MemoryStream _serverGameState;
|
||||
NetworkServerState_t _serverState;
|
||||
NetworkServerState _serverState;
|
||||
uint32_t _lastSentHeartbeat = 0;
|
||||
uint32_t last_ping_sent_time = 0;
|
||||
uint32_t server_connect_time = 0;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public:
|
|||
std::unique_ptr<ITcpSocket> Socket = nullptr;
|
||||
NetworkPacket InboundPacket;
|
||||
NetworkAuth AuthStatus = NetworkAuth::None;
|
||||
NetworkStats_t Stats = {};
|
||||
NetworkStats Stats = {};
|
||||
NetworkPlayer* Player = nullptr;
|
||||
uint32_t PingTime = 0;
|
||||
NetworkKey Key;
|
||||
|
|
|
|||
|
|
@ -89,15 +89,15 @@ enum class NetworkCommand : uint32_t
|
|||
|
||||
static_assert(NetworkCommand::GameInfo == static_cast<NetworkCommand>(9), "Master server expects this to be 9");
|
||||
|
||||
enum class NetworkServerState
|
||||
enum class NetworkServerStatus
|
||||
{
|
||||
Ok,
|
||||
Desynced
|
||||
};
|
||||
|
||||
struct NetworkServerState_t
|
||||
struct NetworkServerState
|
||||
{
|
||||
NetworkServerState state = NetworkServerState::Ok;
|
||||
NetworkServerStatus state = NetworkServerStatus::Ok;
|
||||
uint32_t desyncTick = 0;
|
||||
uint32_t tick = 0;
|
||||
uint32_t srand0 = 0;
|
||||
|
|
@ -108,13 +108,13 @@ struct NetworkServerState_t
|
|||
// this structure can be used in combination with DataSerialiser
|
||||
// to provide extra details with template specialization.
|
||||
#pragma pack(push, 1)
|
||||
template<typename T, size_t _TypeID> struct NetworkObjectId_t
|
||||
template<typename T, size_t _TypeID> struct NetworkObjectId
|
||||
{
|
||||
NetworkObjectId_t(T v)
|
||||
NetworkObjectId(T v)
|
||||
: id(v)
|
||||
{
|
||||
}
|
||||
NetworkObjectId_t()
|
||||
NetworkObjectId()
|
||||
: id(T(-1))
|
||||
{
|
||||
}
|
||||
|
|
@ -128,8 +128,8 @@ template<typename T, size_t _TypeID> struct NetworkObjectId_t
|
|||
|
||||
// NOTE: When adding new types make sure to have no duplicate _TypeID's otherwise
|
||||
// there is no way to specialize templates if they have the exact symbol.
|
||||
using NetworkPlayerId_t = NetworkObjectId_t<int32_t, 0>;
|
||||
using NetworkCheatType_t = NetworkObjectId_t<int32_t, 2>;
|
||||
using NetworkPlayerId_t = NetworkObjectId<int32_t, 0>;
|
||||
using NetworkCheatType_t = NetworkObjectId<int32_t, 2>;
|
||||
|
||||
enum class NetworkStatisticsGroup : uint32_t
|
||||
{
|
||||
|
|
@ -140,7 +140,7 @@ enum class NetworkStatisticsGroup : uint32_t
|
|||
Max,
|
||||
};
|
||||
|
||||
struct NetworkStats_t
|
||||
struct NetworkStats
|
||||
{
|
||||
uint64_t bytesReceived[EnumValue(NetworkStatisticsGroup::Max)];
|
||||
uint64_t bytesSent[EnumValue(NetworkStatisticsGroup::Max)];
|
||||
|
|
|
|||
|
|
@ -112,6 +112,6 @@ void NetworkAppendServerLog(const utf8* text);
|
|||
|
||||
[[nodiscard]] std::string NetworkGetVersion();
|
||||
|
||||
[[nodiscard]] NetworkStats_t NetworkGetStats();
|
||||
[[nodiscard]] NetworkServerState_t NetworkGetServerState();
|
||||
[[nodiscard]] NetworkStats NetworkGetStats();
|
||||
[[nodiscard]] NetworkServerState NetworkGetServerState();
|
||||
[[nodiscard]] json_t NetworkGetServerInfoAsJson();
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ void BannerObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* st
|
|||
|
||||
GetStringTable().Read(context, stream, ObjectStringID::NAME);
|
||||
|
||||
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry sgEntry = stream->ReadValue<RCTObjectEntry>();
|
||||
SetPrimarySceneryGroup(ObjectEntryDescriptor(sgEntry));
|
||||
|
||||
GetImageTable().Read(context, stream);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ void FootpathItemObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
|
|||
|
||||
GetStringTable().Read(context, stream, ObjectStringID::NAME);
|
||||
|
||||
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry sgEntry = stream->ReadValue<RCTObjectEntry>();
|
||||
SetPrimarySceneryGroup(ObjectEntryDescriptor(sgEntry));
|
||||
|
||||
GetImageTable().Read(context, stream);
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ void LargeSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
|
|||
|
||||
GetStringTable().Read(context, stream, ObjectStringID::NAME);
|
||||
|
||||
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry sgEntry = stream->ReadValue<RCTObjectEntry>();
|
||||
SetPrimarySceneryGroup(ObjectEntryDescriptor(sgEntry));
|
||||
|
||||
if (_legacyType.flags & LARGE_SCENERY_FLAG_3D_TEXT)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
using namespace OpenRCT2;
|
||||
|
||||
ObjectEntryDescriptor::ObjectEntryDescriptor(const rct_object_entry& newEntry)
|
||||
ObjectEntryDescriptor::ObjectEntryDescriptor(const RCTObjectEntry& newEntry)
|
||||
{
|
||||
if (!newEntry.IsEmpty())
|
||||
{
|
||||
|
|
@ -153,9 +153,9 @@ ObjectEntryDescriptor Object::GetScgPathXHeader() const
|
|||
return ObjectEntryDescriptor("rct2.scenery_group.scgpathx");
|
||||
}
|
||||
|
||||
rct_object_entry Object::CreateHeader(const char name[DAT_NAME_LENGTH + 1], uint32_t flags, uint32_t checksum)
|
||||
RCTObjectEntry Object::CreateHeader(const char name[DAT_NAME_LENGTH + 1], uint32_t flags, uint32_t checksum)
|
||||
{
|
||||
rct_object_entry header = {};
|
||||
RCTObjectEntry header = {};
|
||||
header.flags = flags;
|
||||
std::copy_n(name, DAT_NAME_LENGTH, header.name);
|
||||
header.checksum = checksum;
|
||||
|
|
@ -187,7 +187,7 @@ std::string Object::GetName(int32_t language) const
|
|||
return GetString(language, ObjectStringID::NAME);
|
||||
}
|
||||
|
||||
void rct_object_entry::SetName(std::string_view value)
|
||||
void RCTObjectEntry::SetName(std::string_view value)
|
||||
{
|
||||
std::memset(name, ' ', sizeof(name));
|
||||
std::memcpy(name, value.data(), std::min(sizeof(name), value.size()));
|
||||
|
|
@ -203,7 +203,7 @@ void Object::SetAuthors(std::vector<std::string>&& authors)
|
|||
_authors = std::move(authors);
|
||||
}
|
||||
|
||||
bool rct_object_entry::IsEmpty() const
|
||||
bool RCTObjectEntry::IsEmpty() const
|
||||
{
|
||||
uint64_t a, b;
|
||||
std::memcpy(&a, reinterpret_cast<const uint8_t*>(this), 8);
|
||||
|
|
@ -216,7 +216,7 @@ bool rct_object_entry::IsEmpty() const
|
|||
return false;
|
||||
}
|
||||
|
||||
bool rct_object_entry::operator==(const rct_object_entry& rhs) const
|
||||
bool RCTObjectEntry::operator==(const RCTObjectEntry& rhs) const
|
||||
{
|
||||
const auto a = this;
|
||||
const auto b = &rhs;
|
||||
|
|
@ -253,7 +253,7 @@ bool rct_object_entry::operator==(const rct_object_entry& rhs) const
|
|||
return true;
|
||||
}
|
||||
|
||||
bool rct_object_entry::operator!=(const rct_object_entry& rhs) const
|
||||
bool RCTObjectEntry::operator!=(const RCTObjectEntry& rhs) const
|
||||
{
|
||||
return !(*this == rhs);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ constexpr const size_t VersionNumFields = 3;
|
|||
using ObjectVersion = std::tuple<uint16_t, uint16_t, uint16_t>;
|
||||
static_assert(std::tuple_size<ObjectVersion>{} == VersionNumFields);
|
||||
|
||||
// First 0xF of rct_object_entry->flags
|
||||
// First 0xF of RCTObjectEntry->flags
|
||||
enum class ObjectType : uint8_t
|
||||
{
|
||||
Ride,
|
||||
|
|
@ -118,7 +118,7 @@ enum class ObjectSourceGame : uint8_t
|
|||
* Object entry structure.
|
||||
* size: 0x10
|
||||
*/
|
||||
struct rct_object_entry
|
||||
struct RCTObjectEntry
|
||||
{
|
||||
union
|
||||
{
|
||||
|
|
@ -159,27 +159,19 @@ struct rct_object_entry
|
|||
}
|
||||
|
||||
bool IsEmpty() const;
|
||||
bool operator==(const rct_object_entry& rhs) const;
|
||||
bool operator!=(const rct_object_entry& rhs) const;
|
||||
bool operator==(const RCTObjectEntry& rhs) const;
|
||||
bool operator!=(const RCTObjectEntry& rhs) const;
|
||||
};
|
||||
assert_struct_size(rct_object_entry, 0x10);
|
||||
assert_struct_size(RCTObjectEntry, 0x10);
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
struct rct_ride_filters
|
||||
struct RideFilters
|
||||
{
|
||||
uint8_t category[2];
|
||||
ride_type_t ride_type;
|
||||
};
|
||||
|
||||
struct rct_object_filters
|
||||
{
|
||||
union
|
||||
{
|
||||
rct_ride_filters ride;
|
||||
};
|
||||
};
|
||||
|
||||
enum class ObjectGeneration : uint8_t
|
||||
{
|
||||
DAT,
|
||||
|
|
@ -191,7 +183,7 @@ struct ObjectEntryDescriptor
|
|||
ObjectGeneration Generation = ObjectGeneration::JSON;
|
||||
|
||||
// DAT
|
||||
rct_object_entry Entry{};
|
||||
RCTObjectEntry Entry{};
|
||||
|
||||
// JSON
|
||||
ObjectType Type{};
|
||||
|
|
@ -199,7 +191,7 @@ struct ObjectEntryDescriptor
|
|||
ObjectVersion Version;
|
||||
|
||||
ObjectEntryDescriptor() = default;
|
||||
explicit ObjectEntryDescriptor(const rct_object_entry& newEntry);
|
||||
explicit ObjectEntryDescriptor(const RCTObjectEntry& newEntry);
|
||||
explicit ObjectEntryDescriptor(std::string_view newIdentifier);
|
||||
explicit ObjectEntryDescriptor(ObjectType type, std::string_view newIdentifier);
|
||||
explicit ObjectEntryDescriptor(const ObjectRepositoryItem& ori);
|
||||
|
|
@ -337,7 +329,7 @@ public:
|
|||
}
|
||||
|
||||
// TODO remove this, we should no longer assume objects have a legacy object entry
|
||||
const rct_object_entry& GetObjectEntry() const
|
||||
const RCTObjectEntry& GetObjectEntry() const
|
||||
{
|
||||
return _descriptor.Entry;
|
||||
}
|
||||
|
|
@ -384,7 +376,7 @@ public:
|
|||
|
||||
ObjectEntryDescriptor GetScgWallsHeader() const;
|
||||
ObjectEntryDescriptor GetScgPathXHeader() const;
|
||||
rct_object_entry CreateHeader(const char name[9], uint32_t flags, uint32_t checksum);
|
||||
RCTObjectEntry CreateHeader(const char name[9], uint32_t flags, uint32_t checksum);
|
||||
|
||||
uint32_t GetNumImages() const
|
||||
{
|
||||
|
|
@ -398,10 +390,10 @@ public:
|
|||
extern int32_t object_entry_group_counts[];
|
||||
extern int32_t object_entry_group_encoding[];
|
||||
|
||||
int32_t ObjectCalculateChecksum(const rct_object_entry* entry, const void* data, size_t dataLength);
|
||||
void ObjectCreateIdentifierName(char* string_buffer, size_t size, const rct_object_entry* object);
|
||||
int32_t ObjectCalculateChecksum(const RCTObjectEntry* entry, const void* data, size_t dataLength);
|
||||
void ObjectCreateIdentifierName(char* string_buffer, size_t size, const RCTObjectEntry* object);
|
||||
|
||||
void ObjectEntryGetNameFixed(utf8* buffer, size_t bufferSize, const rct_object_entry* entry);
|
||||
void ObjectEntryGetNameFixed(utf8* buffer, size_t bufferSize, const RCTObjectEntry* entry);
|
||||
|
||||
void* ObjectEntryGetChunk(ObjectType objectType, ObjectEntryIndex index);
|
||||
const Object* ObjectEntryGetObject(ObjectType objectType, ObjectEntryIndex index);
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ namespace ObjectFactory
|
|||
auto fs = OpenRCT2::FileStream(path, OpenRCT2::FILE_MODE_OPEN);
|
||||
auto chunkReader = SawyerChunkReader(&fs);
|
||||
|
||||
rct_object_entry entry = fs.ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry entry = fs.ReadValue<RCTObjectEntry>();
|
||||
|
||||
if (entry.GetType() != ObjectType::ScenarioText)
|
||||
{
|
||||
|
|
@ -293,7 +293,7 @@ namespace ObjectFactory
|
|||
}
|
||||
|
||||
std::unique_ptr<Object> CreateObjectFromLegacyData(
|
||||
IObjectRepository& objectRepository, const rct_object_entry* entry, const void* data, size_t dataSize)
|
||||
IObjectRepository& objectRepository, const RCTObjectEntry* entry, const void* data, size_t dataSize)
|
||||
{
|
||||
Guard::ArgumentNotNull(entry, GUARD_LINE);
|
||||
Guard::ArgumentNotNull(data, GUARD_LINE);
|
||||
|
|
@ -528,7 +528,7 @@ namespace ObjectFactory
|
|||
{
|
||||
auto originalName = originalId.substr(9, 8);
|
||||
|
||||
rct_object_entry entry = {};
|
||||
RCTObjectEntry entry = {};
|
||||
entry.flags = std::stoul(originalId.substr(0, 8), nullptr, 16);
|
||||
entry.checksum = std::stoul(originalId.substr(18, 8), nullptr, 16);
|
||||
entry.SetType(objectType);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
struct IObjectRepository;
|
||||
class Object;
|
||||
struct rct_object_entry;
|
||||
struct RCTObjectEntry;
|
||||
enum class ObjectType : uint8_t;
|
||||
|
||||
namespace ObjectFactory
|
||||
|
|
@ -25,7 +25,7 @@ namespace ObjectFactory
|
|||
[[nodiscard]] std::unique_ptr<Object> CreateObjectFromLegacyFile(
|
||||
IObjectRepository& objectRepository, const utf8* path, bool loadImages);
|
||||
[[nodiscard]] std::unique_ptr<Object> CreateObjectFromLegacyData(
|
||||
IObjectRepository& objectRepository, const rct_object_entry* entry, const void* data, size_t dataSize);
|
||||
IObjectRepository& objectRepository, const RCTObjectEntry* entry, const void* data, size_t dataSize);
|
||||
[[nodiscard]] std::unique_ptr<Object> CreateObjectFromZipFile(
|
||||
IObjectRepository& objectRepository, std::string_view path, bool loadImages);
|
||||
[[nodiscard]] std::unique_ptr<Object> CreateObject(ObjectType type);
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ ObjectEntryIndex ObjectList::Find(ObjectType type, std::string_view identifier)
|
|||
*
|
||||
* rct2: 0x006AB344
|
||||
*/
|
||||
void ObjectCreateIdentifierName(char* string_buffer, size_t size, const rct_object_entry* object)
|
||||
void ObjectCreateIdentifierName(char* string_buffer, size_t size, const RCTObjectEntry* object)
|
||||
{
|
||||
snprintf(string_buffer, size, "%.8s/%4X%4X", object->name, object->flags, object->checksum);
|
||||
}
|
||||
|
|
@ -222,7 +222,7 @@ void ObjectGetTypeEntryIndex(size_t index, ObjectType* outObjectType, ObjectEntr
|
|||
*outEntryIndex = static_cast<ObjectEntryIndex>(index);
|
||||
}
|
||||
|
||||
void ObjectEntryGetNameFixed(utf8* buffer, size_t bufferSize, const rct_object_entry* entry)
|
||||
void ObjectEntryGetNameFixed(utf8* buffer, size_t bufferSize, const RCTObjectEntry* entry)
|
||||
{
|
||||
bufferSize = std::min(static_cast<size_t>(DAT_NAME_LENGTH) + 1, bufferSize);
|
||||
std::memcpy(buffer, entry->name, bufferSize - 1);
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ public:
|
|||
return RepositoryItemToObject(ori);
|
||||
}
|
||||
|
||||
Object* LoadObject(const rct_object_entry* entry) override
|
||||
Object* LoadObject(const RCTObjectEntry* entry) override
|
||||
{
|
||||
const ObjectRepositoryItem* ori = _objectRepository.FindObject(entry);
|
||||
return RepositoryItemToObject(ori);
|
||||
|
|
@ -722,7 +722,7 @@ private:
|
|||
Console::Error::WriteLine("[%s] Object not found.", name.c_str());
|
||||
}
|
||||
|
||||
void ReportObjectLoadProblem(const rct_object_entry* entry)
|
||||
void ReportObjectLoadProblem(const RCTObjectEntry* entry)
|
||||
{
|
||||
utf8 objName[DAT_NAME_LENGTH + 1] = { 0 };
|
||||
std::copy_n(entry->name, DAT_NAME_LENGTH, objName);
|
||||
|
|
@ -754,7 +754,7 @@ ObjectEntryIndex ObjectManagerGetLoadedObjectEntryIndex(const ObjectEntryDescrip
|
|||
return ObjectManagerGetLoadedObjectEntryIndex(ObjectManagerGetLoadedObject(entry));
|
||||
}
|
||||
|
||||
Object* ObjectManagerLoadObject(const rct_object_entry* entry)
|
||||
Object* ObjectManagerLoadObject(const RCTObjectEntry* entry)
|
||||
{
|
||||
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
|
||||
Object* loadedObject = objectManager.LoadObject(entry);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ struct IObjectManager
|
|||
virtual ObjectList GetLoadedObjects() abstract;
|
||||
|
||||
virtual Object* LoadObject(std::string_view identifier) abstract;
|
||||
virtual Object* LoadObject(const rct_object_entry* entry) abstract;
|
||||
virtual Object* LoadObject(const RCTObjectEntry* entry) abstract;
|
||||
virtual Object* LoadObject(const ObjectEntryDescriptor& descriptor) abstract;
|
||||
virtual void LoadObjects(const ObjectList& entries) abstract;
|
||||
virtual void UnloadObjects(const std::vector<ObjectEntryDescriptor>& entries) abstract;
|
||||
|
|
@ -52,7 +52,7 @@ struct IObjectManager
|
|||
[[nodiscard]] Object* ObjectManagerGetLoadedObject(const ObjectEntryDescriptor& entry);
|
||||
[[nodiscard]] ObjectEntryIndex ObjectManagerGetLoadedObjectEntryIndex(const Object* loadedObject);
|
||||
[[nodiscard]] ObjectEntryIndex ObjectManagerGetLoadedObjectEntryIndex(const ObjectEntryDescriptor& entry);
|
||||
Object* ObjectManagerLoadObject(const rct_object_entry* entry);
|
||||
Object* ObjectManagerLoadObject(const RCTObjectEntry* entry);
|
||||
void ObjectManagerUnloadObjects(const std::vector<ObjectEntryDescriptor>& entries);
|
||||
void ObjectManagerUnloadAllObjects();
|
||||
[[nodiscard]] StringId ObjectManagerGetSourceGameString(const ObjectSourceGame sourceGame);
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ using namespace OpenRCT2;
|
|||
|
||||
struct ObjectEntryHash
|
||||
{
|
||||
size_t operator()(const rct_object_entry& entry) const
|
||||
size_t operator()(const RCTObjectEntry& entry) const
|
||||
{
|
||||
uint32_t hash = 5381;
|
||||
for (auto i : entry.name)
|
||||
|
|
@ -66,14 +66,14 @@ struct ObjectEntryHash
|
|||
|
||||
struct ObjectEntryEqual
|
||||
{
|
||||
bool operator()(const rct_object_entry& lhs, const rct_object_entry& rhs) const
|
||||
bool operator()(const RCTObjectEntry& lhs, const RCTObjectEntry& rhs) const
|
||||
{
|
||||
return memcmp(&lhs.name, &rhs.name, 8) == 0;
|
||||
}
|
||||
};
|
||||
|
||||
using ObjectIdentifierMap = std::unordered_map<std::string, size_t>;
|
||||
using ObjectEntryMap = std::unordered_map<rct_object_entry, size_t, ObjectEntryHash, ObjectEntryEqual>;
|
||||
using ObjectEntryMap = std::unordered_map<RCTObjectEntry, size_t, ObjectEntryHash, ObjectEntryEqual>;
|
||||
|
||||
class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
|
||||
{
|
||||
|
|
@ -220,7 +220,7 @@ public:
|
|||
|
||||
const ObjectRepositoryItem* FindObjectLegacy(std::string_view legacyIdentifier) const override
|
||||
{
|
||||
rct_object_entry entry = {};
|
||||
RCTObjectEntry entry = {};
|
||||
entry.SetName(legacyIdentifier);
|
||||
|
||||
auto kvp = _itemMap.find(entry);
|
||||
|
|
@ -241,7 +241,7 @@ public:
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
const ObjectRepositoryItem* FindObject(const rct_object_entry* objectEntry) const override final
|
||||
const ObjectRepositoryItem* FindObject(const RCTObjectEntry* objectEntry) const override final
|
||||
{
|
||||
auto kvp = _itemMap.find(*objectEntry);
|
||||
if (kvp != _itemMap.end())
|
||||
|
|
@ -293,7 +293,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void AddObject(const rct_object_entry* objectEntry, const void* data, size_t dataSize) override
|
||||
void AddObject(const RCTObjectEntry* objectEntry, const void* data, size_t dataSize) override
|
||||
{
|
||||
utf8 objectName[9];
|
||||
ObjectEntryGetNameFixed(objectName, sizeof(objectName), objectEntry);
|
||||
|
|
@ -340,7 +340,7 @@ public:
|
|||
auto chunkReader = SawyerChunkReader(stream);
|
||||
|
||||
// Check if we already have this object
|
||||
rct_object_entry entry = stream->ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry entry = stream->ReadValue<RCTObjectEntry>();
|
||||
if (FindObject(&entry) != nullptr)
|
||||
{
|
||||
chunkReader.SkipChunk();
|
||||
|
|
@ -378,7 +378,7 @@ private:
|
|||
_newItemMap.clear();
|
||||
for (size_t i = 0; i < _items.size(); i++)
|
||||
{
|
||||
rct_object_entry entry = _items[i].ObjectEntry;
|
||||
RCTObjectEntry entry = _items[i].ObjectEntry;
|
||||
_itemMap[entry] = i;
|
||||
if (!_items[i].Identifier.empty())
|
||||
{
|
||||
|
|
@ -468,7 +468,7 @@ private:
|
|||
}
|
||||
|
||||
static void SaveObject(
|
||||
std::string_view path, const rct_object_entry* entry, const void* data, size_t dataSize, bool fixChecksum = true)
|
||||
std::string_view path, const RCTObjectEntry* entry, const void* data, size_t dataSize, bool fixChecksum = true)
|
||||
{
|
||||
if (fixChecksum)
|
||||
{
|
||||
|
|
@ -532,7 +532,7 @@ private:
|
|||
try
|
||||
{
|
||||
auto fs = FileStream(std::string(path), FILE_MODE_WRITE);
|
||||
fs.Write(entry, sizeof(rct_object_entry));
|
||||
fs.Write(entry, sizeof(RCTObjectEntry));
|
||||
fs.Write(encodedDataBuffer, encodedDataSize);
|
||||
|
||||
Memory::Free(encodedDataBuffer);
|
||||
|
|
@ -623,7 +623,7 @@ private:
|
|||
}
|
||||
}
|
||||
|
||||
void WritePackedObject(OpenRCT2::IStream* stream, const rct_object_entry* entry)
|
||||
void WritePackedObject(OpenRCT2::IStream* stream, const RCTObjectEntry* entry)
|
||||
{
|
||||
const ObjectRepositoryItem* item = FindObject(entry);
|
||||
if (item == nullptr)
|
||||
|
|
@ -633,7 +633,7 @@ private:
|
|||
|
||||
// Read object data from file
|
||||
auto fs = OpenRCT2::FileStream(item->Path, OpenRCT2::FILE_MODE_OPEN);
|
||||
auto fileEntry = fs.ReadValue<rct_object_entry>();
|
||||
auto fileEntry = fs.ReadValue<RCTObjectEntry>();
|
||||
if (*entry != fileEntry)
|
||||
{
|
||||
throw std::runtime_error("Header found in object file does not match object to pack.");
|
||||
|
|
@ -671,7 +671,7 @@ bool IsObjectCustom(const ObjectRepositoryItem* object)
|
|||
}
|
||||
}
|
||||
|
||||
std::unique_ptr<Object> ObjectRepositoryLoadObject(const rct_object_entry* objectEntry)
|
||||
std::unique_ptr<Object> ObjectRepositoryLoadObject(const RCTObjectEntry* objectEntry)
|
||||
{
|
||||
std::unique_ptr<Object> object;
|
||||
auto& objRepository = GetContext()->GetObjectRepository();
|
||||
|
|
@ -715,7 +715,7 @@ const ObjectRepositoryItem* ObjectRepositoryGetItems()
|
|||
return objectRepository.GetObjects();
|
||||
}
|
||||
|
||||
const ObjectRepositoryItem* ObjectRepositoryFindObjectByEntry(const rct_object_entry* entry)
|
||||
const ObjectRepositoryItem* ObjectRepositoryFindObjectByEntry(const RCTObjectEntry* entry)
|
||||
{
|
||||
auto& objectRepository = GetContext()->GetObjectRepository();
|
||||
return objectRepository.FindObject(entry);
|
||||
|
|
@ -727,7 +727,7 @@ const ObjectRepositoryItem* ObjectRepositoryFindObjectByName(const char* name)
|
|||
return objectRepository.FindObjectLegacy(name);
|
||||
}
|
||||
|
||||
int32_t ObjectCalculateChecksum(const rct_object_entry* entry, const void* data, size_t dataLength)
|
||||
int32_t ObjectCalculateChecksum(const RCTObjectEntry* entry, const void* data, size_t dataLength)
|
||||
{
|
||||
const uint8_t* entryBytePtr = reinterpret_cast<const uint8_t*>(entry);
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ struct ObjectRepositoryItem
|
|||
ObjectType Type;
|
||||
ObjectGeneration Generation;
|
||||
std::string Identifier; // e.g. rct2.c3d
|
||||
rct_object_entry ObjectEntry;
|
||||
RCTObjectEntry ObjectEntry;
|
||||
std::string Path;
|
||||
std::string Name;
|
||||
ObjectVersion Version;
|
||||
|
|
@ -81,14 +81,14 @@ struct IObjectRepository
|
|||
[[nodiscard]] virtual const ObjectRepositoryItem* GetObjects() const abstract;
|
||||
[[nodiscard]] virtual const ObjectRepositoryItem* FindObjectLegacy(std::string_view legacyIdentifier) const abstract;
|
||||
[[nodiscard]] virtual const ObjectRepositoryItem* FindObject(std::string_view identifier) const abstract;
|
||||
[[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const rct_object_entry* objectEntry) const abstract;
|
||||
[[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const RCTObjectEntry* objectEntry) const abstract;
|
||||
[[nodiscard]] virtual const ObjectRepositoryItem* FindObject(const ObjectEntryDescriptor& oed) const abstract;
|
||||
|
||||
[[nodiscard]] virtual std::unique_ptr<Object> LoadObject(const ObjectRepositoryItem* ori) abstract;
|
||||
virtual void RegisterLoadedObject(const ObjectRepositoryItem* ori, std::unique_ptr<Object>&& object) abstract;
|
||||
virtual void UnregisterLoadedObject(const ObjectRepositoryItem* ori, Object* object) abstract;
|
||||
|
||||
virtual void AddObject(const rct_object_entry* objectEntry, const void* data, size_t dataSize) abstract;
|
||||
virtual void AddObject(const RCTObjectEntry* objectEntry, const void* data, size_t dataSize) abstract;
|
||||
virtual void AddObjectFromFile(
|
||||
ObjectGeneration generation, std::string_view objectName, const void* data, size_t dataSize) abstract;
|
||||
|
||||
|
|
@ -102,6 +102,6 @@ struct IObjectRepository
|
|||
|
||||
[[nodiscard]] size_t ObjectRepositoryGetItemsCount();
|
||||
[[nodiscard]] const ObjectRepositoryItem* ObjectRepositoryGetItems();
|
||||
[[nodiscard]] const ObjectRepositoryItem* ObjectRepositoryFindObjectByEntry(const rct_object_entry* entry);
|
||||
[[nodiscard]] const ObjectRepositoryItem* ObjectRepositoryFindObjectByEntry(const RCTObjectEntry* entry);
|
||||
[[nodiscard]] const ObjectRepositoryItem* ObjectRepositoryFindObjectByName(const char* name);
|
||||
[[nodiscard]] std::unique_ptr<Object> ObjectRepositoryLoadObject(const rct_object_entry* objectEntry);
|
||||
[[nodiscard]] std::unique_ptr<Object> ObjectRepositoryLoadObject(const RCTObjectEntry* objectEntry);
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ std::vector<ObjectEntryDescriptor> SceneryGroupObject::ReadItems(IStream* stream
|
|||
while (stream->ReadValue<uint8_t>() != 0xFF)
|
||||
{
|
||||
stream->Seek(-1, STREAM_SEEK_CURRENT);
|
||||
auto entry = stream->ReadValue<rct_object_entry>();
|
||||
auto entry = stream->ReadValue<RCTObjectEntry>();
|
||||
items.emplace_back(entry);
|
||||
}
|
||||
return items;
|
||||
|
|
@ -219,7 +219,7 @@ std::vector<ObjectEntryDescriptor> SceneryGroupObject::ReadJsonEntries(IReadObje
|
|||
|
||||
try
|
||||
{
|
||||
rct_object_entry entry = {};
|
||||
RCTObjectEntry entry = {};
|
||||
entry.flags = std::stoul(entryName.substr(DatEntryFlagsStart, DatEntryFlagsLength), nullptr, 16);
|
||||
std::memcpy(entry.name, entryName.c_str() + DatEntryNameStart, DAT_NAME_LENGTH);
|
||||
entry.checksum = 0;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ void SmallSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
|
|||
|
||||
GetStringTable().Read(context, stream, ObjectStringID::NAME);
|
||||
|
||||
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry sgEntry = stream->ReadValue<RCTObjectEntry>();
|
||||
SetPrimarySceneryGroup(ObjectEntryDescriptor(sgEntry));
|
||||
|
||||
if (_legacyType.HasFlag(SMALL_SCENERY_FLAG_HAS_FRAME_OFFSETS))
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ void WallObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stre
|
|||
|
||||
GetStringTable().Read(context, stream, ObjectStringID::NAME);
|
||||
|
||||
rct_object_entry sgEntry = stream->ReadValue<rct_object_entry>();
|
||||
RCTObjectEntry sgEntry = stream->ReadValue<RCTObjectEntry>();
|
||||
SetPrimarySceneryGroup(ObjectEntryDescriptor(sgEntry));
|
||||
|
||||
GetImageTable().Read(context, stream);
|
||||
|
|
|
|||
|
|
@ -2219,7 +2219,7 @@ const RCT2::FootpathMapping* GetFootpathMapping(const ObjectEntryDescriptor& des
|
|||
auto datPathName = GetDATPathName(desc.Identifier);
|
||||
if (datPathName.has_value())
|
||||
{
|
||||
rct_object_entry objectEntry = {};
|
||||
RCTObjectEntry objectEntry = {};
|
||||
objectEntry.SetName(datPathName.value());
|
||||
return RCT2::GetFootpathSurfaceId(ObjectEntryDescriptor(objectEntry));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ namespace OpenRCT2
|
|||
break;
|
||||
case DESCRIPTOR_DAT:
|
||||
{
|
||||
rct_object_entry datEntry;
|
||||
RCTObjectEntry datEntry;
|
||||
cs.Read(&datEntry, sizeof(datEntry));
|
||||
ObjectEntryDescriptor desc(datEntry);
|
||||
if (version <= 2 && datEntry.GetType() == ObjectType::Paths)
|
||||
|
|
@ -400,7 +400,7 @@ namespace OpenRCT2
|
|||
else
|
||||
{
|
||||
cs.Write(DESCRIPTOR_DAT);
|
||||
cs.Write(&entry.Entry, sizeof(rct_object_entry));
|
||||
cs.Write(&entry.Entry, sizeof(RCTObjectEntry));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -646,7 +646,7 @@ namespace OpenRCT2
|
|||
auto type = cs.Read<uint8_t>();
|
||||
if (type == DESCRIPTOR_DAT)
|
||||
{
|
||||
rct_object_entry entry;
|
||||
RCTObjectEntry entry;
|
||||
cs.Read(&entry, sizeof(entry));
|
||||
auto size = cs.Read<uint32_t>();
|
||||
std::vector<uint8_t> data;
|
||||
|
|
@ -694,7 +694,7 @@ namespace OpenRCT2
|
|||
if (String::Equals(extension, ".dat", true))
|
||||
{
|
||||
cs.Write(DESCRIPTOR_DAT);
|
||||
cs.Write(&ori->ObjectEntry, sizeof(rct_object_entry));
|
||||
cs.Write(&ori->ObjectEntry, sizeof(RCTObjectEntry));
|
||||
}
|
||||
else if (String::Equals(extension, ".parkobj", true))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1837,7 +1837,7 @@ static constexpr const uint8_t PeepSpriteImage_Sandwich_35_sequence[] = { 0, 1,
|
|||
static constexpr const uint8_t PeepSpriteImage_Sandwich_36_sequence[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 11, 12, 11, 12, 11, 12, 11, 12, 11, 11, 11, 11, 11, 13, 14, 15 };
|
||||
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Normal[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Normal[] = {
|
||||
{ 6409, std::size(PeepSpriteImage_Normal_00_sequence), PeepSpriteImage_Normal_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Normal_01_sequence), PeepSpriteImage_Normal_01_sequence },
|
||||
{ 6621, std::size(PeepSpriteImage_Normal_02_sequence), PeepSpriteImage_Normal_02_sequence },
|
||||
|
|
@ -1877,7 +1877,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Normal[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Normal_36_sequence), PeepSpriteImage_Normal_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Handyman[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Handyman[] = {
|
||||
{ 11261, std::size(PeepSpriteImage_Handyman_00_sequence), PeepSpriteImage_Handyman_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Handyman_01_sequence), PeepSpriteImage_Handyman_01_sequence },
|
||||
{ 11285, std::size(PeepSpriteImage_Handyman_02_sequence), PeepSpriteImage_Handyman_02_sequence },
|
||||
|
|
@ -1917,7 +1917,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Handyman[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Handyman_36_sequence), PeepSpriteImage_Handyman_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Mechanic[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Mechanic[] = {
|
||||
{ 11441, std::size(PeepSpriteImage_Mechanic_00_sequence), PeepSpriteImage_Mechanic_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Mechanic_01_sequence), PeepSpriteImage_Mechanic_01_sequence },
|
||||
{ 11465, std::size(PeepSpriteImage_Mechanic_02_sequence), PeepSpriteImage_Mechanic_02_sequence },
|
||||
|
|
@ -1957,7 +1957,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Mechanic[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Mechanic_36_sequence), PeepSpriteImage_Mechanic_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Security[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Security[] = {
|
||||
{ 11881, std::size(PeepSpriteImage_Security_00_sequence), PeepSpriteImage_Security_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Security_01_sequence), PeepSpriteImage_Security_01_sequence },
|
||||
{ 11905, std::size(PeepSpriteImage_Security_02_sequence), PeepSpriteImage_Security_02_sequence },
|
||||
|
|
@ -1997,7 +1997,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Security[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Security_36_sequence), PeepSpriteImage_Security_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerPanda[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerPanda[] = {
|
||||
{ 11973, std::size(PeepSpriteImage_EntertainerPanda_00_sequence), PeepSpriteImage_EntertainerPanda_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerPanda_01_sequence), PeepSpriteImage_EntertainerPanda_01_sequence },
|
||||
{ 11997, std::size(PeepSpriteImage_EntertainerPanda_02_sequence), PeepSpriteImage_EntertainerPanda_02_sequence },
|
||||
|
|
@ -2037,7 +2037,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerPanda[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerPanda_36_sequence), PeepSpriteImage_EntertainerPanda_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerTiger[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerTiger[] = {
|
||||
{ 12129, std::size(PeepSpriteImage_EntertainerTiger_00_sequence), PeepSpriteImage_EntertainerTiger_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerTiger_01_sequence), PeepSpriteImage_EntertainerTiger_01_sequence },
|
||||
{ 12153, std::size(PeepSpriteImage_EntertainerTiger_02_sequence), PeepSpriteImage_EntertainerTiger_02_sequence },
|
||||
|
|
@ -2077,7 +2077,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerTiger[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerTiger_36_sequence), PeepSpriteImage_EntertainerTiger_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerElephant[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerElephant[] = {
|
||||
{ 12325, std::size(PeepSpriteImage_EntertainerElephant_00_sequence), PeepSpriteImage_EntertainerElephant_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerElephant_01_sequence), PeepSpriteImage_EntertainerElephant_01_sequence },
|
||||
{ 12349, std::size(PeepSpriteImage_EntertainerElephant_02_sequence), PeepSpriteImage_EntertainerElephant_02_sequence },
|
||||
|
|
@ -2117,7 +2117,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerElephant[]
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerElephant_36_sequence), PeepSpriteImage_EntertainerElephant_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerRoman[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerRoman[] = {
|
||||
{ 13897, std::size(PeepSpriteImage_EntertainerRoman_00_sequence), PeepSpriteImage_EntertainerRoman_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerRoman_01_sequence), PeepSpriteImage_EntertainerRoman_01_sequence },
|
||||
{ 13921, std::size(PeepSpriteImage_EntertainerRoman_02_sequence), PeepSpriteImage_EntertainerRoman_02_sequence },
|
||||
|
|
@ -2157,7 +2157,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerRoman[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerRoman_36_sequence), PeepSpriteImage_EntertainerRoman_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerGorilla[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerGorilla[] = {
|
||||
{ 12549, std::size(PeepSpriteImage_EntertainerGorilla_00_sequence), PeepSpriteImage_EntertainerGorilla_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerGorilla_01_sequence), PeepSpriteImage_EntertainerGorilla_01_sequence },
|
||||
{ 12545, std::size(PeepSpriteImage_EntertainerGorilla_02_sequence), PeepSpriteImage_EntertainerGorilla_02_sequence },
|
||||
|
|
@ -2197,7 +2197,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerGorilla[] =
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerGorilla_36_sequence), PeepSpriteImage_EntertainerGorilla_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerSnowman[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerSnowman[] = {
|
||||
{ 12681, std::size(PeepSpriteImage_EntertainerSnowman_00_sequence), PeepSpriteImage_EntertainerSnowman_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerSnowman_01_sequence), PeepSpriteImage_EntertainerSnowman_01_sequence },
|
||||
{ 12677, std::size(PeepSpriteImage_EntertainerSnowman_02_sequence), PeepSpriteImage_EntertainerSnowman_02_sequence },
|
||||
|
|
@ -2237,7 +2237,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerSnowman[] =
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerSnowman_36_sequence), PeepSpriteImage_EntertainerSnowman_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerKnight[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerKnight[] = {
|
||||
{ 12897, std::size(PeepSpriteImage_EntertainerKnight_00_sequence), PeepSpriteImage_EntertainerKnight_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerKnight_01_sequence), PeepSpriteImage_EntertainerKnight_01_sequence },
|
||||
{ 12893, std::size(PeepSpriteImage_EntertainerKnight_02_sequence), PeepSpriteImage_EntertainerKnight_02_sequence },
|
||||
|
|
@ -2277,7 +2277,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerKnight[] =
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerKnight_36_sequence), PeepSpriteImage_EntertainerKnight_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerAstronaut[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerAstronaut[] = {
|
||||
{ 13769, std::size(PeepSpriteImage_EntertainerAstronaut_00_sequence), PeepSpriteImage_EntertainerAstronaut_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerAstronaut_01_sequence), PeepSpriteImage_EntertainerAstronaut_01_sequence },
|
||||
{ 13765, std::size(PeepSpriteImage_EntertainerAstronaut_02_sequence), PeepSpriteImage_EntertainerAstronaut_02_sequence },
|
||||
|
|
@ -2317,7 +2317,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerAstronaut[]
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerAstronaut_36_sequence), PeepSpriteImage_EntertainerAstronaut_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerBandit[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerBandit[] = {
|
||||
{ 13109, std::size(PeepSpriteImage_EntertainerBandit_00_sequence), PeepSpriteImage_EntertainerBandit_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerBandit_01_sequence), PeepSpriteImage_EntertainerBandit_01_sequence },
|
||||
{ 13105, std::size(PeepSpriteImage_EntertainerBandit_02_sequence), PeepSpriteImage_EntertainerBandit_02_sequence },
|
||||
|
|
@ -2357,7 +2357,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerBandit[] =
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerBandit_36_sequence), PeepSpriteImage_EntertainerBandit_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerSheriff[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerSheriff[] = {
|
||||
{ 13613, std::size(PeepSpriteImage_EntertainerSheriff_00_sequence), PeepSpriteImage_EntertainerSheriff_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerSheriff_01_sequence), PeepSpriteImage_EntertainerSheriff_01_sequence },
|
||||
{ 13609, std::size(PeepSpriteImage_EntertainerSheriff_02_sequence), PeepSpriteImage_EntertainerSheriff_02_sequence },
|
||||
|
|
@ -2397,7 +2397,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerSheriff[] =
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerSheriff_36_sequence), PeepSpriteImage_EntertainerSheriff_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_EntertainerPirate[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_EntertainerPirate[] = {
|
||||
{ 13381, std::size(PeepSpriteImage_EntertainerPirate_00_sequence), PeepSpriteImage_EntertainerPirate_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_EntertainerPirate_01_sequence), PeepSpriteImage_EntertainerPirate_01_sequence },
|
||||
{ 13377, std::size(PeepSpriteImage_EntertainerPirate_02_sequence), PeepSpriteImage_EntertainerPirate_02_sequence },
|
||||
|
|
@ -2437,7 +2437,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_EntertainerPirate[] =
|
|||
{ 7181, std::size(PeepSpriteImage_EntertainerPirate_36_sequence), PeepSpriteImage_EntertainerPirate_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_IceCream[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_IceCream[] = {
|
||||
{ 7505, std::size(PeepSpriteImage_IceCream_00_sequence), PeepSpriteImage_IceCream_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_IceCream_01_sequence), PeepSpriteImage_IceCream_01_sequence },
|
||||
{ 7501, std::size(PeepSpriteImage_IceCream_02_sequence), PeepSpriteImage_IceCream_02_sequence },
|
||||
|
|
@ -2477,7 +2477,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_IceCream[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_IceCream_36_sequence), PeepSpriteImage_IceCream_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Chips[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Chips[] = {
|
||||
{ 7609, std::size(PeepSpriteImage_Chips_00_sequence), PeepSpriteImage_Chips_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Chips_01_sequence), PeepSpriteImage_Chips_01_sequence },
|
||||
{ 7605, std::size(PeepSpriteImage_Chips_02_sequence), PeepSpriteImage_Chips_02_sequence },
|
||||
|
|
@ -2517,7 +2517,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Chips[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Chips_36_sequence), PeepSpriteImage_Chips_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Burger[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Burger[] = {
|
||||
{ 8385, std::size(PeepSpriteImage_Burger_00_sequence), PeepSpriteImage_Burger_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Burger_01_sequence), PeepSpriteImage_Burger_01_sequence },
|
||||
{ 8381, std::size(PeepSpriteImage_Burger_02_sequence), PeepSpriteImage_Burger_02_sequence },
|
||||
|
|
@ -2557,7 +2557,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Burger[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Burger_36_sequence), PeepSpriteImage_Burger_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Drink[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Drink[] = {
|
||||
{ 8713, std::size(PeepSpriteImage_Drink_00_sequence), PeepSpriteImage_Drink_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Drink_01_sequence), PeepSpriteImage_Drink_01_sequence },
|
||||
{ 8709, std::size(PeepSpriteImage_Drink_02_sequence), PeepSpriteImage_Drink_02_sequence },
|
||||
|
|
@ -2597,7 +2597,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Drink[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Drink_36_sequence), PeepSpriteImage_Drink_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Balloon[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Balloon[] = {
|
||||
{ 10785, std::size(PeepSpriteImage_Balloon_00_sequence), PeepSpriteImage_Balloon_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Balloon_01_sequence), PeepSpriteImage_Balloon_01_sequence },
|
||||
{ 10781, std::size(PeepSpriteImage_Balloon_02_sequence), PeepSpriteImage_Balloon_02_sequence },
|
||||
|
|
@ -2637,7 +2637,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Balloon[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Balloon_36_sequence), PeepSpriteImage_Balloon_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Candyfloss[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Candyfloss[] = {
|
||||
{ 10849, std::size(PeepSpriteImage_Candyfloss_00_sequence), PeepSpriteImage_Candyfloss_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Candyfloss_01_sequence), PeepSpriteImage_Candyfloss_01_sequence },
|
||||
{ 10845, std::size(PeepSpriteImage_Candyfloss_02_sequence), PeepSpriteImage_Candyfloss_02_sequence },
|
||||
|
|
@ -2677,7 +2677,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Candyfloss[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Candyfloss_36_sequence), PeepSpriteImage_Candyfloss_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Umbrella[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Umbrella[] = {
|
||||
{ 11197, std::size(PeepSpriteImage_Umbrella_00_sequence), PeepSpriteImage_Umbrella_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Umbrella_01_sequence), PeepSpriteImage_Umbrella_01_sequence },
|
||||
{ 11221, std::size(PeepSpriteImage_Umbrella_02_sequence), PeepSpriteImage_Umbrella_02_sequence },
|
||||
|
|
@ -2717,7 +2717,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Umbrella[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Umbrella_36_sequence), PeepSpriteImage_Umbrella_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Pizza[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Pizza[] = {
|
||||
{ 7785, std::size(PeepSpriteImage_Pizza_00_sequence), PeepSpriteImage_Pizza_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Pizza_01_sequence), PeepSpriteImage_Pizza_01_sequence },
|
||||
{ 7781, std::size(PeepSpriteImage_Pizza_02_sequence), PeepSpriteImage_Pizza_02_sequence },
|
||||
|
|
@ -2757,7 +2757,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Pizza[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Pizza_36_sequence), PeepSpriteImage_Pizza_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_SecurityAlt[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_SecurityAlt[] = {
|
||||
{ 11949, std::size(PeepSpriteImage_SecurityAlt_00_sequence),PeepSpriteImage_SecurityAlt_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_SecurityAlt_01_sequence),PeepSpriteImage_SecurityAlt_01_sequence },
|
||||
{ 11905, std::size(PeepSpriteImage_SecurityAlt_02_sequence),PeepSpriteImage_SecurityAlt_02_sequence },
|
||||
|
|
@ -2797,7 +2797,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_SecurityAlt[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_SecurityAlt_36_sequence),PeepSpriteImage_SecurityAlt_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Popcorn[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Popcorn[] = {
|
||||
{ 11025, std::size(PeepSpriteImage_Popcorn_00_sequence), PeepSpriteImage_Popcorn_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Popcorn_01_sequence), PeepSpriteImage_Popcorn_01_sequence },
|
||||
{ 11021, std::size(PeepSpriteImage_Popcorn_02_sequence), PeepSpriteImage_Popcorn_02_sequence },
|
||||
|
|
@ -2837,7 +2837,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Popcorn[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Popcorn_36_sequence), PeepSpriteImage_Popcorn_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_ArmsCrossed[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_ArmsCrossed[] = {
|
||||
{ 6433, std::size(PeepSpriteImage_ArmsCrossed_00_sequence), PeepSpriteImage_ArmsCrossed_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_ArmsCrossed_01_sequence), PeepSpriteImage_ArmsCrossed_01_sequence },
|
||||
{ 6621, std::size(PeepSpriteImage_ArmsCrossed_02_sequence), PeepSpriteImage_ArmsCrossed_02_sequence },
|
||||
|
|
@ -2877,7 +2877,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_ArmsCrossed[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_ArmsCrossed_36_sequence), PeepSpriteImage_ArmsCrossed_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_HeadDown[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_HeadDown[] = {
|
||||
{ 6457, std::size(PeepSpriteImage_HeadDown_00_sequence), PeepSpriteImage_HeadDown_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_HeadDown_01_sequence), PeepSpriteImage_HeadDown_01_sequence },
|
||||
{ 6621, std::size(PeepSpriteImage_HeadDown_02_sequence), PeepSpriteImage_HeadDown_02_sequence },
|
||||
|
|
@ -2917,7 +2917,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_HeadDown[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_HeadDown_36_sequence), PeepSpriteImage_HeadDown_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Nauseous[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Nauseous[] = {
|
||||
{ 6481, std::size(PeepSpriteImage_Nauseous_00_sequence), PeepSpriteImage_Nauseous_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Nauseous_01_sequence), PeepSpriteImage_Nauseous_01_sequence },
|
||||
{ 6621, std::size(PeepSpriteImage_Nauseous_02_sequence), PeepSpriteImage_Nauseous_02_sequence },
|
||||
|
|
@ -2957,7 +2957,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Nauseous[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Nauseous_36_sequence), PeepSpriteImage_Nauseous_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_VeryNauseous[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_VeryNauseous[] = {
|
||||
{ 6505, std::size(PeepSpriteImage_VeryNauseous_00_sequence), PeepSpriteImage_VeryNauseous_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_VeryNauseous_01_sequence), PeepSpriteImage_VeryNauseous_01_sequence },
|
||||
{ 6529, std::size(PeepSpriteImage_VeryNauseous_02_sequence), PeepSpriteImage_VeryNauseous_02_sequence },
|
||||
|
|
@ -2997,7 +2997,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_VeryNauseous[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_VeryNauseous_36_sequence), PeepSpriteImage_VeryNauseous_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_RequireToilet[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_RequireToilet[] = {
|
||||
{ 6537, std::size(PeepSpriteImage_RequireToilet_00_sequence), PeepSpriteImage_RequireToilet_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_RequireToilet_01_sequence), PeepSpriteImage_RequireToilet_01_sequence },
|
||||
{ 6621, std::size(PeepSpriteImage_RequireToilet_02_sequence), PeepSpriteImage_RequireToilet_02_sequence },
|
||||
|
|
@ -3037,7 +3037,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_RequireToilet[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_RequireToilet_36_sequence), PeepSpriteImage_RequireToilet_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Hat[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Hat[] = {
|
||||
{ 10721, std::size(PeepSpriteImage_Hat_00_sequence), PeepSpriteImage_Hat_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Hat_01_sequence), PeepSpriteImage_Hat_01_sequence },
|
||||
{ 10717, std::size(PeepSpriteImage_Hat_02_sequence), PeepSpriteImage_Hat_02_sequence },
|
||||
|
|
@ -3077,7 +3077,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Hat[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Hat_36_sequence), PeepSpriteImage_Hat_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_HotDog[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_HotDog[] = {
|
||||
{ 7889, std::size(PeepSpriteImage_HotDog_00_sequence), PeepSpriteImage_HotDog_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_HotDog_01_sequence), PeepSpriteImage_HotDog_01_sequence },
|
||||
{ 7885, std::size(PeepSpriteImage_HotDog_02_sequence), PeepSpriteImage_HotDog_02_sequence },
|
||||
|
|
@ -3117,7 +3117,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_HotDog[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_HotDog_36_sequence), PeepSpriteImage_HotDog_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Tentacle[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Tentacle[] = {
|
||||
{ 8065, std::size(PeepSpriteImage_Tentacle_00_sequence), PeepSpriteImage_Tentacle_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Tentacle_01_sequence), PeepSpriteImage_Tentacle_01_sequence },
|
||||
{ 8061, std::size(PeepSpriteImage_Tentacle_02_sequence), PeepSpriteImage_Tentacle_02_sequence },
|
||||
|
|
@ -3157,7 +3157,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Tentacle[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Tentacle_36_sequence), PeepSpriteImage_Tentacle_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_ToffeeApple[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_ToffeeApple[] = {
|
||||
{ 7401, std::size(PeepSpriteImage_ToffeeApple_00_sequence), PeepSpriteImage_ToffeeApple_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_ToffeeApple_01_sequence), PeepSpriteImage_ToffeeApple_01_sequence },
|
||||
{ 7397, std::size(PeepSpriteImage_ToffeeApple_02_sequence), PeepSpriteImage_ToffeeApple_02_sequence },
|
||||
|
|
@ -3197,7 +3197,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_ToffeeApple[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_ToffeeApple_36_sequence), PeepSpriteImage_ToffeeApple_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Donut[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Donut[] = {
|
||||
{ 8561, std::size(PeepSpriteImage_Donut_00_sequence), PeepSpriteImage_Donut_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Donut_01_sequence), PeepSpriteImage_Donut_01_sequence },
|
||||
{ 8557, std::size(PeepSpriteImage_Donut_02_sequence), PeepSpriteImage_Donut_02_sequence },
|
||||
|
|
@ -3237,7 +3237,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Donut[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Donut_36_sequence), PeepSpriteImage_Donut_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Coffee[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Coffee[] = {
|
||||
{ 8885, std::size(PeepSpriteImage_Coffee_00_sequence), PeepSpriteImage_Coffee_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Coffee_01_sequence), PeepSpriteImage_Coffee_01_sequence },
|
||||
{ 8981, std::size(PeepSpriteImage_Coffee_02_sequence), PeepSpriteImage_Coffee_02_sequence },
|
||||
|
|
@ -3277,7 +3277,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Coffee[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Coffee_36_sequence), PeepSpriteImage_Coffee_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Chicken[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Chicken[] = {
|
||||
{ 9005, std::size(PeepSpriteImage_Chicken_00_sequence), PeepSpriteImage_Chicken_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Chicken_01_sequence), PeepSpriteImage_Chicken_01_sequence },
|
||||
{ 9125, std::size(PeepSpriteImage_Chicken_02_sequence), PeepSpriteImage_Chicken_02_sequence },
|
||||
|
|
@ -3317,7 +3317,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Chicken[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Chicken_36_sequence), PeepSpriteImage_Chicken_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Lemonade[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Lemonade[] = {
|
||||
{ 9173, std::size(PeepSpriteImage_Lemonade_00_sequence), PeepSpriteImage_Lemonade_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Lemonade_01_sequence), PeepSpriteImage_Lemonade_01_sequence },
|
||||
{ 9293, std::size(PeepSpriteImage_Lemonade_02_sequence), PeepSpriteImage_Lemonade_02_sequence },
|
||||
|
|
@ -3357,7 +3357,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Lemonade[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Lemonade_36_sequence), PeepSpriteImage_Lemonade_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Watching[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Watching[] = {
|
||||
{ 6409, std::size(PeepSpriteImage_Watching_00_sequence), PeepSpriteImage_Watching_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Watching_01_sequence), PeepSpriteImage_Watching_01_sequence },
|
||||
{ 7245, std::size(PeepSpriteImage_Watching_02_sequence), PeepSpriteImage_Watching_02_sequence },
|
||||
|
|
@ -3397,7 +3397,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Watching[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Watching_36_sequence), PeepSpriteImage_Watching_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Pretzel[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Pretzel[] = {
|
||||
{ 9341, std::size(PeepSpriteImage_Pretzel_00_sequence), PeepSpriteImage_Pretzel_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Pretzel_01_sequence), PeepSpriteImage_Pretzel_01_sequence },
|
||||
{ 9461, std::size(PeepSpriteImage_Pretzel_02_sequence), PeepSpriteImage_Pretzel_02_sequence },
|
||||
|
|
@ -3437,7 +3437,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Pretzel[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Pretzel_36_sequence), PeepSpriteImage_Pretzel_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Sunglasses[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Sunglasses[] = {
|
||||
{ 10685, std::size(PeepSpriteImage_Sunglasses_00_sequence), PeepSpriteImage_Sunglasses_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Sunglasses_01_sequence), PeepSpriteImage_Sunglasses_01_sequence },
|
||||
{ 10713, std::size(PeepSpriteImage_Sunglasses_02_sequence), PeepSpriteImage_Sunglasses_02_sequence },
|
||||
|
|
@ -3477,7 +3477,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Sunglasses[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Sunglasses_36_sequence), PeepSpriteImage_Sunglasses_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_SuJongkwa[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_SuJongkwa[] = {
|
||||
{ 9509, std::size(PeepSpriteImage_SuJongkwa_00_sequence), PeepSpriteImage_SuJongkwa_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_SuJongkwa_01_sequence), PeepSpriteImage_SuJongkwa_01_sequence },
|
||||
{ 9629, std::size(PeepSpriteImage_SuJongkwa_02_sequence), PeepSpriteImage_SuJongkwa_02_sequence },
|
||||
|
|
@ -3517,7 +3517,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_SuJongkwa[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_SuJongkwa_36_sequence), PeepSpriteImage_SuJongkwa_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Juice[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Juice[] = {
|
||||
{ 9677, std::size(PeepSpriteImage_Juice_00_sequence), PeepSpriteImage_Juice_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Juice_01_sequence), PeepSpriteImage_Juice_01_sequence },
|
||||
{ 9797, std::size(PeepSpriteImage_Juice_02_sequence), PeepSpriteImage_Juice_02_sequence },
|
||||
|
|
@ -3557,7 +3557,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Juice[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Juice_36_sequence), PeepSpriteImage_Juice_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_FunnelCake[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_FunnelCake[] = {
|
||||
{ 9845, std::size(PeepSpriteImage_FunnelCake_00_sequence), PeepSpriteImage_FunnelCake_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_FunnelCake_01_sequence), PeepSpriteImage_FunnelCake_01_sequence },
|
||||
{ 9965, std::size(PeepSpriteImage_FunnelCake_02_sequence), PeepSpriteImage_FunnelCake_02_sequence },
|
||||
|
|
@ -3597,7 +3597,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_FunnelCake[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_FunnelCake_36_sequence), PeepSpriteImage_FunnelCake_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Noodles[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Noodles[] = {
|
||||
{ 10013, std::size(PeepSpriteImage_Noodles_00_sequence), PeepSpriteImage_Noodles_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Noodles_01_sequence), PeepSpriteImage_Noodles_01_sequence },
|
||||
{ 10133, std::size(PeepSpriteImage_Noodles_02_sequence), PeepSpriteImage_Noodles_02_sequence },
|
||||
|
|
@ -3637,7 +3637,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Noodles[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Noodles_36_sequence), PeepSpriteImage_Noodles_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Sausage[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Sausage[] = {
|
||||
{ 10181, std::size(PeepSpriteImage_Sausage_00_sequence), PeepSpriteImage_Sausage_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Sausage_01_sequence), PeepSpriteImage_Sausage_01_sequence },
|
||||
{ 10301, std::size(PeepSpriteImage_Sausage_02_sequence), PeepSpriteImage_Sausage_02_sequence },
|
||||
|
|
@ -3677,7 +3677,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Sausage[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Sausage_36_sequence), PeepSpriteImage_Sausage_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Soup[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Soup[] = {
|
||||
{ 10349, std::size(PeepSpriteImage_Soup_00_sequence), PeepSpriteImage_Soup_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Soup_01_sequence), PeepSpriteImage_Soup_01_sequence },
|
||||
{ 10469, std::size(PeepSpriteImage_Soup_02_sequence), PeepSpriteImage_Soup_02_sequence },
|
||||
|
|
@ -3717,7 +3717,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Soup[] = {
|
|||
{ 7181, std::size(PeepSpriteImage_Soup_36_sequence), PeepSpriteImage_Soup_36_sequence },
|
||||
};
|
||||
|
||||
static constexpr const rct_peep_animation PeepSpriteImage_Sandwich[] = {
|
||||
static constexpr const PeepAnimation PeepSpriteImage_Sandwich[] = {
|
||||
{ 10517, std::size(PeepSpriteImage_Sandwich_00_sequence), PeepSpriteImage_Sandwich_00_sequence },
|
||||
{ 6585, std::size(PeepSpriteImage_Sandwich_01_sequence), PeepSpriteImage_Sandwich_01_sequence },
|
||||
{ 10637, std::size(PeepSpriteImage_Sandwich_02_sequence), PeepSpriteImage_Sandwich_02_sequence },
|
||||
|
|
@ -3758,7 +3758,7 @@ static constexpr const rct_peep_animation PeepSpriteImage_Sandwich[] = {
|
|||
};
|
||||
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Normal[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Normal[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -3798,7 +3798,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Normal[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Handyman[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Handyman[] = {
|
||||
{ 12, 16, 6 },
|
||||
{ 8, 16, 5 },
|
||||
{ 9, 16, 6 },
|
||||
|
|
@ -3838,7 +3838,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Handyman[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Mechanic[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Mechanic[] = {
|
||||
{ 10, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 16, 5 },
|
||||
|
|
@ -3878,7 +3878,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Mechanic[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Security[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Security[] = {
|
||||
{ 8, 18, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 17, 5 },
|
||||
|
|
@ -3918,7 +3918,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Security[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerPanda[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerPanda[] = {
|
||||
{ 13, 24, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -3958,7 +3958,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerPanda[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerTiger[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerTiger[] = {
|
||||
{ 13, 24, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -3998,7 +3998,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerTiger[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerElephant[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerElephant[] = {
|
||||
{ 13, 24, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4038,7 +4038,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerElephant[]
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerRoman[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerRoman[] = {
|
||||
{ 13, 24, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4078,7 +4078,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerRoman[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerGorilla[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerGorilla[] = {
|
||||
{ 13, 24, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4118,7 +4118,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerGorilla[] =
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerSnowman[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerSnowman[] = {
|
||||
{ 13, 24, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4158,7 +4158,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerSnowman[] =
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerKnight[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerKnight[] = {
|
||||
{ 16, 32, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4198,7 +4198,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerKnight[] =
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerAstronaut[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerAstronaut[] = {
|
||||
{ 16, 32, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4238,7 +4238,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerAstronaut[]
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerBandit[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerBandit[] = {
|
||||
{ 16, 32, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4278,7 +4278,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerBandit[] =
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerSheriff[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerSheriff[] = {
|
||||
{ 16, 32, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4318,7 +4318,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerSheriff[] =
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerPirate[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_EntertainerPirate[] = {
|
||||
{ 16, 32, 8 },
|
||||
{ 8, 16, 5 },
|
||||
{ 10, 23, 7 },
|
||||
|
|
@ -4358,7 +4358,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_EntertainerPirate[] =
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_IceCream[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_IceCream[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4398,7 +4398,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_IceCream[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Chips[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Chips[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4438,7 +4438,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Chips[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Burger[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Burger[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4478,7 +4478,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Burger[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Drink[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Drink[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4518,7 +4518,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Drink[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Balloon[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Balloon[] = {
|
||||
{ 11, 28, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 11, 28, 5 },
|
||||
|
|
@ -4558,7 +4558,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Balloon[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Candyfloss[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Candyfloss[] = {
|
||||
{ 11, 19, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 11, 19, 5 },
|
||||
|
|
@ -4598,7 +4598,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Candyfloss[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Umbrella[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Umbrella[] = {
|
||||
{ 14, 21, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 14, 21, 5 },
|
||||
|
|
@ -4638,7 +4638,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Umbrella[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Pizza[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Pizza[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4678,7 +4678,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Pizza[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_SecurityAlt[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_SecurityAlt[] = {
|
||||
{ 8, 18, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 17, 5 },
|
||||
|
|
@ -4718,7 +4718,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_SecurityAlt[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Popcorn[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Popcorn[] = {
|
||||
{ 11, 19, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 11, 19, 5 },
|
||||
|
|
@ -4758,7 +4758,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Popcorn[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Hat[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Hat[] = {
|
||||
{ 12, 32, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 12, 32, 5 },
|
||||
|
|
@ -4798,7 +4798,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Hat[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_HotDog[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_HotDog[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4838,7 +4838,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_HotDog[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Tentacle[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Tentacle[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4878,7 +4878,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Tentacle[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_ToffeeApple[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_ToffeeApple[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4918,7 +4918,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_ToffeeApple[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Donut[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Donut[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4958,7 +4958,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Donut[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Coffee[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Coffee[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -4998,7 +4998,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Coffee[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Chicken[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Chicken[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5038,7 +5038,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Chicken[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Lemonade[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Lemonade[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5078,7 +5078,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Lemonade[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Pretzel[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Pretzel[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5118,7 +5118,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Pretzel[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_SuJongkwa[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_SuJongkwa[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5158,7 +5158,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_SuJongkwa[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Juice[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Juice[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5198,7 +5198,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Juice[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_FunnelCake[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_FunnelCake[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5238,7 +5238,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_FunnelCake[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Noodles[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Noodles[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5278,7 +5278,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Noodles[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Sausage[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Sausage[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5318,7 +5318,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Sausage[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Soup[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Soup[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5358,7 +5358,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Soup[] = {
|
|||
{ 9, 22, 7 },
|
||||
};
|
||||
|
||||
static constexpr const rct_sprite_bounds PeepSpriteBounds_Sandwich[] = {
|
||||
static constexpr const SpriteBounds PeepSpriteBounds_Sandwich[] = {
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
{ 8, 16, 5 },
|
||||
|
|
@ -5399,7 +5399,7 @@ static constexpr const rct_sprite_bounds PeepSpriteBounds_Sandwich[] = {
|
|||
};
|
||||
|
||||
|
||||
constexpr rct_peep_animation_entry g_peep_animation_entries[] =
|
||||
constexpr PeepAnimationEntry g_peep_animation_entries[] =
|
||||
{
|
||||
{ PeepSpriteImage_Normal, PeepSpriteBounds_Normal },
|
||||
{ PeepSpriteImage_Handyman, PeepSpriteBounds_Handyman },
|
||||
|
|
|
|||
|
|
@ -40,20 +40,14 @@ enum class SPECIAL_FOLDER
|
|||
RCT2_DISCORD,
|
||||
};
|
||||
|
||||
struct rct2_date
|
||||
struct RealWorldDate
|
||||
{
|
||||
uint8_t day;
|
||||
uint8_t month;
|
||||
int16_t year;
|
||||
uint8_t day_of_week;
|
||||
};
|
||||
|
||||
struct rct2_time
|
||||
{
|
||||
uint8_t hour;
|
||||
uint8_t minute;
|
||||
uint8_t second;
|
||||
};
|
||||
struct RealWorldTime;
|
||||
|
||||
namespace Platform
|
||||
{
|
||||
|
|
@ -79,8 +73,8 @@ namespace Platform
|
|||
MeasurementFormat GetLocaleMeasurementFormat();
|
||||
uint8_t GetLocaleDateFormat();
|
||||
TemperatureUnit GetLocaleTemperatureFormat();
|
||||
rct2_time GetTimeLocal();
|
||||
rct2_date GetDateLocal();
|
||||
RealWorldTime GetTimeLocal();
|
||||
RealWorldDate GetDateLocal();
|
||||
|
||||
bool FindApp(std::string_view app, std::string* output);
|
||||
int32_t Execute(std::string_view command, std::string* output = nullptr);
|
||||
|
|
|
|||
|
|
@ -69,12 +69,12 @@ namespace Platform
|
|||
return CurrencyType::Pounds;
|
||||
}
|
||||
|
||||
rct2_date GetDateLocal()
|
||||
RealWorldDate GetDateLocal()
|
||||
{
|
||||
auto time = std::time(nullptr);
|
||||
auto localTime = std::localtime(&time);
|
||||
|
||||
rct2_date outDate;
|
||||
RealWorldDate outDate;
|
||||
outDate.day = localTime->tm_mday;
|
||||
outDate.day_of_week = localTime->tm_wday;
|
||||
outDate.month = localTime->tm_mon + 1;
|
||||
|
|
@ -82,12 +82,12 @@ namespace Platform
|
|||
return outDate;
|
||||
}
|
||||
|
||||
rct2_time GetTimeLocal()
|
||||
RealWorldTime GetTimeLocal()
|
||||
{
|
||||
auto time = std::time(nullptr);
|
||||
auto localTime = std::localtime(&time);
|
||||
|
||||
rct2_time outTime;
|
||||
RealWorldTime outTime;
|
||||
outTime.hour = localTime->tm_hour;
|
||||
outTime.minute = localTime->tm_min;
|
||||
outTime.second = localTime->tm_sec;
|
||||
|
|
|
|||
|
|
@ -1275,7 +1275,7 @@ namespace RCT1
|
|||
dst->ActionSpriteType = static_cast<PeepActionSpriteType>(src->ActionSpriteType);
|
||||
dst->ActionFrame = src->ActionFrame;
|
||||
|
||||
const rct_sprite_bounds* spriteBounds = &GetSpriteBounds(dst->SpriteType, dst->ActionSpriteType);
|
||||
const SpriteBounds* spriteBounds = &GetSpriteBounds(dst->SpriteType, dst->ActionSpriteType);
|
||||
dst->sprite_width = spriteBounds->sprite_width;
|
||||
dst->sprite_height_negative = spriteBounds->sprite_height_negative;
|
||||
dst->sprite_height_positive = spriteBounds->sprite_height_positive;
|
||||
|
|
|
|||
|
|
@ -258,9 +258,9 @@ namespace RCT2
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
std::optional<rct_object_entry> GetBestObjectEntryForSurface(std::string_view surface, std::string_view railings)
|
||||
std::optional<RCTObjectEntry> GetBestObjectEntryForSurface(std::string_view surface, std::string_view railings)
|
||||
{
|
||||
rct_object_entry result;
|
||||
RCTObjectEntry result;
|
||||
std::memset(&result, 0, sizeof(result));
|
||||
|
||||
result.SetType(ObjectType::Paths);
|
||||
|
|
|
|||
|
|
@ -304,13 +304,13 @@ namespace RCT2
|
|||
/* Track Scenery entry size: 0x16 */
|
||||
struct TD6SceneryElement
|
||||
{
|
||||
rct_object_entry scenery_object; // 0x00
|
||||
int8_t x; // 0x10
|
||||
int8_t y; // 0x11
|
||||
int8_t z; // 0x12
|
||||
uint8_t flags; // 0x13 direction quadrant tertiary colour
|
||||
uint8_t primary_colour; // 0x14
|
||||
uint8_t secondary_colour; // 0x15
|
||||
RCTObjectEntry scenery_object; // 0x00
|
||||
int8_t x; // 0x10
|
||||
int8_t y; // 0x11
|
||||
int8_t z; // 0x12
|
||||
uint8_t flags; // 0x13 direction quadrant tertiary colour
|
||||
uint8_t primary_colour; // 0x14
|
||||
uint8_t secondary_colour; // 0x15
|
||||
};
|
||||
assert_struct_size(TD6SceneryElement, 0x16);
|
||||
|
||||
|
|
@ -380,7 +380,7 @@ namespace RCT2
|
|||
uint8_t track_rail_colour[Limits::NumColourSchemes]; // 0x64
|
||||
uint8_t track_support_colour[Limits::NumColourSchemes]; // 0x68
|
||||
uint32_t flags2; // 0x6C
|
||||
rct_object_entry vehicle_object; // 0x70
|
||||
RCTObjectEntry vehicle_object; // 0x70
|
||||
uint8_t space_required_x; // 0x80
|
||||
uint8_t space_required_y; // 0x81
|
||||
uint8_t vehicle_additional_colour[Limits::MaxTrainsPerRide]; // 0x82
|
||||
|
|
@ -785,9 +785,9 @@ namespace RCT2
|
|||
int32_t objective_arg_2; // 0x04
|
||||
int16_t objective_arg_3; // 0x08
|
||||
uint8_t pad_00A[0x3E];
|
||||
char name[64]; // 0x48
|
||||
char details[256]; // 0x88
|
||||
rct_object_entry entry; // 0x188
|
||||
char name[64]; // 0x48
|
||||
char details[256]; // 0x88
|
||||
RCTObjectEntry entry; // 0x188
|
||||
};
|
||||
assert_struct_size(S6Info, 0x198);
|
||||
|
||||
|
|
@ -805,20 +805,20 @@ namespace RCT2
|
|||
// SC6[3]
|
||||
union
|
||||
{
|
||||
rct_object_entry Objects[RCT2_OBJECT_ENTRY_COUNT];
|
||||
RCTObjectEntry Objects[RCT2_OBJECT_ENTRY_COUNT];
|
||||
struct
|
||||
{
|
||||
rct_object_entry RideObjects[Limits::MaxRideObjects];
|
||||
rct_object_entry SceneryObjects[Limits::MaxSmallSceneryObjects];
|
||||
rct_object_entry LargeSceneryObjects[Limits::MaxLargeSceneryObjects];
|
||||
rct_object_entry WallSceneryObjects[Limits::MaxWallSceneryObjects];
|
||||
rct_object_entry BannerObjects[Limits::MaxBannerObjects];
|
||||
rct_object_entry PathObjects[Limits::MaxPathObjects];
|
||||
rct_object_entry PathAdditionObjects[Limits::MaxPathAdditionObjects];
|
||||
rct_object_entry SceneryGroupObjects[Limits::MaxSceneryGroupObjects];
|
||||
rct_object_entry ParkEntranceObjects[Limits::MaxParkEntranceObjects];
|
||||
rct_object_entry WaterObjects[Limits::MaxWaterObjects];
|
||||
rct_object_entry ScenarioTextObjects[Limits::MaxScenarioTextObjects];
|
||||
RCTObjectEntry RideObjects[Limits::MaxRideObjects];
|
||||
RCTObjectEntry SceneryObjects[Limits::MaxSmallSceneryObjects];
|
||||
RCTObjectEntry LargeSceneryObjects[Limits::MaxLargeSceneryObjects];
|
||||
RCTObjectEntry WallSceneryObjects[Limits::MaxWallSceneryObjects];
|
||||
RCTObjectEntry BannerObjects[Limits::MaxBannerObjects];
|
||||
RCTObjectEntry PathObjects[Limits::MaxPathObjects];
|
||||
RCTObjectEntry PathAdditionObjects[Limits::MaxPathAdditionObjects];
|
||||
RCTObjectEntry SceneryGroupObjects[Limits::MaxSceneryGroupObjects];
|
||||
RCTObjectEntry ParkEntranceObjects[Limits::MaxParkEntranceObjects];
|
||||
RCTObjectEntry WaterObjects[Limits::MaxWaterObjects];
|
||||
RCTObjectEntry ScenarioTextObjects[Limits::MaxScenarioTextObjects];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -1054,7 +1054,7 @@ namespace RCT2
|
|||
|
||||
const FootpathMapping* GetFootpathSurfaceId(
|
||||
const ObjectEntryDescriptor& desc, bool ideallyLoaded = false, bool isQueue = false);
|
||||
std::optional<rct_object_entry> GetBestObjectEntryForSurface(std::string_view surface, std::string_view railings);
|
||||
std::optional<RCTObjectEntry> GetBestObjectEntryForSurface(std::string_view surface, std::string_view railings);
|
||||
|
||||
static constexpr std::string_view DefaultTerrainSurfaces[] = {
|
||||
"rct2.terrain_surface.grass", "rct2.terrain_surface.sand", "rct2.terrain_surface.dirt",
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ namespace RCT2
|
|||
tempStream.WriteArray(_trackDesign->track_rail_colour, Limits::NumColourSchemes);
|
||||
tempStream.WriteArray(_trackDesign->track_support_colour, Limits::NumColourSchemes);
|
||||
tempStream.WriteValue<uint32_t>(_trackDesign->flags2);
|
||||
tempStream.Write(&_trackDesign->vehicle_object.Entry, sizeof(rct_object_entry));
|
||||
tempStream.Write(&_trackDesign->vehicle_object.Entry, sizeof(RCTObjectEntry));
|
||||
tempStream.WriteValue<uint8_t>(_trackDesign->space_required_x);
|
||||
tempStream.WriteValue<uint8_t>(_trackDesign->space_required_y);
|
||||
for (auto& colour : _trackDesign->vehicle_colours)
|
||||
|
|
@ -135,7 +135,7 @@ namespace RCT2
|
|||
|
||||
for (const auto& sceneryElement : _trackDesign->scenery_elements)
|
||||
{
|
||||
tempStream.Write(&sceneryElement.scenery_object.Entry, sizeof(rct_object_entry));
|
||||
tempStream.Write(&sceneryElement.scenery_object.Entry, sizeof(RCTObjectEntry));
|
||||
tempStream.WriteValue<int8_t>(sceneryElement.loc.x / COORDS_XY_STEP);
|
||||
tempStream.WriteValue<int8_t>(sceneryElement.loc.y / COORDS_XY_STEP);
|
||||
tempStream.WriteValue<int8_t>(sceneryElement.loc.z / COORDS_Z_STEP);
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ static bool track_design_is_supported_object(const Object* obj)
|
|||
}
|
||||
|
||||
static void track_design_save_push_tile_element_desc(
|
||||
const rct_object_entry& entry, const CoordsXYZ& loc, uint8_t flags, uint8_t primaryColour, uint8_t secondaryColour)
|
||||
const RCTObjectEntry& entry, const CoordsXYZ& loc, uint8_t flags, uint8_t primaryColour, uint8_t secondaryColour)
|
||||
{
|
||||
TrackDesignSceneryElement item{};
|
||||
item.scenery_object = ObjectEntryDescriptor(entry);
|
||||
|
|
@ -334,9 +334,9 @@ static TrackDesignAddStatus track_design_save_add_wall(const CoordsXY& loc, Wall
|
|||
return TrackDesignAddStatus::Fail(STR_UNSUPPORTED_OBJECT_FORMAT);
|
||||
}
|
||||
|
||||
static std::optional<rct_object_entry> track_design_save_footpath_get_best_entry(PathElement* pathElement)
|
||||
static std::optional<RCTObjectEntry> track_design_save_footpath_get_best_entry(PathElement* pathElement)
|
||||
{
|
||||
rct_object_entry pathEntry;
|
||||
RCTObjectEntry pathEntry;
|
||||
auto legacyPathObj = pathElement->GetLegacyPathEntry();
|
||||
if (legacyPathObj != nullptr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include <memory>
|
||||
|
||||
struct rct_object_entry;
|
||||
struct RCTObjectEntry;
|
||||
|
||||
struct scenario_highscore_entry
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue