[Pingus-CVS] r3704 - in trunk/pingus/src: . components display editor gui particles worldmap worldobjs

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-07 08:41:36 +0200 (Mon, 07 Jul 2008)
New Revision: 3704

Modified:
   trunk/pingus/src/capture_rectangle.cpp
   trunk/pingus/src/components/action_button.cpp
   trunk/pingus/src/components/pingus_counter.cpp
   trunk/pingus/src/components/time_display.cpp
   trunk/pingus/src/demo_session.cpp
   trunk/pingus/src/display/cursor.cpp
   trunk/pingus/src/editor/combobox.cpp
   trunk/pingus/src/editor/panel.cpp
   trunk/pingus/src/gui/checkbox.cpp
   trunk/pingus/src/particles/pingu_particle_holder.cpp
   trunk/pingus/src/particles/rain_particle_holder.cpp
   trunk/pingus/src/particles/smoke_particle_holder.cpp
   trunk/pingus/src/particles/snow_particle_holder.cpp
   trunk/pingus/src/pingus_menu_manager.cpp
   trunk/pingus/src/worldmap/level_dot.cpp
   trunk/pingus/src/worldmap/pingus.cpp
   trunk/pingus/src/worldmap/worldmap_screen.cpp
   trunk/pingus/src/worldobjs/entrance.cpp
   trunk/pingus/src/worldobjs/exit.cpp
   trunk/pingus/src/worldobjs/fake_exit.cpp
   trunk/pingus/src/worldobjs/guillotine.cpp
   trunk/pingus/src/worldobjs/hammer.cpp
   trunk/pingus/src/worldobjs/ice_block.cpp
   trunk/pingus/src/worldobjs/info_box.cpp
   trunk/pingus/src/worldobjs/smasher.cpp
   trunk/pingus/src/worldobjs/spike.cpp
   trunk/pingus/src/worldobjs/switch_door.cpp
   trunk/pingus/src/worldobjs/teleporter.cpp
   trunk/pingus/src/worldobjs/teleporter_target.cpp
   trunk/pingus/src/worldobjs/thunderstorm_background.cpp
Log:
Remove some unneeded Sprite() constructor calls

Modified: trunk/pingus/src/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/capture_rectangle.cpp      2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/capture_rectangle.cpp      2008-07-07 06:41:36 UTC (rev 
3704)
@@ -30,10 +30,10 @@
   : session(session_),
     pingu(0),
     owner_id(0),
-    good(Sprite("game/cursors/capgood")),
-    bad(Sprite("game/cursors/capbad")),
-    arrow_left(Sprite("game/cursors/arrow_left")),
-    arrow_right(Sprite("game/cursors/arrow_right")),
+    good("game/cursors/capgood"),
+    bad("game/cursors/capbad"),
+    arrow_left("game/cursors/arrow_left"),
+    arrow_right("game/cursors/arrow_right"),
     font(Fonts::courier_small)
 {
 }

Modified: trunk/pingus/src/components/action_button.cpp
===================================================================
--- trunk/pingus/src/components/action_button.cpp       2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/components/action_button.cpp       2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -32,8 +32,8 @@
                            int x, int y, ActionName name_, int owner_id)
   : RectComponent(Rect(Vector2i(x, y), Size(60, 38))),
     action_holder(h),
