aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/detection.cpp4
-rw-r--r--engines/gob/mult_v2.cpp10
-rw-r--r--engines/gob/scenery.cpp8
-rw-r--r--engines/gob/util.cpp72
-rw-r--r--engines/gob/util.h10
5 files changed, 59 insertions, 45 deletions
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 6b37d05e98..9dfbf534d4 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -1150,7 +1150,9 @@ REGISTER_PLUGIN(GOB, "Gob Engine", "Goblins Games (C) Coktel Vision");
namespace Gob {
bool GobEngine::detectGame() {
- const GOBGameDescription *gd = (const GOBGameDescription *)Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
+ Common::EncapsulatedADGameDesc encapsulatedDesc = Common::AdvancedDetector::detectBestMatchingGame(detectionParams);
+ const GOBGameDescription *gd = (const GOBGameDescription *)(encapsulatedDesc.realDesc);
+
if (gd == 0)
return false;
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 38810e8c05..f57d5ecb0c 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -1044,12 +1044,15 @@ void Mult_v2::playImd(const char *imdFile, Mult::Mult_ImdKey &key, int16 dir,
if ((palFrame != -1) && (lastFrame != -1))
if ((lastFrame - palFrame) < startFrame)
if (!(key.flags & 0x4000)) {
+ _vm->_game->_preventScroll = false;
_vm->_imdPlayer->closeImd();
return;
}
- if (!_vm->_imdPlayer->openImd(imdFile, x, y, 0, flags))
+ if (!_vm->_imdPlayer->openImd(imdFile, x, y, 0, flags)) {
+ _vm->_game->_preventScroll = false;
return;
+ }
if (palFrame == -1)
palFrame = 0;
@@ -1064,6 +1067,7 @@ void Mult_v2::playImd(const char *imdFile, Mult::Mult_ImdKey &key, int16 dir,
void Mult_v2::advanceObjects(int16 index) {
int16 frame;
bool stop = false;
+ bool hasImds = false;
frame = _multData->animKeysFrames[index];
if (frame == -1)
@@ -1165,10 +1169,14 @@ void Mult_v2::advanceObjects(int16 index) {
if ((dir != 1) && (--startFrame > 0))
startFrame = 0;
+ hasImds = true;
playImd(imdFile, key, dir, startFrame);
}
}
+ if (!hasImds && (_vm->_draw->_showCursor == 3))
+ _vm->_game->_preventScroll = false;
+
doSoundAnim(stop, frame);
WRITE_VAR(22, frame);
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp
index 17f3af646a..ae04c220d3 100644
--- a/engines/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
@@ -666,10 +666,10 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
pictIndex = (pictIndex & 15) - 1;
- left = FROM_LE_16(pictPtr[pictIndex][pieceIndex].left);
- right = FROM_LE_16(pictPtr[pictIndex][pieceIndex].right);
- top = FROM_LE_16(pictPtr[pictIndex][pieceIndex].top);
- bottom = FROM_LE_16(pictPtr[pictIndex][pieceIndex].bottom);
+ left = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].left);
+ right = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].right);
+ top = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].top);
+ bottom = READ_LE_UINT16(&pictPtr[pictIndex][pieceIndex].bottom);
if (flags & 2) {
if (destX < _vm->_mult->_animLeft) {
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index d7c3ab5337..ff6333aa9e 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -40,8 +40,6 @@ namespace Gob {
Util::Util(GobEngine *vm) : _vm(vm) {
_mouseButtons = 0;
- for (int i = 0; i < KEYBUFSIZE; i++)
- _keyBuffer[i] = 0;
_keyBufferHead = 0;
_keyBufferTail = 0;
_fastMode = 0;
@@ -108,13 +106,13 @@ void Util::processInput(bool scroll) {
break;
case Common::EVENT_KEYDOWN:
if (event.kbd.flags == Common::KBD_CTRL) {
- if (event.kbd.keycode == 'f')
+ if (event.kbd.keycode == Common::KEYCODE_f)
_fastMode ^= 1;
- else if (event.kbd.keycode == 'g')
+ else if (event.kbd.keycode == Common::KEYCODE_g)
_fastMode ^= 2;
break;
}
- addKeyToBuffer(event.kbd.ascii);
+ addKeyToBuffer(event.kbd);
break;
case Common::EVENT_KEYUP:
break;
@@ -145,7 +143,7 @@ bool Util::keyBufferEmpty() {
return (_keyBufferHead == _keyBufferTail);
}
-void Util::addKeyToBuffer(int16 key) {
+void Util::addKeyToBuffer(const Common::KeyState &key) {
if ((_keyBufferHead + 1) % KEYBUFSIZE == _keyBufferTail) {
warning("key buffer overflow");
return;
@@ -155,7 +153,7 @@ void Util::addKeyToBuffer(int16 key) {
_keyBufferHead = (_keyBufferHead + 1) % KEYBUFSIZE;
}
-bool Util::getKeyFromBuffer(int16& key) {
+bool Util::getKeyFromBuffer(Common::KeyState &key) {
if (_keyBufferHead == _keyBufferTail) return false;
key = _keyBuffer[_keyBufferTail];
@@ -164,44 +162,49 @@ bool Util::getKeyFromBuffer(int16& key) {
return true;
}
-int16 Util::translateKey(int16 key) {
+int16 Util::translateKey(const Common::KeyState &key) {
static struct keyS {
int16 from;
int16 to;
} keys[] = {
- {8, 0x0E08}, // Backspace
- {32, 0x3920}, // Space
- {13, 0x1C0D}, // Enter
- {27, 0x011B}, // ESC
- {127, 0x5300}, // Del
- {273, 0x4800}, // Up arrow
- {274, 0x5000}, // Down arrow
- {275, 0x4D00}, // Right arrow
- {276, 0x4B00}, // Left arrow
- {315, 0x3B00}, // F1
- {316, 0x3C00}, // F2
- {317, 0x3D00}, // F3
- {318, 0x3E00}, // F4
- {319, 0x011B}, // F5
- {320, 0x4000}, // F6
- {321, 0x4100}, // F7
- {322, 0x4200}, // F8
- {323, 0x4300}, // F9
- {324, 0x4400} // F10
+ {Common::KEYCODE_INVALID, 0x0000},
+ {Common::KEYCODE_BACKSPACE, 0x0E08},
+ {Common::KEYCODE_SPACE, 0x3920},
+ {Common::KEYCODE_RETURN, 0x1C0D},
+ {Common::KEYCODE_ESCAPE, 0x011B},
+ {Common::KEYCODE_DELETE, 0x5300},
+ {Common::KEYCODE_UP, 0x4800},
+ {Common::KEYCODE_DOWN, 0x5000},
+ {Common::KEYCODE_RIGHT, 0x4D00},
+ {Common::KEYCODE_LEFT, 0x4B00},
+ {Common::KEYCODE_F1, 0x3B00},
+ {Common::KEYCODE_F2, 0x3C00},
+ {Common::KEYCODE_F3, 0x3D00},
+ {Common::KEYCODE_F4, 0x3E00},
+ {Common::KEYCODE_F5, 0x011B},
+ {Common::KEYCODE_F6, 0x4000},
+ {Common::KEYCODE_F7, 0x4100},
+ {Common::KEYCODE_F8, 0x4200},
+ {Common::KEYCODE_F9, 0x4300},
+ {Common::KEYCODE_F10, 0x4400}
};
for (int i = 0; i < ARRAYSIZE(keys); i++)
- if (key == keys[i].from)
+ if (key.keycode == keys[i].from)
return keys[i].to;
- if ((key < 32) || (key >= 128))
- return 0;
+ if ((key.keycode >= Common::KEYCODE_SPACE) &&
+ (key.keycode <= Common::KEYCODE_DELETE)) {
+
+ // Used as a user input in Gobliins 2 notepad, in the save dialog, ...
+ return key.ascii;
+ }
- return key;
+ return 0;
}
int16 Util::getKey(void) {
- int16 key;
+ Common::KeyState key;
while (!getKeyFromBuffer(key)) {
processInput();
@@ -213,10 +216,9 @@ int16 Util::getKey(void) {
}
int16 Util::checkKey(void) {
- int16 key;
+ Common::KeyState key;
- if (!getKeyFromBuffer(key))
- key = 0;
+ getKeyFromBuffer(key);
return translateKey(key);
}
diff --git a/engines/gob/util.h b/engines/gob/util.h
index 09fe668518..2cc0547a20 100644
--- a/engines/gob/util.h
+++ b/engines/gob/util.h
@@ -26,6 +26,8 @@
#ifndef GOB_UTIL_H
#define GOB_UTIL_H
+#include "common/keyboard.h"
+
#include "gob/video.h"
namespace Gob {
@@ -90,7 +92,7 @@ public:
protected:
int16 _mouseButtons;
- int16 _keyBuffer[KEYBUFSIZE];
+ Common::KeyState _keyBuffer[KEYBUFSIZE];
int16 _keyBufferHead;
int16 _keyBufferTail;
@@ -99,9 +101,9 @@ protected:
GobEngine *_vm;
bool keyBufferEmpty();
- void addKeyToBuffer(int16 key);
- bool getKeyFromBuffer(int16& key);
- int16 translateKey(int16 key);
+ void addKeyToBuffer(const Common::KeyState &key);
+ bool getKeyFromBuffer(Common::KeyState &key);
+ int16 translateKey(const Common::KeyState &key);
void checkJoystick();
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-03 21:46:25 +0000