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

[Strangerke]

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:
c56f19cfbd EFH: Simplify a couple of checks


Commit: c56f19cfbd61826a84dc7c1d084c660d096be353
    https://github.com/scummvm/scummvm/commit/c56f19cfbd61826a84dc7c1d084c660d096be353
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2023-04-30T18:33:17+01:00

Commit Message:
EFH: Simplify a couple of checks

Changed paths:
    engines/efh/efh.cpp


diff --git a/engines/efh/efh.cpp b/engines/efh/efh.cpp
index 3bfdd0c0675..60d5da08f5f 100644
--- a/engines/efh/efh.cpp
+++ b/engines/efh/efh.cpp
@@ -2150,7 +2150,7 @@ bool EfhEngine::handleInteractionText(int16 mapPosX, int16 mapPosY, int16 charId
 	if (tileId < 0)
 		return false;
 
-	if ((arg8 == 4 && _mapSpecialTiles[_techId][tileId]._triggerType < 0xFA) || arg8 != 4) {
+	if (arg8 != 4 || _mapSpecialTiles[_techId][tileId]._triggerType < 0xFA) {
 		if (_mapSpecialTiles[_techId][tileId]._field7_textId > 0xFE)
 			return false;
 		displayImp1Text(_mapSpecialTiles[_techId][tileId]._field7_textId);
@@ -2177,7 +2177,7 @@ int8 EfhEngine::checkTileStatus(int16 mapPosX, int16 mapPosY, bool teamFl) {
 	}
 
 	if (_tileFact[tileFactId]._tileId != 0xFF) {
-		if (teamFl || (!teamFl && tileFactId != 128 && tileFactId != 121)) {
+		if (teamFl || (tileFactId != 128 && tileFactId != 121)) {
 			if (_largeMapFlag)
 				_mapGameMaps[_techId][mapPosX][mapPosY] = _tileFact[tileFactId]._tileId;
 			else