diff options
| -rw-r--r-- | backends/midi/adlib.cpp | 2 | ||||
| -rw-r--r-- | common/gameDetector.cpp | 2 | ||||
| -rw-r--r-- | common/gameDetector.h | 2 | ||||
| -rw-r--r-- | scumm/debugger.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/backends/midi/adlib.cpp b/backends/midi/adlib.cpp index 554a053dc2..39349a6220 100644 --- a/backends/midi/adlib.cpp +++ b/backends/midi/adlib.cpp @@ -422,7 +422,7 @@ static byte map_gm_to_fm [128][30] = { struct PercussionMapEntry { byte _key; // 0 means no map data - char *_name; + const char *_name; byte _instrument [30]; }; diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index c17c78d31c..f228d9173e 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -642,7 +642,7 @@ int GameDetector::detectMain() { if (!_gameDataPath) { warning("No path was provided. Assuming the data files are in the current directory"); - _gameDataPath = ""; + _gameDataPath = strdup(""); #ifndef __PALM_OS__ // add last slash also in File::fopenNoCase, so this is not needed } else if (_gameDataPath[strlen(_gameDataPath)-1] != '/' #ifdef __MORPHOS__ diff --git a/common/gameDetector.h b/common/gameDetector.h index d9e5b104a5..697d05c7c4 100644 --- a/common/gameDetector.h +++ b/common/gameDetector.h @@ -70,7 +70,7 @@ struct VersionSettings { ADLIB_NEVER = 3 } adlib; uint32 features; - char *detectname; + const char *detectname; }; struct MusicDriver { diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 74d3aef13c..a49e1fcb5f 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -900,7 +900,7 @@ void ScummDebugger::drawBox(int box) { } bool ScummDebugger::Cmd_PrintDraft(int argc, const char **argv) { - char *names[] = { + const char *names[] = { "Opening", "Straw to Gold", "Dyeing", "Night Vision", "Twisting", "Sleep", "Emptying", "Invisibility", "Terror", @@ -913,7 +913,7 @@ bool ScummDebugger::Cmd_PrintDraft(int argc, const char **argv) { 73, 19274, 76, 77, 20302, 20816, 21330, 84 }; - char *notes = "cdefgabC"; + const char *notes = "cdefgabC"; int i, base, draft; if (_s->_gameId != GID_LOOM && _s->_gameId != GID_LOOM256) { |