[Scummvm-git-logs] scummvm master -> 76ec4b8d82b8bcefd752e221fe5f9e2184d1c643

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
76ec4b8d82 CGE2: Fix GCC Warnings by Explicit Structure Initialization


Commit: 76ec4b8d82b8bcefd752e221fe5f9e2184d1c643
    https://github.com/scummvm/scummvm/commit/76ec4b8d82b8bcefd752e221fe5f9e2184d1c643
Author: D G Turner (digitall at scummvm.org)
Date: 2019-07-24T22:04:37+01:00

Commit Message:
CGE2: Fix GCC Warnings by Explicit Structure Initialization

This is as per the changes to the CGE engine.

Changed paths:
    engines/cge2/events.cpp


diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp
index b5c4527..3493363 100644
--- a/engines/cge2/events.cpp
+++ b/engines/cge2/events.cpp
@@ -207,8 +207,15 @@ void Mouse::newMouse(Common::Event &event) {
 EventManager::EventManager(CGE2Engine *vm) : _vm(vm) {
 	_eventQueueHead = 0;
 	_eventQueueTail = 0;
-	memset(&_eventQueue, 0, kEventMax * sizeof(CGE2Event));
-	memset(&_event, 0, sizeof(Common::Event));
+	for (uint16 k = 0; k < kEventMax; k++) {
+		_eventQueue[k]._mask = 0;
+		_eventQueue[k]._x = 0;
+		_eventQueue[k]._y = 0;
+		_eventQueue[k]._spritePtr = nullptr;
+	}
+	_event.joystick.axis = 0;
+	_event.joystick.position = 0;
+	_event.joystick.button = 0;
 }
 
 void EventManager::poll() {