[Scummvm-git-logs] scummvm master -> a0ebd94ead07e7767ac9d4d896f9625ad42bb565

[sev-]

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:
a0ebd94ead HDB: Fixed not being able to pick up Red Unimail Envelope with keyboard


Commit: a0ebd94ead07e7767ac9d4d896f9625ad42bb565
    https://github.com/scummvm/scummvm/commit/a0ebd94ead07e7767ac9d4d896f9625ad42bb565
Author: Zach Showers (linkpro400 at gmail.com)
Date: 2023-02-20T19:41:06+01:00

Commit Message:
HDB: Fixed not being able to pick up Red Unimail Envelope with keyboard

Changed paths:
    engines/hdb/ai-funcs.cpp


diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 73a2938c947..8b1c95a9221 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -2384,6 +2384,12 @@ void AI::movePlayer(uint16 buttons) {
 		int ny = _player->tileY + yva[_player->dir];
 		AIEntity *hit = findEntity(nx, ny);
 
+		if (hit && hit->type == AI_NONE) {
+			AIEntity *temp = g_hdb->_ai->findEntityIgnore(nx, ny, hit);
+			if (temp)
+				hit = temp;
+		}
+
 		// the reason to check for no entity or an AI_NONE is because
 		// there's a possibility that an actual entity and a LUA entity
 		// can share the same spot, so we need to be able to deal with