4 files changed, 40 insertions, 3 deletions
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index cc8f6b5e3c..151ed42526 100644
--- a/engines/gob/draw_v2.cpp
+++ b/engines/gob/draw_v2.cpp
@@ -916,4 +916,3 @@ void Draw_v2::spriteOperation(int16 operation) {
 }
 
 } // End of namespace Gob
-
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 78d5e34271..b1689e8d9e 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -477,9 +477,14 @@ protected:
 	virtual void setupOpcodesGob();
 
 	void o3_getTotTextItemPart(OpFuncParams &params);
+	void o3_speakerOn(OpFuncParams &params);
+	void o3_speakerOff(OpFuncParams &params);
 	void o3_copySprite(OpFuncParams &params);
 
 	void o3_wobble(OpGobParams &params);
+
+private:
+	bool _ignoreSpeakerOff;
 };
 
 class Inter_Inca2 : public Inter_v3 {
diff --git a/engines/gob/inter_v3.cpp b/engines/gob/inter_v3.cpp
index 47486b0899..edf56012d9 100644
--- a/engines/gob/inter_v3.cpp
+++ b/engines/gob/inter_v3.cpp
@@ -31,6 +31,7 @@
 #include "gob/game.h"
 #include "gob/script.h"
 #include "gob/resources.h"
+#include "gob/sound/sound.h"
 
 namespace Gob {
 
@@ -39,7 +40,7 @@ namespace Gob {
 #define OPCODEFUNC(i, x)  _opcodesFunc[i]._OPCODEFUNC(OPCODEVER, x)
 #define OPCODEGOB(i, x)   _opcodesGob[i]._OPCODEGOB(OPCODEVER, x)
 
-Inter_v3::Inter_v3(GobEngine *vm) : Inter_v2(vm) {
+Inter_v3::Inter_v3(GobEngine *vm) : Inter_v2(vm), _ignoreSpeakerOff(false) {
 }
 
 void Inter_v3::setupOpcodesDraw() {
@@ -50,6 +51,8 @@ void Inter_v3::setupOpcodesFunc() {
 	Inter_v2::setupOpcodesFunc();
 
 	OPCODEFUNC(0x1A, o3_getTotTextItemPart);
+	OPCODEFUNC(0x22, o3_speakerOn);
+	OPCODEFUNC(0x23, o3_speakerOff);
 	OPCODEFUNC(0x32, o3_copySprite);
 }
 
@@ -245,6 +248,36 @@ void Inter_v3::o3_getTotTextItemPart(OpFuncParams &params) {
 	delete textItem;
 }
 
+void Inter_v3::o3_speakerOn(OpFuncParams &params) {
+	int16 frequency = _vm->_game->_script->readValExpr();
+	int32 length    = -1;
+
+	_ignoreSpeakerOff = false;
+
+	// WORKAROUND: This is the footsteps sound. The scripts just fire
+	// speaker on" and then a "speaker off" after a short while. Since
+	// we have delay in certain places avoid 100% CPU all the time and
+	// our PC speaker emulator sometimes "swallows" very short beeper
+	// bursts issued in this way, this is in general quite wonky and
+	// prone to fail, as can be seen in bug report #3376547. Therefore,
+	// we explicitely set a length in this case and ignore the next
+	// speaker off command.
+	if (frequency == 50) {
+		length = 5;
+
+		_ignoreSpeakerOff = true;
+	}
+
+	_vm->_sound->speakerOn(frequency, length);
+}
+
+void Inter_v3::o3_speakerOff(OpFuncParams &params) {
+	if (!_ignoreSpeakerOff)
+		_vm->_sound->speakerOff();
+
+	_ignoreSpeakerOff = false;
+}
+
 void Inter_v3::o3_copySprite(OpFuncParams &params) {
 	o1_copySprite(params);
 
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp
index bb50818ed8..33fdfcaa2a 100644
--- a/engines/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
@@ -622,7 +622,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
 		if (frame >= (int32)_vm->_vidPlayer->getFrameCount(obj.videoSlot - 1))
 			frame = _vm->_vidPlayer->getFrameCount(obj.videoSlot - 1) - 1;
 
-		if (_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) >= 255) {
+		if ((int32)_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) >= 255) {
 			// Allow for object videos with more than 255 frames, although the
 			// object frame counter is just a byte.