diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-09-24 23:24:40 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-09-24 23:24:40 +0000 |
| commit | 8f4b1c131b62a94170dda6a54c257a4730976fca (patch) | |
| tree | d6f77e26f3f5c630269cd5f85cd0962677723642 /src | |
| parent | 4d99be2eac38f0bfad3b77f359e1f17aaceb63b4 (diff) | |
| download | mana-8f4b1c131b62a94170dda6a54c257a4730976fca.tar.gz mana-8f4b1c131b62a94170dda6a54c257a4730976fca.tar.bz2 mana-8f4b1c131b62a94170dda6a54c257a4730976fca.tar.xz mana-8f4b1c131b62a94170dda6a54c257a4730976fca.zip | |
Removed unused hairstyle frames and applied patch by Rogier Polak to solve the
problem with an OpenGL related redefinition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/playerbox.cpp | 2 | ||||
| -rw-r--r-- | src/resources/image.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index f0ed9b71..0a155573 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -97,7 +97,7 @@ void PlayerBox::draw(gcn::Graphics *graphics) if (mHairColor >= 0 && mHairStyle >= 0 && mHairColor < NR_HAIR_COLORS && mHairStyle < NR_HAIR_STYLES) { - int hf = 9 * mHairColor; + int hf = 5 * mHairColor; if (hf >= 0 && hf < (int)hairset[mHairStyle]->size()) { dynamic_cast<Graphics*>(graphics)->drawImage( hairset[mHairStyle]->get(hf), 35, 7); diff --git a/src/resources/image.h b/src/resources/image.h index 1f67fcae..c769ecb6 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -26,6 +26,13 @@ #include <SDL.h> #ifdef USE_OPENGL + +/* The definition of OpenGL extensions by SDL is giving problems with recent + * gl.h headers, since they also include these definitions. As we're not using + * extensions anyway it's safe to just disable the SDL version. + */ +#define NO_SDL_GLEXT + #include <SDL_opengl.h> #endif |