From 14c0e224948800d1936a5dd4e920833ccda135ac Mon Sep 17 00:00:00 2001 From: Bill Currie <bill@taniwha.org> Date: Mon, 6 Feb 2012 15:49:37 +0900 Subject: [PATCH] Tweak Draw_MakePic to be a little more usable. --- libs/video/renderer/r_progs.c | 2 +- ruamoko/include/draw.h | 2 +- ruamoko/lib/draw.r | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/video/renderer/r_progs.c b/libs/video/renderer/r_progs.c index 86abefcee..b71143bc6 100644 --- a/libs/video/renderer/r_progs.c +++ b/libs/video/renderer/r_progs.c @@ -136,7 +136,7 @@ bi_Draw_MakePic (progs_t *pr) draw_resources_t *res = PR_Resources_Find (pr, "Draw"); int width = P_INT (pr, 0); int height = P_INT (pr, 1); - byte *data = (byte *) P_GPOINTER (pr, 2); + byte *data = (byte *) P_GSTRING (pr, 2); qpic_t *pic; qpic_res_t *qp; bi_qpic_t *bq; diff --git a/ruamoko/include/draw.h b/ruamoko/include/draw.h index be432af3a..353a586b6 100644 --- a/ruamoko/include/draw.h +++ b/ruamoko/include/draw.h @@ -11,7 +11,7 @@ struct _qpic_t { typedef struct _qpic_t *qpic_t; @extern void Draw_FreePic (qpic_t pic); -@extern qpic_t Draw_MakePic (int width, int heiight, void *data); +@extern qpic_t Draw_MakePic (int width, int heiight, string data); @extern qpic_t Draw_CachePic (string name, int alpha); @extern void Draw_Pic (int x, int y, qpic_t pic); diff --git a/ruamoko/lib/draw.r b/ruamoko/lib/draw.r index c1c970922..2cb4bcd31 100644 --- a/ruamoko/lib/draw.r +++ b/ruamoko/lib/draw.r @@ -1,7 +1,7 @@ #include "draw.h" void Draw_FreePic (qpic_t pic) = #0; -qpic_t Draw_MakePic (int width, int heiight, void *data) = #0; +qpic_t Draw_MakePic (int width, int heiight, string data) = #0; qpic_t (string name, int alpha) Draw_CachePic = #0; void (int x, int y, qpic_t pic) Draw_Pic = #0;