diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 2112beeae3..bac4d59a3d 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -495,7 +495,7 @@ struct CompanyFinancesWindow : Window { } } - bool OnTooltip(Point pt, int widget, TooltipCloseCondition close_cond) + bool OnTooltip(Point pt, int widget, TooltipCloseCondition close_cond) override { switch (widget) { case WID_CF_INCREASE_LOAN: { diff --git a/src/core/pool_func.hpp b/src/core/pool_func.hpp index ffcea87651..f2a31d5178 100644 --- a/src/core/pool_func.hpp +++ b/src/core/pool_func.hpp @@ -60,8 +60,8 @@ DEFINE_POOL_METHOD(inline void)::ResizeFor(size_t index) this->data = ReallocT(this->data, new_size); MemSetT(this->data + this->size, 0, new_size - this->size); - this->free_bitmap = ReallocT(this->free_bitmap, CeilDiv(new_size, 64)); - MemSetT(this->free_bitmap + CeilDiv(this->size, 64), 0, CeilDiv(new_size, 64) - CeilDiv(this->size, 64)); + this->free_bitmap = ReallocT(this->free_bitmap, CeilDivT(new_size, 64)); + MemSetT(this->free_bitmap + CeilDivT(this->size, 64), 0, CeilDivT(new_size, 64) - CeilDivT(this->size, 64)); if (new_size % 64 != 0) { this->free_bitmap[new_size / 64] |= (~((uint64) 0)) << (new_size % 64); } @@ -75,8 +75,8 @@ DEFINE_POOL_METHOD(inline void)::ResizeFor(size_t index) */ DEFINE_POOL_METHOD(inline size_t)::FindFirstFree() { - uint bitmap_index = this->first_free / 64; - uint bitmap_end = CeilDiv(this->first_unused, 64); + size_t bitmap_index = this->first_free / 64; + size_t bitmap_end = CeilDivT(this->first_unused, 64); for (; bitmap_index < bitmap_end; bitmap_index++) { uint64 available = ~this->free_bitmap[bitmap_index]; diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 16bded36e4..3b67b8bac5 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -70,17 +70,17 @@ private: public: SpriteFontCache(FontSize fs); ~SpriteFontCache(); - virtual SpriteID GetUnicodeGlyph(WChar key); - virtual void SetUnicodeGlyph(WChar key, SpriteID sprite); + virtual SpriteID GetUnicodeGlyph(WChar key) override; + virtual void SetUnicodeGlyph(WChar key, SpriteID sprite) override; virtual void InitializeUnicodeGlyphMap() override; - virtual void ClearFontCache(); - virtual const Sprite *GetGlyph(GlyphID key); - virtual uint GetGlyphWidth(GlyphID key); - virtual bool GetDrawGlyphShadow(); - virtual GlyphID MapCharToGlyph(WChar key) { assert(IsPrintable(key)); return SPRITE_GLYPH | key; } - virtual const void *GetFontTable(uint32 tag, size_t &length) { length = 0; return nullptr; } + virtual void ClearFontCache() override; + virtual const Sprite *GetGlyph(GlyphID key) override; + virtual uint GetGlyphWidth(GlyphID key) override; + virtual bool GetDrawGlyphShadow() override; + virtual GlyphID MapCharToGlyph(WChar key) override { assert(IsPrintable(key)); return SPRITE_GLYPH | key; } + virtual const void *GetFontTable(uint32 tag, size_t &length) override { length = 0; return nullptr; } virtual const char *GetFontName() { return "sprite"; } - virtual bool IsBuiltInFont() { return true; } + virtual bool IsBuiltInFont() override { return true; } }; /** diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 9149ee915e..1c4ee94f8b 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -397,6 +397,7 @@ static void UpdateRouteStepSpriteSize() _vp_route_step_subsprite.top = 0; } +#if !defined(DEDICATED) /* multi can be density, field type, ... */ static SpriteID GetSpriteIDForClearGround(const ClearGround cg, const Slope slope, const uint multi) { @@ -415,6 +416,7 @@ static SpriteID GetSpriteIDForClearGround(const ClearGround cg, const Slope slop default: NOT_REACHED(); } } +#endif /* !DEDICATED */ /** Once the sprites are loaded, we can determine main colours of ground/water/... */ void GfxDetermineMainColours() diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index da44d3eead..c14a9efdbe 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -586,7 +586,7 @@ public: void SendCommand(Packet *p, const CommandPacket *cp); virtual std::string GetDebugInfo() const; - virtual void LogSentPacket(const Packet &pkt); + virtual void LogSentPacket(const Packet &pkt) override; }; #endif /* NETWORK_CORE_TCP_GAME_H */ diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index 5350cc35a3..6706389e4f 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -200,7 +200,7 @@ struct DeterministicSpriteGroup : SpriteGroup { void AnalyseCallbacks(AnalyseCallbackOperation &op) const override; protected: - const SpriteGroup *Resolve(ResolverObject &object) const; + const SpriteGroup *Resolve(ResolverObject &object) const override; }; enum RandomizedSpriteGroupCompareMode { @@ -224,7 +224,7 @@ struct RandomizedSpriteGroup : SpriteGroup { void AnalyseCallbacks(AnalyseCallbackOperation &op) const override; protected: - const SpriteGroup *Resolve(ResolverObject &object) const; + const SpriteGroup *Resolve(ResolverObject &object) const override; }; @@ -250,7 +250,7 @@ struct CallbackResultSpriteGroup : SpriteGroup { } uint16 result; - uint16 GetCallbackResult() const { return this->result; } + uint16 GetCallbackResult() const override { return this->result; } void AnalyseCallbacks(AnalyseCallbackOperation &op) const override; }; diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 706a33c13a..996d5cb9fa 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1820,7 +1820,6 @@ CommandCost CmdModifyOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 case OCV_COUNTER_VALUE: case OCV_TIME_DATE: case OCV_TIMETABLE: - if (data >= (1 << 16)) return CMD_ERROR; break; default: diff --git a/src/string_func.h b/src/string_func.h index 0184deea18..c022155c1a 100644 --- a/src/string_func.h +++ b/src/string_func.h @@ -38,9 +38,9 @@ int CDECL seprintf(char *str, const char *last, const char *format, ...) WARN_FO int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap) WARN_FORMAT(3, 0); char *CDECL str_fmt(const char *str, ...) WARN_FORMAT(1, 2); -char *str_vfmt(const char *str, va_list ap); +char *str_vfmt(const char *str, va_list ap) WARN_FORMAT(1, 0); std::string CDECL stdstr_fmt(const char *str, ...) WARN_FORMAT(1, 2); -std::string stdstr_vfmt(const char *str, va_list va); +std::string stdstr_vfmt(const char *str, va_list va) WARN_FORMAT(1, 0); char *str_validate(char *str, const char *last, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK); std::string str_validate(const std::string &str, StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK);