summaryrefslogtreecommitdiff
path: root/includes/graphics.h
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-04-08 14:28:57 (GMT)
committer Simon <simon@hardwired.org.uk>2011-04-08 14:28:57 (GMT)
commit626cc8fa6a6cf5e2f046d138b72e3122614c46ad (patch)
tree670c71d232ad958ec4689e9653741c6907d3becc /includes/graphics.h
parent60039b531e4bec2c8f16817b8da2beda148e828d (diff)
downloadpowder-626cc8fa6a6cf5e2f046d138b72e3122614c46ad.zip
powder-626cc8fa6a6cf5e2f046d138b72e3122614c46ad.tar.gz
Remove a TON of warnings
Diffstat (limited to 'includes/graphics.h')
-rw-r--r--includes/graphics.h19
1 files changed, 5 insertions, 14 deletions
diff --git a/includes/graphics.h b/includes/graphics.h
index eed3ed6..31f8c57 100644
--- a/includes/graphics.h
+++ b/includes/graphics.h
@@ -64,17 +64,9 @@ int draw_tool_xy(pixel *vid_buf, int x, int y, int b, unsigned pc);
void draw_menu(pixel *vid_buf, int i, int hover);
-#if defined(WIN32) && !defined(__GNUC__)
-_inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
-#else
-extern inline void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
-#endif
+void drawpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
-#if defined(WIN32) && !defined(__GNUC__)
-_inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a);
-#else
-extern inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a);
-#endif
+int drawchar(pixel *vid, int x, int y, int c, 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);
@@ -99,13 +91,10 @@ void textnpos(char *s, int n, int w, int *cx, int *cy);
int textwidthx(char *s, int w);
int textposxy(char *s, int width, int w, int h);
+
int textwrapheight(char *s, int width);
-#if defined(WIN32) && !defined(__GNUC__)
-_inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
-#else
void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a);
-#endif
void draw_icon(pixel *vid_buf, int x, int y, char ch, int flag);
@@ -122,7 +111,9 @@ void xor_line(int x1, int y1, int x2, int y2, pixel *vid);
void xor_rect(pixel *vid, int x, int y, int w, int h);
void draw_parts(pixel *vid);
+
void draw_wavelengths(pixel *vid, int x, int y, int h, int wl);
+
void render_signs(pixel *vid_buf);
void render_fire(pixel *dst);