mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +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

10
src/openrct2/core/ZipAndroid.cpp
View File

@@ -82,7 +82,7 @@ public:
return string;
}
uint64 GetFileSize(size_t index) const override
uint64_t GetFileSize(size_t index) const override
{
// retrieve the JNI environment.
JNIEnv *env = (JNIEnv *) SDL_AndroidGetJNIEnv();
@@ -93,7 +93,7 @@ public:
return (size_t) env->CallLongMethod(_zip, fileSizeMethod, (jint) index);
}
std::vector<uint8> GetFileData(const std::string_view& path) const override
std::vector<uint8_t> GetFileData(const std::string_view& path) const override
{
// retrieve the JNI environment.
JNIEnv *env = (JNIEnv *) SDL_AndroidGetJNIEnv();
@@ -106,13 +106,13 @@ public:
jmethodID fileMethod = env->GetMethodID(zipClass, "getFile", "(I)J");
jlong ptr = env->CallLongMethod(_zip, fileMethod, index);
auto dataPtr = reinterpret_cast<uint8 *>(ptr);
auto dataPtr = reinterpret_cast<uint8_t *>(ptr);
auto dataSize = this->GetFileSize(index);
return std::vector<uint8>(dataPtr, dataPtr + dataSize);
return std::vector<uint8_t>(dataPtr, dataPtr + dataSize);
}
void SetFileData(const std::string_view& path, std::vector<uint8>&& data) override
void SetFileData(const std::string_view& path, std::vector<uint8_t>&& data) override
{
STUB();
}