diff options
-rw-r--r-- | engines/gob/hotspots.cpp | 8 | ||||
-rw-r--r-- | engines/gob/hotspots.h | 2 | ||||
-rw-r--r-- | engines/gob/init_fascin.cpp | 4 | ||||
-rw-r--r-- | engines/gob/init_v3.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index 1edb7fc0cb..1563a39394 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -1393,9 +1393,9 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs, ids[i] = _vm->_game->_script->readInt16(); flags = _vm->_game->_script->readInt16(); - if (flags > 3) + if (flags > 3) warning("evaluateNew: Warning, use of type 2 or 20. flags = %d, should be %d\n", flags, flags&3); - + funcEnter = 0; funcLeave = _vm->_game->_script->pos(); @@ -1424,7 +1424,7 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs, } bool Hotspots::evaluateFind(uint16 key, int16 timeVal, const uint16 *ids, - uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2, + uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2, uint16 endIndex, int16 &duration, uint16 &id, uint16 &index, bool &finished) { bool fascinCheck = false; @@ -1678,7 +1678,7 @@ int16 Hotspots::findCursor(uint16 x, uint16 y) const { cursor = 0; for (int i = 0; (i < kHotspotCount) && !_hotspots[i].isEnd(); i++) { const Hotspot &spot = _hotspots[i]; - // this check is /really/ Fascination specific. + // this check is /really/ Fascination specific. // It's illogical, so if it's to be reused in Adi games... Be careful! if ((spot.flags & 0xFF00) == curType) if (spot.isIn(x - deltax, y - deltay)) { diff --git a/engines/gob/hotspots.h b/engines/gob/hotspots.h index cba400d5b6..7346c66bb5 100644 --- a/engines/gob/hotspots.h +++ b/engines/gob/hotspots.h @@ -224,7 +224,7 @@ private: uint16 &inputId, bool &hasInput, uint16 &inputCount); /** Find the hotspot requested by script commands. */ bool evaluateFind(uint16 key, int16 timeVal, const uint16 *ids, - uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2, + uint16 leaveWindowIndex, uint16 hotspotIndex1, uint16 hotspotIndex2, uint16 endIndex, int16 &duration, uint16 &id, uint16 &index, bool &finished); // Finding specific hotspots diff --git a/engines/gob/init_fascin.cpp b/engines/gob/init_fascin.cpp index 3f049e14db..f59106dbd2 100644 --- a/engines/gob/init_fascin.cpp +++ b/engines/gob/init_fascin.cpp @@ -41,8 +41,8 @@ Init_Fascination::~Init_Fascination() { void Init_Fascination::updateConfig() { // In Fascination, some empty texts are present and used to clean up the text area. // Using _doSubtitles does the trick. -// The first obvious example is in the hotel hall: 'Use ...' is displayed at the same -// place than the character dialogs. +// The first obvious example is in the hotel hall: 'Use ...' is displayed at the same +// place than the character dialogs. _vm->_global->_doSubtitles = true; } diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp index 4a2379bad0..cb4a0b713f 100644 --- a/engines/gob/init_v3.cpp +++ b/engines/gob/init_v3.cpp @@ -39,7 +39,7 @@ Init_v3::~Init_v3() { } void Init_v3::updateConfig() { -// In the CD version of Goblins3, some texts are flagged 'subtitles' +// In the CD version of Goblins3, some texts are flagged 'subtitles' // incorrectly and therefore should be displayed in all cases. // The first obvious example is just after Death level. if ((_vm->getGameType() == kGameTypeGob3) && _vm->isCD()) |