From 2722a85ee4974c1dfdb50b40c649c1b12bafe162 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 3 Sep 2016 13:09:50 +0100 Subject: [PATCH] Fix #4349: x64: Crash when placing roller coaster track designs --- src/ride/ride.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index abaaa23899..c6a0bf74a3 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -5591,9 +5591,9 @@ void game_command_set_ride_name(int *eax, int *ebx, int *ecx, int *edx, int *esi nameChunkOffset = 2; nameChunkOffset *= 12; nameChunkOffset = min(nameChunkOffset, countof(newName) - 12); - RCT2_GLOBAL(newName + nameChunkOffset + 0, uint32) = *edx; - RCT2_GLOBAL(newName + nameChunkOffset + 4, uint32) = *ebp; - RCT2_GLOBAL(newName + nameChunkOffset + 8, uint32) = *edi; + memcpy((void*)((uintptr_t)newName + (uintptr_t)nameChunkOffset + 0), edx, sizeof(uint32)); + memcpy((void*)((uintptr_t)newName + (uintptr_t)nameChunkOffset + 4), ebp, sizeof(uint32)); + memcpy((void*)((uintptr_t)newName + (uintptr_t)nameChunkOffset + 8), edi, sizeof(uint32)); //} if (nameChunkIndex != 0) {