summaryrefslogtreecommitdiff
path: root/newgrf.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-11-05 08:24:52 +0000
committertron <tron@openttd.org>2006-11-05 08:24:52 +0000
commit2a53bcf2b01afd81f336083d16f93c6177398fa2 (patch)
tree26ad191e57d6bb585a8b08b55819a3909380140d /newgrf.c
parent60ea083b28f5ef571243296c94b899f3038e8c03 (diff)
downloadopenttd-2a53bcf2b01afd81f336083d16f93c6177398fa2.tar.xz
(svn r7065) Use simple assignment instead of memcpy()
Diffstat (limited to 'newgrf.c')
-rw-r--r--newgrf.c4
1 files changed, 2 insertions, 2 deletions
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;