[Scummvm-git-logs] scummvm master -> 8382ecdeaee8e81f7276e5548130358140876259

[rsn8887]

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:
8382ecdeae PSP2/SWITCH: Touch structs initialization in constructor to fix build


Commit: 8382ecdeaee8e81f7276e5548130358140876259
    https://github.com/scummvm/scummvm/commit/8382ecdeaee8e81f7276e5548130358140876259
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2020-04-15T14:41:43-05:00

Commit Message:
PSP2/SWITCH: Touch structs initialization in constructor to fix build

Changed paths:
    backends/events/psp2sdl/psp2sdl-events.cpp
    backends/events/psp2sdl/psp2sdl-events.h
    backends/events/switchsdl/switchsdl-events.cpp
    backends/events/switchsdl/switchsdl-events.h


diff --git a/backends/events/psp2sdl/psp2sdl-events.cpp b/backends/events/psp2sdl/psp2sdl-events.cpp
index 1141f7d8ce..b5583b7853 100644
--- a/backends/events/psp2sdl/psp2sdl-events.cpp
+++ b/backends/events/psp2sdl/psp2sdl-events.cpp
@@ -44,6 +44,11 @@ PSP2EventSource::PSP2EventSource() {
 	for (int port = 0; port < SCE_TOUCH_PORT_MAX_NUM; port++) {
 		for (int i = 0; i < MAX_NUM_FINGERS; i++) {
 			_finger[port][i].id = -1;
+			_finger[port][i].timeLastDown = 0;
+			_finger[port][i].lastX = 0;
+			_finger[port][i].lastY = 0;
+			_finger[port][i].lastDownX = 0;
+			_finger[port][i].lastDownY = 0;
 		}
 		_multiFingerDragging[port] = DRAG_NONE;
 	}
diff --git a/backends/events/psp2sdl/psp2sdl-events.h b/backends/events/psp2sdl/psp2sdl-events.h
index b5a8498c36..11e97ec5b9 100644
--- a/backends/events/psp2sdl/psp2sdl-events.h
+++ b/backends/events/psp2sdl/psp2sdl-events.h
@@ -54,7 +54,7 @@ private:
 		float lastDownY; // SDL touch coordinates when last pressed down
 	} Touch;
 
-	Touch _finger[SCE_TOUCH_PORT_MAX_NUM][MAX_NUM_FINGERS] = {0}; // keep track of finger status
+	Touch _finger[SCE_TOUCH_PORT_MAX_NUM][MAX_NUM_FINGERS]; // keep track of finger status
 
 	typedef enum DraggingType {
 		DRAG_NONE = 0,
@@ -62,9 +62,9 @@ private:
 		DRAG_THREE_FINGER,
 	} DraggingType;
 
-	DraggingType _multiFingerDragging[SCE_TOUCH_PORT_MAX_NUM] = {0}; // keep track whether we are currently drag-and-dropping
+	DraggingType _multiFingerDragging[SCE_TOUCH_PORT_MAX_NUM]; // keep track whether we are currently drag-and-dropping
 
-	unsigned int _simulatedClickStartTime[SCE_TOUCH_PORT_MAX_NUM][2] = {0}; // initiation time of last simulated left or right click (zero if no click)
+	unsigned int _simulatedClickStartTime[SCE_TOUCH_PORT_MAX_NUM][2]; // initiation time of last simulated left or right click (zero if no click)
 
 	int _hiresDX; // keep track of slow, sub-pixel, finger motion across multiple frames
 	int _hiresDY;
diff --git a/backends/events/switchsdl/switchsdl-events.cpp b/backends/events/switchsdl/switchsdl-events.cpp
index ff750b20d8..bac16963fb 100644
--- a/backends/events/switchsdl/switchsdl-events.cpp
+++ b/backends/events/switchsdl/switchsdl-events.cpp
@@ -40,6 +40,11 @@ SwitchEventSource::SwitchEventSource() {
 	for (int port = 0; port < SCE_TOUCH_PORT_MAX_NUM; port++) {
 		for (int i = 0; i < MAX_NUM_FINGERS; i++) {
 			_finger[port][i].id = -1;
+			_finger[port][i].timeLastDown = 0;
+			_finger[port][i].lastX = 0;
+			_finger[port][i].lastY = 0;
+			_finger[port][i].lastDownX = 0;
+			_finger[port][i].lastDownY = 0;
 		}
 		_multiFingerDragging[port] = DRAG_NONE;
 	}
diff --git a/backends/events/switchsdl/switchsdl-events.h b/backends/events/switchsdl/switchsdl-events.h
index b56f7a52d6..8aa41b2301 100644
--- a/backends/events/switchsdl/switchsdl-events.h
+++ b/backends/events/switchsdl/switchsdl-events.h
@@ -57,7 +57,7 @@ private:
 		float lastDownY; // SDL touch coordinates when last pressed down
 	} Touch;
 
-	Touch _finger[SCE_TOUCH_PORT_MAX_NUM][MAX_NUM_FINGERS] = {0}; // keep track of finger status
+	Touch _finger[SCE_TOUCH_PORT_MAX_NUM][MAX_NUM_FINGERS]; // keep track of finger status
 
 	typedef enum DraggingType {
 		DRAG_NONE = 0,
@@ -65,9 +65,9 @@ private:
 		DRAG_THREE_FINGER,
 	} DraggingType;
 
-	DraggingType _multiFingerDragging[SCE_TOUCH_PORT_MAX_NUM] = {0}; // keep track whether we are currently drag-and-dropping
+	DraggingType _multiFingerDragging[SCE_TOUCH_PORT_MAX_NUM]; // keep track whether we are currently drag-and-dropping
 
-	unsigned int _simulatedClickStartTime[SCE_TOUCH_PORT_MAX_NUM][2] = {0}; // initiation time of last simulated left or right click (zero if no click)
+	unsigned int _simulatedClickStartTime[SCE_TOUCH_PORT_MAX_NUM][2]; // initiation time of last simulated left or right click (zero if no click)
 
 	void preprocessFingerDown(SDL_Event *event);
 	void preprocessFingerUp(SDL_Event *event);