[Scummvm-cvs-logs] scummvm master -> fcadd5a56d2ed1b51df9106a7703aa6a50dada8d
DrMcCoy
drmccoy at drmccoy.de
Sun Aug 28 21:58:20 CEST 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5b25fc3e25 GOB: Fix language inconsistencies in Geisha
8c69d64678 GOB: Fix a potential input box bug
fcadd5a56d GOB: Fix Geisha's hotspot checks
Commit: 5b25fc3e25389c8d44b05bb92d514229f595b627
https://github.com/scummvm/scummvm/commit/5b25fc3e25389c8d44b05bb92d514229f595b627
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-28T12:54:42-07:00
Commit Message:
GOB: Fix language inconsistencies in Geisha
Changed paths:
engines/gob/game.cpp
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp
index 7b43e9c..502a440 100644
--- a/engines/gob/game.cpp
+++ b/engines/gob/game.cpp
@@ -583,7 +583,11 @@ void Game::playTot(int16 function) {
WRITE_VAR(13, _vm->_global->_useMouse);
WRITE_VAR(14, _vm->_global->_soundFlags);
WRITE_VAR(15, _vm->_global->_fakeVideoMode);
- WRITE_VAR(16, _vm->_global->_language);
+
+ if (_vm->getGameType() == kGameTypeGeisha)
+ WRITE_VAR(57, _vm->_global->_language);
+ else
+ WRITE_VAR(16, _vm->_global->_language);
// WORKAROUND: Inca2 seems to depend on that variable to be cleared
if (_vm->getGameType() == kGameTypeInca2)
Commit: 8c69d64678361420fc1e51632cd79b29fb3128f3
https://github.com/scummvm/scummvm/commit/8c69d64678361420fc1e51632cd79b29fb3128f3
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-28T12:54:42-07:00
Commit Message:
GOB: Fix a potential input box bug
Changed paths:
engines/gob/hotspots.cpp
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index f3647af..1a2f4b2 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -1348,12 +1348,12 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs,
inputs[inputCount].str = 0;
if ((type >= kTypeInput2NoLeave) && (type <= kTypeInput3Leave)) {
- uint16 length = _vm->_game->_script->readUint16();
+ inputs[inputCount].length = _vm->_game->_script->readUint16();
inputs[inputCount].str =
(const char *)(_vm->_game->_script->getData() + _vm->_game->_script->pos());
- _vm->_game->_script->skip(length);
+ _vm->_game->_script->skip(inputs[inputCount].length);
}
if (left == 0xFFFF) {
Commit: fcadd5a56d2ed1b51df9106a7703aa6a50dada8d
https://github.com/scummvm/scummvm/commit/fcadd5a56d2ed1b51df9106a7703aa6a50dada8d
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-28T12:54:43-07:00
Commit Message:
GOB: Fix Geisha's hotspot checks
Changed paths:
engines/gob/hotspots.cpp
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index 1a2f4b2..96b1efb 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -775,7 +775,8 @@ uint16 Hotspots::check(uint8 handleMouse, int16 delay, uint16 &id, uint16 &index
_vm->_draw->blitCursor();
- if ((key != _currentKey) && (_vm->getGameType() != kGameTypeFascination))
+ if ((key != _currentKey) && (_vm->getGameType() != kGameTypeFascination) &&
+ (_vm->getGameType() != kGameTypeGeisha))
// If the hotspot changed, leave the old one
// Code not present in Fascination executables
leave(_currentIndex);
More information about the Scummvm-git-logs
mailing list