From 76b4fddee6106b60dbc6da6d7bcef61b42a3c310 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Sat, 29 Jul 2017 13:53:52 -0400
Subject: Added gui window

Bound irrlicht's IGUIWindow to lua
---
 src/client/callbackhandeler.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/client/callbackhandeler.cpp')

diff --git a/src/client/callbackhandeler.cpp b/src/client/callbackhandeler.cpp
index 5e5e407..59b5bee 100644
--- a/src/client/callbackhandeler.cpp
+++ b/src/client/callbackhandeler.cpp
@@ -17,10 +17,10 @@ using namespace std;
 
 extern lua_State* L;
 
-std::map<IGUIElement*,std::map<EGUI_EVENT_TYPE, void(*)(irr::SEvent)> > guifuncs;
+std::map<IGUIElement*,std::map<EGUI_EVENT_TYPE, bool(*)(irr::SEvent)> > guifuncs;
 //IrrlichtDevice* device;
 
-void registerguicallback(IGUIElement* element, EGUI_EVENT_TYPE event, void (*func)(irr::SEvent)){
+void registerguicallback(IGUIElement* element, EGUI_EVENT_TYPE event, bool (*func)(irr::SEvent)){
   printf("Callback registered\n");
   guifuncs[element][event] = func;
 }
@@ -35,13 +35,11 @@ bool GlobalEventReceiver::OnEvent(const SEvent& e){
 	case EET_GUI_EVENT:{
         IGUIElement* caller = e.GUIEvent.Caller;
         EGUI_EVENT_TYPE get = e.GUIEvent.EventType;
-        printf("detected gui event...\n");
+        printf("detected gui event: %d\n",get);
         bool callerregistered = guifuncs.find(caller) != guifuncs.end();
         bool callerhasfunc = guifuncs[caller].find(get) != guifuncs[caller].end();
     	if (callerregistered && callerhasfunc){
-    		guifuncs[caller][get](e);
-            printf("sucessfully called a gui event\n");
-    		return true;
+    		return guifuncs[caller][get](e);
     	}
     	return false;
     	break;
-- 
cgit v1.2.3-70-g09d2