diff options
| author | Johannes Schickel | 2008-11-16 20:20:31 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-11-16 20:20:31 +0000 |
| commit | 2ef8a32a0119f93483e2b58c9bd1f2f42851f9ea (patch) | |
| tree | 5acce47983e5ef5210696de8731999a016b160dd /engines/saga | |
| parent | e1fdb1f882c7937d34e99dbfeeb3154846eee565 (diff) | |
| download | scummvm-rg350-2ef8a32a0119f93483e2b58c9bd1f2f42851f9ea.tar.gz scummvm-rg350-2ef8a32a0119f93483e2b58c9bd1f2f42851f9ea.tar.bz2 scummvm-rg350-2ef8a32a0119f93483e2b58c9bd1f2f42851f9ea.zip | |
Fixed various g++ warnings ("format not a string literal and no format arguments").
svn-id: r35096
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/rscfile.cpp | 6 | ||||
| -rw-r--r-- | engines/saga/sthread.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp index cd4dbdd0a9..41fe510906 100644 --- a/engines/saga/rscfile.cpp +++ b/engines/saga/rscfile.cpp @@ -408,7 +408,7 @@ bool Resource::createContexts() { if (Common::File::exists(curSoundfiles[i].fileName)) { _contextsCount++; soundFileIndex = _contextsCount - 1; - sprintf(soundFileName, curSoundfiles[i].fileName); + strcpy(soundFileName, curSoundfiles[i].fileName); _vm->_gf_compressed_sounds = curSoundfiles[i].isCompressed; fileFound = true; break; @@ -452,7 +452,7 @@ bool Resource::createContexts() { if (Common::File::exists(curSoundfiles[i].fileName)) { _contextsCount++; voicesFileIndex = _contextsCount - 1; - sprintf(_voicesFileName[0], curSoundfiles[i].fileName); + strcpy(_voicesFileName[0], curSoundfiles[i].fileName); _vm->_gf_compressed_sounds = curSoundfiles[i].isCompressed; fileFound = true; @@ -519,7 +519,7 @@ bool Resource::createContexts() { _contextsCount++; digitalMusic = true; fileFound = true; - sprintf(musicFileName, musicFilesITE[i].fileName); + strcpy(musicFileName, musicFilesITE[i].fileName); break; } } diff --git a/engines/saga/sthread.cpp b/engines/saga/sthread.cpp index c1b289a060..376e15c372 100644 --- a/engines/saga/sthread.cpp +++ b/engines/saga/sthread.cpp @@ -232,7 +232,7 @@ bool Script::runThread(ScriptThread *thread, uint instructionLimit) { #define CASEOP(opName) case opName: \ if (operandChar == opName) { \ operandName = #opName; \ - debug(2, operandName); \ + debug(2, "%s", operandName); \ } debug(8, "Executing thread offset: %u (%x) stack: %d", thread->_instructionOffset, operandChar, thread->pushedSize()); |