From 1e23d43006705a1d25e04d9cc90674044789cb92 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 5 Jan 2019 20:09:23 +0100
Subject: SCUMM: Silence GCC memset() warnings

Recent GCC versions complain if you memset() a class or struct that
contain non-POD data types. Get around that by either initializing
the object when created, or by adding a reset() method.
---
 engines/scumm/gfx.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'engines/scumm/gfx.h')

diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h
index 86913f9e2e..35be19295e 100644
--- a/engines/scumm/gfx.h
+++ b/engines/scumm/gfx.h
@@ -53,6 +53,18 @@ struct CameraData {
 	int _leftTrigger, _rightTrigger;
 	byte _follows, _mode;
 	bool _movingToActor;
+
+	void reset() {
+		_cur.x = _cur.y = 0;
+		_dest.x = _dest.y = 0;
+		_accel.x = _accel.y = 0;
+		_last.x = _last.y = 0;
+		_leftTrigger = 0;
+		_rightTrigger = 0;
+		_follows = 0;
+		_mode = 0;
+		_movingToActor = 0;
+	}
 };
 
 /** Virtual screen identifiers */
-- 
cgit v1.2.3