gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: make no assumptions on how the internals of TileIndex work (#11183)

Browse Source 
Basically, avoid ".value", and just cast it to its original type
if you want to retrieve this.
This commit is contained in:
Patric Stout 2023-08-11 14:53:51 +02:00 committed by GitHub
parent 6190f48df0
commit 5fba47b0f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map_func.h
View File

@ -426,7 +426,7 @@ debug_inline static TileIndex TileVirtXY(uint x, uint y)
*/
debug_inline static uint TileX(TileIndex tile)
{
return tile.value & Map::MaxX();
return static_cast<uint32_t>(tile) & Map::MaxX();
}
/**
@ -436,7 +436,7 @@ debug_inline static uint TileX(TileIndex tile)
*/
debug_inline static uint TileY(TileIndex tile)
{
return tile.value >> Map::LogX();
return static_cast<uint32_t>(tile) >> Map::LogX();
}
/**

4
src/misc/endian_buffer.hpp
View File

@ -53,7 +53,7 @@ public:
if constexpr (std::is_enum_v<T>) {
this->Write(static_cast<std::underlying_type_t<const T>>(data));
} else if constexpr (std::is_base_of_v<StrongTypedefBase, T>) {
this->Write(data.value);
this->Write(static_cast<typename T::Type>(data));
} else {
this->Write(data);
}
@ -146,7 +146,7 @@ public:
if constexpr (std::is_enum_v<T>) {
data = static_cast<T>(this->Read<std::underlying_type_t<T>>());
} else if constexpr (std::is_base_of_v<StrongTypedefBase, T>) {
data.value = this->Read<decltype(data.value)>();
data = this->Read<typename T::Type>();
} else {
data = this->Read<T>();
}

2
src/script/squirrel_helper.hpp
View File

@ -37,7 +37,7 @@ namespace SQConvert {
template <> struct Return<int32_t> { static inline int Set(HSQUIRRELVM vm, int32_t res) { sq_pushinteger(vm, res); return 1; } };
template <> struct Return<int64_t> { static inline int Set(HSQUIRRELVM vm, int64_t res) { sq_pushinteger(vm, res); return 1; } };
template <> struct Return<Money> { static inline int Set(HSQUIRRELVM vm, Money res) { sq_pushinteger(vm, res); return 1; } };
template <> struct Return<TileIndex> { static inline int Set(HSQUIRRELVM vm, TileIndex res) { sq_pushinteger(vm, (int32_t)res.value); return 1; } };
template <> struct Return<TileIndex> { static inline int Set(HSQUIRRELVM vm, TileIndex res) { sq_pushinteger(vm, (int32_t)static_cast<uint32_t>(res)); return 1; } };
template <> struct Return<bool> { static inline int Set(HSQUIRRELVM vm, bool res) { sq_pushbool (vm, res); return 1; } };
template <> struct Return<char *> { /* Do not use char *, use std::optional<std::string> instead. */ };
template <> struct Return<const char *> { /* Do not use const char *, use std::optional<std::string> instead. */ };