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

Cleanup game_movie.h 

See #42
This commit is contained in:
Alexander Batalov 2022-06-18 16:52:03 +03:00
parent 4515c6cd51
commit ab8ef590fe
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/game_movie.cc
View File

@ -11,6 +11,7 @@
#include "movie.h" #include "movie.h"
#include "movie_effect.h" #include "movie_effect.h"
#include "palette.h" #include "palette.h"
#include "platform_compat.h"
#include "text_font.h" #include "text_font.h"
#include "widget.h" #include "widget.h"
#include "window_manager.h" #include "window_manager.h"
@ -21,11 +22,13 @@
#define GAME_MOVIE_WINDOW_WIDTH 640 #define GAME_MOVIE_WINDOW_WIDTH 640
#define GAME_MOVIE_WINDOW_HEIGHT 480 #define GAME_MOVIE_WINDOW_HEIGHT 480
static char* gameMovieBuildSubtitlesFilePath(char* movieFilePath);
// 0x50352A // 0x50352A
const float flt_50352A = 0.032258064f; static const float flt_50352A = 0.032258064f;
// 0x518DA0 // 0x518DA0
const char* gMovieFileNames[MOVIE_COUNT] = { static const char* gMovieFileNames[MOVIE_COUNT] = {
"iplogo.mve", "iplogo.mve",
"intro.mve", "intro.mve",
"elder.mve", "elder.mve",
@ -46,7 +49,7 @@ const char* gMovieFileNames[MOVIE_COUNT] = {
}; };
// 0x518DE4 // 0x518DE4
const char* gMoviePaletteFilePaths[MOVIE_COUNT] = { static const char* gMoviePaletteFilePaths[MOVIE_COUNT] = {
NULL, NULL,
"art\\cuts\\introsub.pal", "art\\cuts\\introsub.pal",
"art\\cuts\\eldersub.pal", "art\\cuts\\eldersub.pal",
@ -67,16 +70,16 @@ const char* gMoviePaletteFilePaths[MOVIE_COUNT] = {
}; };
// 0x518E28 // 0x518E28
bool gGameMovieIsPlaying = false; static bool gGameMovieIsPlaying = false;
// 0x518E2C // 0x518E2C
bool gGameMovieFaded = false; static bool gGameMovieFaded = false;
// 0x596C78 // 0x596C78
unsigned char gGameMoviesSeen[MOVIE_COUNT]; static unsigned char gGameMoviesSeen[MOVIE_COUNT];
// 0x596C89 // 0x596C89
char gGameMovieSubtitlesFilePath[COMPAT_MAX_PATH]; static char gGameMovieSubtitlesFilePath[COMPAT_MAX_PATH];
// gmovie_init // gmovie_init
// 0x44E5C0 // 0x44E5C0
@ -324,7 +327,7 @@ bool gameMovieIsPlaying()
} }
// 0x44EB1C // 0x44EB1C
char* gameMovieBuildSubtitlesFilePath(char* movieFilePath) static char* gameMovieBuildSubtitlesFilePath(char* movieFilePath)
{ {
char* language; char* language;
configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language); configGetString(&gGameConfig, GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_LANGUAGE_KEY, &language);

12
src/game_movie.h
View File

@ -2,7 +2,6 @@
#define GAME_MOVIE_H #define GAME_MOVIE_H
#include "db.h" #include "db.h"
#include "platform_compat.h"
typedef enum GameMovieFlags { typedef enum GameMovieFlags {
GAME_MOVIE_FADE_IN = 0x01, GAME_MOVIE_FADE_IN = 0x01,
@ -32,16 +31,6 @@ typedef enum GameMovie {
MOVIE_COUNT, MOVIE_COUNT,
} GameMovie; } GameMovie;
extern const float flt_50352A;
extern const char* gMovieFileNames[MOVIE_COUNT];
extern const char* gMoviePaletteFilePaths[MOVIE_COUNT];
extern bool gGameMovieIsPlaying;
extern bool gGameMovieFaded;
extern char gGameMovieSubtitlesFilePath[COMPAT_MAX_PATH];
extern unsigned char gGameMoviesSeen[MOVIE_COUNT];
int gameMoviesInit(); int gameMoviesInit();
void gameMoviesReset(); void gameMoviesReset();
int gameMoviesLoad(File* stream); int gameMoviesLoad(File* stream);
@ -50,6 +39,5 @@ int gameMoviePlay(int movie, int flags);
void gameMovieFadeOut(); void gameMovieFadeOut();
bool gameMovieIsSeen(int movie); bool gameMovieIsSeen(int movie);
bool gameMovieIsPlaying(); bool gameMovieIsPlaying();
char* gameMovieBuildSubtitlesFilePath(char* movieFilePath);
#endif /* GAME_MOVIE_H */ #endif /* GAME_MOVIE_H */