Commit b3333530 authored by João Silva's avatar João Silva
Browse files

Avoid BITMAP collision between wrapalleg.h and wingdi.h

parent af421093
......@@ -15,9 +15,9 @@ void alleg_downcase(char *p)
}
}
BITMAP *create_bitmap(int w,int h)
ALLEGRO_BITMAP *create_bitmap(int w,int h)
{
BITMAP *buff = malloc(sizeof (BITMAP));
ALLEGRO_BITMAP *buff = malloc(sizeof (ALLEGRO_BITMAP));
if (!buff)
return NULL;
......@@ -32,7 +32,7 @@ BITMAP *create_bitmap(int w,int h)
return buff;
}
int destroy_bitmap(BITMAP *buff)
int destroy_bitmap(ALLEGRO_BITMAP *buff)
{
if (buff)
{
......@@ -46,8 +46,8 @@ int destroy_bitmap(BITMAP *buff)
}
void rect(BITMAP *buff,int x,int y,int x2,int y2,unsigned char color) { }
void rectfill(BITMAP *buff,int x,int y,int x2,int y2,unsigned char color) { }
void DrawHline(BITMAP *buff,int x,int y,int dx,int dy,unsigned char color) { }
void DrawVline(BITMAP *buff,int x,int y,int dx,int dy,unsigned char color) { }
void line(BITMAP *buff,int x1,int y1,int x2,int y2,unsigned char color) { }
void rect(ALLEGRO_BITMAP *buff,int x,int y,int x2,int y2,unsigned char color) { }
void rectfill(ALLEGRO_BITMAP *buff,int x,int y,int x2,int y2,unsigned char color) { }
void DrawHline(ALLEGRO_BITMAP *buff,int x,int y,int dx,int dy,unsigned char color) { }
void DrawVline(ALLEGRO_BITMAP *buff,int x,int y,int dx,int dy,unsigned char color) { }
void line(ALLEGRO_BITMAP *buff,int x1,int y1,int x2,int y2,unsigned char color) { }
......@@ -20,7 +20,7 @@ typedef struct
int h;
int pitch;
int depth;
}BITMAP;
}ALLEGRO_BITMAP;
typedef struct
{
......@@ -30,11 +30,11 @@ typedef struct
}APALETTE;
extern BITMAP *create_bitmap(int w,int h);
extern int destroy_bitmap(BITMAP *buff);
extern void line(BITMAP *buff,int x1,int y1,int x2,int y2,unsigned char color);
extern void rect(BITMAP *buff,int x,int y,int x2,int y2,unsigned char color);
extern void rectfill(BITMAP *buff,int x,int y,int x2,int y2,unsigned char color);
extern ALLEGRO_BITMAP *create_bitmap(int w,int h);
extern int destroy_bitmap(ALLEGRO_BITMAP *buff);
extern void line(ALLEGRO_BITMAP *buff,int x1,int y1,int x2,int y2,unsigned char color);
extern void rect(ALLEGRO_BITMAP *buff,int x,int y,int x2,int y2,unsigned char color);
extern void rectfill(ALLEGRO_BITMAP *buff,int x,int y,int x2,int y2,unsigned char color);
extern void alleg_upcase(char *p);
extern void alleg_downcase(char *p);
......
......@@ -66,8 +66,8 @@ static PALETTE colors,oldcol;
/* The pointer to the graphics buffer */
static uint8_t *vscreen = NULL;
static BITMAP *bmp = NULL;
static BITMAP *bmpcache = NULL;
static ALLEGRO_BITMAP *bmp = NULL;
static ALLEGRO_BITMAP *bmpcache = NULL;
static int cached_lines[MAXLINES];
uint8_t coltab[256];
......
......@@ -25,7 +25,7 @@
#include "wrapalleg.h"
static uint8_t LumReg = 0xff, TraReg = 0xff;
static BITMAP *vppbmp = NULL;
static ALLEGRO_BITMAP *vppbmp = NULL;
static uint8_t *colplus = NULL;
static int vppon = 1;
static int vpp_cx = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment