[Pingus-CVS] CVS: Games/Pingus/src menu_button.cxx, 1.14, 1.15 sprite.cxx, 1.18, 1.19 sprite.hxx, 1.14, 1.15

[Ingo Ruhnke]

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

Modified Files:
        menu_button.cxx sprite.cxx sprite.hxx 
Log Message:
- removed a few unnedded constructors from Sprite

Index: menu_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- menu_button.cxx     21 Oct 2003 11:01:52 -0000      1.14
+++ menu_button.cxx     22 Oct 2003 12:35:47 -0000      1.15
@@ -381,8 +381,10 @@
 {
   Sound::PingusSound::play_sound ("letsgo");
 
+#ifdef CLANLIB_0_6
   ThemeSelector theme_selector;
   theme_selector.display();
+#endif
 }
 
 #if 0

Index: sprite.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sprite.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sprite.cxx  22 Oct 2003 11:11:22 -0000      1.18
+++ sprite.cxx  22 Oct 2003 12:35:47 -0000      1.19
@@ -32,36 +32,6 @@
 {
 }
 
-Sprite::Sprite (const Sprite& sprite) 
-  : sprite(sprite.sprite),
-    frame (sprite.frame),
-    frames_per_second (sprite.frames_per_second),
-    direction (sprite.direction),
-    looptype (sprite.looptype),
-    is_finished (sprite.is_finished),
-    x_align (sprite.x_align),
-    y_align (sprite.y_align)
-{
-}
-
-Sprite&
-Sprite::operator= (const Sprite& arg_sprite)
-{
-  if (this == &arg_sprite)
-    return *this;
-
-  sprite            = arg_sprite.sprite;
-  frame             = arg_sprite.frame;
-  frames_per_second = arg_sprite.frames_per_second;
-  direction         = arg_sprite.direction;
-  looptype          = arg_sprite.looptype;
-  is_finished       = arg_sprite.is_finished;
-  x_align           = arg_sprite.x_align;
-  y_align           = arg_sprite.y_align;
-
-  return *this;
-}
-
 Sprite::Sprite (std::string arg_sprite_name,
                std::string arg_datafile,
                float arg_frames_per_second,
@@ -77,34 +47,6 @@
 {
 }
 
-Sprite::Sprite (const CL_Sprite& arg_sprite,
-               float arg_frames_per_second,
-               Sprite::Direction dir,
-               LoopType arg_loop_type)
-  : frame (0.0f),
-    frames_per_second (arg_frames_per_second),
-    direction (dir),
-    looptype (arg_loop_type),
-    is_finished (false),
-    x_align (0), y_align (0)
-{
-  sprite = arg_sprite;
-}
-
-Sprite::Sprite (const ResDescriptor& desc,
-               float arg_frames_per_second,
-               Sprite::Direction dir,
-               LoopType arg_loop_type)
-  : frame (0.0f),
-    frames_per_second (arg_frames_per_second),
-    direction (dir),
-    looptype (arg_loop_type),
-    is_finished (false),
-    x_align (0), y_align (0)
-{
-  sprite = PingusResource::load_sprite(desc);
-}
-
 void
 Sprite::draw (int x, int y)
 {
@@ -321,6 +263,18 @@
   frame = n;
 }
 
+int
+Sprite::get_width ()
+{
+  return sprite.get_width();
+}
+
+int
+Sprite::get_height ()
+{
+  return sprite.get_height();
+}
+
 } // namespace Pingus
 
 /* EOF */

Index: sprite.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sprite.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sprite.hxx  22 Oct 2003 11:11:22 -0000      1.14
+++ sprite.hxx  22 Oct 2003 12:35:47 -0000      1.15
@@ -52,28 +52,12 @@
   /// Creates an empty sprite, drawing and updating does nothing
   Sprite ();
 
-  /// Copy a sprite
-  Sprite (const Sprite& sprite);
-
-  /// Copy a sprite
-  Sprite& operator= (const Sprite& sprite);
-
   Sprite (std::string arg_sur_name,
          std::string arg_datafile,
          float arg_frames_per_second = 10.0f,
          Direction dir = NONE,
          LoopType arg_loop_type = ENDLESS);
 
-  Sprite (const CL_Sprite& sur,
-         float frames_per_second = 10.0f,
-         Direction dir = NONE,
-         LoopType arg_loop_type = ENDLESS);
-
-  Sprite (const ResDescriptor&,
-         float frames_per_second = 10.0f,
-         Direction dir = NONE,
-         LoopType arg_loop_type = ENDLESS);
-
   /** High level version of draw (), it handles the frame count
       and the aligment, might be used when you don't have a Vector
       at hand. */