diff --git a/gui/gui.d b/gui/gui.d index 5bd37ec5e..5eb4a7160 100644 --- a/gui/gui.d +++ b/gui/gui.d @@ -26,7 +26,6 @@ module gui.gui; import monster.monster; import monster.vm.mclass; import monster.modules.console; -import input.events : exitProgram; import gui.bindings; import bullet.bindings; import std.string; @@ -280,6 +279,14 @@ void setupGUIScripts() Console cons; +// Checked from input/events.d. Shouldn't really be here, but it's a +// workaround for a DMD import issue. +bool doExit = false; +void exitProgram() +{ + doExit = true; +} + // Some glue code that will go away later when we use the C++ // interface to Monster directly. extern(C): diff --git a/input/events.d b/input/events.d index 7b84950a9..f48a8080a 100644 --- a/input/events.d +++ b/input/events.d @@ -40,6 +40,7 @@ import monster.vm.dbg; import ogre.bindings; import gui.bindings; +import gui.gui; import input.keys; import input.ois; @@ -111,13 +112,6 @@ void togglePause() else writefln("Pause off"); } -bool doExit = false; - -void exitProgram() -{ - doExit = true; -} - extern(C) void d_handleMouseMove(MouseState *state) { debug(printMouseMove)