summaryrefslogtreecommitdiff
path: root/src/Graphics.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-05-30 11:32:58 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-05-30 11:32:58 (GMT)
commit86746f38b0c0f382f06eb11c59b3dc49641490aa (patch)
treee6b6b239f9097c06faa235e2773903f811458519 /src/Graphics.h
parent7074036b898083cdab1316cedbbade009ce6422d (diff)
downloadpowder-86746f38b0c0f382f06eb11c59b3dc49641490aa.zip
powder-86746f38b0c0f382f06eb11c59b3dc49641490aa.tar.gz
Separate SDL from graphics code
Also remove OS X specific project files and update Makefile to ensure the Element class generator only runs when necessary
Diffstat (limited to 'src/Graphics.h')
-rw-r--r--src/Graphics.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Graphics.h b/src/Graphics.h
index 5e43417..d3f891c 100644
--- a/src/Graphics.h
+++ b/src/Graphics.h
@@ -117,9 +117,7 @@ public:
#ifdef OGLR
//OpenGL specific instance variables
GLuint vidBuf, textTexture;
-#else
- SDL_Surface * sdl_scrn;
-#endif
+ #endif
//Common graphics methods in Graphics.cpp
static char * GenerateGradient(pixel * colours, float * points, int pointcount, int size);
@@ -147,8 +145,7 @@ public:
void draw_icon(int x, int y, Icon icon);
void Clear();
- void AttachSDLSurface(SDL_Surface * surface);
- void Blit();
+ void Finalise();
//
int drawtext(int x, int y, const char *s, int r, int g, int b, int a);
int drawtext(int x, int y, std::string s, int r, int g, int b, int a);