[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper

pingus-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.9,1.10 bu

From:	torangan
Subject:	[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.9,1.10 bumper_obj.hxx,1.9,1.10 conveyor_belt_obj.cxx,1.7,1.8 conveyor_belt_obj.hxx,1.7,1.8 entrance_obj.cxx,1.7,1.8 entrance_obj.hxx,1.3,1.4 exit_obj.cxx,1.1,1.2 exit_obj.hxx,1.2,1.3 fake_exit_obj.cxx,1.10,1.11 fake_exit_obj.hxx,1.10,1.11 groundpiece_obj.cxx,1.14,1.15 groundpiece_obj.hxx,1.4,1.5 guillotine_obj.cxx,1.9,1.10 guillotine_obj.hxx,1.9,1.10 hammer_obj.cxx,1.10,1.11 hammer_obj.hxx,1.9,1.10 hotspot_obj.cxx,1.2,1.3 hotspot_obj.hxx,1.5,1.6 ice_block_obj.cxx,1.6,1.7 ice_block_obj.hxx,1.5,1.6 info_box_obj.cxx,1.4,1.5 info_box_obj.hxx,1.6,1.7 laser_exit_obj.cxx,1.10,1.11 laser_exit_obj.hxx,1.9,1.10 liquid_obj.cxx,1.5,1.6 liquid_obj.hxx,1.5,1.6 prefab_obj.hxx,1.3,1.4 smasher_obj.cxx,1.8,1.9 smasher_obj.hxx,1.10,1.11 solid_color_background_obj.cxx,1.6,1.7 solid_color_background_obj.hxx,1.6,1.7 spike_obj.cxx,1.10,1.11 spike_obj.hxx,1.10,1.11 starfield_background_obj.cxx,1.5,1.6 starfield_background_obj.hxx,1.6,1.7surface_background_obj.cxx,1.9,1.10 surface_background_obj.hxx,1.6,1.7 switch_door_obj.cxx,1.7,1.8 switch_door_obj.hxx,1.7,1.8 switch_door_switch_obj.cxx,1.2,1.3 switch_door_switch_obj.hxx,1.4,1.5 teleporter_obj.cxx,1.9,1.10 teleporter_obj.hxx,1.9,1.10 teleporter_target_obj.cxx,1.6,1.7 teleporter_target_obj.hxx,1.4,1.5thunderstorm_background_obj.hxx,1.4,1.5
Date:	19 Apr 2003 10:23:21 -0000
Update of /var/lib/cvs/Games/Pingus/src/editorobjs
In directory dark:/tmp/cvs-serv20737/editorobjs

Modified Files:
        bumper_obj.cxx bumper_obj.hxx conveyor_belt_obj.cxx 
        conveyor_belt_obj.hxx entrance_obj.cxx entrance_obj.hxx 
        exit_obj.cxx exit_obj.hxx fake_exit_obj.cxx fake_exit_obj.hxx 
        groundpiece_obj.cxx groundpiece_obj.hxx guillotine_obj.cxx 
        guillotine_obj.hxx hammer_obj.cxx hammer_obj.hxx 
        hotspot_obj.cxx hotspot_obj.hxx ice_block_obj.cxx 
        ice_block_obj.hxx info_box_obj.cxx info_box_obj.hxx 
        laser_exit_obj.cxx laser_exit_obj.hxx liquid_obj.cxx 
        liquid_obj.hxx prefab_obj.hxx smasher_obj.cxx smasher_obj.hxx 
        solid_color_background_obj.cxx solid_color_background_obj.hxx 
        spike_obj.cxx spike_obj.hxx starfield_background_obj.cxx 
        starfield_background_obj.hxx surface_background_obj.cxx 
        surface_background_obj.hxx switch_door_obj.cxx 
        switch_door_obj.hxx switch_door_switch_obj.cxx 
        switch_door_switch_obj.hxx teleporter_obj.cxx 
        teleporter_obj.hxx teleporter_target_obj.cxx 
        teleporter_target_obj.hxx thunderstorm_background_obj.hxx 
Log Message:
removed trailing whitespace


Index: bumper_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/bumper_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bumper_obj.cxx      28 Sep 2002 11:52:24 -0000      1.9
+++ bumper_obj.cxx      19 Apr 2003 10:23:18 -0000      1.10
@@ -66,14 +66,14 @@
   view->draw(sprite, data->pos, frame);
 }
 
-std::string  
+std::string
 BumperObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "BumperObj: %4.2fx%4.2fx%4.2f", data->pos.x, data->pos.y, 
data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: bumper_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/bumper_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bumper_obj.hxx      28 Nov 2002 20:09:54 -0000      1.9
+++ bumper_obj.hxx      19 Apr 2003 10:23:18 -0000      1.10
@@ -36,15 +36,15 @@
 
 public:
   BumperObj (const WorldObjsData::BumperData& data_);
- ~BumperObj ();   
+ ~BumperObj ();
 
   static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
-  
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-  
+
   std::string status_line ();
   EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:

Index: conveyor_belt_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- conveyor_belt_obj.cxx       4 Mar 2003 12:53:47 -0000       1.7
+++ conveyor_belt_obj.cxx       19 Apr 2003 10:23:18 -0000      1.8
@@ -53,12 +53,12 @@
                 static_cast<int>(data->pos.y),
                 static_cast<int>(data->counter));
     }
-    
+
   view->draw(right_sur,
             static_cast<int>(data->pos.x) + left_sur.get_width() + data->width 
* middle_sur.get_width(),
             static_cast<int>(data->pos.y),
             static_cast<int>(data->counter));
-            
+
   data->counter += data->speed;
   if (data->counter > 14)
     data->counter = 0;
