[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.10,1.11 action_button.hxx,1.9,1.10 button_panel.cxx,1.12,1.13 button_panel.hxx,1.10,1.11 client.cxx,1.19,1.20 client.hxx,1.13,1.14 exit_menu.cxx,1.5,1.6 exit_menu.hxx,1.6,1.7 game_session.cxx,1.7,1.8 game_session.hxx,1.6,1.7 gui_screen.cxx,1.6,1.7 gui_screen.hxx,1.7,1.8 hurry_up.cxx,1.1,1.2 hurry_up.hxx,1.4,1.5 input_debug_screen.cxx,1.1,1.2 input_debug_screen.hxx,1.1,1.2 option_menu.cxx,1.3,1.4 option_menu.hxx,1.4,1.5 pingus_counter.cxx,1.5,1.6 pingus_counter.hxx,1.6,1.7 pingus_menu_manager.cxx,1.10,1.11 pingus_menu_manager.hxx,1.10,1.11 playfield.cxx,1.19,1.20 playfield.hxx,1.10,1.11 screen.hxx,1.7,1.8 screen_manager.cxx,1.14,1.15 screen_manager.hxx,1.10,1.11 smallmap.cxx,1.12,1.13 smallmap.hxx,1.8,1.9 story.cxx,1.5,1.6 story.hxx,1.6,1.7 surface_button.cxx,1.10,1.11 surface_button.hxx,1.8,1.9 time_display.cxx,1.5,1.6 time_display.hxx,1.5,1.6 view.cxx,1.9,1.10

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv30676

Modified Files:
        action_button.cxx action_button.hxx button_panel.cxx 
        button_panel.hxx client.cxx client.hxx exit_menu.cxx 
        exit_menu.hxx game_session.cxx game_session.hxx gui_screen.cxx 
        gui_screen.hxx hurry_up.cxx hurry_up.hxx 
        input_debug_screen.cxx input_debug_screen.hxx option_menu.cxx 
        option_menu.hxx pingus_counter.cxx pingus_counter.hxx 
        pingus_menu_manager.cxx pingus_menu_manager.hxx playfield.cxx 
        playfield.hxx screen.hxx screen_manager.cxx screen_manager.hxx 
        smallmap.cxx smallmap.hxx story.cxx story.hxx 
        surface_button.cxx surface_button.hxx time_display.cxx 
        time_display.hxx view.cxx 
Log Message:
- added GC to Screen and subclasses of it

Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- action_button.cxx   25 Aug 2002 09:08:48 -0000      1.10
+++ action_button.cxx   5 Sep 2002 12:24:01 -0000       1.11
@@ -124,7 +124,7 @@
 }
 
 void
