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

ISO C++ forbids converting a string constant to char*

This commit is contained in:
k3tamina 2022-05-26 22:37:50 +02:00
parent b467198f16
commit f1416da4a9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/color.cc
View File

@ -352,7 +352,7 @@ void _setMixTableColor(int a1)
} }
// 0x4C78E4 // 0x4C78E4
bool colorPaletteLoad(char* path) bool colorPaletteLoad(const char* path)
{ {
if (gColorFileNameMangler != NULL) { if (gColorFileNameMangler != NULL) {
path = gColorFileNameMangler(path); path = gColorFileNameMangler(path);

4
src/color.h
View File

@ -6,7 +6,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
typedef char*(ColorFileNameManger)(char*); typedef const char*(ColorFileNameManger)(const char*);
typedef void(ColorTransitionCallback)(); typedef void(ColorTransitionCallback)();
typedef int(ColorPaletteFileOpenProc)(const char* path, int mode); typedef int(ColorPaletteFileOpenProc)(const char* path, int mode);
@ -55,7 +55,7 @@ void _setSystemPaletteEntries(unsigned char* a1, int a2, int a3);
void _setIntensityTableColor(int a1); void _setIntensityTableColor(int a1);
void _setIntensityTables(); void _setIntensityTables();
void _setMixTableColor(int a1); void _setMixTableColor(int a1);
bool colorPaletteLoad(char* path); bool colorPaletteLoad(const char* path);
char* _colorError(); char* _colorError();
void _buildBlendTable(unsigned char* ptr, unsigned char ch); void _buildBlendTable(unsigned char* ptr, unsigned char ch);
void _rebuildColorBlendTables(); void _rebuildColorBlendTables();

4
src/game_movie.cc
View File

@ -46,7 +46,7 @@ const char* gMovieFileNames[MOVIE_COUNT] = {
}; };
// 0x518DE4 // 0x518DE4
char* gMoviePaletteFilePaths[MOVIE_COUNT] = { const char* gMoviePaletteFilePaths[MOVIE_COUNT] = {
NULL, NULL,
"art\\cuts\\introsub.pal", "art\\cuts\\introsub.pal",
"art\\cuts\\eldersub.pal", "art\\cuts\\eldersub.pal",
@ -209,7 +209,7 @@ int gameMoviePlay(int movie, int flags)
int oldTextColor; int oldTextColor;
int oldFont; int oldFont;
if (subtitlesEnabled) { if (subtitlesEnabled) {
char* subtitlesPaletteFilePath; const char* subtitlesPaletteFilePath;
if (gMoviePaletteFilePaths[movie] != NULL) { if (gMoviePaletteFilePaths[movie] != NULL) {
subtitlesPaletteFilePath = gMoviePaletteFilePaths[movie]; subtitlesPaletteFilePath = gMoviePaletteFilePaths[movie];
} else { } else {

2
src/game_movie.h
View File

@ -39,7 +39,7 @@ typedef enum GameMovie {
extern const float flt_50352A; extern const float flt_50352A;
extern const char* gMovieFileNames[MOVIE_COUNT]; extern const char* gMovieFileNames[MOVIE_COUNT];
extern char* gMoviePaletteFilePaths[MOVIE_COUNT]; extern const char* gMoviePaletteFilePaths[MOVIE_COUNT];
extern bool gGameMovieIsPlaying; extern bool gGameMovieIsPlaying;
extern bool gGameMovieFaded; extern bool gGameMovieFaded;