Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup d3movie.cpp

Browse Source 
Remove unused variables, minor fixes.
This commit is contained in:
Azamat H. Hackimov 2024-07-07 04:46:50 +03:00
parent c6eb9a8908
commit 32df86203a
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmve/mvelib.h
View File

@ -32,7 +32,7 @@ typedef void (*mve_cb_ShowFrame)(unsigned char *buffer, unsigned int bufw, unsig
unsigned int sy, unsigned int w, unsigned int h, unsigned int dstx, unsigned int dsty, unsigned int sy, unsigned int w, unsigned int h, unsigned int dstx, unsigned int dsty,
unsigned int hicolor); unsigned int hicolor);
/* callback for setting palette */ /* callback for setting palette */
typedef void (*mve_cb_SetPalette)(unsigned char *p, unsigned int start, unsigned int count); typedef void (*mve_cb_SetPalette)(const unsigned char *p, unsigned int start, unsigned int count);
/* callback for segment type */ /* callback for segment type */
typedef int (*MVESEGMENTHANDLER)(unsigned char major, unsigned char minor, unsigned char *data, int len, void *context); typedef int (*MVESEGMENTHANDLER)(unsigned char major, unsigned char minor, unsigned char *data, int len, void *context);

19
movie/d3movie.cpp
View File

@ -33,8 +33,6 @@
namespace { namespace {
MovieFrameCallback_fp Movie_callback = nullptr; MovieFrameCallback_fp Movie_callback = nullptr;
char MovieDir[512];
char SoundCardName[512];
uint16_t CurrentPalette[256]; uint16_t CurrentPalette[256];
int Movie_bm_handle = -1; int Movie_bm_handle = -1;
uint32_t Movie_current_framenum = 0; uint32_t Movie_current_framenum = 0;
@ -45,7 +43,7 @@ static void *CallbackAlloc(uint32_t size);
static void CallbackFree(void *p); static void CallbackFree(void *p);
static uint32_t CallbackFileRead(void *stream, void *pBuffer, uint32_t bufferCount); static uint32_t CallbackFileRead(void *stream, void *pBuffer, uint32_t bufferCount);
static void InitializePalette(); static void InitializePalette();
static void CallbackSetPalette(uint8_t *pBuffer, uint32_t start, uint32_t count); static void CallbackSetPalette(const uint8_t *pBuffer, uint32_t start, uint32_t count);
static void CallbackShowFrame(uint8_t *buf, uint32_t bufw, uint32_t bufh, uint32_t sx, static void CallbackShowFrame(uint8_t *buf, uint32_t bufw, uint32_t bufh, uint32_t sx,
uint32_t sy, uint32_t w, uint32_t h, uint32_t dstx, uint32_t dsty, uint32_t sy, uint32_t w, uint32_t h, uint32_t dstx, uint32_t dsty,
uint32_t hicolor); uint32_t hicolor);
@ -58,8 +56,6 @@ static void mve_CloseSound();
// sets the directory where movies are stored // sets the directory where movies are stored
int mve_Init(const char *dir, const char *sndcard) { int mve_Init(const char *dir, const char *sndcard) {
#ifndef NO_MOVIES #ifndef NO_MOVIES
strcpy(MovieDir, dir);
strcpy(SoundCardName, sndcard);
return MVELIB_NOERROR; return MVELIB_NOERROR;
#else #else
return MVELIB_INIT_ERROR; return MVELIB_INIT_ERROR;
@ -124,16 +120,10 @@ int mve_PlayMovie(const char *pMovieName, oeApplication *pApp) {
return MVELIB_FILE_ERROR; return MVELIB_FILE_ERROR;
} }
// determine the movie type
const char *pExtension = strrchr(pMovieName, '.');
bool highColor = (pExtension != NULL && stricmp(pExtension, ".mv8") != 0);
// setup // setup
// MVE_rmFastMode(MVE_RM_NORMAL);
MVE_sfCallbacks(CallbackShowFrame); MVE_sfCallbacks(CallbackShowFrame);
MVE_memCallbacks(CallbackAlloc, CallbackFree); MVE_memCallbacks(CallbackAlloc, CallbackFree);
MVE_ioCallbacks(CallbackFileRead); MVE_ioCallbacks(CallbackFileRead);
// MVE_sfSVGA(640, 480, 480, 0, NULL, 0, 0, NULL, highColor ? 1 : 0);
MVE_palCallbacks(CallbackSetPalette); MVE_palCallbacks(CallbackSetPalette);
InitializePalette(); InitializePalette();
Movie_bm_handle = -1; Movie_bm_handle = -1;
@ -207,12 +197,12 @@ uint32_t CallbackFileRead(void *stream, void *pBuffer, uint32_t bufferCount) {
} }
void InitializePalette() { void InitializePalette() {
for (int i = 0; i < 256; ++i) { for (unsigned short & i : CurrentPalette) {
CurrentPalette[i] = OPAQUE_FLAG | GR_RGB16(0, 0, 0); i = OPAQUE_FLAG | GR_RGB16(0, 0, 0);
} }
} }
void CallbackSetPalette(uint8_t *pBuffer, uint32_t start, uint32_t count) { void CallbackSetPalette(const uint8_t *pBuffer, uint32_t start, uint32_t count) {
#ifndef NO_MOVIES #ifndef NO_MOVIES
pBuffer += start * 3; pBuffer += start * 3;
@ -384,7 +374,6 @@ intptr_t mve_SequenceStart(const char *mvename, void *fhandle, oeApplication *ap
} }
// setup // setup
//MVE_rmFastMode(MVE_RM_NORMAL);
MVE_memCallbacks(CallbackAlloc, CallbackFree); MVE_memCallbacks(CallbackAlloc, CallbackFree);
MVE_ioCallbacks(CallbackFileRead); MVE_ioCallbacks(CallbackFileRead);
MVE_sfCallbacks(CallbackShowFrameNoFlip); MVE_sfCallbacks(CallbackShowFrameNoFlip);