@@ -84,8 +84,8 @@
   newdata.pos = pos;
   return EditorObjLst(1, new ConveyorBeltObj(newdata));
 }
-  
-std::string 
+
+std::string
 ConveyorBeltObj::status_line ()
 {
   char str[256];
@@ -93,7 +93,7 @@
   return str;
 }
 
-int 
+int
 ConveyorBeltObj::get_width ()
 {
   return   left_sur  .get_width()
@@ -101,7 +101,7 @@
         + middle_sur.get_width() * data->width;
 }
 
-int 
+int
 ConveyorBeltObj::get_height ()
 {
   return middle_sur.get_height();
@@ -112,7 +112,7 @@
   return data->pos.z;
 }
 
-void 
+void
 ConveyorBeltObj::set_position_offset (const Vector& offset)
 {
   data->pos += offset;
@@ -145,14 +145,14 @@
 EditorNS::PropertyFrame*
 ConveyorBeltObj::get_gui_dialog(EditorNS::Editor* editor)
 {
-  EditorNS::GenericPropertyFrame* propframe 
+  EditorNS::GenericPropertyFrame* propframe
     = new EditorNS::GenericPropertyFrame("ConveyorBelt Properties",
                                          
editor->get_property_window()->get_client_area());
 
   propframe->add_integer_box("Width", &data->width);
   propframe->add_float_box("Speed", &data->speed);
-  
-  return propframe; 
+
+  return propframe;
 }
 
 } // namespace EditorObjs

Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- conveyor_belt_obj.hxx       4 Mar 2003 10:25:31 -0000       1.7
+++ conveyor_belt_obj.hxx       19 Apr 2003 10:23:18 -0000      1.8
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -44,7 +44,7 @@
   ConveyorBeltObj (const WorldObjsData::ConveyorBeltData& data_);
 
   EditorObj* duplicate ();
-  
+
   void draw (EditorNS::EditorView * view);
   void draw_scroll_map (int x_pos, int y_pos, int arg_width, int arg_height);
 
@@ -54,7 +54,7 @@
   float get_z_pos ();
 
   void set_position_offset (const Vector &);
-  
+
   static EditorObjLst create (WorldObjData* obj);
 
   /** Create the object with reasonable defaults */

