From 9a268f553869ee59288873e059ca938d404378c4 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sat, 30 Jun 2012 10:16:52 +0200
Subject: Switched back to old standard; addded -Wall

- removed -std=c++11
- added -Wall and removed most reported warnings
---
 src/common/event.h | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

(limited to 'src/common')

diff --git a/src/common/event.h b/src/common/event.h
index e7ff552..70b110d 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -637,31 +637,18 @@ struct Event
 {
     //! Type of event (EVENT_*)
     EventType type;
-    /**
-      \union EventDataUnion
-      \brief Additional data associated with some events
-
-      For the listed event, the given member is filled with data.
-      For other event types, it is filled with zeros.
-     */
-    union EventDataUnion
-    {
-        //! Additional data for EVENT_KEY_DOWN and EVENT_KEY_UP
-        KeyEventData key;
-        //! Additional data for EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP
-        MouseButtonEventData mouseButton;
-        //! Additional data for EVENT_MOUSE_MOVE
-        MouseMoveEventData mouseMove;
-        //! Additional data for EVENT_JOY
-        JoyAxisEventData joyAxis;
-        //! Additional data for EVENT_JOY_AXIS
-        JoyButtonEventData joyButton;
-
-        EventDataUnion()
-            { memset(this, 0, sizeof(EventDataUnion)); }
-        ~EventDataUnion()
-            {}
-    } data;
+
+    //! Additional data for EVENT_KEY_DOWN and EVENT_KEY_UP
+    KeyEventData key;
+    //! Additional data for EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP
+    MouseButtonEventData mouseButton;
+    //! Additional data for EVENT_MOUSE_MOVE
+    MouseMoveEventData mouseMove;
+    //! Additional data for EVENT_JOY
+    JoyAxisEventData joyAxis;
+    //! Additional data for EVENT_JOY_AXIS
+    JoyButtonEventData joyButton;
+
     //? long         param;      // parameter
     //? Math::Point  pos;        // mouse position (0 .. 1)
     //? float        axeX;       // control the X axis (-1 .. 1)
-- 
cgit v1.2.3-1-g7c22