[Scummvm-git-logs] scummvm master -> 7dea98e89c1426119ab37692dc85a475b96bd21a

athrxx noreply at scummvm.org
Thu Oct 31 00:48:53 UTC 2024


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:
7dea98e89c KYRA: (EOB) - remove unnecessary comments


Commit: 7dea98e89c1426119ab37692dc85a475b96bd21a
    https://github.com/scummvm/scummvm/commit/7dea98e89c1426119ab37692dc85a475b96bd21a
Author: athrxx (athrxx at scummvm.org)
Date: 2024-10-31T01:48:30+01:00

Commit Message:
KYRA: (EOB) - remove unnecessary comments

I verified some code parts from disasm at the request of
contributor vrza. The double-checked code turned out to
be correct for EOB I and EOB II. This commit just removes
the comments telling me what to check.

Changed paths:
    engines/kyra/engine/eobcommon.cpp


diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp
index b03c73d1a9e..0b3a3332bd7 100644
--- a/engines/kyra/engine/eobcommon.cpp
+++ b/engines/kyra/engine/eobcommon.cpp
@@ -2457,14 +2457,12 @@ bool EoBCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int
 	if (charIndex < 0)
 		return true;
 
-	// TODO double check disassembly here:
 	int p = item ? (_flags.gameID == GI_EOB1 ? _items[item].type : (_itemTypes[_items[item].type].extraProperties & 0x7F)) : 0;
 
 	if (_monsters[monsterIndex].flags & 0x20)
-		return true;// EOB 2 only ?
+		return true;
 
 	int t = _monsters[monsterIndex].type;
-	// TODO double check disassembly here:
 	int d = (p < 1 || p > 3) ? 0 : _items[item].value;
 
 	if (_flags.gameID == GI_EOB2) {




More information about the Scummvm-git-logs mailing list