diff options
Diffstat (limited to 'src/resources/imageloader.cpp')
| -rw-r--r-- | src/resources/imageloader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index fe420e89..694c57af 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -1,9 +1,8 @@ /* - * Aethyra + * The Mana World * Copyright (C) 2007 The Mana World Development Team * - * This file is part of Aethyra based on original code - * from The Mana World. + * This file is part of The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,14 +19,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <cassert> +#include "resources/imageloader.h" + +#include "resources/image.h" +#include "resources/resourcemanager.h" #include <guichan/color.hpp> #include <guichan/sdl/sdlpixel.hpp> -#include "image.h" -#include "imageloader.h" -#include "resourcemanager.h" +#include <cassert> ProxyImage::ProxyImage(SDL_Surface *s): mImage(NULL), mSDLImage(s) @@ -88,7 +88,7 @@ void ProxyImage::convertToDisplayFormat() mSDLImage = NULL; } -gcn::Image *ImageLoader::load(std::string const &filename, bool convert) +gcn::Image *ImageLoader::load(const std::string &filename, bool convert) { ResourceManager *resman = ResourceManager::getInstance(); ProxyImage *i = new ProxyImage(resman->loadSDLSurface(filename)); |