-VerticalActionButton::draw()
+VerticalActionButton::draw(GraphicContext& gc)
 {
   std::string str;
   // FIXME: This could need some optimization, throwing strings all
@@ -190,7 +190,7 @@
 ArmageddonButton::~ArmageddonButton() { }
 
 void
-ArmageddonButton::draw()
+ArmageddonButton::draw(GraphicContext& gc)
 {
   if (server->get_armageddon ())
     {
@@ -262,7 +262,7 @@
 ForwardButton::~ForwardButton() {}
 
 void
-ForwardButton::draw()
+ForwardButton::draw(GraphicContext& gc)
 {
   if (server->get_fast_forward())
     {
@@ -308,7 +308,7 @@
 PauseButton::~PauseButton() {}
 
 void
-PauseButton::draw()
+PauseButton::draw(GraphicContext& gc)
 {
   if (server->get_pause()) 
     backgroundhl.put_screen (x_pos, y_pos);

Index: action_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action_button.hxx   25 Aug 2002 09:08:48 -0000      1.9
+++ action_button.hxx   5 Sep 2002 12:24:01 -0000       1.10
@@ -53,7 +53,7 @@
   ArmageddonButton(Server*, int x, int y);
   virtual ~ArmageddonButton();
 
-  void draw();
+  void draw(GraphicContext& gc);
   void update(float);
   bool is_at(int x, int y);
   void on_primary_button_click (int x, int y);
@@ -80,7 +80,7 @@
   ForwardButton(Server*, int x, int y);
   virtual ~ForwardButton();
 
-  void draw();
+  void draw(GraphicContext& gc);
   bool is_at (int x, int y);
   void on_primary_button_click (int x, int y);
   
@@ -106,7 +106,7 @@
   PauseButton(Server*, int x, int y);
   virtual ~PauseButton();
 
-  void draw();
+  void draw(GraphicContext& gc);
   bool is_at (int x, int y);
   void on_primary_button_click (int x, int y);
   
@@ -144,11 +144,8 @@
 
   void init(int x, int y, ActionName name_, int owner_id);
 
-  /// Draws the button and increase the animation counter.
-  virtual void   draw() = 0;
- 
   /// Not used.
-  void   update(float delta);
+  void update(float delta);
 
   /// Returns the name of the action the button represents.
   ActionName get_action_name();
@@ -177,7 +174,7 @@
   VerticalActionButton(int x, int y, ActionName name, int owner_id);
   virtual ~VerticalActionButton();
 
-  void draw();
+  void draw(GraphicContext& gc);
   bool is_at (int x, int y);
   
 private:

Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- button_panel.cxx    25 Aug 2002 09:08:48 -0000      1.12
+++ button_panel.cxx    5 Sep 2002 12:24:01 -0000       1.13
@@ -88,7 +88,7 @@
 }
 
 void 
-ButtonPanel::draw() 
+ButtonPanel::draw(GraphicContext& gc) 
 {
   float alpha;
 
@@ -105,7 +105,7 @@
       else
        (*button)->pressed = false;
 
-      (*button)->draw();
+      (*button)->draw(gc);
     }
 }
 

Index: button_panel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- button_panel.hxx    4 Sep 2002 14:55:11 -0000       1.10
+++ button_panel.hxx    5 Sep 2002 12:24:01 -0000       1.11
@@ -59,7 +59,7 @@
 
   ActionName get_action_name();
   void   update(float delta);
-  void   draw();
+  void   draw(GraphicContext& gc);
   void   set_server(Server*);
   void   set_client(Client*);
   void   set_button(int);

Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- client.cxx  4 Sep 2002 19:40:19 -0000       1.19
+++ client.cxx  5 Sep 2002 12:24:01 -0000       1.20
@@ -440,9 +440,9 @@
 }
 
 void
-Client::draw ()
+Client::draw (GraphicContext& gc)
 {
-  GUIScreen::draw ();
+  GUIScreen::draw (gc);
 }
 
 void

Index: client.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- client.hxx  23 Aug 2002 15:49:48 -0000      1.13
+++ client.hxx  5 Sep 2002 12:24:01 -0000       1.14
@@ -104,7 +104,7 @@
   void on_mouse_button_release(const CL_Key &key);
 
   // Overloaded GUIScreen stuff
-  void draw ();
+  void draw (GraphicContext& gc);
   void on_startup ();
   void on_shutdown ();
 

Index: exit_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exit_menu.cxx       17 Aug 2002 00:26:49 -0000      1.5
+++ exit_menu.cxx       5 Sep 2002 12:24:01 -0000       1.6
@@ -37,7 +37,7 @@
     return x > 270 && x < 390 && y > 300 && y < 380;
   }
 
-  void draw () {}
+  void draw (GraphicContext& gc) {}
 
   void on_primary_button_press (int, int)
   {
@@ -61,7 +61,7 @@
     return x > 430 && x < 540 && y > 300 && y < 380;
   }
 
-  void draw () {}
+  void draw (GraphicContext& gc) {}
 
   void on_primary_button_press (int, int)
   {
@@ -82,7 +82,7 @@
 }
 
 void 
-ExitMenu::draw ()
+ExitMenu::draw (GraphicContext& gc)
 {
   CL_Display::fill_rect (0, 0, CL_Display::get_width (), 
CL_Display::get_height (),
                         0, 0, 0, 0.5);

Index: exit_menu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/exit_menu.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exit_menu.hxx       23 Aug 2002 15:49:48 -0000      1.6
+++ exit_menu.hxx       5 Sep 2002 12:24:01 -0000       1.7
@@ -34,7 +34,7 @@
   ExitMenu (PingusMenuManager* manager);
   ~ExitMenu ();
 
-  void draw ();
+  void draw (GraphicContext& gc);
   void update (float delta);
   void preload ();
   

Index: game_session.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- game_session.cxx    23 Aug 2002 15:49:48 -0000      1.7
+++ game_session.cxx    5 Sep 2002 12:24:01 -0000       1.8
@@ -46,9 +46,9 @@
 }
 
 void
-PingusGameSession::draw ()
+PingusGameSession::draw (GraphicContext& gc)
 {
-  client->draw ();
+  client->draw (gc);
 }
 
 void

Index: game_session.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/game_session.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- game_session.hxx    23 Aug 2002 15:49:48 -0000      1.6
+++ game_session.hxx    5 Sep 2002 12:24:02 -0000       1.7
@@ -63,7 +63,7 @@
 
   // Overloaded Screen functions 
   /** Draw this screen */
-  void draw ();
+  void draw (GraphicContext& gc);
 
   /** Pass a delta to the screen */
   void update (const GameDelta& delta);

Index: gui_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gui_screen.cxx      17 Aug 2002 01:03:27 -0000      1.6
+++ gui_screen.cxx      5 Sep 2002 12:24:02 -0000       1.7
@@ -39,10 +39,10 @@
 
   /** Draw this screen */
 void
-GUIScreen::draw ()
+GUIScreen::draw (GraphicContext& gc)
 {
   draw_background ();
-  gui_manager->draw ();
+  gui_manager->draw (gc);
   draw_foreground ();
 }
 

Index: gui_screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gui_screen.hxx      23 Aug 2002 15:49:48 -0000      1.7
+++ gui_screen.hxx      5 Sep 2002 12:24:02 -0000       1.8
@@ -45,7 +45,7 @@
   /** Draw this screen */
   virtual void draw_foreground () {}
   virtual void draw_background () {}
-  virtual void draw ();
+  virtual void draw (GraphicContext& gc);
 
   /** Pass a game delta to the screen */
   virtual void update (const GameDelta& delta);

Index: hurry_up.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/hurry_up.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hurry_up.cxx        12 Jun 2002 19:09:37 -0000      1.1
+++ hurry_up.cxx        5 Sep 2002 12:24:02 -0000       1.2
@@ -42,7 +42,7 @@
 
 
 void
-HurryUp::draw()
+HurryUp::draw(GraphicContext& gc)
 {
   if (is_finished) return;
 

Index: hurry_up.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/hurry_up.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hurry_up.hxx        23 Aug 2002 15:49:49 -0000      1.4
+++ hurry_up.hxx        5 Sep 2002 12:24:02 -0000       1.5
@@ -44,8 +44,8 @@
   HurryUp();
   virtual ~HurryUp();
 
-  virtual void draw();
-  virtual void update(float delta);
+  void draw(GraphicContext& gc);
+  void update(float delta);
   void set_client(Client*);
   
 private:

Index: input_debug_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input_debug_screen.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input_debug_screen.cxx      16 Aug 2002 17:15:31 -0000      1.1
+++ input_debug_screen.cxx      5 Sep 2002 12:24:02 -0000       1.2
@@ -31,7 +31,7 @@
 
 /** Draw this screen */
 void
-InputDebugScreen::draw ()
+InputDebugScreen::draw (GraphicContext& gc)
 {
   std::cout << "InputDebugScreen::draw ()" << std::endl;
 }

Index: input_debug_screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input_debug_screen.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input_debug_screen.hxx      16 Aug 2002 17:15:31 -0000      1.1
+++ input_debug_screen.hxx      5 Sep 2002 12:24:02 -0000       1.2
@@ -32,7 +32,7 @@
   virtual ~InputDebugScreen ();
 
   /** Draw this screen */
-  void draw ();
+  void draw (GraphicContext& gc);
 
   /** Pass a delta to the screen */
   void update (const GameDelta& delta);

Index: option_menu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/option_menu.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- option_menu.cxx     23 Aug 2002 15:49:49 -0000      1.3
+++ option_menu.cxx     5 Sep 2002 12:24:02 -0000       1.4
@@ -130,7 +130,7 @@
 }
 
 void
-OptionEntry::draw()
+OptionEntry::draw(GraphicContext& gc)
 {
   if (!mouse_over()) {
     CL_Display::fill_rect(x_pos - 7, y_pos - 1,
@@ -325,14 +325,14 @@
 }
 
 void
-OptionMenu::draw()
+OptionMenu::draw(GraphicContext& gc)
 {  
   //draw_background();
   
   title_font->print_center(CL_Display::get_width() / 2, 10, _("Pingus Option 
Menu"));
 
   for(EntryIter item = entry.begin(); item != entry.end(); ++item) {
-    item->draw();
+    item->draw(gc);
   }
 
   back.put_screen(CL_Display::get_width () - back.get_width (), 0);
@@ -370,7 +370,7 @@
 
       if (item != EntryIter()) 
        item->toggle();
-      draw();
+      //draw();
       while(CL_Mouse::left_pressed())
        CL_System::keep_alive();
     }
@@ -379,7 +379,7 @@
     {
       if (item != EntryIter()) 
        item->rtoggle();
-      draw();
+      //draw();
       while(CL_Mouse::right_pressed())
        CL_System::keep_alive();
     }
@@ -388,6 +388,7 @@
 void
 OptionMenu::display()
 {
+  assert (!"kaputtt");
   if (!is_init)
     init();
 
@@ -411,14 +412,12 @@
                                                   
PingusResource::get("game")));
   Display::show_cursor();
 
-  draw();
+  //draw();
 
   while(!quit)
     {
-
-
       {
-       draw();
+       //draw();
        temp_item = item;
       }
       update (0.1f);

Index: option_menu.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/option_menu.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- option_menu.hxx     23 Aug 2002 15:49:49 -0000      1.4
+++ option_menu.hxx     5 Sep 2002 12:24:02 -0000       1.5
@@ -51,7 +51,7 @@
   ~OptionEntry ();
     
   bool mouse_over();
-  void draw();
+  void draw(GraphicContext& gc);
   void toggle();
   void rtoggle();
 };
@@ -99,7 +99,7 @@
   void draw_background ();
   void preload () { init (); }
   void update (float delta);
-  void draw ();
+  void draw (GraphicContext& gc);
   void check_click ();
   EntryIter current_item ();
   void add_entry (const std::string& e, bool* v);

Index: pingus_counter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pingus_counter.cxx  4 Sep 2002 14:55:11 -0000       1.5
+++ pingus_counter.cxx  5 Sep 2002 12:24:02 -0000       1.6
@@ -39,7 +39,7 @@
 }
 
 void 
-PingusCounter::draw(void)
+PingusCounter::draw(GraphicContext& gc)
 {
   char str[128];
 

Index: pingus_counter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_counter.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pingus_counter.hxx  23 Aug 2002 15:49:49 -0000      1.6
+++ pingus_counter.hxx  5 Sep 2002 12:24:02 -0000       1.7
@@ -37,7 +37,7 @@
   PingusCounter();
   virtual ~PingusCounter() {}
 
-  void draw(void);
+  void draw(GraphicContext& gc);
   void set_client(Client*);
   
 private:

Index: pingus_menu_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pingus_menu_manager.cxx     16 Aug 2002 17:15:31 -0000      1.10
+++ pingus_menu_manager.cxx     5 Sep 2002 12:24:02 -0000       1.11
@@ -47,7 +47,7 @@
 }
 
 void
-PingusMenuManager::draw ()
+PingusMenuManager::draw (GraphicContext& gc)
 {
   background.draw ();
   CL_Display::fill_rect(0, CL_Display::get_height () - 22,
@@ -55,7 +55,7 @@
                        0, 0, 0, 1.0f);
 
   for (MenuStackIter i = menu_stack.begin (); i != menu_stack.end (); ++i)
-    (*i)->draw ();
+    (*i)->draw (gc);
 }
 
 void
@@ -112,6 +112,7 @@
 PingusMenuManager::fadeout ()
 {
   std::cout << "PingusMenuManager::fadeout () Not implemented" << std::endl;
+#if 0
   DeltaManager delta_manager;
   EnlargingRectFadeOut fadeout;
 
@@ -126,6 +127,7 @@
 
       CL_System::keep_alive ();
     }
+#endif 
 }
 
 void

Index: pingus_menu_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_menu_manager.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pingus_menu_manager.hxx     4 Sep 2002 14:55:11 -0000       1.10
+++ pingus_menu_manager.hxx     5 Sep 2002 12:24:02 -0000       1.11
@@ -61,7 +61,7 @@
 
   void fadeout ();
 
-  void draw ();
+  void draw (GraphicContext& gc);
   void update (const GameDelta&);
 
   // !FIXME! Should use controller instead

Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- playfield.cxx       4 Sep 2002 14:55:11 -0000       1.19
+++ playfield.cxx       5 Sep 2002 12:24:02 -0000       1.20
@@ -94,7 +94,7 @@
 }
 
 void
-Playfield::draw()
+Playfield::draw(GraphicContext& gc)
 { 
   for(std::vector<View*>::iterator i = view.begin();
       i != view.end(); 

Index: playfield.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- playfield.hxx       23 Aug 2002 15:49:50 -0000      1.10
+++ playfield.hxx       5 Sep 2002 12:24:02 -0000       1.11
@@ -71,7 +71,7 @@
 
   void set_viewpoint(int, int);
 
-  void draw();
+  void draw(GraphicContext& gc);
   void update(float delta);
   void set_world(World*);
   Pingu* current_pingu_find(int x_pos, int y_pos);

Index: screen.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- screen.hxx  23 Aug 2002 15:49:50 -0000      1.7
+++ screen.hxx  5 Sep 2002 12:24:02 -0000       1.8
@@ -22,6 +22,8 @@
 
 #include "game_delta.hxx"
 
+class GraphicContext;
+
 /** A interface for screens. A screen is a Pingus 'thing' which gets
     complete controll over the display and input. Examples of
     screens are the PingusMenu or a PingusGameSession */
@@ -34,7 +36,7 @@
   Screen () { }
   
   /** Draw this screen */
-  virtual void draw () =0;
+  virtual void draw (GraphicContext& gc) =0;
 
   /** Pass a delta to the screen */
   virtual void update (const GameDelta& delta) =0;

Index: screen_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen_manager.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- screen_manager.cxx  22 Aug 2002 00:36:30 -0000      1.14
+++ screen_manager.cxx  5 Sep 2002 12:24:02 -0000       1.15
@@ -33,7 +33,8 @@
 ScreenManager* ScreenManager::instance_ = 0;
 
 ScreenManager::ScreenManager ()
-  : last_screen (0)
+  : display_gc (0, 0, CL_Display::get_width (), CL_Display::get_height (), 0, 
0),
+    last_screen (0)
 {
   replace_screen_arg = std::pair<Screen*, bool>(0, false);
   cached_action = none;
@@ -101,7 +102,7 @@
       // skip draw if the screen changed
       if (last_screen == current_screen)
        {
-         current_screen->draw ();
+         current_screen->draw (display_gc);
          Display::flip_display ();
        }
       else
@@ -213,13 +214,13 @@
 
       //std::cout << "FadeOver: " << border_x << " " << border_y << std::endl;
 
-      new_screen->draw ();
+      new_screen->draw (display_gc);
 
       CL_Display::push_clip_rect(CL_ClipRect (0 + border_x, 
                                              0 + border_y,
                                              CL_Display::get_width () - 
border_x,
                                              CL_Display::get_height () - 
border_y));
-      old_screen->draw ();
+      old_screen->draw (display_gc);
 
       GameDelta delta (time_delta, events);
       new_screen->update (delta);

Index: screen_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screen_manager.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- screen_manager.hxx  23 Aug 2002 15:49:50 -0000      1.10
+++ screen_manager.hxx  5 Sep 2002 12:24:02 -0000       1.11
@@ -23,12 +23,16 @@
 #include "pingus.hxx"
 #include <vector>
 
+#include "display_graphic_context.hxx"
+
 class Screen;
 
 class ScreenManager
 {
 private:
   static ScreenManager* instance_;
+
+  DisplayGraphicContext display_gc;
 
   /** Screen stack (first is the screen, second is delete_screen,
       which tells if the screen should be deleted onces it got poped

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- smallmap.cxx        4 Sep 2002 14:55:11 -0000       1.12
+++ smallmap.cxx        5 Sep 2002 12:24:02 -0000       1.13
@@ -151,7 +151,7 @@
 }
 
 void
-SmallMap::draw()
+SmallMap::draw(GraphicContext& gc)
 {
   Playfield* playfield = client->get_playfield();
 

Index: smallmap.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smallmap.hxx        23 Aug 2002 15:49:50 -0000      1.8
+++ smallmap.hxx        5 Sep 2002 12:24:02 -0000       1.9
@@ -54,7 +54,7 @@
   void set_client(Client* c);
   bool mouse_over();
   void init();
-  void draw();
+  void draw(GraphicContext& gc);
   void draw_pingus();
   void update(float delta);
 

Index: story.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/story.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- story.cxx   17 Aug 2002 00:31:06 -0000      1.5
+++ story.cxx   5 Sep 2002 12:24:02 -0000       1.6
@@ -52,7 +52,7 @@
 }
 
 void 
-Story::draw()
+Story::draw(GraphicContext& gc)
 {
   CL_Display::fill_rect (0,0,
                         CL_Display::get_width (),

Index: story.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/story.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- story.hxx   23 Aug 2002 15:49:51 -0000      1.6
+++ story.hxx   5 Sep 2002 12:24:02 -0000       1.7
@@ -45,7 +45,7 @@
 
   void preload () { init (); }
 
-  void draw ();
+  void draw (GraphicContext& gc);
   void update (float delta);
 
   /// Display a string at the right position

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- surface_button.cxx  22 Aug 2002 00:36:30 -0000      1.10
+++ surface_button.cxx  5 Sep 2002 12:24:02 -0000       1.11
@@ -54,7 +54,7 @@
 }
 
 void 
-SurfaceButton::draw()
+SurfaceButton::draw(GraphicContext& gc)
 {
   if (mouse_over && !pressed)
     {

Index: surface_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_button.hxx  23 Aug 2002 15:49:51 -0000      1.8
+++ surface_button.hxx  5 Sep 2002 12:24:02 -0000       1.9
@@ -52,7 +52,7 @@
   SurfaceButton();
   virtual ~SurfaceButton();
   
-  void draw();
+  void draw(GraphicContext& gc);
   void update (float delta);
 
   bool is_at (int x, int y);

Index: time_display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/time_display.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- time_display.cxx    4 Sep 2002 14:55:11 -0000       1.5
+++ time_display.cxx    5 Sep 2002 12:24:02 -0000       1.6
@@ -34,7 +34,7 @@
 }
 
 void
-TimeDisplay::draw()
+TimeDisplay::draw(GraphicContext& gc)
 {
   int time_value = server->get_world()->get_time_left();
   char time_string[8];

Index: time_display.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/time_display.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- time_display.hxx    23 Aug 2002 15:49:51 -0000      1.5
+++ time_display.hxx    5 Sep 2002 12:24:02 -0000       1.6
@@ -35,7 +35,7 @@
   TimeDisplay();
   virtual ~TimeDisplay() {}
 
-  void draw();
+  void draw(GraphicContext& gc);
   void set_server(Server*);
   
 private:

Index: view.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/view.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- view.cxx    4 Sep 2002 19:40:19 -0000       1.9
+++ view.cxx    5 Sep 2002 12:24:02 -0000       1.10
@@ -69,6 +69,7 @@
              x_offset, y_offset, size);*/
 
   // Update the scroll position
+  //display_gc.set_zoom (2.0f);
   display_gc.set_offset (x_offset - (x2_pos - x1_pos)/2,
                         y_offset - (y2_pos - y1_pos)/2);
   world->draw (display_gc);