TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use proper type for mve backbuffers

Browse source
This commit is contained in:
Kp 2012-11-24 17:19:56 +00:00
parent 69c507c5a7
commit acb664ae40
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2x-rebirth/libmve/decoders.h
View file

@ -8,7 +8,7 @@
#define _DECODERS_H
extern int g_width, g_height;
extern void *g_vBackBuf1, *g_vBackBuf2;
extern unsigned char *g_vBackBuf1, *g_vBackBuf2;
extern void decodeFrame8(unsigned char *pFrame, unsigned char *pMap, int mapRemain, unsigned char *pData, int dataRemain);
extern void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, unsigned char *pData, int dataRemain);

9
d2x-rebirth/libmve/mveplay.c
View file

@ -514,7 +514,8 @@ static int audio_data_handler(unsigned char major, unsigned char minor, unsigned
static int videobuf_created = 0;
static int video_initialized = 0;
int g_width, g_height;
void *g_vBuffers = NULL, *g_vBackBuf1, *g_vBackBuf2;
static unsigned char *g_vBuffers;
unsigned char *g_vBackBuf1, *g_vBackBuf2;
static int g_destX, g_destY;
static int g_screenWidth, g_screenHeight;
@ -558,11 +559,11 @@ static int create_videobuf_handler(unsigned char major, unsigned char minor, uns
/* TODO: * 4 causes crashes on some files */
/* only malloc once */
if (g_vBuffers == NULL)
g_vBackBuf1 = g_vBuffers = mve_alloc(g_width * g_height * 8);
g_vBackBuf1 = g_vBuffers = (unsigned char *)mve_alloc(g_width * g_height * 8);
if (truecolor) {
g_vBackBuf2 = (unsigned short *)g_vBackBuf1 + (g_width * g_height);
g_vBackBuf2 = (unsigned char *)((unsigned short *)g_vBackBuf1) + (g_width * g_height);
} else {
g_vBackBuf2 = (unsigned char *)g_vBackBuf1 + (g_width * g_height);
g_vBackBuf2 = (g_vBackBuf1 + (g_width * g_height));
}
memset(g_vBackBuf1, 0, g_width * g_height * 4);