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

Use std::vector for MVE buffer

Browse source
This commit is contained in:
Kp 2014-11-01 15:00:04 +00:00
parent 3f4de49b2b
commit 279233cf24
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
d2x-rebirth/libmve/mveplay.cpp
View file

@ -516,7 +516,7 @@ static int audio_data_handler(unsigned char major, unsigned char minor, const un
static int videobuf_created = 0;
static int video_initialized = 0;
int g_width, g_height;
static unsigned char *g_vBuffers;
static std::vector<unsigned char> g_vBuffers;
unsigned char *g_vBackBuf1, *g_vBackBuf2;
static int g_destX, g_destY;
@ -560,16 +560,13 @@ static int create_videobuf_handler(unsigned char major, unsigned char minor, con
/* TODO: * 4 causes crashes on some files */
/* only malloc once */
if (g_vBuffers == NULL)
g_vBackBuf1 = g_vBuffers = (unsigned char *)mve_alloc(g_width * g_height * 8);
g_vBuffers.assign(g_width * g_height * 8, 0);
g_vBackBuf1 = &g_vBuffers[0];
if (truecolor) {
g_vBackBuf2 = (unsigned char *)((unsigned short *)g_vBackBuf1) + (g_width * g_height);
} else {
g_vBackBuf2 = (g_vBackBuf1 + (g_width * g_height));
}
memset(g_vBuffers, 0, g_width * g_height * 8);
#ifdef DEBUG
con_printf(CON_CRITICAL, "DEBUG: w,h=%d,%d count=%d, tc=%d", w, h, count, truecolor);
#endif
@ -789,9 +786,7 @@ void MVE_rmEndMovie(MVESTREAM *&mve)
mve_free(mve_audio_spec);
mve_audio_spec=NULL;
audiobuf_created = 0;
mve_free(g_vBuffers);
g_vBuffers = NULL;
g_vBuffers.clear();
g_pCurMap=NULL;
g_nMapLength=0;
videobuf_created = 0;