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

Merge pull request #291 from VacuumBreather/fix_warnings

Browse Source 
Fix a few compiler warnings
This commit is contained in:
Jonathan G Rennison
2021-06-28 20:33:46 +01:00
committed by GitHub
parent 4d0cda12bd 29b227a3cd
commit b94b6268da
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/fontcache.cpp
View File

@@ -70,17 +70,17 @@ private:
public:
SpriteFontCache(FontSize fs);
~SpriteFontCache();
virtual SpriteID GetUnicodeGlyph(WChar key) override;
virtual void SetUnicodeGlyph(WChar key, SpriteID sprite) override;
virtual void InitializeUnicodeGlyphMap() override;
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() override { return true; }
SpriteID GetUnicodeGlyph(WChar key) override;
void SetUnicodeGlyph(WChar key, SpriteID sprite) override;
void InitializeUnicodeGlyphMap() override;
void ClearFontCache() override;
const Sprite *GetGlyph(GlyphID key) override;
uint GetGlyphWidth(GlyphID key) override;
bool GetDrawGlyphShadow() override;
GlyphID MapCharToGlyph(WChar key) override { assert(IsPrintable(key)); return SPRITE_GLYPH | key; }
const void *GetFontTable(uint32 tag, size_t &length) override { length = 0; return nullptr; }
const char *GetFontName() override { return "sprite"; }
bool IsBuiltInFont() override { return true; }
};
/**

2
src/newgrf_spritegroup.h
View File

@@ -107,7 +107,7 @@ struct RealSpriteGroup : SpriteGroup {
std::vector<const SpriteGroup *> loading; ///< List of loading groups (can be SpriteIDs or Callback results)
protected:
const SpriteGroup *Resolve(ResolverObject &object) const;
const SpriteGroup *Resolve(ResolverObject &object) const override;
};
/* Shared by deterministic and random groups. */

2
src/pathfinder/npf/npf.cpp
View File

@@ -25,8 +25,6 @@
static const uint NPF_HASH_BITS = 12; ///< The size of the hash used in pathfinding. Just changing this value should be sufficient to change the hash size. Should be an even value.
/* Do no change below values */
static const uint NPF_HASH_SIZE = 1 << NPF_HASH_BITS;
static const uint NPF_HASH_HALFBITS = NPF_HASH_BITS / 2;
static const uint NPF_HASH_HALFMASK = (1 << NPF_HASH_HALFBITS) - 1;
/** Meant to be stored in AyStar.targetdata */
struct NPFFindStationOrTileData {