From f1416da4a953e86cc6098c12178608842ae07df1 Mon Sep 17 00:00:00 2001 From: k3tamina Date: Thu, 26 May 2022 22:37:50 +0200 Subject: [PATCH] ISO C++ forbids converting a string constant to char* --- src/color.cc | 2 +- src/color.h | 4 ++-- src/game_movie.cc | 4 ++-- src/game_movie.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/color.cc b/src/color.cc index a98b8a2..fb4dde3 100644 --- a/src/color.cc +++ b/src/color.cc @@ -352,7 +352,7 @@ void _setMixTableColor(int a1) } // 0x4C78E4 -bool colorPaletteLoad(char* path) +bool colorPaletteLoad(const char* path) { if (gColorFileNameMangler != NULL) { path = gColorFileNameMangler(path); diff --git a/src/color.h b/src/color.h index fd6b7cb..d2714a1 100644 --- a/src/color.h +++ b/src/color.h @@ -6,7 +6,7 @@ #include #include -typedef char*(ColorFileNameManger)(char*); +typedef const char*(ColorFileNameManger)(const char*); typedef void(ColorTransitionCallback)(); 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 _setIntensityTables(); void _setMixTableColor(int a1); -bool colorPaletteLoad(char* path); +bool colorPaletteLoad(const char* path); char* _colorError(); void _buildBlendTable(unsigned char* ptr, unsigned char ch); void _rebuildColorBlendTables(); diff --git a/src/game_movie.cc b/src/game_movie.cc index dd86da6..9e69cd7 100644 --- a/src/game_movie.cc +++ b/src/game_movie.cc @@ -46,7 +46,7 @@ const char* gMovieFileNames[MOVIE_COUNT] = { }; // 0x518DE4 -char* gMoviePaletteFilePaths[MOVIE_COUNT] = { +const char* gMoviePaletteFilePaths[MOVIE_COUNT] = { NULL, "art\\cuts\\introsub.pal", "art\\cuts\\eldersub.pal", @@ -209,7 +209,7 @@ int gameMoviePlay(int movie, int flags) int oldTextColor; int oldFont; if (subtitlesEnabled) { - char* subtitlesPaletteFilePath; + const char* subtitlesPaletteFilePath; if (gMoviePaletteFilePaths[movie] != NULL) { subtitlesPaletteFilePath = gMoviePaletteFilePaths[movie]; } else { diff --git a/src/game_movie.h b/src/game_movie.h index 88a70b6..4cc87de 100644 --- a/src/game_movie.h +++ b/src/game_movie.h @@ -39,7 +39,7 @@ typedef enum GameMovie { extern const float flt_50352A; extern const char* gMovieFileNames[MOVIE_COUNT]; -extern char* gMoviePaletteFilePaths[MOVIE_COUNT]; +extern const char* gMoviePaletteFilePaths[MOVIE_COUNT]; extern bool gGameMovieIsPlaying; extern bool gGameMovieFaded;