-    background (Sprite("core/buttons/buttonbackground")),
-    backgroundhl (Sprite("core/buttons/buttonbackgroundhl")),
+    background("core/buttons/buttonbackground"),
+    backgroundhl("core/buttons/buttonbackgroundhl"),
     name(name_)
 {
   sprite = Sprite("pingus/player0/" + action_to_string(name) + "/right");
@@ -149,8 +149,8 @@
 ForwardButton::ForwardButton(GameSession* s, int x, int y)
   : RectComponent(Rect(Vector2i(x, y), Size(38, 60))),
     session(s),
-    background  (Sprite("core/buttons/hbuttonbgb")),
-    backgroundhl(Sprite("core/buttons/hbuttonbg"))
+    background ("core/buttons/hbuttonbgb"),
+    backgroundhl("core/buttons/hbuttonbg")
 {
   surface = Sprite("core/buttons/fast_forward");
 }
@@ -187,8 +187,8 @@
 PauseButton::PauseButton(GameSession* s, int x, int y)
   : RectComponent(Rect(Vector2i(x, y), Size(38, 60))),
     session(s),
-    background  (Sprite("core/buttons/hbuttonbgb")),
-    backgroundhl(Sprite("core/buttons/hbuttonbg"))
+    background ("core/buttons/hbuttonbgb"),
+    backgroundhl("core/buttons/hbuttonbg")
 {
   surface = Sprite("core/buttons/pause");
 }

Modified: trunk/pingus/src/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp      2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/components/pingus_counter.cpp      2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -28,7 +28,7 @@
 
 PingusCounter::PingusCounter(Server* s)
   : server(s),
-    background(Sprite("core/buttons/info"))
+    background("core/buttons/info")
 {
   font = Fonts::pingus_small_fixnum;
 }

Modified: trunk/pingus/src/components/time_display.cpp
===================================================================
--- trunk/pingus/src/components/time_display.cpp        2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/components/time_display.cpp        2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -31,7 +31,7 @@
 
 TimeDisplay::TimeDisplay (GameSession* c)
   : server(c->get_server()),
-    infinity_symbol(Sprite("core/misc/infinity"))
+    infinity_symbol("core/misc/infinity")
 {
   font = Fonts::pingus_small_fixnum;
 }

Modified: trunk/pingus/src/demo_session.cpp
===================================================================
--- trunk/pingus/src/demo_session.cpp   2008-07-07 06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/demo_session.cpp   2008-07-07 06:41:36 UTC (rev 3704)
@@ -48,7 +48,7 @@
           boost::function<void (void)> callback_,
           boost::function<bool(void)> highlight_func_ = &false_func)
     : SurfaceButton(x, y, name, name + "-pressed", name + "-hover"),
-      highlight(Sprite("core/demo/highlight")),
+      highlight("core/demo/highlight"),
       callback(callback_),
       highlight_func(highlight_func_)
   {}

Modified: trunk/pingus/src/display/cursor.cpp
===================================================================
--- trunk/pingus/src/display/cursor.cpp 2008-07-07 06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/display/cursor.cpp 2008-07-07 06:41:36 UTC (rev 3704)
@@ -20,7 +20,7 @@
 #include "cursor.hpp"
 
 Cursor::Cursor(const std::string& ident)
-  : sprite(Sprite(ident))
+  : sprite(ident)
 {
 }
 

Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp        2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/editor/combobox.cpp        2008-07-07 06:41:36 UTC (rev 
3704)
@@ -27,7 +27,7 @@
 
 Combobox::Combobox(const Rect& rect)
   : RectComponent(rect),
-    sprite(Sprite("core/editor/combobox")),
+    sprite("core/editor/combobox"),
     current_item(-1),
     drop_down(false)
 {

Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp   2008-07-07 06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/editor/panel.cpp   2008-07-07 06:41:36 UTC (rev 3704)
@@ -35,7 +35,7 @@
 
 public:
   PanelSeparator(const Vector2i& pos_)
-    : sprite(Sprite("core/editor/separator")),
+    : sprite("core/editor/separator"),
       pos(pos_)
   {
   }
@@ -69,9 +69,9 @@
               const Vector2i& pos_, const std::string& name, const 
std::string& tooltip_, 
               Callback callback_ = 0)
     : editor(editor_),
-      button_raised(Sprite("core/editor/button-raised")),
-      button_pressed(Sprite("core/editor/button-pressed")),
-      sprite(Sprite(name)),
+      button_raised("core/editor/button-raised"),
+      button_pressed("core/editor/button-pressed"),
+      sprite(name),
       mouse_over(false),
       mouse_down(false),
       pos(pos_),
@@ -142,7 +142,7 @@
 
 Panel::Panel(EditorScreen* editor_)
   : editor(editor_),
-    logo(Sprite("core/editor/logo")),
+    logo("core/editor/logo"),
     pos(2,2)
 {  
   editor->get_gui_manager()->add(this, true);

Modified: trunk/pingus/src/gui/checkbox.cpp
===================================================================
--- trunk/pingus/src/gui/checkbox.cpp   2008-07-07 06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/gui/checkbox.cpp   2008-07-07 06:41:36 UTC (rev 3704)
@@ -25,7 +25,7 @@
 namespace GUI {
        
 Checkbox::Checkbox(Vector2i p, std::string label_, CheckboxListener* l) :
-       checkmark(Sprite("core/misc/checkbox_clicked")),
+       checkmark("core/misc/checkbox_clicked"),
        is_checked(false),
        pos(p),
        width(20),

Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp        2008-07-07 
06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp        2008-07-07 
06:41:36 UTC (rev 3704)
@@ -36,7 +36,7 @@
 
 
 PinguParticleHolder::PinguParticleHolder ()
-  : surface(Sprite("particles/pingu_explo"))
+  : surface("particles/pingu_explo")
 {
 }
 

Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -33,9 +33,9 @@
 
 
 RainParticleHolder::RainParticleHolder ()
-  : rain1_surf (Sprite("particles/rain1")),
-    rain2_surf (Sprite("particles/rain2")),
-    rain_splash(Sprite("particles/rain_splash"))
+  : rain1_surf("particles/rain1"),
+    rain2_surf("particles/rain2"),
+    rain_splash("particles/rain_splash")
 {
 }
 

Modified: trunk/pingus/src/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.cpp        2008-07-07 
06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/particles/smoke_particle_holder.cpp        2008-07-07 
06:41:36 UTC (rev 3704)
@@ -30,8 +30,8 @@
 
 
 SmokeParticleHolder::SmokeParticleHolder ()
-  : surf1(Sprite("particles/smoke")),
-    surf2(Sprite("particles/smoke2"))
+  : surf1("particles/smoke"),
+    surf2("particles/smoke2")
 {
 }
 

Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -54,11 +54,11 @@
 
 
 SnowParticleHolder::SnowParticleHolder ()
-  : snow1 (Sprite("particles/snow1")),
-    snow2 (Sprite("particles/snow2")),
-    snow3 (Sprite("particles/snow3")),
-    snow4 (Sprite("particles/snow4")),
-    snow5 (Sprite("particles/snow5")),
+  : snow1("particles/snow1"),
+    snow2("particles/snow2"),
+    snow3("particles/snow3"),
+    snow4("particles/snow4"),
+    snow5("particles/snow5"),
     ground(Resource::load_collision_mask("particles/ground_snow"))
 {
 }

Modified: trunk/pingus/src/pingus_menu_manager.cpp
===================================================================
--- trunk/pingus/src/pingus_menu_manager.cpp    2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/pingus_menu_manager.cpp    2008-07-07 06:41:36 UTC (rev 
3704)
@@ -29,32 +29,32 @@
   : mainmenu (this),
     exitmenu (this)
 {
-       int w = Display::get_width();
-       int h = Display::get_height();
-       // We only need to scale the background main menu images if the screen 
-       // resolution is not default
-       if (w != default_screen_width && h != default_screen_height)
-       {
-               background.add_layer (Blitter::scale_surface_to_canvas(
-                       Resource::load_surface("core/menu/layer1"), w, 185 * h 
/ default_screen_height), 0, 0, 12, 0);
-               background.add_layer (Blitter::scale_surface_to_canvas(
-                       Resource::load_surface("core/menu/layer2"), w, 362 * h 
/ default_screen_height), 0, 150 * (float)h / default_screen_height, 25, 0);
-               background.add_layer (Blitter::scale_surface_to_canvas(
-                       Resource::load_surface("core/menu/layer3"), w, 306 * h 
/ default_screen_height), 0, 200 * (float)h / default_screen_height, 50, 0);
-               background.add_layer (Blitter::scale_surface_to_canvas(
-                       Resource::load_surface("core/menu/layer4"), w, 171 * h 
/ default_screen_height), 0, 429 * (float)h / default_screen_height, 100, 0);
-               background.add_layer (Blitter::scale_surface_to_canvas(
-                       Resource::load_surface("core/menu/layer5"), 302 * w / 
default_screen_width, 104 * h / default_screen_height), 0, 500 * (float)h / 
default_screen_height, 200, 0);
-       }
-       else
-       {
-               background.add_layer(Sprite("core/menu/layer1"), 0, 0, 12, 0);
-               background.add_layer(Sprite("core/menu/layer2"), 0, 150, 25, 0);
-               background.add_layer(Sprite("core/menu/layer3"), 0, 200, 50, 0);
-               background.add_layer(Sprite("core/menu/layer4"), 0, 429, 100, 
0);
-               background.add_layer(Sprite("core/menu/layer5"), 0, 500, 200, 
0);
-       }
-       push_menu (&mainmenu);
+  int w = Display::get_width();
+  int h = Display::get_height();
+  // We only need to scale the background main menu images if the screen 
+  // resolution is not default
+  if (w != default_screen_width && h != default_screen_height)
+    {
+      background.add_layer (Blitter::scale_surface_to_canvas(
+                                                             
Resource::load_surface("core/menu/layer1"), w, 185 * h / 
default_screen_height), 0, 0, 12, 0);
+      background.add_layer (Blitter::scale_surface_to_canvas(
+                                                             
Resource::load_surface("core/menu/layer2"), w, 362 * h / 
default_screen_height), 0, 150 * (float)h / default_screen_height, 25, 0);
+      background.add_layer (Blitter::scale_surface_to_canvas(
+                                                             
Resource::load_surface("core/menu/layer3"), w, 306 * h / 
default_screen_height), 0, 200 * (float)h / default_screen_height, 50, 0);
+      background.add_layer (Blitter::scale_surface_to_canvas(
+                                                             
Resource::load_surface("core/menu/layer4"), w, 171 * h / 
default_screen_height), 0, 429 * (float)h / default_screen_height, 100, 0);
+      background.add_layer (Blitter::scale_surface_to_canvas(
+                                                             
Resource::load_surface("core/menu/layer5"), 302 * w / default_screen_width, 104 
* h / default_screen_height), 0, 500 * (float)h / default_screen_height, 200, 
0);
+    }
+  else
+    {
+      background.add_layer(Sprite("core/menu/layer1"), 0, 0, 12, 0);
+      background.add_layer(Sprite("core/menu/layer2"), 0, 150, 25, 0);
+      background.add_layer(Sprite("core/menu/layer3"), 0, 200, 50, 0);
+      background.add_layer(Sprite("core/menu/layer4"), 0, 429, 100, 0);
+      background.add_layer(Sprite("core/menu/layer5"), 0, 500, 200, 0);
+    }
+  push_menu (&mainmenu);
 }
 
 PingusMenuManager::~PingusMenuManager ()

Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp     2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldmap/level_dot.cpp     2008-07-07 06:41:36 UTC (rev 
3704)
@@ -36,11 +36,11 @@
 
 LevelDot::LevelDot(FileReader reader)
   : Dot(reader.read_section("dot")),
-    green_dot_sur(Sprite("core/worldmap/dot_green")),
-    red_dot_sur(Sprite("core/worldmap/dot_red")),
-    inaccessible_dot_sur(Sprite("core/worldmap/dot_invalid")),
-    highlight_green_dot_sur(Sprite("core/worldmap/dot_green_hl")),
-    highlight_red_dot_sur(Sprite("core/worldmap/dot_red_hl"))
+    green_dot_sur("core/worldmap/dot_green"),
+    red_dot_sur("core/worldmap/dot_red"),
+    inaccessible_dot_sur("core/worldmap/dot_invalid"),
+    highlight_green_dot_sur("core/worldmap/dot_green_hl"),
+    highlight_red_dot_sur("core/worldmap/dot_red_hl")
 {
   std::string resname;
   reader.read_string("levelname", resname); 

Modified: trunk/pingus/src/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp        2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldmap/pingus.cpp        2008-07-07 06:41:36 UTC (rev 
3704)
@@ -29,8 +29,8 @@
 Pingus::Pingus (PathGraph* arg_path)
   : Drawable("pingus"),
     path(arg_path),
-    sprite_standing (Sprite("core/worldmap/pingus_standing")),
-    arrow (Sprite("core/worldmap/arrow"))
+    sprite_standing("core/worldmap/pingus_standing"),
+    arrow("core/worldmap/arrow")
 {
   sprite.load(Direction::LEFT,  Sprite("core/worldmap/pingus/left"));
   sprite.load(Direction::RIGHT, Sprite("core/worldmap/pingus/right"));

Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp       2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -211,7 +211,7 @@
 }
 
 WorldmapScreen::WorldmapScreen()
-  : levelname_bg(Sprite("core/worldmap/levelname_bg")),
+  : levelname_bg("core/worldmap/levelname_bg"),
     is_init(false),
     exit_worldmap(false)
 {

Modified: trunk/pingus/src/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp     2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/entrance.cpp     2008-07-07 06:41:36 UTC (rev 
3704)
@@ -31,7 +31,7 @@
     release_rate(150),
     owner_id(0),
     type("generic"),
-    smallmap_symbol(Sprite("core/misc/smallmap_entrance"))
+    smallmap_symbol("core/misc/smallmap_entrance")
 {
   reader.read_string("type",         type);
   reader.read_int   ("owner-id",     owner_id);

Modified: trunk/pingus/src/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2008-07-07 06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/worldobjs/exit.cpp 2008-07-07 06:41:36 UTC (rev 3704)
@@ -29,7 +29,7 @@
 namespace WorldObjs {
 
 Exit::Exit(const FileReader& reader)
-  : smallmap_symbol(Sprite("core/misc/smallmap_exit"))
+  : smallmap_symbol("core/misc/smallmap_exit")
 {
   reader.read_vector("position", pos);
   reader.read_desc  ("surface",  desc);

Modified: trunk/pingus/src/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp    2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/fake_exit.cpp    2008-07-07 06:41:36 UTC (rev 
3704)
@@ -25,8 +25,8 @@
 namespace WorldObjs {
 
 FakeExit::FakeExit(const FileReader& reader)
-  : surface(Sprite("traps/fake_exit")),
-    smallmap_symbol(Sprite("core/misc/smallmap_exit")),
+  : surface("traps/fake_exit"),
+    smallmap_symbol("core/misc/smallmap_exit"),
     smashing(false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.cpp   2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/guillotine.cpp   2008-07-07 06:41:36 UTC (rev 
3704)
@@ -24,9 +24,9 @@
 namespace WorldObjs {
 
 Guillotine::Guillotine(const FileReader& reader)
-  : sprite_kill_right (Sprite("traps/guillotinekill/right")),
-    sprite_kill_left (Sprite("traps/guillotinekill/left")),
-    sprite_idle (Sprite("traps/guillotineidle")),
+  : sprite_kill_right("traps/guillotinekill/right"),
+    sprite_kill_left("traps/guillotinekill/left"),
+    sprite_idle("traps/guillotineidle"),
     killing(false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp       2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/hammer.cpp       2008-07-07 06:41:36 UTC (rev 
3704)
@@ -24,7 +24,7 @@
 namespace WorldObjs {
 
 Hammer::Hammer(const FileReader& reader)
-  : sprite(Sprite("traps/hammer"))
+  : sprite("traps/hammer")
 {
   reader.read_vector("position", pos);
 }

Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-07 06:41:36 UTC (rev 
3704)
@@ -29,7 +29,7 @@
   : thickness(1.0),
     is_finished(false),
     last_contact(0),
-    block_sur(Sprite("worldobjs/iceblock")),
+    block_sur("worldobjs/iceblock"),
     block_sur_cmap(Resource::load_collision_mask("worldobjs/iceblock"))
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/info_box.cpp
===================================================================
--- trunk/pingus/src/worldobjs/info_box.cpp     2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/info_box.cpp     2008-07-07 06:41:36 UTC (rev 
3704)
@@ -25,7 +25,7 @@
 namespace WorldObjs {
 
 InfoBox::InfoBox(const FileReader& reader)
-  : sprite(Sprite("worldobjs/infobox")),
+  : sprite("worldobjs/infobox"),
     is_open (false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp      2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/smasher.cpp      2008-07-07 06:41:36 UTC (rev 
3704)
@@ -29,7 +29,7 @@
 namespace WorldObjs {
 
 Smasher::Smasher(const FileReader& reader)
-  : surface(Sprite("traps/smasher")),
+  : surface("traps/smasher"),
     smashing(false),
     downwards(false),
     count(0)

Modified: trunk/pingus/src/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp        2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/spike.cpp        2008-07-07 06:41:36 UTC (rev 
3704)
@@ -24,7 +24,7 @@
 namespace WorldObjs {
 
 Spike::Spike (const FileReader& reader)
-  : surface(Sprite("traps/spike")),
+  : surface("traps/spike"),
     killing(false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-07 06:41:36 UTC (rev 
3704)
@@ -25,11 +25,11 @@
 namespace WorldObjs {
 
 SwitchDoor::SwitchDoor(const FileReader& reader)
-  : door_box      (Sprite("worldobjs/switchdoor_box")),
+  : door_box     ("worldobjs/switchdoor_box"),
     door_box_cmap (Resource::load_collision_mask("worldobjs/switchdoor_box")),
-    door_tile     (Sprite("worldobjs/switchdoor_tile")),
+    door_tile    ("worldobjs/switchdoor_tile"),
     
door_tile_cmap(Resource::load_collision_mask("worldobjs/switchdoor_tile_cmap")),
-    switch_sur    (Sprite("worldobjs/switchdoor_switch")),
+    switch_sur   ("worldobjs/switchdoor_switch"),
     is_opening(false)
 {
   FileReader subreader;

Modified: trunk/pingus/src/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp   2008-07-07 06:35:38 UTC (rev 
3703)
+++ trunk/pingus/src/worldobjs/teleporter.cpp   2008-07-07 06:41:36 UTC (rev 
3704)
@@ -26,7 +26,7 @@
 namespace WorldObjs {
 
 Teleporter::Teleporter(const FileReader& reader)
-  : sprite(Sprite("worldobjs/teleporter"))
+  : sprite("worldobjs/teleporter")
 {
   reader.read_vector("position", pos);
   reader.read_string("target-id", target_id);

Modified: trunk/pingus/src/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.cpp    2008-07-07 06:35:38 UTC 
(rev 3703)
+++ trunk/pingus/src/worldobjs/teleporter_target.cpp    2008-07-07 06:41:36 UTC 
(rev 3704)
@@ -26,7 +26,7 @@
 
 TeleporterTarget::TeleporterTarget(const FileReader& reader)
   : WorldObj(reader),
-    sprite(Sprite("worldobjs/teleportertarget"))
+    sprite("worldobjs/teleportertarget")
 {
   reader.read_vector("position", pos);
 }

Modified: trunk/pingus/src/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.cpp      2008-07-07 
06:35:38 UTC (rev 3703)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.cpp      2008-07-07 
06:41:36 UTC (rev 3704)
@@ -21,7 +21,7 @@
 namespace WorldObjs {
 
 ThunderstormBackground:: ThunderstormBackground(const FileReader& reader)
-  : clouds_sur(Sprite("textures/thunderstorm")),
+  : clouds_sur("textures/thunderstorm"),
     x_pos(0)
 {
   reader.read_vector("position", pos);