diff options
author | rubidium <rubidium@openttd.org> | 2008-05-27 21:41:00 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-05-27 21:41:00 +0000 |
commit | 5c5ee7eb579d0ee6655e0b81f6169dca7632ab97 (patch) | |
tree | 086ec523744482fc8374da46db2a402e4b5c5d0a /src/spritecache.cpp | |
parent | 49a0bd7f90f3c48f81e9ad0bcabe87a77cf36e0f (diff) | |
download | openttd-5c5ee7eb579d0ee6655e0b81f6169dca7632ab97.tar.xz |
(svn r13301) -Fix [FS#1997]: resolve more MSVC 9 x64 warnings.
Diffstat (limited to 'src/spritecache.cpp')
-rw-r--r-- | src/spritecache.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/spritecache.cpp b/src/spritecache.cpp index b3b669c32..adc0145df 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -25,7 +25,7 @@ uint _sprite_cache_size = 4; struct SpriteCache { void *ptr; uint32 id; - uint32 file_pos; + size_t file_pos; uint16 file_slot; int16 lru; }; @@ -123,7 +123,7 @@ void* AllocSprite(size_t); static void* ReadSprite(SpriteCache *sc, SpriteID id, bool real_sprite) { uint8 file_slot = sc->file_slot; - uint32 file_pos = sc->file_pos; + size_t file_pos = sc->file_pos; DEBUG(sprite, 9, "Load sprite %d", id); @@ -241,7 +241,7 @@ static void* ReadSprite(SpriteCache *sc, SpriteID id, bool real_sprite) bool LoadNextSprite(int load_index, byte file_slot, uint file_sprite_id) { SpriteCache *sc; - uint32 file_pos = FioGetPos(); + size_t file_pos = FioGetPos(); if (!ReadSpriteHeaderSkipData()) return false; @@ -279,9 +279,9 @@ static inline MemBlock* NextBlock(MemBlock* block) return (MemBlock*)((byte*)block + (block->size & ~S_FREE_MASK)); } -static uint32 GetSpriteCacheUsage() +static size_t GetSpriteCacheUsage() { - uint32 tot_size = 0; + size_t tot_size = 0; MemBlock* s; for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s)) { |