diff --git a/SetupThrive.sh b/SetupThrive.sh index e8d2f567e1e..22e4076a8f7 100755 --- a/SetupThrive.sh +++ b/SetupThrive.sh @@ -186,7 +186,9 @@ function prepare_CEGUI() { cd cegui fi - hg update default + # Let's use this commit for now + hg update 869014de5669 + #hg update default mkdir build cd build diff --git a/contrib/luabind b/contrib/luabind index 55b1bd92172..a0edf58e14c 160000 --- a/contrib/luabind +++ b/contrib/luabind @@ -1 +1 @@ -Subproject commit 55b1bd9217205253b41ab7d4746637ee5b0d276f +Subproject commit a0edf58e14cfb8cd4f13779707921b5e9caf686c diff --git a/src/gui/CEGUIWindow.cpp b/src/gui/CEGUIWindow.cpp index 1c4f9fc917e..d51040a442d 100644 --- a/src/gui/CEGUIWindow.cpp +++ b/src/gui/CEGUIWindow.cpp @@ -482,7 +482,7 @@ CEGUIWindow::registerKeyEventHandler( { luabind::call_function(callback, CEGUIWindow(static_cast< const CEGUI::WindowEventArgs&>(args).window, false), - static_cast(static_cast(args).character)); + static_cast(static_cast(args).d_character)); return 0; };