Remove indirection from event attributes

Author: HexDecimal

src/screen.cpp

@@ -138,7 +138,7 @@ bool Screen::update() {
 		}
 		if (fadeEnded) fadeLvl=0.0f;
 	}
-    return update(elapsed, *key,*ms);
+    return update(elapsed, key, ms);
 }
 
 void Screen::setFadeIn (int lengthInMilli, TCODColor col) {

src/screen.hpp

@@ -31,8 +31,8 @@ public :
 	virtual void render() = 0;
 	virtual bool update(float elapsed, TCOD_key_t &k,TCOD_mouse_t &mouse) = 0;
 	virtual ~Screen() {}
-	void keyboard (TCOD_key_t &key) { this->key=&key; }
-	void mouse (TCOD_mouse_t &ms) { this->ms=&ms; }
+	void keyboard (TCOD_key_t &key) { this->key=key; }
+	void mouse (TCOD_mouse_t &ms) { this->ms=ms; }
 	bool update (void);
 
     void setFadeIn (int lengthInMilli, TCODColor col = TCODColor::black); //set fade lengths in milliseconds
@@ -47,8 +47,8 @@ protected :
     TCODColor fadeOutColor;
 
 	enum { FADE_UP, FADE_DOWN, FADE_OFF, FADE_NONE } fade;
-	TCOD_key_t *key;
-	TCOD_mouse_t *ms;
+	TCOD_key_t key{};
+	TCOD_mouse_t ms{};
 	void onInitialise();
 	void prepareImage(TCODImage *img)const;
 	TCODImage *loadChapterPicture(bool big=false);

src/ui_dialog.cpp

@@ -222,7 +222,7 @@ bool Dialog::update() {
 	}
 	if (!UmbraWidget::update()) return false;
     internalUpdate();
-    return update(elapsed, *key,*ms);
+    return update(elapsed, key, ms);
 }
 
 void Dialog::onActivate() {

src/ui_dialog.hpp

@@ -123,8 +123,8 @@ protected :
 class Dialog : public UmbraWidget {
 public :
 	Dialog() : flags(0),isMinimized(false),waitRelease(false) {}
-	void keyboard (TCOD_key_t &key) { this->key=&key; UmbraWidget::keyboard(key); }
-	void mouse (TCOD_mouse_t &ms) { this->ms=&ms; UmbraWidget::mouse(ms); }
+	void keyboard (TCOD_key_t &key) { this->key=key; UmbraWidget::keyboard(key); }
+	void mouse (TCOD_mouse_t &ms) { this->ms=ms; UmbraWidget::mouse(ms); }
 	bool update (void);
 	virtual bool update(float elapsed, TCOD_key_t &k, TCOD_mouse_t &mouse) = 0;
 	void setMaximized();
@@ -141,8 +141,8 @@ public :
 	void onDeactivate();
 protected :
 	int flags;
-	TCOD_key_t *key;
-	TCOD_mouse_t *ms;
+	TCOD_key_t key{};
+	TCOD_mouse_t ms{};
 	TCODConsole *con;
 	bool isMinimized;
 	bool waitRelease;