Index: entrance_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/entrance_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- entrance_obj.cxx    30 Mar 2003 13:12:35 -0000      1.7
+++ entrance_obj.cxx    19 Apr 2003 10:23:18 -0000      1.8
@@ -38,8 +38,8 @@
     {
       sprite = Sprite("Entrances/generic", "entrances");
       sprite.set_align_center_bottom();
-    } 
-  else if (data->type == "woodthing") 
+    }
+  else if (data->type == "woodthing")
     {
       sprite = Sprite("Entrances/woodthing_mov", "entrances");
       sprite.set_align(0  - sprite.get_width()/2,
@@ -49,8 +49,8 @@
     {
       sprite = Sprite("Entrances/cloud", "entrances");
       sprite.set_align(-115, -75);
-    } 
-  else 
+    }
+  else
     {
       PingusError::raise("EntranceObj: Unknown entrance type: " + data->type);
     }
@@ -103,7 +103,7 @@
 EditorNS::PropertyFrame*
 EntranceObj::get_gui_dialog (EditorNS::Editor* editor)
 {
-  EditorNS::GenericPropertyFrame* propframe 
+  EditorNS::GenericPropertyFrame* propframe
     = new EditorNS::GenericPropertyFrame("Entrance Properties",
                                          
editor->get_property_window()->get_client_area());
 

Index: entrance_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/entrance_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entrance_obj.hxx    1 Dec 2002 21:45:14 -0000       1.3
+++ entrance_obj.hxx    19 Apr 2003 10:23:18 -0000      1.4
@@ -29,19 +29,19 @@
 {
 private:
   WorldObjsData::EntranceData* const data;
-  
+
 public:
   EntranceObj (const WorldObjsData::EntranceData& data_);
   ~EntranceObj ();
 
   EditorObj* duplicate ();
-  
+
   void write_xml (std::ostream& xml);
-  
+
   std::string status_line ();
-  
+
   EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
-  
+
 private:
   EntranceObj (const EntranceObj&);
   EntranceObj& operator= (const EntranceObj&);

Index: exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/exit_obj.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exit_obj.cxx        27 Sep 2002 16:01:55 -0000      1.1
+++ exit_obj.cxx        19 Apr 2003 10:23:18 -0000      1.2
@@ -29,7 +29,7 @@
 {
   pos_ref = &data->pos;
   sprite.set_align_center_bottom();
-         
+
   if (data->use_old_pos_handling)
     {
       data->pos.x += sprite.get_width ()/2;
@@ -55,11 +55,11 @@
   data->write_xml(xml);
 }
 
-std::string 
+std::string
 ExitObj::status_line ()
 {
   char str[256];
-  
+
   snprintf(str, 256, "Exit - %s - X:%4.2f Y:%4.2f Z:%4.2f OwnerId: %d",
            data->desc.res_name.c_str(), data->pos.x, data->pos.y, data->pos.z, 
data->owner_id);
 

Index: exit_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/exit_obj.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exit_obj.hxx        28 Nov 2002 20:09:54 -0000      1.2
+++ exit_obj.hxx        19 Apr 2003 10:23:18 -0000      1.3
@@ -32,17 +32,17 @@
 {
 private:
   WorldObjsData::ExitData* const data;
-  
+
 public:
   ExitObj (const WorldObjsData::ExitData& data_);
  ~ExitObj ();
 
   EditorObj* duplicate ();
-  
+
   void write_xml (std::ostream& xml);
-  
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   ExitObj (const ExitObj&);
   ExitObj& operator= (const ExitObj&);

Index: fake_exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/fake_exit_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fake_exit_obj.cxx   28 Sep 2002 11:52:24 -0000      1.10
+++ fake_exit_obj.cxx   19 Apr 2003 10:23:18 -0000      1.11
@@ -24,7 +24,7 @@
 
 namespace EditorObjs {
 
-FakeExitObj::FakeExitObj (const WorldObjsData::FakeExitData& data_) 
+FakeExitObj::FakeExitObj (const WorldObjsData::FakeExitData& data_)
   : data(new WorldObjsData::FakeExitData(data_)),
     frame(0)
 {
@@ -47,7 +47,7 @@
   newdata.pos = pos;
   return EditorObjLst(1, new FakeExitObj (newdata));
 }
-  
+
 EditorObj*
 FakeExitObj::duplicate ()
 {
@@ -66,14 +66,14 @@
   view->draw(sprite, data->pos, frame);
 }
 
-std::string  
+std::string
 FakeExitObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "FakeExitObj: %4.2fx%4.2fx%4.2f", data->pos.x, 
data->pos.y, data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: fake_exit_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/fake_exit_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fake_exit_obj.hxx   28 Nov 2002 20:09:54 -0000      1.10
+++ fake_exit_obj.hxx   19 Apr 2003 10:23:18 -0000      1.11
@@ -33,20 +33,20 @@
 private:
   WorldObjsData::FakeExitData* const data;
   int frame;
-  
+
 public:
   FakeExitObj (const WorldObjsData::FakeExitData& data_);
   ~FakeExitObj ();
-   
+
   static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
-    
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-    
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   FakeExitObj (const FakeExitObj&);
   FakeExitObj& operator= (const FakeExitObj&);

Index: groundpiece_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- groundpiece_obj.cxx 2 Apr 2003 20:02:28 -0000       1.14
+++ groundpiece_obj.cxx 19 Apr 2003 10:23:18 -0000      1.15
@@ -59,7 +59,7 @@
   data->write_xml(xml);
 }
 
-std::string 
+std::string
 GroundpieceObj::status_line ()
 {
   return "Groundpiece: " + data->desc.res_name
@@ -109,7 +109,7 @@
 
 struct GroundpieceObjRotate {
   GroundpieceObj* obj;
-  GroundpieceObjRotate(GroundpieceObj* o) 
+  GroundpieceObjRotate(GroundpieceObj* o)
   {
     obj = o;
   }
@@ -121,7 +121,7 @@
 
 struct GroundpieceObjFlipHorizontal {
   GroundpieceObj* obj;
-  GroundpieceObjFlipHorizontal(GroundpieceObj* o) 
+  GroundpieceObjFlipHorizontal(GroundpieceObj* o)
   {
     obj = o;
   }
@@ -133,11 +133,11 @@
 
 struct GroundpieceObjFlipVertical {
   GroundpieceObj* obj;
-  GroundpieceObjFlipVertical(GroundpieceObj* o) 
+  GroundpieceObjFlipVertical(GroundpieceObj* o)
   {
     obj = o;
   }
-  
+
   void operator()() {
     obj->vertical_flip();
   }
@@ -146,7 +146,7 @@
 EditorNS::PropertyFrame*
 GroundpieceObj::get_gui_dialog (EditorNS::Editor* editor)
 {
-  EditorNS::GenericPropertyFrame* propframe 
+  EditorNS::GenericPropertyFrame* propframe
     = new EditorNS::GenericPropertyFrame("GroundPiece Properties",
                                          
editor->get_property_window()->get_client_area());
 
@@ -157,11 +157,11 @@
   propframe->add_enum_value("Bridge",      Groundtype::GP_BRIDGE);
   propframe->add_enum_value("Remove",      Groundtype::GP_REMOVE);
   propframe->end_add_enum_box();
-  
+
   propframe->add_button_box("Rotate 90 (r)",       GroundpieceObjRotate(this));
   propframe->add_button_box("Flip Vertical (v)",   
GroundpieceObjFlipVertical(this));
   propframe->add_button_box("Flip Horizontal (h)", 
GroundpieceObjFlipHorizontal(this));
-  
+
   return propframe;
 }
 

Index: groundpiece_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/groundpiece_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- groundpiece_obj.hxx 30 Nov 2002 00:10:29 -0000      1.4
+++ groundpiece_obj.hxx 19 Apr 2003 10:23:18 -0000      1.5
@@ -56,7 +56,7 @@
   void rotate_270 ();
 
   void write_xml (std::ostream& xml);
-  
+
   EditorObj* duplicate ();
   std::string status_line ();
 

Index: guillotine_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/guillotine_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- guillotine_obj.cxx  28 Sep 2002 11:52:24 -0000      1.9
+++ guillotine_obj.cxx  19 Apr 2003 10:23:18 -0000      1.10
@@ -45,7 +45,7 @@
   newdata.pos = pos;
   return EditorObjLst(1, new GuillotineObj(newdata));
 }
-  
+
 EditorObj*
 GuillotineObj::duplicate ()
 {
@@ -64,14 +64,14 @@
   view->draw(sprite, data->pos, frame);
 }
 
-std::string  
+std::string
 GuillotineObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "GuillotineObj: %4.2fx%4.2fx%4.2f", data->pos.x, 
data->pos.y, data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: guillotine_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/guillotine_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- guillotine_obj.hxx  28 Nov 2002 20:09:54 -0000      1.9
+++ guillotine_obj.hxx  19 Apr 2003 10:23:18 -0000      1.10
@@ -33,20 +33,20 @@
 private:
   WorldObjsData::GuillotineData* const data;
   int frame;
-  
+
 public:
   GuillotineObj (const WorldObjsData::GuillotineData& data_);
   ~GuillotineObj ();
-   
+
   static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
-    
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-    
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   GuillotineObj (const GuillotineObj&);
   GuillotineObj& operator= (const GuillotineObj&);

Index: hammer_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hammer_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hammer_obj.cxx      1 Oct 2002 23:40:19 -0000       1.10
+++ hammer_obj.cxx      19 Apr 2003 10:23:18 -0000      1.11
@@ -24,7 +24,7 @@
 
 namespace EditorObjs {
 
-HammerObj::HammerObj (const WorldObjsData::HammerData& data_) 
+HammerObj::HammerObj (const WorldObjsData::HammerData& data_)
   : data(new WorldObjsData::HammerData(data_)),
     frame(0)
 {
@@ -51,7 +51,7 @@
   hammer_data.pos = pos;
   return EditorObjLst(1, new HammerObj(hammer_data));
 }
-  
+
 void
 HammerObj::write_xml (std::ostream& xml)
 {
@@ -64,14 +64,14 @@
   view->draw(sprite, data->pos, frame);
 }
 
-std::string  
+std::string
 HammerObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "HammerObj: %4.2fx%4.2fx%4.2f", data->pos.x, data->pos.y, 
data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: hammer_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hammer_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hammer_obj.hxx      28 Nov 2002 20:09:54 -0000      1.9
+++ hammer_obj.hxx      19 Apr 2003 10:23:18 -0000      1.10
@@ -33,20 +33,20 @@
 private:
   WorldObjsData::HammerData* const data;
   int frame;
-  
+
 public:
   HammerObj (const WorldObjsData::HammerData& data_);
   ~HammerObj ();
-   
+
   static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
-    
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-    
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   HammerObj (const HammerObj&);
   HammerObj& operator= (const HammerObj&);

Index: hotspot_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hotspot_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hotspot_obj.cxx     27 Sep 2002 18:36:40 -0000      1.2
+++ hotspot_obj.cxx     19 Apr 2003 10:23:18 -0000      1.3
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -45,7 +45,7 @@
 std::string
 HotspotObj::status_line ()
 {
-  return "Hotspot: "  
+  return "Hotspot: "
          + to_string(data->pos.x) + ", "
         + to_string(data->pos.y) + ", "
         + to_string(data->pos.z);

Index: hotspot_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/hotspot_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hotspot_obj.hxx     5 Dec 2002 20:38:10 -0000       1.5
+++ hotspot_obj.hxx     19 Apr 2003 10:23:18 -0000      1.6
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_EDITOR_HOTSPOT_HXX
 
 #include "../editor/editor.hxx"
-#include "../editor/sprite_editorobj.hxx" 
+#include "../editor/sprite_editorobj.hxx"
 
 namespace WorldObjsData {
 class HotspotData;
@@ -33,7 +33,7 @@
 {
 private:
   WorldObjsData::HotspotData* const data;
-  
+
 public:
   HotspotObj (const WorldObjsData::HotspotData& data_);
 

Index: ice_block_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/ice_block_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ice_block_obj.cxx   4 Mar 2003 12:53:47 -0000       1.6
+++ ice_block_obj.cxx   19 Apr 2003 10:23:18 -0000      1.7
@@ -25,7 +25,7 @@
 
 IceBlockObj::IceBlockObj (const WorldObjsData::IceBlockData& data_)
   : SpriteEditorObj ("iceblock", "worldobjs"),
-    data(new WorldObjsData::IceBlockData(data_))   
+    data(new WorldObjsData::IceBlockData(data_))
 {
   pos_ref = &data->pos;
 }
@@ -44,7 +44,7 @@
   return EditorObjLst(1, new IceBlockObj(newdata));
 }
 
-std::string 
+std::string
 IceBlockObj::status_line ()
 {
   char str[256];

Index: ice_block_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/ice_block_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ice_block_obj.hxx   28 Nov 2002 20:09:54 -0000      1.5
+++ ice_block_obj.hxx   19 Apr 2003 10:23:18 -0000      1.6
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -28,11 +28,11 @@
 
 namespace EditorObjs {
 
-class IceBlockObj : public SpriteEditorObj                       
+class IceBlockObj : public SpriteEditorObj
 {
 private:
   WorldObjsData::IceBlockData* const data;
-  
+
 public:
   IceBlockObj (const WorldObjsData::IceBlockData& data_);
  ~IceBlockObj ();
@@ -41,10 +41,10 @@
   static EditorObjLst create (const Vector& pos);
 
   void write_xml (std::ostream& xml);
-  
+
   EditorObj* duplicate ();
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   IceBlockObj (const IceBlockObj&);
   IceBlockObj& operator= (const IceBlockObj&);

Index: info_box_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/info_box_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- info_box_obj.cxx    28 Sep 2002 11:52:25 -0000      1.4
+++ info_box_obj.cxx    19 Apr 2003 10:23:18 -0000      1.5
@@ -54,7 +54,7 @@
   return new InfoBoxObj(*data);
 }
 
-std::string 
+std::string
 InfoBoxObj::status_line ()
 {
   return "InfoBoxObj";

Index: info_box_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/info_box_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- info_box_obj.hxx    28 Nov 2002 20:09:54 -0000      1.6
+++ info_box_obj.hxx    19 Apr 2003 10:23:18 -0000      1.7
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -42,7 +42,7 @@
   void write_xml (std::ostream& xml);
   EditorObj* duplicate ();
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   InfoBoxObj (const InfoBoxObj&);
   InfoBoxObj& operator= (const InfoBoxObj&);

Index: laser_exit_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/laser_exit_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- laser_exit_obj.cxx  28 Sep 2002 11:52:25 -0000      1.10
+++ laser_exit_obj.cxx  19 Apr 2003 10:23:18 -0000      1.11
@@ -24,7 +24,7 @@
 
 namespace EditorObjs {
 
-LaserExitObj::LaserExitObj (const WorldObjsData::LaserExitData& data_) 
+LaserExitObj::LaserExitObj (const WorldObjsData::LaserExitData& data_)
   : data(new WorldObjsData::LaserExitData(data_)),
     frame(0)
 {
@@ -65,14 +65,14 @@
   view->draw(sprite, data->pos, frame);
 }
 
-std::string  
+std::string
 LaserExitObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "LaserExitObj: %4.2fx%4.2fx%4.2f", data->pos.x, 
data->pos.y, data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: laser_exit_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/laser_exit_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- laser_exit_obj.hxx  28 Nov 2002 20:09:54 -0000      1.9
+++ laser_exit_obj.hxx  19 Apr 2003 10:23:18 -0000      1.10
@@ -33,21 +33,21 @@
 private:
   WorldObjsData::LaserExitData* const data;
   int frame;
-  
+
 public:
   LaserExitObj (const WorldObjsData::LaserExitData& data_);
   ~LaserExitObj ();
 
   static EditorObjLst create (const Vector& pos);
 
-   
+
   EditorObj* duplicate ();
-    
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-    
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   LaserExitObj (const LaserExitObj&);
   LaserExitObj& operator= (const LaserExitObj&);

Index: liquid_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/liquid_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- liquid_obj.cxx      19 Feb 2003 17:16:59 -0000      1.5
+++ liquid_obj.cxx      19 Apr 2003 10:23:18 -0000      1.6
@@ -58,7 +58,7 @@
 }
 
 void
-LiquidObj::draw_mark (EditorNS::EditorView* view) 
+LiquidObj::draw_mark (EditorNS::EditorView* view)
 {
   view->draw_rect(static_cast<int>(data->pos.x),
                  static_cast<int>(data->pos.y),
@@ -73,7 +73,7 @@
   data->write_xml(xml);
 }
 
-std::string  
+std::string
 LiquidObj::status_line ()
 {
   char str[32];
@@ -88,13 +88,13 @@
   return sprite.get_width() * data->width;
 }
 
-void 
+void
 LiquidObj::make_larger ()
 {
   ++data->width;
 }
 
-void 
+void
 LiquidObj::make_smaller ()
 {
   if (data->width > 1)
@@ -104,7 +104,7 @@
 EditorNS::PropertyFrame*
 LiquidObj::get_gui_dialog(EditorNS::Editor* editor)
 {
-  EditorNS::GenericPropertyFrame* propframe 
+  EditorNS::GenericPropertyFrame* propframe
     = new EditorNS::GenericPropertyFrame("Liquid Properties",
                                          
editor->get_property_window()->get_client_area());
 

Index: liquid_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/liquid_obj.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- liquid_obj.hxx      19 Feb 2003 17:16:59 -0000      1.5
+++ liquid_obj.hxx      19 Apr 2003 10:23:18 -0000      1.6
@@ -33,18 +33,18 @@
 {
 private:
   WorldObjsData::LiquidData* const data;
-  
+
 public:
   LiquidObj (const WorldObjsData::LiquidData& data_);
  ~LiquidObj ();
 
   EditorObj* duplicate ();
-  
+
   void draw      (EditorNS::EditorView * view);
   void draw_mark (EditorNS::EditorView * view);
-  
+
   void write_xml (std::ostream& xml);
-  
+
   std::string status_line ();
 
   int get_width ();

Index: prefab_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/prefab_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prefab_obj.hxx      5 Mar 2003 19:13:59 -0000       1.3
+++ prefab_obj.hxx      19 Apr 2003 10:23:18 -0000      1.4
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2002 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -34,10 +34,10 @@
 private:
   /** The object group which this prefab wraps */
   WorldObjGroup* obj_group;
-  
+
   /** The data that holds this prefab */
   PrefabObjData* data;
-  
+
 public:
   PrefabObj ();
 

Index: smasher_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/smasher_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smasher_obj.cxx     28 Sep 2002 11:52:25 -0000      1.8
+++ smasher_obj.cxx     19 Apr 2003 10:23:18 -0000      1.9
@@ -45,7 +45,7 @@
   smasher_data.pos = pos;
   return EditorObjLst(1, new SmasherObj(smasher_data));
 }
-  
+
 EditorObj*
 SmasherObj::duplicate ()
 {
@@ -64,14 +64,14 @@
   view->draw(sprite, data->pos, frame);
 }
 
-std::string  
+std::string
 SmasherObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "SmasherObj: %4.2fx%4.2fx%4.2f", data->pos.x, 
data->pos.y, data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: smasher_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/smasher_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smasher_obj.hxx     28 Nov 2002 20:09:54 -0000      1.10
+++ smasher_obj.hxx     19 Apr 2003 10:23:18 -0000      1.11
@@ -33,20 +33,20 @@
 private:
   WorldObjsData::SmasherData* const data;
   int frame;
-  
+
 public:
   SmasherObj (const WorldObjsData::SmasherData& data_);
   ~SmasherObj ();
 
   static EditorObjLst create (const Vector& pos);
-   
+
   EditorObj* duplicate ();
-    
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-    
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   SmasherObj (const SmasherObj&);
   SmasherObj& operator= (const SmasherObj&);

Index: solid_color_background_obj.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/editorobjs/solid_color_background_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- solid_color_background_obj.cxx      30 Nov 2002 17:11:55 -0000      1.6
+++ solid_color_background_obj.cxx      19 Apr 2003 10:23:18 -0000      1.7
@@ -61,8 +61,8 @@
 
 Vector
 SolidColorBackgroundObj::get_upper_left_corner ()
-{ 
-  return data->pos; 
+{
+  return data->pos;
 }
 
 void
@@ -82,21 +82,21 @@
 SolidColorBackgroundObj::set_position_offset (const Vector& offset)
 {
   data->pos += offset;
-}  
+}
 
 std::string
 SolidColorBackgroundObj::status_line ()
 {
-  return "SolidColorBackground: " 
+  return "SolidColorBackground: "
         + to_string(data->pos.x) + ", "
         + to_string(data->pos.y) + ", "
         + to_string(data->pos.z);
 }
 
-EditorNS::PropertyFrame* 
+EditorNS::PropertyFrame*
 SolidColorBackgroundObj::get_gui_dialog(Editor* editor)
 {
-  GenericPropertyFrame* propframe 
+  GenericPropertyFrame* propframe
     = new GenericPropertyFrame("SolidColorBackground", 
editor->get_property_window()->get_client_area());
 
   propframe->add_float_box("Red", &data->color.red);

Index: solid_color_background_obj.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/editorobjs/solid_color_background_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- solid_color_background_obj.hxx      29 Nov 2002 22:54:23 -0000      1.6
+++ solid_color_background_obj.hxx      19 Apr 2003 10:23:18 -0000      1.7
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -38,16 +38,16 @@
 {
 private:
   WorldObjsData::SolidColorBackgroundData* const data;
-  
+
 public:
   SolidColorBackgroundObj (const WorldObjsData::SolidColorBackgroundData& 
data_);
  ~SolidColorBackgroundObj ();
- 
+
   void write_xml (std::ostream& xml);
 
   /// Return the object width
   int get_width () { return 256; }
-  
+
   /// Return the object height
   int get_height () { return 256; }
 
@@ -58,8 +58,8 @@
   Vector get_upper_left_corner ();
 
   void draw (EditorNS::EditorView* view);
-  
-  void set_position_offset (const Vector& offset);  
+
+  void set_position_offset (const Vector& offset);
 
   std::string status_line ();
   EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*);

Index: spike_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/spike_obj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- spike_obj.cxx       25 Mar 2003 23:15:23 -0000      1.10
+++ spike_obj.cxx       19 Apr 2003 10:23:18 -0000      1.11
@@ -24,7 +24,7 @@
 
 namespace EditorObjs {
 
-SpikeObj::SpikeObj (const WorldObjsData::SpikeData& data_) 
+SpikeObj::SpikeObj (const WorldObjsData::SpikeData& data_)
   : data(new WorldObjsData::SpikeData(data_))
 {
   data->pos.z = -100;
@@ -44,7 +44,7 @@
   spike_data.pos = pos;
   return EditorObjLst(1, new SpikeObj(spike_data));
 }
-  
+
 EditorObj*
 SpikeObj::duplicate ()
 {
@@ -63,14 +63,14 @@
   view->draw(sprite, data->pos, 2);
 }
 
-std::string  
+std::string
 SpikeObj::status_line ()
 {
   char str[64];
   snprintf (str, 64, "SpikeObj: %4.2fx%4.2fx%4.2f", data->pos.x, data->pos.y, 
data->pos.z);
   return str;
 }
-  
+
 } // namespace EditorObjs
 
 /* EOF */

Index: spike_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/spike_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- spike_obj.hxx       25 Mar 2003 23:15:23 -0000      1.10
+++ spike_obj.hxx       19 Apr 2003 10:23:18 -0000      1.11
@@ -32,20 +32,20 @@
 {
 private:
   WorldObjsData::SpikeData* const data;
-  
+
 public:
   SpikeObj (const WorldObjsData::SpikeData& data_);
   ~SpikeObj ();
-   
+
   static EditorObjLst create (const Vector& pos);
 
   EditorObj* duplicate ();
-    
+
   void write_xml (std::ostream& xml);
   void draw (EditorNS::EditorView* view);
-    
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   SpikeObj (const SpikeObj&);
   SpikeObj& operator= (const SpikeObj&);

Index: starfield_background_obj.cxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/editorobjs/starfield_background_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- starfield_background_obj.cxx        30 Nov 2002 17:11:55 -0000      1.5
+++ starfield_background_obj.cxx        19 Apr 2003 10:23:18 -0000      1.6
@@ -56,17 +56,17 @@
 std::string
 StarfieldBackgroundObj::status_line ()
 {
-  return "StarfieldBackground: " 
+  return "StarfieldBackground: "
         + to_string (pos.x) + ", "
         + to_string (pos.y) + ", "
         + to_string (pos.z);
 }
 
 
-EditorNS::PropertyFrame* 
+EditorNS::PropertyFrame*
 StarfieldBackgroundObj::get_gui_dialog(Editor* editor)
 {
-  GenericPropertyFrame* propframe 
+  GenericPropertyFrame* propframe
     = new GenericPropertyFrame("StarfieldBackground", 
editor->get_property_window()->get_client_area());
 
   propframe->add_integer_box("Small Stars", &data->small_stars_count);

Index: starfield_background_obj.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/editorobjs/starfield_background_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background_obj.hxx        29 Nov 2002 22:54:23 -0000      1.6
+++ starfield_background_obj.hxx        19 Apr 2003 10:23:18 -0000      1.7
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -35,7 +35,7 @@
 private:
   WorldObjsData::StarfieldBackgroundData* const data;
   Vector pos;
-  
+
 public:
   StarfieldBackgroundObj (const WorldObjsData::StarfieldBackgroundData& data_);
  ~StarfieldBackgroundObj ();

Index: surface_background_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- surface_background_obj.cxx  30 Mar 2003 13:12:35 -0000      1.9
+++ surface_background_obj.cxx  19 Apr 2003 10:23:18 -0000      1.10
@@ -56,7 +56,7 @@
 std::string
 SurfaceBackgroundObj::status_line ()
 {
-  return "SurfaceBackground: " 
+  return "SurfaceBackground: "
          + to_string(data->pos.x) + ", "
          + to_string(data->pos.y) + ", "
          + to_string(data->pos.z);
@@ -65,7 +65,7 @@
 EditorNS::PropertyFrame*
 SurfaceBackgroundObj::get_gui_dialog(EditorNS::Editor* editor)
 {
-  GenericPropertyFrame* propframe 
+  GenericPropertyFrame* propframe
     = new GenericPropertyFrame("SurfaceBackground", 
editor->get_property_window()->get_client_area());
 
   propframe->add_float_box("Parallax-X", &data->para_x);

Index: surface_background_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/surface_background_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_background_obj.hxx  30 Nov 2002 15:06:32 -0000      1.6
+++ surface_background_obj.hxx  19 Apr 2003 10:23:18 -0000      1.7
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -32,11 +32,11 @@
 {
 private:
   WorldObjsData::SurfaceBackgroundData* const data;
-  
+
 public:
   SurfaceBackgroundObj (const WorldObjsData::SurfaceBackgroundData& data_);
  ~SurfaceBackgroundObj ();
- 
+
   void write_xml (std::ostream& xml);
 
   EditorObj* duplicate ();

Index: switch_door_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- switch_door_obj.cxx 30 Mar 2003 13:12:35 -0000      1.7
+++ switch_door_obj.cxx 19 Apr 2003 10:23:18 -0000      1.8
@@ -24,7 +24,7 @@
 #include "../pingus_resource.hxx"
 #include "../worldobjsdata/switch_door_data.hxx"
 
-namespace EditorObjs { 
+namespace EditorObjs {
 
 SwitchDoorObj::SwitchDoorObj (const WorldObjsData::SwitchDoorData& data_)
   : data(new WorldObjsData::SwitchDoorData(data_)),
@@ -84,11 +84,11 @@
   data->write_xml(xml);
 }
 
-std::string 
+std::string
 SwitchDoorObj::status_line()
 {
   char str[128];
-  snprintf(str, 128, "SwitchDoor - (%f %f %f)", 
+  snprintf(str, 128, "SwitchDoor - (%f %f %f)",
          data->door_pos.x, data->door_pos.y, data->door_pos.z);
   return str;
 }
@@ -98,15 +98,15 @@
 {
   view->draw_line(data->door_pos, data->switch_pos, 1.0, 0.0, 0.0);
 
-  view->draw(door_box, 
+  view->draw(door_box,
              static_cast<int>(data->door_pos.x),
             static_cast<int>(data->door_pos.y));
 
   for (int i = 0; i < data->door_height; ++i)
     {
-      view->draw(door_tile, 
-                static_cast<int>(data->door_pos.x), 
-                static_cast<int>(data->door_pos.y 
+      view->draw(door_tile,
+                static_cast<int>(data->door_pos.x),
+                static_cast<int>(data->door_pos.y
                                  + (i * door_tile.get_height())
                                  + door_box.get_height()));
     }
@@ -118,7 +118,7 @@
   data->door_height += 1;
 }
 
-void 
+void
 SwitchDoorObj::make_smaller ()
 {
   if (data->door_height > 1)
@@ -137,7 +137,7 @@
   return data->door_pos;
 }
 
-void 
+void
 SwitchDoorObj::set_position_offset (const Vector& offset)
 {
   data->door_pos += offset;

Index: switch_door_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_obj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- switch_door_obj.hxx 28 Nov 2002 20:09:54 -0000      1.7
+++ switch_door_obj.hxx 19 Apr 2003 10:23:18 -0000      1.8
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -37,13 +37,13 @@
   CL_Surface door_tile;
   CL_Surface door_tile_cmap;
   CL_Surface switch_sur;
- 
+
 public:
   friend class SwitchDoorSwitchObj;
-  
+
   SwitchDoorObj (const WorldObjsData::SwitchDoorData& data_);
  ~SwitchDoorObj ();
-  
+
   /** Create this object (and child objects) with reasonable defaults
       for the editor */
   static EditorObjLst create (const Vector& pos);

Index: switch_door_switch_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_switch_obj.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- switch_door_switch_obj.cxx  28 Sep 2002 11:52:25 -0000      1.2
+++ switch_door_switch_obj.cxx  19 Apr 2003 10:23:18 -0000      1.3
@@ -20,7 +20,7 @@
 #include "switch_door_obj.hxx"
 #include "../worldobjsdata/switch_door_data.hxx"
 
-namespace EditorObjs { 
+namespace EditorObjs {
 
 SwitchDoorSwitchObj::SwitchDoorSwitchObj (SwitchDoorObj* data)
                                         : SpriteEditorObj 
("switchdoor_switch", "worldobjs"),
@@ -29,7 +29,7 @@
   pos_ref = &door->data->switch_pos;
 }
 
-std::string 
+std::string
 SwitchDoorSwitchObj::status_line ()
 {
   return "--- SwitchDoorSwitchObj ---";
@@ -37,8 +37,8 @@
 
 EditorObj*
 SwitchDoorSwitchObj::duplicate ()
-{ 
-  return door->duplicate (); 
+{
+  return door->duplicate ();
 }
 
 } // namespace EditorObjs

Index: switch_door_switch_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/switch_door_switch_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- switch_door_switch_obj.hxx  28 Nov 2002 20:09:54 -0000      1.4
+++ switch_door_switch_obj.hxx  19 Apr 2003 10:23:18 -0000      1.5
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -32,16 +32,16 @@
 {
 private:
   SwitchDoorObj* door;
-  
+
 public:
   SwitchDoorSwitchObj (SwitchDoorObj* data);
-   
+
   EditorObj* duplicate ();
 
   void write_xml (std::ostream&) {}
   std::string status_line ();
 
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   SwitchDoorSwitchObj (const SwitchDoorSwitchObj&);
   SwitchDoorSwitchObj& operator= (const SwitchDoorSwitchObj&);

Index: teleporter_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_obj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- teleporter_obj.cxx  30 Mar 2003 13:12:35 -0000      1.9
+++ teleporter_obj.cxx  19 Apr 2003 10:23:18 -0000      1.10
@@ -65,9 +65,9 @@
 void
 TeleporterObj::draw (EditorNS::EditorView * view)
 {
-  view->draw_line (static_cast<int>(data->pos.x), 
+  view->draw_line (static_cast<int>(data->pos.x),
                   static_cast<int>(data->pos.y),
-                  static_cast<int>(data->target_pos.x), 
+                  static_cast<int>(data->target_pos.x),
                   static_cast<int>(data->target_pos.y),
                   0.0, 1.0, 0.0, 0.5);
   SpriteEditorObj::draw (view);

Index: teleporter_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_obj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- teleporter_obj.hxx  28 Nov 2002 20:09:54 -0000      1.9
+++ teleporter_obj.hxx  19 Apr 2003 10:23:18 -0000      1.10
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

Index: teleporter_target_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_target_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- teleporter_target_obj.cxx   12 Oct 2002 00:49:10 -0000      1.6
+++ teleporter_target_obj.cxx   19 Apr 2003 10:23:18 -0000      1.7
@@ -25,7 +25,7 @@
 namespace EditorObjs {
 
 TeleporterTargetObj::TeleporterTargetObj (TeleporterObj* arg_teleporter)
-  : SpriteEditorObj ("teleporter2", 
+  : SpriteEditorObj ("teleporter2",
                     "worldobjs",
                     &arg_teleporter->get_target_pos_ref()),
     teleporter(arg_teleporter)
@@ -33,7 +33,7 @@
   sprite.set_align_center();
 }
 
-EditorObj* 
+EditorObj*
 TeleporterTargetObj::duplicate ()
 {
   return teleporter->duplicate();

Index: teleporter_target_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editorobjs/teleporter_target_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- teleporter_target_obj.hxx   28 Nov 2002 20:09:54 -0000      1.4
+++ teleporter_target_obj.hxx   19 Apr 2003 10:23:18 -0000      1.5
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

Index: thunderstorm_background_obj.hxx
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/src/editorobjs/thunderstorm_background_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thunderstorm_background_obj.hxx     28 Nov 2002 20:09:54 -0000      1.4
+++ thunderstorm_background_obj.hxx     19 Apr 2003 10:23:18 -0000      1.5
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -32,17 +32,17 @@
 {
 private:
   WorldObjsData::ThunderstormBackgroundData* const data;
-  
+
 public:
   ThunderstormBackgroundObj (const WorldObjsData::ThunderstormBackgroundData& 
data_);
  ~ThunderstormBackgroundObj ();
- 
+
   void write_xml (std::ostream& xml);
-  
+
   EditorObj* duplicate ();
-  
+
   std::string status_line ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   ThunderstormBackgroundObj (const ThunderstormBackgroundObj&);
   ThunderstormBackgroundObj& operator= (const ThunderstormBackgroundObj&);
[Prev in Thread]
Current Thread
[Next in Thread]
[Pingus-CVS] CVS: Games/Pingus/src/editorobjs bumper_obj.cxx,1.9,1.10 bumper_obj.hxx,1.9,1.10 conveyor_belt_obj.cxx,1.7,1.8 conveyor_belt_obj.hxx,1.7,1.8 entrance_obj.cxx,1.7,1.8 entrance_obj.hxx,1.3,1.4 exit_obj.cxx,1.1,1.2 exit_obj.hxx,1.2,1.3 fake_exit_obj.cxx,1.10,1.11 fake_exit_obj.hxx,1.10,1.11 groundpiece_obj.cxx,1.14,1.15 groundpiece_obj.hxx,1.4,1.5 guillotine_obj.cxx,1.9,1.10 guillotine_obj.hxx,1.9,1.10 hammer_obj.cxx,1.10,1.11 hammer_obj.hxx,1.9,1.10 hotspot_obj.cxx,1.2,1.3 hotspot_obj.hxx,1.5,1.6 ice_block_obj.cxx,1.6,1.7 ice_block_obj.hxx,1.5,1.6 info_box_obj.cxx,1.4,1.5 info_box_obj.hxx,1.6,1.7 laser_exit_obj.cxx,1.10,1.11 laser_exit_obj.hxx,1.9,1.10 liquid_obj.cxx,1.5,1.6 liquid_obj.hxx,1.5,1.6 prefab_obj.hxx,1.3,1.4 smasher_obj.cxx,1.8,1.9 smasher_obj.hxx,1.10,1.11 solid_color_background_obj.cxx,1.6,1.7 solid_color_background_obj.hxx,1.6,1.7 spike_obj.cxx,1.10,1.11 spike_obj.hxx,1.10,1.11 starfield_background_obj.cxx,1.5,1.6 starfield_background_obj.hxx,1.6,1.7surface_background_obj.cxx,1.9,1.10 surface_background_obj.hxx,1.6,1.7 switch_door_obj.cxx,1.7,1.8 switch_door_obj.hxx,1.7,1.8 switch_door_switch_obj.cxx,1.2,1.3 switch_door_switch_obj.hxx,1.4,1.5 teleporter_obj.cxx,1.9,1.10 teleporter_obj.hxx,1.9,1.10 teleporter_target_obj.cxx,1.6,1.7 teleporter_target_obj.hxx,1.4,1.5thunderstorm_background_obj.hxx,1.4,1.5, torangan <=