dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some unused variable warnings when asserts are disabled

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-11-20 23:59:08 +00:00
parent 0d4d4a9cac
commit 154df0bb7d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/serialisation.cpp
View File

@@ -16,7 +16,7 @@
* @param bytes_to_write The amount of bytes we want to try to write. * @param bytes_to_write The amount of bytes we want to try to write.
* @return True iff the given amount of bytes can be written to the packet. * @return True iff the given amount of bytes can be written to the packet.
*/ */
static bool BufferCanWriteToPacket(const std::vector<byte> &buffer, size_t limit, size_t bytes_to_write) [[maybe_unused]] static bool BufferCanWriteToPacket(const std::vector<byte> &buffer, size_t limit, size_t bytes_to_write)
{ {
return buffer.size() + bytes_to_write <= limit; return buffer.size() + bytes_to_write <= limit;
} }

4
src/sl/extended_ver_sl.cpp
View File

@@ -595,13 +595,13 @@ static void Save_SLXI()
if (extra_data_length > 0) { if (extra_data_length > 0) {
SlWriteUint32(extra_data_length); SlWriteUint32(extra_data_length);
size_t written = SlGetBytesWritten(); [[maybe_unused]] size_t written = SlGetBytesWritten();
info->save_proc(info, false); info->save_proc(info, false);
assert(SlGetBytesWritten() == written + extra_data_length); assert(SlGetBytesWritten() == written + extra_data_length);
} }
if (chunk_count > 0) { if (chunk_count > 0) {
SlWriteUint32(chunk_count); SlWriteUint32(chunk_count);
size_t written = SlGetBytesWritten(); [[maybe_unused]] size_t written = SlGetBytesWritten();
WriteChunkIdList(info->chunk_list, false); WriteChunkIdList(info->chunk_list, false);
assert(SlGetBytesWritten() == written + (chunk_count * 4)); assert(SlGetBytesWritten() == written + (chunk_count * 4));
} }

4
src/spritecache.cpp
View File

@@ -1135,11 +1135,11 @@ void *GetRawSprite(SpriteID sprite, SpriteType type, uint8 zoom_levels, Allocato
/* Load the sprite, if it is not loaded, yet */ /* Load the sprite, if it is not loaded, yet */
if (sc->GetPtr() == nullptr) { if (sc->GetPtr() == nullptr) {
void *ptr = ReadSprite(sc, sprite, type, AllocSprite, nullptr, zoom_levels); [[maybe_unused]] void *ptr = ReadSprite(sc, sprite, type, AllocSprite, nullptr, zoom_levels);
assert(ptr == _last_sprite_allocation.GetPtr()); assert(ptr == _last_sprite_allocation.GetPtr());
sc->Assign(std::move(_last_sprite_allocation)); sc->Assign(std::move(_last_sprite_allocation));
} else if ((sc->total_missing_zoom_levels & zoom_levels) != 0) { } else if ((sc->total_missing_zoom_levels & zoom_levels) != 0) {
void *ptr = ReadSprite(sc, sprite, type, AllocSprite, nullptr, sc->total_missing_zoom_levels & zoom_levels); [[maybe_unused]] void *ptr = ReadSprite(sc, sprite, type, AllocSprite, nullptr, sc->total_missing_zoom_levels & zoom_levels);
assert(ptr == _last_sprite_allocation.GetPtr()); assert(ptr == _last_sprite_allocation.GetPtr());
sc->Append(std::move(_last_sprite_allocation)); sc->Append(std::move(_last_sprite_allocation));
} }

4
src/viewport.cpp
View File

@@ -5601,8 +5601,8 @@ static void CheckOverflow(int &test, int &other, int max, int mult)
test = max; test = max;
} }
static const uint X_DIRS = (1 << DIR_NE) | (1 << DIR_SW); [[maybe_unused]] static const uint X_DIRS = (1 << DIR_NE) | (1 << DIR_SW);
static const uint Y_DIRS = (1 << DIR_SE) | (1 << DIR_NW); [[maybe_unused]] static const uint Y_DIRS = (1 << DIR_SE) | (1 << DIR_NW);
static const uint HORZ_DIRS = (1 << DIR_W) | (1 << DIR_E); static const uint HORZ_DIRS = (1 << DIR_W) | (1 << DIR_E);
//static const uint VERT_DIRS = (1 << DIR_N) | (1 << DIR_S); //static const uint VERT_DIRS = (1 << DIR_N) | (1 << DIR_S);