diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-18 18:39:48 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-18 18:39:48 +0000 |
commit | 86441fda9c561dd264039edc68ddabbf7cb54ce2 (patch) | |
tree | f9d15edf9587bc149a42399369bfcf3b9d5c5b27 /src/resources/sdlimageloader.cpp | |
parent | d3ab0ef7be4c1f0098acc08748c308091e75dfff (diff) | |
download | mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.tar.gz mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.tar.bz2 mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.tar.xz mana-86441fda9c561dd264039edc68ddabbf7cb54ce2.zip |
Merged removal of dependency on Guichan OpenGL from trunk to 0.0 branch,
including optimization of OpenGL memory usage on modern OpenGL drivers.
Patches by Guillaume Melquiond.
Diffstat (limited to 'src/resources/sdlimageloader.cpp')
-rw-r--r-- | src/resources/sdlimageloader.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/resources/sdlimageloader.cpp b/src/resources/sdlimageloader.cpp deleted file mode 100644 index ae4f4dcb..00000000 --- a/src/resources/sdlimageloader.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - */ - -#include "sdlimageloader.h" - -#include <string> - -#include "resourcemanager.h" - -SDL_Surface* SDLImageLoader::loadSDLSurface(const std::string& filename) -{ - ResourceManager *resman = ResourceManager::getInstance(); - return resman->loadSDLSurface(filename); -} |