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

Replace our own integer types with standard ones

Browse Source
This commit is contained in:
Michael Steenbeek
2018-06-20 17:28:51 +02:00
parent ec3a1e575e
commit 1b08fb4e69
618 changed files with 33440 additions and 33449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -34,9 +34,9 @@ struct TrackRepositoryItem
{
std::string Name;
std::string Path;
uint8 RideType = 0;
uint8_t RideType = 0;
std::string ObjectEntry;
uint32 Flags = 0;
uint32_t Flags = 0;
};
enum TRACK_REPO_ITEM_FLAGS
@@ -55,8 +55,8 @@ std::string GetNameFromTrackPath(const std::string &path)
class TrackDesignFileIndex final : public FileIndex<TrackRepositoryItem>
{
private:
static constexpr uint32 MAGIC_NUMBER = 0x58444954; // TIDX
static constexpr uint16 VERSION = 2;
static constexpr uint32_t MAGIC_NUMBER = 0x58444954; // TIDX
static constexpr uint16_t VERSION = 2;
static constexpr auto PATTERN = "*.td4;*.td6";
public:
@@ -74,7 +74,7 @@ public:
}
public:
std::tuple<bool, TrackRepositoryItem> Create(sint32, const std::string &path) const override
std::tuple<bool, TrackRepositoryItem> Create(int32_t, const std::string &path) const override
{
auto td6 = track_design_open(path.c_str());
if (td6 != nullptr)
@@ -113,9 +113,9 @@ protected:
TrackRepositoryItem item;
item.Name = stream->ReadStdString();
item.Path = stream->ReadStdString();
item.RideType = stream->ReadValue<uint8>();
item.RideType = stream->ReadValue<uint8_t>();
item.ObjectEntry = stream->ReadStdString();
item.Flags = stream->ReadValue<uint32>();
item.Flags = stream->ReadValue<uint32_t>();
return item;
}
@@ -152,7 +152,7 @@ public:
*
* @param entry The entry name to count the track list of. Leave empty to count track list for the non-separated types (e.g. Hyper-Twister, Car Ride)
*/
size_t GetCountForObjectEntry(uint8 rideType, const std::string &entry) const override
size_t GetCountForObjectEntry(uint8_t rideType, const std::string &entry) const override
{
size_t count = 0;
const auto repo = GetContext()->GetObjectRepository();
@@ -181,7 +181,7 @@ public:
return count;
}
size_t GetCountForRideGroup(uint8 rideType, const RideGroup * rideGroup) const override
size_t GetCountForRideGroup(uint8_t rideType, const RideGroup * rideGroup) const override
{
size_t count = 0;
const auto repo = GetContext()->GetObjectRepository();
@@ -194,7 +194,7 @@ public:
}
const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str());
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
uint8_t rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup))
@@ -210,7 +210,7 @@ public:
*
* @param entry The entry name to build a track list for. Leave empty to build track list for the non-separated types (e.g. Hyper-Twister, Car Ride)
*/
std::vector<track_design_file_ref> GetItemsForObjectEntry(uint8 rideType, const std::string &entry) const override
std::vector<track_design_file_ref> GetItemsForObjectEntry(uint8_t rideType, const std::string &entry) const override
{
std::vector<track_design_file_ref> refs;
const auto repo = GetContext()->GetObjectRepository();
@@ -243,7 +243,7 @@ public:
return refs;
}
std::vector<track_design_file_ref> GetItemsForRideGroup(uint8 rideType, const RideGroup * rideGroup) const override
std::vector<track_design_file_ref> GetItemsForRideGroup(uint8_t rideType, const RideGroup * rideGroup) const override
{
std::vector<track_design_file_ref> refs;
const auto repo = GetContext()->GetObjectRepository();
@@ -256,7 +256,7 @@ public:
}
const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str());
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
uint8_t rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup))
@@ -271,7 +271,7 @@ public:
return refs;
}
void Scan(sint32 language) override
void Scan(int32_t language) override
{
_items.clear();
auto trackDesigns = _fileIndex.LoadOrBuild(language);