From: sparky4 Date: Wed, 10 Dec 2014 08:08:51 +0000 (-0600) Subject: remove warning, sparky4 stronk! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f98ae447e28dd87d8cbf4c8dfd4374e6d04cef6f;p=16.git remove warning, sparky4 stronk! modified: src/scroll.c --- diff --git a/src/scroll.c b/src/scroll.c index 1a326fca..91aa8cd1 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -499,7 +499,7 @@ allocMap(int w, int h) { result.height=h; if(initxms()>0) result.data = malloc(sizeof(byte) * w * h); - else result.data = xmsmalloc(sizeof(byte) * w * h); + else result.data = (byte *)xmsmalloc(sizeof(byte) * w * h); return result; } @@ -513,17 +513,17 @@ initMap(map_t *map) { int tile = 1; if(initxms()>0) map->tiles = malloc(sizeof(tiles_t)); - else map->tiles = xmsmalloc(sizeof(tiles_t)); + else map->tiles = (tiles_t *)xmsmalloc(sizeof(tiles_t)); /* create the tile set */ if(initxms()>0) map->tiles->data = malloc(sizeof(bitmap_t)); - else map->tiles->data = xmsmalloc(sizeof(bitmap_t)); + else map->tiles->data = (bitmap_t *)xmsmalloc(sizeof(bitmap_t)); map->tiles->data->width = (TILEWH*2); map->tiles->data->height= TILEWH; if(initxms()>0) map->tiles->data->data = malloc((TILEWH*2)*TILEWH); - else map->tiles->data->data = xmsmalloc((TILEWH*2)*TILEWH); + else map->tiles->data->data = (byte *)xmsmalloc((TILEWH*2)*TILEWH); map->tiles->tileHeight = TILEWH; map->tiles->tileWidth =TILEWH; map->tiles->rows = 1;