summaryrefslogtreecommitdiff
path: root/graphics.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-09-02 23:06:18 (GMT)
committer Simon <simon@hardwired.org.uk>2010-09-02 23:06:18 (GMT)
commit274383105a675af4235c250e7c0690a86e71a8c0 (patch)
tree79801fe8b463163591f87804f4bfbd8c41f0d3fc /graphics.c
parent32b1a2c3ab928bec980601f257487db39b0b8e33 (diff)
downloadpowder-274383105a675af4235c250e7c0690a86e71a8c0.zip
powder-274383105a675af4235c250e7c0690a86e71a8c0.tar.gz
Revert "does not compile at the moment, cause unknown, also. always use // for one line comments"
This reverts commit 32b1a2c3ab928bec980601f257487db39b0b8e33.
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 e06122b..a6f83f3 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, const char *s, int r, int g, int b, int a)
+int drawtext(pixel *vid, int x, int y, 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
+#endif \ No newline at end of file