diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-09-19 12:34:18 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-09-19 12:34:18 +0000 |
commit | 27d5346e9faf183f5bf9c8a92a47897998c9d60c (patch) | |
tree | 514bbdc7cdf07cde8ed50160226c776e360d270e /src/openglgraphics.h | |
parent | 2c4d4ecc19fc8308b2772e4ffe6570ca362264d1 (diff) | |
download | mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.tar.gz mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.tar.bz2 mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.tar.xz mana-27d5346e9faf183f5bf9c8a92a47897998c9d60c.zip |
Mostly code cleanups related to commits in past two days.
* Replaced custom function FIND_PATH with AC_PATH_PROG, used for finding sdl-config.
* Removed -lphysfs from Makefile.am which should be added automatically already.
* Actually show the overweight message, and only show it once for each time weight
goes above half the max weight.
* Surfaces passed to SDL_BlitSurface shouldn't be locked according to the manual.
* Minimal fps limit is now 10 fps.
* Reverted change by Bertram that hardcoded the updatehost value.
Diffstat (limited to 'src/openglgraphics.h')
-rw-r--r-- | src/openglgraphics.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/openglgraphics.h b/src/openglgraphics.h index cd99e6a6..c61ae66c 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -35,7 +35,10 @@ class OpenGLGraphics : public Graphics bool setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel); - bool drawImage(Image *image, int srcX, int srcY, int dstX, int dstY, int width, int height); + bool drawImage(Image *image, + int srcX, int srcY, + int dstX, int dstY, + int width, int height); void updateScreen(); @@ -47,8 +50,10 @@ class OpenGLGraphics : public Graphics void setColor(const gcn::Color &color); - void drawImage(const gcn::Image* image, int srcX, int srcY, - int dstX, int dstY, int width, int height); + void drawImage(const gcn::Image* image, + int srcX, int srcY, + int dstX, int dstY, + int width, int height); void drawPoint(int x, int y); @@ -63,14 +68,14 @@ class OpenGLGraphics : public Graphics void setTargetPlane(int width, int height); /** - * takes a screenshot and returns it as SDL surface - */ + * Takes a screenshot and returns it as SDL surface. + */ SDL_Surface* getScreenshot(); protected: void setTexturingAndBlending(bool enable); void drawTexedQuad(int x, int y, int w, int h, - float texX1, float texY1, float texX2, float texY2); + float texX1, float texY1, float texX2, float texY2); private: bool mAlpha, mTexture; |