diff options
author | Sven Hesse | 2007-03-30 17:52:31 +0000 |
---|---|---|
committer | Sven Hesse | 2007-03-30 17:52:31 +0000 |
commit | d65e05841a324d2ec898a3662f40e193fbc77e47 (patch) | |
tree | 55d85a458c0559e6c3d3b060dd54f7385562867a /engines/gob/inter_v2.cpp | |
parent | 33c6a6f46057748a30a143c9eb5dc1f86c813e32 (diff) | |
download | scummvm-rg350-d65e05841a324d2ec898a3662f40e193fbc77e47.tar.gz scummvm-rg350-d65e05841a324d2ec898a3662f40e193fbc77e47.tar.bz2 scummvm-rg350-d65e05841a324d2ec898a3662f40e193fbc77e47.zip |
- Fixed the IMD playing within mults, the non-interactive Gob3 demo should work better now
- Replaced strcpy with strncpy where appropriate
- Added detection entries for other languages of the multilingual Gob3 CD; bug #1691230
svn-id: r26327
Diffstat (limited to 'engines/gob/inter_v2.cpp')
-rw-r--r-- | engines/gob/inter_v2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 74c129bac6..0998d3de31 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -1074,7 +1074,7 @@ void Inter_v2::o2_readLIC() { char path[40]; evalExpr(0); - strcpy(path, _vm->_global->_inter_resStr); + strncpy0(path, _vm->_global->_inter_resStr, 35); strcat(path, ".LIC"); _vm->_cdrom->readLIC(path); @@ -1460,7 +1460,7 @@ void Inter_v2::o2_playImd() { evalExpr(0); _vm->_global->_inter_resStr[8] = 0; - strcpy(imd, _vm->_global->_inter_resStr); + strncpy0(imd, _vm->_global->_inter_resStr, 127); x = _vm->_parse->parseValExpr(); y = _vm->_parse->parseValExpr(); @@ -1542,7 +1542,7 @@ void Inter_v2::o2_openItk() { char fileName[32]; evalExpr(0); - strcpy(fileName, _vm->_global->_inter_resStr); + strncpy0(fileName, _vm->_global->_inter_resStr, 27); strcat(fileName, ".ITK"); _vm->_dataIO->openDataFile(fileName, true); @@ -1920,7 +1920,7 @@ void Inter_v2::o2_loadInfogramesIns(OpGobParams ¶ms) { if (_vm->_noMusic) return; - strcpy(fileName, GET_VAR_STR(varName)); + strncpy0(fileName, GET_VAR_STR(varName), 15); strcat(fileName, ".INS"); debugC(1, kDebugMusic, "Loading Infogrames instrument file \"%s\"", fileName); @@ -1950,7 +1950,7 @@ void Inter_v2::o2_playInfogrames(OpGobParams ¶ms) { if (_vm->_noMusic) return; - strcpy(fileName, GET_VAR_STR(varName)); + strncpy0(fileName, GET_VAR_STR(varName), 15); strcat(fileName, ".DUM"); debugC(1, kDebugMusic, "Playing Infogrames music file \"%s\"", fileName); @@ -2026,7 +2026,7 @@ int16 Inter_v2::loadSound(int16 search) { source = SOUND_FILE; - strcpy(sndfile, _vm->_global->_inter_execPtr); + strncpy0(sndfile, _vm->_global->_inter_execPtr, 9); _vm->_global->_inter_execPtr += 9; if (type == SOUND_ADL) |