diff options
author | tron <tron@openttd.org> | 2006-11-05 08:24:52 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2006-11-05 08:24:52 +0000 |
commit | 88b78bb5e84b4777adbaaa3d8277fcd52a6a4cdd (patch) | |
tree | 26ad191e57d6bb585a8b08b55819a3909380140d /newgrf.c | |
parent | d008c45b4b522b757d7b8195ec77cbc32719020a (diff) | |
download | openttd-88b78bb5e84b4777adbaaa3d8277fcd52a6a4cdd.tar.xz |
(svn r7065) Use simple assignment instead of memcpy()
Diffstat (limited to 'newgrf.c')
-rw-r--r-- | newgrf.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |