From ba4ee58c9fd317d8e1f29a1fb4ad6b58cd5bbf1b Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 27 Jun 2022 23:18:24 +0200
Subject: [PATCH] Pass along bools instead of player index

---
 Source/objects.cpp | 16 ++++++++--------
 Source/sync.cpp    |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/objects.cpp b/Source/objects.cpp
index d77831977..5177ae908 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -2145,7 +2145,7 @@ void DeltaOperateLever(Object &object)
 	ObjChangeMap(object._oVar1, object._oVar2, object._oVar3, object._oVar4);
 }
 
-void OperateLever(int pnum, int i)
+void OperateLever(int i, bool sendmsg)
 {
 	Object &object = Objects[i];
 	if (object._oSelFlag == 0) {
@@ -2161,7 +2161,7 @@ void OperateLever(int pnum, int i)
 		Quests[Q_NAKRUL]._qactive = QUEST_DONE;
 	}
 
-	if (pnum == MyPlayerId)
+	if (sendmsg)
 		NetSendCmdParam1(false, CMD_OPERATEOBJ, i);
 }
 
@@ -2237,7 +2237,7 @@ void OperateBook(int pnum, Object &book)
 	}
 }
 
-void OperateBookLever(int pnum, int i)
+void OperateBookLever(int i, bool sendmsg)
 {
 	if (ActiveItemCount >= MAXITEMS) {
 		return;
@@ -2272,7 +2272,7 @@ void OperateBookLever(int pnum, int i)
 		}
 		Objects[i]._oAnimFrame = Objects[i]._oVar6;
 		InitQTextMsg(Objects[i].bookMessage);
-		if (pnum == MyPlayerId)
+		if (sendmsg)
 			NetSendCmdParam1(false, CMD_OPERATEOBJ, i);
 	}
 }
@@ -4989,7 +4989,7 @@ void OperateObject(int pnum, int i, bool teleFlag)
 	case OBJ_LEVER:
 	case OBJ_L5LEVER:
 	case OBJ_SWITCHSKL:
-		OperateLever(pnum, i);
+		OperateLever(i, sendmsg);
 		break;
 	case OBJ_BOOK2L:
 		OperateBook(pnum, Objects[i]);
@@ -5015,7 +5015,7 @@ void OperateObject(int pnum, int i, bool teleFlag)
 	case OBJ_BLINDBOOK:
 	case OBJ_BLOODBOOK:
 	case OBJ_STEELTOME:
-		OperateBookLever(pnum, i);
+		OperateBookLever(i, sendmsg);
 		break;
 	case OBJ_SHRINEL:
 	case OBJ_SHRINER:
@@ -5182,7 +5182,7 @@ void SyncOpObject(int pnum, int cmd, int i)
 	case OBJ_LEVER:
 	case OBJ_L5LEVER:
 	case OBJ_SWITCHSKL:
-		OperateLever(pnum, i);
+		OperateLever(i, pnum == MyPlayerId);
 		break;
 	case OBJ_CHEST1:
 	case OBJ_CHEST2:
@@ -5199,7 +5199,7 @@ void SyncOpObject(int pnum, int cmd, int i)
 	case OBJ_BLINDBOOK:
 	case OBJ_BLOODBOOK:
 	case OBJ_STEELTOME:
-		OperateBookLever(pnum, i);
+		OperateBookLever(i, pnum == MyPlayerId);
 		break;
 	case OBJ_SHRINEL:
 	case OBJ_SHRINER:
diff --git a/Source/sync.cpp b/Source/sync.cpp
index 3bc5387c8..a2c6a2160 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -148,7 +148,7 @@ void SyncPlrInv(TSyncHeader *pHdr)
 	}
 }
 
-void SyncMonster(int pnum, const TSyncMonster &monsterSync)
+void SyncMonster(bool isOwner, const TSyncMonster &monsterSync)
 {
 	const int monsterId = monsterSync._mndx;
 	Monster &monster = Monsters[monsterId];
@@ -165,7 +165,7 @@ void SyncMonster(int pnum, const TSyncMonster &monsterSync)
 			delta = 255;
 		}
 
-		if (delta < monsterSync._mdelta || (delta == monsterSync._mdelta && pnum > MyPlayerId)) {
+		if (delta < monsterSync._mdelta || (delta == monsterSync._mdelta && isOwner)) {
 			return;
 		}
 		if (monster.position.future == position) {
@@ -312,7 +312,7 @@ uint32_t OnSyncData(const TCmd *pCmd, int pnum)
 				continue;
 
 			if (GetLevelForMultiplayer(*MyPlayer) == level) {
-				SyncMonster(pnum, monsterSyncs[i]);
+				SyncMonster(pnum > MyPlayerId, monsterSyncs[i]);
 			}
 
 			delta_sync_monster(monsterSyncs[i], level);