From 6c5acdde6a468d4ba143dcdd66a9e917f5a45f11 Mon Sep 17 00:00:00 2001
From: zsilencer <zsilencergame@gmail.com>
Date: Fri, 30 Oct 2015 19:41:49 -0600
Subject: [PATCH] fix #2161

---
 src/peep/peep.c  | 4 ++--
 src/ride/ride.c  | 4 ++--
 src/world/park.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index e5b8ece6da..d1d06e3ec7 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -9021,12 +9021,12 @@ money32 set_peep_name(int flags, int state, uint16 sprite_index, uint8* text_1,
 	}
 
 	utf8* fullText = RCT2_ADDRESS(0x00F1AEF6, utf8);
-	if (flags & GAME_COMMAND_FLAG_APPLY) {
+	//if (flags & GAME_COMMAND_FLAG_APPLY) { // this check seems to be useless and causes problems in multiplayer
 		uint8 position = (state - 1) % 3;
 		memcpy(fullText + position * 12, text_1, 4);
 		memcpy(fullText + 4 + position * 12, text_2, 4);
 		memcpy(fullText + 8 + position * 12, text_3, 4);
-	}
+	//}
 
 	if (state != 0)
 		return 0;
diff --git a/src/ride/ride.c b/src/ride/ride.c
index fcbf42edbb..dc97e233ce 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -4919,7 +4919,7 @@ void game_command_set_ride_name(int *eax, int *ebx, int *ecx, int *edx, int *esi
 	int nameChunkIndex = *eax & 0xFFFF;
 
 	RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_RIDE_RUNNING_COSTS * 4;
-	if (*ebx & GAME_COMMAND_FLAG_APPLY) {
+	//if (*ebx & GAME_COMMAND_FLAG_APPLY) { // this check seems to be useless and causes problems in multiplayer
 		int nameChunkOffset = nameChunkIndex - 1;
 		if (nameChunkOffset < 0)
 			nameChunkOffset = 2;
@@ -4927,7 +4927,7 @@ void game_command_set_ride_name(int *eax, int *ebx, int *ecx, int *edx, int *esi
 		RCT2_GLOBAL(newName + nameChunkOffset + 0, uint32) = *edx;
 		RCT2_GLOBAL(newName + nameChunkOffset + 4, uint32) = *ebp;
 		RCT2_GLOBAL(newName + nameChunkOffset + 8, uint32) = *edi;
-	}
+	//}
 
 	if (nameChunkIndex != 0) {
 		*ebx = 0;
diff --git a/src/world/park.c b/src/world/park.c
index 5f22410873..61ea797a8f 100644
--- a/src/world/park.c
+++ b/src/world/park.c
@@ -869,7 +869,7 @@ void game_command_set_park_name(int *eax, int *ebx, int *ecx, int *edx, int *esi
 	int nameChunkIndex = *eax & 0xFFFF;
 
 	RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_LANDSCAPING * 4;
-	if (*ebx & GAME_COMMAND_FLAG_APPLY) {
+	//if (*ebx & GAME_COMMAND_FLAG_APPLY) { // this check seems to be useless and causes problems in multiplayer
 		int nameChunkOffset = nameChunkIndex - 1;
 		if (nameChunkOffset < 0)
 			nameChunkOffset = 2;
@@ -877,7 +877,7 @@ void game_command_set_park_name(int *eax, int *ebx, int *ecx, int *edx, int *esi
 		RCT2_GLOBAL(newName + nameChunkOffset + 0, uint32) = *edx;
 		RCT2_GLOBAL(newName + nameChunkOffset + 4, uint32) = *ebp;
 		RCT2_GLOBAL(newName + nameChunkOffset + 8, uint32) = *edi;
-	}
+	//}
 
 	if (nameChunkIndex != 0) {
 		*ebx = 0;