--- a/src/Graphics/Graphics.cc Wed Jan 21 03:33:35 2009 +0200
+++ b/src/Graphics/Graphics.cc Wed Jan 21 23:07:22 2009 +0200
@@ -7,10 +7,11 @@
{
// initialize the global graphics object
-static Graphics *graphics = NULL;
+Graphics *graphics = NULL;
Graphics::Graphics (Engine &engine, CL_ResourceManager &resources, const DisplayConfig &display_config) :
- engine(engine), fonts(resources), display(display_config)
+ // display must be set up before fonts, due to implicit CL_DisplayWindow
+ engine(engine), display(display_config), fonts(resources)
{
assert(!graphics);