From 0903463824538dcec8a19fb3f5c4a6f1bfa2860a Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 12 Mar 2010 19:18:26 +0000 Subject: [PATCH] (svn r19391) -Fix (r19255): shuffling around GRFIdentifier in GRFConfig caused gamelog to log the wrong data which could cause crashes later on when that data is queried --- src/gamelog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gamelog.cpp b/src/gamelog.cpp index 83d1ba112e..c0325fd2ac 100644 --- a/src/gamelog.cpp +++ b/src/gamelog.cpp @@ -543,7 +543,7 @@ void GamelogGRFAdd(const GRFConfig *newg) LoggedChange *lc = GamelogChange(GLCT_GRFADD); if (lc == NULL) return; - memcpy(&lc->grfadd, newg, sizeof(GRFIdentifier)); + lc->grfadd = newg->ident; } /** Logs loading compatible GRF @@ -557,7 +557,7 @@ void GamelogGRFCompatible(const GRFIdentifier *newg) LoggedChange *lc = GamelogChange(GLCT_GRFCOMPAT); if (lc == NULL) return; - memcpy(&lc->grfcompat, newg, sizeof(GRFIdentifier)); + lc->grfcompat = *newg; } /** Logs changing GRF order