Update.

[universe.git] / main.cc

diff --git a/main.cc b/main.cc
index 1d618d8..bbea852 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -218,12 +218,12 @@ int main(int argc, char **argv) {
   retina.set_location(manipulator.hand_x(), manipulator.hand_y());
 
   SimpleWindow *window_main = 0, *window_brain = 0;
+  int window_main_fd = -1;
+
 #ifdef CAIRO_SUPPORT
-  cairo_t *cairo_cr = 0;
+  cairo_t *window_main_cairo_cr = 0;
 #endif
 
-  int window_main_fd = -1;
-
   MapConcatener sensory_map(2);
   sensory_map.add_map(&retina);
   sensory_map.add_map(&manipulator);
@@ -255,7 +255,7 @@ int main(int argc, char **argv) {
     window_main_fd = window_main->file_descriptor();
     window_main->map();
 #ifdef CAIRO_SUPPORT
-    cairo_cr = window_main->get_cairo_context_resource();
+    window_main_cairo_cr = window_main->get_cairo_context_resource();
 #endif
     cout << "When the main window has the focus, press `q' to quit and click and drag to move" << endl
          << "objects." << endl;
@@ -347,14 +347,14 @@ int main(int argc, char **argv) {
             window_main->color(0.0, 0.0, 0.0);
             window_main->color(1.0, 1.0, 1.0);
             window_main->fill();
-            task->draw(window_main);
 
 #ifdef CAIRO_SUPPORT
-            universe.draw(cairo_cr);
+            universe.draw(window_main_cairo_cr);
 #else
             universe.draw(window_main);
 #endif
 
+            task->draw(window_main);
             manipulator.draw_on_universe(window_main);
             retina.draw_on_universe(window_main);