From 019de0cc23b698bff56601e662fb5c44cf99a98e Mon Sep 17 00:00:00 2001 From: D G Turner Date: Sat, 14 Sep 2019 00:54:10 +0100 Subject: [PATCH] EVENTRECORDER: Fix GCC Compiler Warnings These were memcpy usage to copy a non-trivial structure. --- common/recorderfile.h | 10 ++++++++++ gui/EventRecorder.cpp | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/recorderfile.h b/common/recorderfile.h index d34a442604f..b1001628b84 100644 --- a/common/recorderfile.h +++ b/common/recorderfile.h @@ -44,6 +44,16 @@ enum RecorderEventType { struct RecorderEvent : Event { RecorderEventType recordedtype; uint32 time; + + RecorderEvent() { + recordedtype = kRecorderEventTypeNormal; + time = 0; + } + + RecorderEvent(const Event &e) : Event(e) { + recordedtype = kRecorderEventTypeNormal; + time = 0; + } }; diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp index 560df0ec356..d249ea4eff2 100644 --- a/gui/EventRecorder.cpp +++ b/gui/EventRecorder.cpp @@ -455,8 +455,7 @@ Common::List EventRecorder::mapEvent(const Common::Event &ev, Com if (((evt.type == Common::EVENT_LBUTTONDOWN) || (evt.type == Common::EVENT_LBUTTONUP) || (evt.type == Common::EVENT_MOUSEMOVE)) && _controlPanel->isMouseOver()) { return Common::List(); } else { - Common::RecorderEvent e; - memcpy(&e, &ev, sizeof(ev)); + Common::RecorderEvent e(ev); e.recordedtype = Common::kRecorderEventTypeNormal; e.time = _fakeTimer; _playbackFile->writeEvent(e);