cpp/openttd-patchpack/source File Diff

File diff r4849:41dc3967353a → r4850:7a78073de588

economy.c

➞

Show inline comments

@@ @@ -1543,7 +1543,7 @@ int32 CmdBuyShareInCompany(TileIndex til @@
 	int64 cost;
 	/* Check if buying shares is allowed (protection against modified clients */
-	if (p1 >= MAX_PLAYERS || !_patches.allow_shares) return CMD_ERROR;
+	if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR;
 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
 	p = GetPlayer(p1);
@@ @@ -1588,7 +1588,7 @@ int32 CmdSellShareInCompany(TileIndex ti @@
 	int64 cost;
 	/* Check if buying shares is allowed (protection against modified clients */
-	if (p1 >= MAX_PLAYERS || !_patches.allow_shares) return CMD_ERROR;
+	if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR;
 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
 	p = GetPlayer(p1);
@@ @@ -1622,7 +1622,7 @@ int32 CmdBuyCompany(TileIndex tile, uint @@
 	Player *p;
 	/* Disable takeovers in multiplayer games */
-	if (p1 >= MAX_PLAYERS || _networking) return CMD_ERROR;
+	if (!IsValidPlayer((PlayerID)p1) || _networking) return CMD_ERROR;
 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
 	p = GetPlayer(p1);