jprdonnelly/fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused movie callbacks

Browse Source
This commit is contained in:
Alexander Batalov
2025-02-12 08:29:34 +03:00
parent 82793d14f4
commit d6fc3bb2d8
2 changed files with 5 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/movie.cc
View File

@@ -100,21 +100,12 @@ static Rect _movieRect;
// 0x638E30
static void (*_movieCallback)();
// 0x638E34
MovieEndFunc* _endMovieFunc;
// 0x638E38
static MovieSetPaletteProc* gMoviePaletteProc;
// 0x638E3C
static MovieFailedOpenFunc* _failedOpenFunc;
// 0x638E40
static MovieBuildSubtitleFilePathProc* gMovieBuildSubtitleFilePathProc;
// 0x638E44
static MovieStartFunc* _startMovieFunc;
// 0x638E48
static int _subtitleW;
@@ -133,9 +124,6 @@ static int _lastMovieSY;
// 0x638E5C
static int _movieScaleFlag;
// 0x638E60
static MoviePreDrawFunc* _moviePreDrawFunc;
// 0x638E64
static int _lastMovieH;
@@ -166,18 +154,12 @@ static int _movieH;
// 0x638E88
static int _movieOffset;
// 0x638E8C
static MovieCaptureFrameProc* _movieCaptureFrameFunc;
// 0x638E90
static unsigned char* _lastMovieBuffer;
// 0x638E94
static int _movieW;
// 0x638E98
static MovieFrameGrabProc* _movieFrameGrabFunc;
// 0x638EA0
static int _subtitleH;
@@ -204,31 +186,6 @@ static unsigned char* _alphaBuf;
static SDL_Surface* gMovieSdlSurface = nullptr;
// NOTE: Unused.
//
// 0x4865E0
void _movieSetPreDrawFunc(MoviePreDrawFunc* preDrawFunc)
{
_moviePreDrawFunc = preDrawFunc;
}
// NOTE: Unused.
//
// 0x4865E8
void _movieSetFailedOpenFunc(MovieFailedOpenFunc* failedOpenFunc)
{
_failedOpenFunc = failedOpenFunc;
}
// NOTE: Unused.
//
// 0x4865F0
void _movieSetFunc(MovieStartFunc* startFunc, MovieEndFunc* endFunc)
{
_startMovieFunc = startFunc;
_endMovieFunc = endFunc;
}
// 0x4865FC
static void* movieMallocImpl(size_t size)
{
@@ -304,20 +261,6 @@ static void movieDirectImpl(SDL_Surface* surface, int srcWidth, int srcHeight, i
destRect.x += gMovieWindowRect.left;
destRect.y += gMovieWindowRect.top;
if (_movieCaptureFrameFunc != nullptr) {
if (SDL_LockSurface(surface) == 0) {
_movieCaptureFrameFunc(static_cast<unsigned char*>(surface->pixels),
srcWidth,
srcHeight,
surface->pitch,
destRect.x,
destRect.y,
destRect.w,
destRect.h);
SDL_UnlockSurface(surface);
}
}
// TODO: This is a super-ugly hack. The reason is that surfaces managed by
// MVE does not have palette. If we blit from these internal surfaces into
// backbuffer surface (with palette set), all we get is shiny white box.
@@ -348,42 +291,14 @@ static void movieBufferedImpl(SDL_Surface* a1, int a2, int a3, int a4, int a5, i
return;
}
if (_movieCaptureFrameFunc != nullptr) {
_movieCaptureFrameFunc(static_cast<unsigned char*>(a1->pixels), a2, a3, a1->pitch, _movieRect.left, _movieRect.top, a6, a7);
}
if (_movieFrameGrabFunc != nullptr) {
_movieFrameGrabFunc(static_cast<unsigned char*>(a1->pixels), a2, a3, a1->pitch);
} else {
MovieBlitFunc* func = gMovieBlitFuncs[_movieAlphaFlag][_movieScaleFlag][_movieSubRectFlag];
if (func(gMovieWindow, static_cast<unsigned char*>(a1->pixels), a2, a3, a1->pitch) != 0) {
if (_moviePreDrawFunc != nullptr) {
_moviePreDrawFunc(gMovieWindow, &_movieRect);
}
windowRefreshRect(gMovieWindow, &_movieRect);
}
MovieBlitFunc* func = gMovieBlitFuncs[_movieAlphaFlag][_movieScaleFlag][_movieSubRectFlag];
if (func(gMovieWindow, static_cast<unsigned char*>(a1->pixels), a2, a3, a1->pitch) != 0) {
windowRefreshRect(gMovieWindow, &_movieRect);
}
SDL_UnlockSurface(a1);
}
// NOTE: Unused.
//
// 0x486A98
void _movieSetFrameGrabFunc(MovieFrameGrabProc* proc)
{
_movieFrameGrabFunc = proc;
}
// NOTE: Unused.
//
// 0x486AA0
void _movieSetCaptureFrameFunc(MovieCaptureFrameProc* func)
{
_movieCaptureFrameFunc = func;
}
// 0x486B68
int _movieScaleSubRect(int win, unsigned char* data, int width, int height, int pitch)
{
@@ -506,10 +421,6 @@ static void _cleanupMovie(int a1)
return;
}
if (_endMovieFunc != nullptr) {
_endMovieFunc(gMovieWindow, _movieX, _movieY, _movieW, _movieH);
}
int frame;
int dropped;
MVE_rmFrameCounts(&frame, &dropped);
@@ -661,14 +572,8 @@ static File* movieOpen(char* filePath)
{
gMovieFileStream = fileOpen(filePath, "rb");
if (gMovieFileStream == nullptr) {
if (_failedOpenFunc == nullptr) {
debugPrint("Couldn't find movie file %s\n", filePath);
return nullptr;
}
while (gMovieFileStream == nullptr && _failedOpenFunc(filePath) != 0) {
gMovieFileStream = fileOpen(filePath, "rb");
}
debugPrint("Couldn't find movie file %s\n", filePath);
return nullptr;
}
return gMovieFileStream;
}
@@ -842,10 +747,6 @@ static int _movieStart(int win, char* filePath)
debugPrint("not scaled\n");
}
if (_startMovieFunc != nullptr) {
_startMovieFunc(gMovieWindow);
}
if (_alphaHandle != nullptr) {
int size;
fileReadInt32(_alphaHandle, &size);

6
src/movie.h
View File

@@ -23,13 +23,7 @@ typedef enum MovieExtendedFlags {
typedef char* MovieBuildSubtitleFilePathProc(char* movieFilePath);
typedef void MovieSetPaletteEntriesProc(unsigned char* palette, int start, int end);
typedef void MovieSetPaletteProc(int frame);
typedef void(MovieFrameGrabProc)(unsigned char* data, int width, int height, int pitch);
typedef void(MovieCaptureFrameProc)(unsigned char* data, int width, int height, int pitch, int movieX, int movieY, int movieWidth, int movieHeight);
typedef int(MovieBlitFunc)(int win, unsigned char* data, int width, int height, int pitch);
typedef void(MoviePreDrawFunc)(int win, Rect* rect);
typedef void(MovieStartFunc)(int win);
typedef void(MovieEndFunc)(int win, int x, int y, int width, int height);
typedef int(MovieFailedOpenFunc)(char* path);
void movieInit();
void movieExit();