diff options
| author | Willem Jan Palenstijn | 2014-09-28 23:56:15 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2014-09-28 23:57:26 +0200 |
| commit | 2c61e80d7e6c6dc14efc96608ebd7f3b4c0b2e02 (patch) | |
| tree | ce53a9368b75c22e6e020268df990aeb4b3f700f /engines/cge2 | |
| parent | 9ee78d1e4c9770d8f3b768e9823e1f93dae65b1a (diff) | |
| download | scummvm-rg350-2c61e80d7e6c6dc14efc96608ebd7f3b4c0b2e02.tar.gz scummvm-rg350-2c61e80d7e6c6dc14efc96608ebd7f3b4c0b2e02.tar.bz2 scummvm-rg350-2c61e80d7e6c6dc14efc96608ebd7f3b4c0b2e02.zip | |
CGE2: Constify strings
Diffstat (limited to 'engines/cge2')
| -rw-r--r-- | engines/cge2/map.cpp | 2 | ||||
| -rw-r--r-- | engines/cge2/sound.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge2/map.cpp b/engines/cge2/map.cpp index 1ed0ea7daf..8c1f00048f 100644 --- a/engines/cge2/map.cpp +++ b/engines/cge2/map.cpp @@ -42,7 +42,7 @@ void Map::clear() { void Map::load(int scene) { clear(); - char fname[] = "%.2d.MAP\0"; + const char *fname = "%.2d.MAP"; Common::String fileName = Common::String::format(fname, scene); if (!_vm->_resman->exist(fileName.c_str())) return; diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp index 32f94b17b9..57ec5983e8 100644 --- a/engines/cge2/sound.cpp +++ b/engines/cge2/sound.cpp @@ -143,9 +143,9 @@ void Fx::clear() { } Common::String Fx::name(int ref, int sub) { - char fxname[] = "%.2dfx%.2d.WAV\0"; - char subName[] = "%.2dfx%.2d?.WAV\0"; - char *p = (sub) ? subName : fxname; + const char *fxname = "%.2dfx%.2d.WAV"; + const char *subName = "%.2dfx%.2d?.WAV"; + const char *p = (sub) ? subName : fxname; Common::String filename = Common::String::format(p, ref >> 8, ref & 0xFF); if (sub) filename.setChar('@' + sub, 6); |