From 5c5ee7eb579d0ee6655e0b81f6169dca7632ab97 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 27 May 2008 21:41:00 +0000 Subject: (svn r13301) -Fix [FS#1997]: resolve more MSVC 9 x64 warnings. --- src/spriteloader/grf.cpp | 2 +- src/spriteloader/grf.hpp | 2 +- src/spriteloader/png.cpp | 6 +++--- src/spriteloader/png.hpp | 2 +- src/spriteloader/spriteloader.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/spriteloader') diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp index 4fcad5386..6f01ee713 100644 --- a/src/spriteloader/grf.cpp +++ b/src/spriteloader/grf.cpp @@ -9,7 +9,7 @@ #include "../core/alloc_func.hpp" #include "grf.hpp" -bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, uint32 file_pos) +bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos) { /* Open the right file and go to the correct position */ FioSeekToFile(file_slot, file_pos); diff --git a/src/spriteloader/grf.hpp b/src/spriteloader/grf.hpp index f1e68aaa1..aff4c57cb 100644 --- a/src/spriteloader/grf.hpp +++ b/src/spriteloader/grf.hpp @@ -12,7 +12,7 @@ public: /** * Load a sprite from the disk and return a sprite struct which is the same for all loaders. */ - bool LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, uint32 file_pos); + bool LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos); }; #endif /* SPRITELOADER_GRF_HPP */ diff --git a/src/spriteloader/png.cpp b/src/spriteloader/png.cpp index 153a2d698..54d04a3a8 100644 --- a/src/spriteloader/png.cpp +++ b/src/spriteloader/png.cpp @@ -170,11 +170,11 @@ static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 i return true; } -bool SpriteLoaderPNG::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, uint32 file_pos) +bool SpriteLoaderPNG::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos) { const char *filename = FioGetFilename(file_slot); - if (!LoadPNG(sprite, filename, file_pos, false)) return false; - if (!LoadPNG(sprite, filename, file_pos, true)) return false; + if (!LoadPNG(sprite, filename, (uint32)file_pos, false)) return false; + if (!LoadPNG(sprite, filename, (uint32)file_pos, true)) return false; return true; } diff --git a/src/spriteloader/png.hpp b/src/spriteloader/png.hpp index 314e25e89..62c30db75 100644 --- a/src/spriteloader/png.hpp +++ b/src/spriteloader/png.hpp @@ -12,7 +12,7 @@ public: /** * Load a sprite from the disk and return a sprite struct which is the same for all loaders. */ - bool LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, uint32 file_pos); + bool LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos); }; #endif /* SPRITELOADER_PNG_HPP */ diff --git a/src/spriteloader/spriteloader.hpp b/src/spriteloader/spriteloader.hpp index 6e107811a..69b51c2f0 100644 --- a/src/spriteloader/spriteloader.hpp +++ b/src/spriteloader/spriteloader.hpp @@ -26,7 +26,7 @@ public: /** * Load a sprite from the disk and return a sprite struct which is the same for all loaders. */ - virtual bool LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, uint32 file_pos) = 0; + virtual bool LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos) = 0; virtual ~SpriteLoader() { } }; -- cgit v1.2.3-54-g00ecf