[Scummvm-git-logs] scummvm master -> 0bd88e301bf919cb2d30f34f3f2fae73f662a5c9

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0bd88e301b KYRA: (EOB) - fix bug no. 12189


Commit: 0bd88e301bf919cb2d30f34f3f2fae73f662a5c9
    https://github.com/scummvm/scummvm/commit/0bd88e301bf919cb2d30f34f3f2fae73f662a5c9
Author: athrxx (athrxx at scummvm.org)
Date: 2021-02-24T18:37:43+01:00

Commit Message:
KYRA: (EOB) - fix bug no. 12189

(EOB2 short sword "Sting" regression in v2.2.0)

Changed paths:
    engines/kyra/gui/gui_eob.cpp


diff --git a/engines/kyra/gui/gui_eob.cpp b/engines/kyra/gui/gui_eob.cpp
index f02f3e23b4..90ee807073 100644
--- a/engines/kyra/gui/gui_eob.cpp
+++ b/engines/kyra/gui/gui_eob.cpp
@@ -943,7 +943,7 @@ int EoBCoreEngine::clickedSceneDropPickupItem(Button *button) {
 		if (!d)
 			return 1;
 
-		if (_items[d].nameUnid == 97) {
+		if (_flags.gameID == GI_EOB1 && _items[d].nameUnid == 97) {
 			_items[d].block = -1;
 			addLevelMap(_items[d].value);
 			snd_playSoundEffect(0x101C);