summaryrefslogtreecommitdiff
path: root/graphics.c
diff options
context:
space:
mode:
authorFelix Wallin <nibbler.v1@gmail.com>2010-09-02 20:59:48 (GMT)
committer Felix Wallin <nibbler.v1@gmail.com>2010-09-02 20:59:48 (GMT)
commit32b1a2c3ab928bec980601f257487db39b0b8e33 (patch)
treecf699c673188c45ae2061a2f0f6952af72668c74 /graphics.c
parent5c0ffc799bd2cb5d8596904df5be124b2f52a387 (diff)
downloadpowder-32b1a2c3ab928bec980601f257487db39b0b8e33.zip
powder-32b1a2c3ab928bec980601f257487db39b0b8e33.tar.gz
does not compile at the moment, cause unknown, also. always use // for one line comments
Diffstat (limited to 'graphics.c')
-rw-r--r--graphics.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics.c b/graphics.c
index a6f83f3..e06122b 100644
--- a/graphics.c
+++ b/graphics.c
@@ -756,11 +756,11 @@ void draw_menu(pixel *vid_buf, int i, int hover)
}
}
-#ifdef WIN32
+/*#ifdef WIN32
_inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
-#else
+#else*/
inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a)
-#endif
+//#endif
{
pixel t;
if(x<0 || y<0 || x>=XRES+BARSIZE || y>=YRES+MENUSIZE)
@@ -799,7 +799,7 @@ inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a)
return x + w;
}
-int drawtext(pixel *vid, int x, int y, char *s, int r, int g, int b, int a)
+int drawtext(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a)
{
#ifdef OpenGL
#else
@@ -2352,4 +2352,4 @@ void ClearScreen()
{
glClear(GL_COLOR_BUFFER_BIT);
}
-#endif \ No newline at end of file
+#endif