[Pingus-CVS] CVS: Games/Pingus/src/editorobjs entrance_obj.cxx,1.6,1.7 groundpiece_obj.cxx,1.11,1.12 surface_background_obj.cxx,1.8,1.9 switch_door_obj.cxx,1.6,1.7 teleporter_obj.cxx,1.8,1.9

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv7109/src/editorobjs

Modified Files:
        entrance_obj.cxx groundpiece_obj.cxx 
        surface_background_obj.cxx switch_door_obj.cxx 
        teleporter_obj.cxx 
Log Message:
- show editor help screen at startup, but only for the first time
- added solid-tutorial level
- added descriptions for all levels
- removed some more useless std::cout's
- added scrollwheel support, doesn't use the input/ stuff, since it was
  easier this way
- added some keyboard shortcuts for result/start screen
- added clanlib patches

Index: entrance_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/entrance_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- entrance_obj.cxx    7 Mar 2003 18:49:21 -0000       1.6
+++ entrance_obj.cxx    30 Mar 2003 13:12:35 -0000      1.7
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <iostream>
 #include "../pingus_error.hxx"
 #include "../editor/editor.hxx"
 #include "../editor/property_window.hxx"
@@ -35,9 +34,6 @@
 {
   pos_ref = &data->pos;
 
-  std::cout << "EntranceObj::EntranceObj(const EntranceData& data): " 
-           << data->type << std::endl;
-
   if (data->type == "generic")
     {
       sprite = Sprite("Entrances/generic", "entrances");
@@ -45,7 +41,6 @@
     } 
   else if (data->type == "woodthing") 
     {
-      std::cout << "WOODTHING" << std::endl;
       sprite = Sprite("Entrances/woodthing_mov", "entrances");
       sprite.set_align(0  - sprite.get_width()/2,
                       32 - sprite.get_height());
@@ -57,7 +52,6 @@
     } 
   else 
     {
-      std::cout << "Entrance obj error!" << std::endl;
       PingusError::raise("EntranceObj: Unknown entrance type: " + data->type);
     }
 }
@@ -70,7 +64,6 @@
 EditorObj*
 EntranceObj::duplicate ()
 {
-  std::cout << "EntranceObj::duplicate()" << std::endl;
   return new EntranceObj(*data);
 }
 

Index: groundpiece_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- groundpiece_obj.cxx 18 Feb 2003 22:03:39 -0000      1.11
+++ groundpiece_obj.cxx 30 Mar 2003 13:12:35 -0000      1.12
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <iostream>
 #include "../worldobjsdata/groundpiece_data.hxx"
 #include "../pingus_resource.hxx"
 #include "../editor/property_window.hxx"
@@ -75,7 +74,6 @@
 void
 GroundpieceObj::vertical_flip ()
 {
-  std::cout << "Vertical flip" << std::endl;
   data->desc.modifier = ResourceModifierNS::vertical_flip(data->desc.modifier);
   sprite.get_surface() = PingusResource::load_surface(data->desc);
 }
@@ -83,7 +81,6 @@
 void
 GroundpieceObj::horizontal_flip ()
 {
-  std::cout << "Horz flip" << std::endl;
   data->desc.modifier = 
ResourceModifierNS::horizontal_flip(data->desc.modifier);
   sprite.get_surface() = PingusResource::load_surface(data->desc);
 }
@@ -91,8 +88,6 @@
 void
 GroundpieceObj::rotate_90 ()
 {
-  std::cout << "rot90" << std::endl;
-
   data->pos.x += sprite.get_width ()/2;
   data->pos.y += sprite.get_height()/2;
 
@@ -106,8 +101,6 @@
 void
 GroundpieceObj::rotate_270 ()
 {
-  std::cout << "rot 270" << std::endl;
-
   data->pos.x += sprite.get_width ()/2;
   data->pos.y += sprite.get_height()/2;
 

Index: surface_background_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_background_obj.cxx  19 Feb 2003 17:17:00 -0000      1.8
+++ surface_background_obj.cxx  30 Mar 2003 13:12:35 -0000      1.9
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <iostream>
 #include "../string_converter.hxx"
 #include "../worldobjsdata/surface_background_data.hxx"
 #include "../editor/editor.hxx"

Index: switch_door_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- switch_door_obj.cxx 28 Sep 2002 11:52:25 -0000      1.6
+++ switch_door_obj.cxx 30 Mar 2003 13:12:35 -0000      1.7
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <iostream>
+#include "../debug.hxx"
 #include "switch_door_obj.hxx"
 #include "../editor/editor_view.hxx"
 #include "../pingus_resource.hxx"
@@ -43,7 +43,7 @@
 EditorObj*
 SwitchDoorObj::duplicate ()
 {
-  std::cout << "SwitchDoorObj::duplicate(): not implemented" << std::endl;
+  pwarn << "SwitchDoorObj::duplicate(): not implemented" << std::endl;
   return 0;
 }
 

Index: teleporter_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- teleporter_obj.cxx  7 Oct 2002 23:04:21 -0000       1.8
+++ teleporter_obj.cxx  30 Mar 2003 13:12:35 -0000      1.9
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <iostream>
+#include "../debug.hxx"
 #include "teleporter_obj.hxx"
 #include "../editor/editor_view.hxx"
 #include "../worldobjsdata/teleporter_data.hxx"
@@ -46,7 +46,7 @@
 EditorObj*
 TeleporterObj::duplicate()
 {
-  std::cout << "EditorTeleporterObj::duplicate(): not implemented" << 
std::endl;
+  pwarn << "EditorTeleporterObj::duplicate(): not implemented" << std::endl;
   return 0;
 }
 
@@ -55,8 +55,6 @@
 {
   WorldObjsData::TeleporterData newdata;
 
-  std::cout << "EditorTeleporterObj: creating..." << std::endl;
-
   newdata.pos          = pos;
   newdata.target_pos.x = pos.x + 50;
   newdata.target_pos.y = pos.y + 50;
@@ -67,7 +65,6 @@
 void
 TeleporterObj::draw (EditorNS::EditorView * view)
 {
-  //std::cout << "Drawing line" << std::endl;
   view->draw_line (static_cast<int>(data->pos.x), 
                   static_cast<int>(data->pos.y),
                   static_cast<int>(data->target_pos.x),