[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx, 1.58, 1.59 editor.hxx, 1.26, 1.27 editor_view.cxx, 1.14, 1.15

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv9067/src/editor

Modified Files:
        editor.cxx editor.hxx editor_view.cxx 
Log Message:
- bunch of more font fixes and signal fixes
- worldmap is now showing too, at least partly

Index: editor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- editor.cxx  13 Dec 2003 16:23:39 -0000      1.58
+++ editor.cxx  13 Dec 2003 23:41:11 -0000      1.59
@@ -109,21 +109,16 @@
   scroll_map->editor_event = event;
 
   //std::cout << "Editor: registering event handler" << event << "... " << 
std::flush;
-#ifdef CLANLIB_0_6
-  on_button_press_slot   = CL_Input::sig_button_press ().connect(event, 
&EditorEvent::on_button_press);
-  on_button_release_slot = CL_Input::sig_button_release ().connect(event, 
&EditorEvent::on_button_release);
-#endif
+  slots.push_back(CL_Keyboard::sig_key_down().connect(event, 
&EditorEvent::on_button_press));
+  slots.push_back(CL_Keyboard::sig_key_up().connect(event, 
&EditorEvent::on_button_release));
+  slots.push_back(CL_Mouse::sig_key_down().connect(event, 
&EditorEvent::on_button_press));
+  slots.push_back(CL_Mouse::sig_key_up().connect(event, 
&EditorEvent::on_button_release));
 }
 
 Editor::~Editor ()
 {
   StatManager::instance()->set_bool("show-editor-help-screen", 
show_help_screen);
-
-#ifdef CLANLIB_0_6
-  CL_Input::sig_button_press ().disconnect (on_button_press_slot);
-  CL_Input::sig_button_release ().disconnect (on_button_release_slot);
-#endif 
-
+  
   delete object_manager;
   delete status_line;
   delete object_selector;
@@ -161,12 +156,10 @@
        {
          EditorObj* obj = selection->get_current_obj();
          property_window->update_frame(obj);
-         //CL_Component* comp = obj->get_gui_dialog (editor->property_window);
        }
       else
        {
          property_window->update_frame(0);
-         //std::cout << "EditorEvent::editor_show_object_properties (): error: 
multiple objects selected" << std::endl;
        }
     }
 

Index: editor.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- editor.hxx  18 Oct 2003 23:17:27 -0000      1.26
+++ editor.hxx  13 Dec 2003 23:41:12 -0000      1.27
@@ -52,8 +52,7 @@
   EditorEvent* event;
   friend class EditorEvent;
 
-  CL_Slot on_button_press_slot;
-  CL_Slot on_button_release_slot;
+  std::vector<CL_Slot> slots;
 
   int event_handler_ref_counter;
 

Index: editor_view.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_view.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- editor_view.cxx     13 Dec 2003 11:21:24 -0000      1.14
+++ editor_view.cxx     13 Dec 2003 23:41:12 -0000      1.15
@@ -177,10 +177,10 @@
 EditorView::draw (Sprite& sprite, const Vector& pos)
 {
 #ifdef CLANLIB_0_6
-  CL_Surface sur (sprite.get_surface ());
-  draw (sur,
-       (int) pos.x + sprite.get_x_align (),
-       (int) pos.y + sprite.get_y_align ());
+  CL_Surface sur(sprite.get_surface ());
+  draw(sur,
+       (int) pos.x + sprite.get_x_align (),
+       (int) pos.y + sprite.get_y_align ());
 #endif
 }
 
@@ -212,8 +212,6 @@
                offset.z, offset.z);
     }
 #endif
-  //CL_Display::draw_line (x1, y1, x2, y2, 1.0, 1.0, 0.0);
-  //CL_Display::draw_line (x1, y2, x2, y1, 1.0, 1.0, 0.0);
 }
 
 void