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/game.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/game.cpp')
| -rw-r--r-- | engines/gob/game.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 9ed83ecf18..4c0bb5a613 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -292,7 +292,7 @@ int16 Game::checkKeys(int16 *pMouseX, int16 *pMouseY, _vm->_util->processInput(); - if (_vm->_mult->_multData && (_vm->_global->_inter_variables != 0) && + if (_vm->_mult->_multData && _vm->_global->_inter_variables && (VAR(58) != 0)) { if (_vm->_mult->_multData->frameStart != (int) VAR(58) - 1) _vm->_mult->_multData->frameStart++; @@ -309,9 +309,6 @@ int16 Game::checkKeys(int16 *pMouseX, int16 *pMouseY, _vm->_inter->_soundEndTimeKey = 0; } - if (_vm->_global->_useMouse == 0) - error("checkKeys: Can't work without mouse!"); - _vm->_util->getMouseState(pMouseX, pMouseY, pButtons); if (*pButtons == 3) @@ -436,7 +433,7 @@ void Game::totSub(int8 flags, char *newTotFile) { _vm->_global->_inter_variablesSizes = 0; } - strcpy(_curTotFile, newTotFile); + strncpy0(_curTotFile, newTotFile, 9); strcat(_curTotFile, ".TOT"); if (_vm->_inter->_terminate != 0) |