cpp/openttd-patchpack/source Changeset - r5024:612bfb3d37ce

Changeset - r5024:612bfb3d37ce

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

tron - 18 years ago 2006-11-05 08:24:52
tron@openttd.org

(svn r7065) Use simple assignment instead of memcpy()

5 files changed with 7 insertions and 7 deletions:

genworld_gui.c

newgrf.c

openttd.c

settings_gui.c

sound.c

0 comments (0 inline, 0 general)

genworld_gui.c

➞

Show inline comments

@@ @@ -163,7 +163,7 @@ static void StartGeneratingLandscape(glw @@
 	/* Copy all XXX_newgame to XXX */
 	UpdatePatches();
 	_opt_ptr = &_opt;
-	memcpy(_opt_ptr, &_opt_newgame, sizeof(GameOptions));
+	*_opt_ptr = _opt_newgame;
 	/* Load the right landscape stuff */
 	GfxLoadSprites();

newgrf.c

➞

Show inline comments

@@ @@ -1272,7 +1272,7 @@ static bool SoundEffectChangeInfo(uint s @@
 					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, in @@
 	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;

openttd.c

➞

Show inline comments

@@ @@ -456,7 +456,7 @@ int ttd_main(int argc, char *argv[]) @@
 	/* Make sure _patches is filled with _patches_newgame if we switch to a game directly */
 	if (_switch_mode != SM_NONE) {
-		memcpy(&_opt, &_opt_newgame, sizeof(_opt));
+		_opt = _opt_newgame;
 		GfxLoadSprites();
 		UpdatePatches();
+	}
@@ @@ -662,7 +662,7 @@ static void StartScenario(void) @@
+	}
 	_opt_ptr = &_opt;
-	memcpy(&_opt_ptr->diff, &_opt_newgame.diff, sizeof(_opt_ptr->diff));
+	_opt_ptr->diff = _opt_newgame.diff;
 	_opt.diff_level = _opt_newgame.diff_level;
 	// Inititalize data

settings_gui.c

➞

Show inline comments

@@ @@ -554,7 +554,7 @@ void ShowGameDifficulty(void) @@
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
 	/* Copy current settings (ingame or in intro) to temporary holding place
 	 * change that when setting stuff, copy back on clicking 'OK' */
-	memcpy(&_opt_mod_temp, _opt_ptr, sizeof(GameOptions));
+	_opt_mod_temp = *_opt_ptr;
 	AllocateWindowDesc(&_game_difficulty_desc);
+}

sound.c

➞

Show inline comments

@@ @@ -186,7 +186,7 @@ void SndCopyToPool(void) @@
 		FileEntry *orig = &_files[_sound_idx[i]];
 		FileEntry *fe = AllocateFileEntry();
-		memcpy(fe, orig, sizeof(*orig));
+		*fe = *orig;
 		fe->volume = _sound_base_vol[i];
 		fe->priority = 0;
+	}

0 comments (0 inline, 0 general)