From 2a53bcf2b01afd81f336083d16f93c6177398fa2 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 5 Nov 2006 08:24:52 +0000 Subject: (svn r7065) Use simple assignment instead of memcpy() --- newgrf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'newgrf.c') diff --git a/newgrf.c b/newgrf.c index c984d44c5..dfd05c9c5 100644 --- a/newgrf.c +++ b/newgrf.c @@ -1272,7 +1272,7 @@ static bool SoundEffectChangeInfo(uint sid, int numinfo, int prop, byte **bufp, FileEntry *oldfe = GetSound(orig_sound); /* Literally copy the data of the new sound over the original */ - memcpy(oldfe, newfe, sizeof(*oldfe)); + *oldfe = *newfe; } } break; @@ -2939,7 +2939,7 @@ static void ImportGRFSound(byte *buf, int len) grfmsg(GMS_NOTICE, "ImportGRFSound: Copying sound %d (%d) from file %X", sound, file->sound_offset + sound, grfid); - memcpy(se, GetSound(file->sound_offset + sound), sizeof(*se)); + *se = *GetSound(file->sound_offset + sound); /* Reset volume and priority, which TTDPatch doesn't copy */ se->volume = 128; -- cgit v1.2.3-70-g09d2