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

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-04 07:24:12 +0200 (Fri, 04 Jul 2008)
New Revision: 3658

Modified:
   trunk/pingus/src/actions/angel.cpp
   trunk/pingus/src/actions/angel.hpp
   trunk/pingus/src/actions/basher.cpp
   trunk/pingus/src/actions/boarder.cpp
   trunk/pingus/src/actions/bomber.cpp
   trunk/pingus/src/actions/bridger.cpp
   trunk/pingus/src/actions/climber.cpp
   trunk/pingus/src/actions/digger.cpp
   trunk/pingus/src/actions/drown.cpp
   trunk/pingus/src/actions/exiter.cpp
   trunk/pingus/src/actions/faller.cpp
   trunk/pingus/src/actions/floater.cpp
   trunk/pingus/src/actions/floater.hpp
   trunk/pingus/src/actions/jumper.cpp
   trunk/pingus/src/actions/laser_kill.cpp
   trunk/pingus/src/actions/miner.cpp
   trunk/pingus/src/actions/rocket_launcher.cpp
   trunk/pingus/src/actions/slider.cpp
   trunk/pingus/src/actions/smashed.cpp
   trunk/pingus/src/actions/splashed.cpp
   trunk/pingus/src/actions/superman.cpp
   trunk/pingus/src/actions/superman.hpp
   trunk/pingus/src/actions/teleported.cpp
   trunk/pingus/src/actions/waiter.cpp
   trunk/pingus/src/actions/waiter.hpp
   trunk/pingus/src/addon_menu.cpp
   trunk/pingus/src/capture_rectangle.cpp
   trunk/pingus/src/components/action_button.cpp
   trunk/pingus/src/components/menu_button.cpp
   trunk/pingus/src/components/pingus_counter.cpp
   trunk/pingus/src/components/time_display.cpp
   trunk/pingus/src/credits.cpp
   trunk/pingus/src/demo_session.cpp
   trunk/pingus/src/display/cursor.cpp
   trunk/pingus/src/editor/combobox.cpp
   trunk/pingus/src/editor/level_objs.cpp
   trunk/pingus/src/editor/object_selector.cpp
   trunk/pingus/src/editor/panel.cpp
   trunk/pingus/src/editor/panel_buttons.cpp
   trunk/pingus/src/exit_menu.cpp
   trunk/pingus/src/gui/checkbox.cpp
   trunk/pingus/src/gui/surface_button.cpp
   trunk/pingus/src/level_menu.cpp
   trunk/pingus/src/levelset.cpp
   trunk/pingus/src/option_menu.cpp
   trunk/pingus/src/particles/ground_particle.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.cpp
   trunk/pingus/src/pingus_menu_manager.cpp
   trunk/pingus/src/resource.cpp
   trunk/pingus/src/resource.hpp
   trunk/pingus/src/result_screen.cpp
   trunk/pingus/src/sprite.cpp
   trunk/pingus/src/sprite.hpp
   trunk/pingus/src/start_screen.cpp
   trunk/pingus/src/state_sprite.cpp
   trunk/pingus/src/story_screen.cpp
   trunk/pingus/src/worldmap/level_dot.cpp
   trunk/pingus/src/worldmap/manager.cpp
   trunk/pingus/src/worldmap/pingus.cpp
   trunk/pingus/src/worldmap/surface_drawable.cpp
   trunk/pingus/src/worldobjs/conveyor_belt.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/hotspot.cpp
   trunk/pingus/src/worldobjs/ice_block.cpp
   trunk/pingus/src/worldobjs/info_box.cpp
   trunk/pingus/src/worldobjs/liquid.cpp
   trunk/pingus/src/worldobjs/smasher.cpp
   trunk/pingus/src/worldobjs/spike.cpp
   trunk/pingus/src/worldobjs/starfield_background_stars.cpp
   trunk/pingus/src/worldobjs/surface_background.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
   trunk/pingus/src/worldobjs/woodthing.cpp
Log:
Moved resource handling inside the Sprite class to keep other code simpler

Modified: trunk/pingus/src/actions/angel.cpp
===================================================================
--- trunk/pingus/src/actions/angel.cpp  2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/angel.cpp  2008-07-04 05:24:12 UTC (rev 3658)
@@ -17,7 +17,6 @@
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../math.hpp"
-#include "../resource.hpp"
 #include "../globals.hpp"
 #include "angel.hpp"
 
@@ -27,7 +26,7 @@
   : PinguAction(p),
     counter(0.0),
     x_pos(pingu->get_x()),
-    sprite(Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/angel"))
+    sprite(Sprite("pingus/player" + pingu->get_owner_str() + "/angel"))
 {
 }
 

Modified: trunk/pingus/src/actions/angel.hpp
===================================================================
--- trunk/pingus/src/actions/angel.hpp  2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/angel.hpp  2008-07-04 05:24:12 UTC (rev 3658)
@@ -18,6 +18,7 @@
 #define HEADER_PINGUS_ACTIONS_ANGEL_HPP
 
 #include "../pingu_action.hpp"
+#include "../sprite.hpp"
 
 namespace Actions {
 

Modified: trunk/pingus/src/actions/basher.cpp
===================================================================
--- trunk/pingus/src/actions/basher.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/basher.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -20,7 +20,6 @@
 #include "../globals.hpp"
 #include "../display/scene_context.hpp"
 #include "../ground_map.hpp"
-#include "../resource.hpp"
 #include "../pingu.hpp"
 #include "../world.hpp"
 #include "../worldobj.hpp"
@@ -34,9 +33,9 @@
     basher_c(0),
     first_bash(true)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
     pingu->get_owner_str() + "/basher/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
     pingu->get_owner_str() + "/basher/right"));
 
   bash_radius_width = bash_radius.get_width();

Modified: trunk/pingus/src/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/actions/boarder.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/boarder.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -17,7 +17,6 @@
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
-#include "../resource.hpp"
 #include "boarder.hpp"
 
 namespace Actions {
@@ -27,9 +26,9 @@
     x_pos(pingu->get_x()),
     speed(0.0)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
     pingu->get_owner_str() + "/boarder/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
     pingu->get_owner_str() + "/boarder/right"));
 }
 

Modified: trunk/pingus/src/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/actions/bomber.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/bomber.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -22,7 +22,6 @@
 #include "../pingu_enums.hpp"
 #include "../ground_map.hpp"
 #include "../world.hpp"
-#include "../resource.hpp"
 #include "../particles/pingu_particle_holder.hpp"
 #include "../colliders/pingu_collider.hpp"
 #include "../movers/linear_mover.hpp"
@@ -37,7 +36,7 @@
     gfx_exploded(false),
     colmap_exploded(false),
     bomber_radius("other/bomber_radius_gfx", "other/bomber_radius"),
-    explo_surf(Resource::load_sprite("pingus/player" + pingu->get_owner_str() 
+ "/explo"))
+    explo_surf(Sprite("pingus/player" + pingu->get_owner_str() + "/explo"))
 {
   sprite.load(Direction::LEFT,  "pingus/player" + pingu->get_owner_str() + 
"/bomber/left");
   sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() + 
"/bomber/right");

Modified: trunk/pingus/src/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/actions/bridger.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/bridger.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -19,7 +19,6 @@
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "../ground_map.hpp"
-#include "../resource.hpp"
 #include "../sound/sound.hpp"
 #include "../world.hpp"
 #include "../worldobj.hpp"
@@ -38,15 +37,15 @@
     block_build(false),
     name(_("Bridger") + std::string(" (" + StringUtil::to_string(bricks) + 
")"))
 {
-  walk_sprite.load (Direction::LEFT,  Resource::load_sprite("pingus/player" + 
-                                                            
pingu->get_owner_str() + "/bridger_walk/left"));
-  walk_sprite.load (Direction::RIGHT, Resource::load_sprite("pingus/player" + 
-                                                            
pingu->get_owner_str() + "/bridger_walk/right"));
+  walk_sprite.load (Direction::LEFT,  Sprite("pingus/player" + 
+                                             pingu->get_owner_str() + 
"/bridger_walk/left"));
+  walk_sprite.load (Direction::RIGHT, Sprite("pingus/player" + 
+                                             pingu->get_owner_str() + 
"/bridger_walk/right"));
 
-  build_sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
-                                                             
pingu->get_owner_str() + "/bridger/left"));
-  build_sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
-                                                             
pingu->get_owner_str() + "/bridger/right"));
+  build_sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
+                                             pingu->get_owner_str() + 
"/bridger/left"));
+  build_sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
+                                             pingu->get_owner_str() + 
"/bridger/right"));
 }
 
 void
@@ -69,15 +68,15 @@
 
   switch (mode)
     {
-    case B_BUILDING:
-      gc.color().draw(build_sprite[pingu->direction], 
Vector3f(pingu->get_pos().x - (x_offset * pingu->direction),
-                                                             
pingu->get_pos().y + y_offset));
-      break;
+      case B_BUILDING:
+        gc.color().draw(build_sprite[pingu->direction], 
Vector3f(pingu->get_pos().x - (x_offset * pingu->direction),
+                                                                 
pingu->get_pos().y + y_offset));
+        break;
 
-    case B_WALKING:
-      gc.color().draw(walk_sprite[pingu->direction], 
Vector3f(pingu->get_pos().x - (x_offset * pingu->direction),
-                                                            pingu->get_pos().y 
+ y_offset));
-      break;
+      case B_WALKING:
+        gc.color().draw(walk_sprite[pingu->direction], 
Vector3f(pingu->get_pos().x - (x_offset * pingu->direction),
+                                                                
pingu->get_pos().y + y_offset));
+        break;
     }
 }
 
@@ -86,13 +85,13 @@
 {
   switch (mode)
     {
-    case B_BUILDING:
-      update_build ();
-      break;
+      case B_BUILDING:
+        update_build ();
+        break;
 
-    case B_WALKING:
-      update_walk ();
-      break;
+      case B_WALKING:
+        update_walk ();
+        break;
     }
 }
 

Modified: trunk/pingus/src/actions/climber.cpp
===================================================================
--- trunk/pingus/src/actions/climber.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/climber.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -16,7 +16,6 @@
 
 #include "../col_map.hpp"
 #include "../display/scene_context.hpp"
-#include "../resource.hpp"
 #include "../pingu.hpp"
 #include "climber.hpp"
 
@@ -25,9 +24,9 @@
 Climber::Climber (Pingu* p)
   : PinguAction(p)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
     pingu->get_owner_str() + "/climber/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
     pingu->get_owner_str() + "/climber/right"));
 }
 

Modified: trunk/pingus/src/actions/digger.cpp
===================================================================
--- trunk/pingus/src/actions/digger.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/digger.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -20,7 +20,6 @@
 #include "../ground_map.hpp"
 #include "../world.hpp"
 #include "../worldobj.hpp"
-#include "../resource.hpp"
 #include "../sound/sound.hpp"
 #include "../pingu.hpp"
 #include "digger.hpp"
@@ -32,7 +31,7 @@
     digger_radius("other/digger_radius_gfx", "other/digger_radius"),
     digger_c(0)
 {
-  sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/digger/left");
+  sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/digger/left");
 }
 
 void

Modified: trunk/pingus/src/actions/drown.cpp
===================================================================
--- trunk/pingus/src/actions/drown.cpp  2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/drown.cpp  2008-07-04 05:24:12 UTC (rev 3658)
@@ -17,7 +17,6 @@
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
-#include "../resource.hpp"
 #include "drown.hpp"
 
 namespace Actions {
@@ -25,9 +24,9 @@
 Drown::Drown (Pingu* p)
   : PinguAction(p)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
     pingu->get_owner_str() + "/drownfall/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
     pingu->get_owner_str() + "/drownfall/right"));
 }
 

Modified: trunk/pingus/src/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/actions/exiter.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/exiter.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -16,7 +16,6 @@
 
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
-#include "../resource.hpp"
 #include "../pingu.hpp"
 #include "../sound/sound.hpp"
 #include "exiter.hpp"
@@ -27,9 +26,9 @@
   : PinguAction(p),
     sound_played(false)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
     pingu->get_owner_str() + "/exit/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
     pingu->get_owner_str() + "/exit/right"));
 }
 

Modified: trunk/pingus/src/actions/faller.cpp
===================================================================
--- trunk/pingus/src/actions/faller.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/faller.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -22,7 +22,6 @@
 #include "../display/scene_context.hpp"
 #include "../movers/linear_mover.hpp"
 #include "../pingu.hpp"
-#include "../resource.hpp"
 #include "../world.hpp"
 #include "../worldobj.hpp"
 #include "faller.hpp"
@@ -32,14 +31,14 @@
 Faller::Faller (Pingu* p)
   : PinguAction(p)
 {
-  faller.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  faller.load(Direction::LEFT,  Sprite("pingus/player" + 
                                                       pingu->get_owner_str() + 
"/faller/left"));
-  faller.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  faller.load(Direction::RIGHT, Sprite("pingus/player" + 
                                                       pingu->get_owner_str() + 
"/faller/right"));
 
-  tumbler.load(Direction::LEFT,  Resource::load_sprite("pingus/player" +
+  tumbler.load(Direction::LEFT,  Sprite("pingus/player" +
                                                        pingu->get_owner_str() 
+ "/tumbler/left"));
-  tumbler.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  tumbler.load(Direction::RIGHT, Sprite("pingus/player" + 
                                                        pingu->get_owner_str() 
+ "/tumbler/right"));
 
   // FIXME: add sprites for jumping here: if x_vel > y_vel, use them

Modified: trunk/pingus/src/actions/floater.cpp
===================================================================
--- trunk/pingus/src/actions/floater.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/floater.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -14,7 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../resource.hpp"
 #include "../pingu.hpp"
 #include "../display/scene_context.hpp"
 #include "../groundtype.hpp"
@@ -27,7 +26,7 @@
     falling_depth(0),
     step(0)
 {
-  sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/floater/left");
+  sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/floater/left");
 }
 
 void

Modified: trunk/pingus/src/actions/floater.hpp
===================================================================
--- trunk/pingus/src/actions/floater.hpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/floater.hpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -18,6 +18,7 @@
 #define HEADER_PINGUS_ACTIONS_FLOATER_HPP
 
 #include "../pingu_action.hpp"
+#include "../sprite.hpp"
 
 namespace Actions {
 

Modified: trunk/pingus/src/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/actions/jumper.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/jumper.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -17,7 +17,6 @@
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
-#include "../resource.hpp"
 #include "jumper.hpp"
 
 namespace Actions {
@@ -25,9 +24,9 @@
 Jumper::Jumper (Pingu* p)
   : PinguAction(p)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
                                                       pingu->get_owner_str() + 
"/jumper/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
                                                       pingu->get_owner_str() + 
"/jumper/right"));
 }
 

Modified: trunk/pingus/src/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/actions/laser_kill.cpp     2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/laser_kill.cpp     2008-07-04 05:24:12 UTC (rev 
3658)
@@ -15,7 +15,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../math/vector3f.hpp"
-#include "../resource.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
 #include "laser_kill.hpp"
@@ -25,8 +24,8 @@
 LaserKill::LaserKill(Pingu* p)
   : PinguAction(p)
 {
-  sprite.load(Direction::LEFT,  
Resource::load_sprite("other/laser_kill/left"));
-  sprite.load(Direction::RIGHT, 
Resource::load_sprite("other/laser_kill/right"));
+  sprite.load(Direction::LEFT,  Sprite("other/laser_kill/left"));
+  sprite.load(Direction::RIGHT, Sprite("other/laser_kill/right"));
 }
 
 void

Modified: trunk/pingus/src/actions/miner.cpp
===================================================================
--- trunk/pingus/src/actions/miner.cpp  2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/miner.cpp  2008-07-04 05:24:12 UTC (rev 3658)
@@ -19,7 +19,6 @@
 #include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../world.hpp"
-#include "../resource.hpp"
 #include "../sound/sound.hpp"
 #include "../pingu.hpp"
 #include "../worldobj.hpp"
@@ -32,9 +31,9 @@
     miner_radius("other/bash_radius_gfx", "other/bash_radius"),
     slow_count(0)
 {
-  sprite.load(Direction::LEFT,  Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::LEFT,  Sprite("pingus/player" + 
     pingu->get_owner_str() + "/miner/left"));
-  sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" + 
+  sprite.load(Direction::RIGHT, Sprite("pingus/player" + 
     pingu->get_owner_str() + "/miner/right"));
 }
 

Modified: trunk/pingus/src/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/actions/rocket_launcher.cpp        2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/actions/rocket_launcher.cpp        2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -18,7 +18,6 @@
 //#include "../particles/particle_holder.hpp"
 //#include "../particles/explosive_particle.hpp"
 #include "../world.hpp"
-#include "../resource.hpp"
 #include "../pingu.hpp"
 #include "../worldobj.hpp"
 #include "rocket_launcher.hpp"

Modified: trunk/pingus/src/actions/slider.cpp
===================================================================
--- trunk/pingus/src/actions/slider.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/slider.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -14,7 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../resource.hpp"
 #include "../col_map.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"

Modified: trunk/pingus/src/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/actions/smashed.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/smashed.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -14,10 +14,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../resource.hpp"
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
+#include "../sprite.hpp"
 #include "smashed.hpp"
 
 namespace Actions {
@@ -26,7 +26,7 @@
   : PinguAction(p),
     sound_played(false)
 {
-  sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/bomber");
+  sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/bomber");
 }
 
 void

Modified: trunk/pingus/src/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/actions/splashed.cpp       2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/splashed.cpp       2008-07-04 05:24:12 UTC (rev 
3658)
@@ -14,7 +14,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../resource.hpp"
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
 #include "../world.hpp"
@@ -29,7 +28,7 @@
     particle_thrown(false),
     sound_played(false)
 {
-  sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/splat");
+  sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/splat");
 }
 
 void

Modified: trunk/pingus/src/actions/superman.cpp
===================================================================
--- trunk/pingus/src/actions/superman.cpp       2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/superman.cpp       2008-07-04 05:24:12 UTC (rev 
3658)
@@ -16,7 +16,7 @@
 
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
-#include "../resource.hpp"
+#include "../sprite.hpp"
 #include "superman.hpp"
 
 namespace Actions {
@@ -25,7 +25,7 @@
   : PinguAction(p),
     counter(0.0f),
     x_pos(pingu->get_x()),
-    sprite(Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/superman"))
+    sprite(Sprite("pingus/player" + pingu->get_owner_str() + "/superman"))
 {
 }
 

Modified: trunk/pingus/src/actions/superman.hpp
===================================================================
--- trunk/pingus/src/actions/superman.hpp       2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/superman.hpp       2008-07-04 05:24:12 UTC (rev 
3658)
@@ -17,6 +17,7 @@
 #ifndef HEADER_PINGUS_ACTIONS_SUPERMAN_HPP
 #define HEADER_PINGUS_ACTIONS_SUPERMAN_HPP
 
+#include "../sprite.hpp"
 #include "../pingu_action.hpp"
 
 namespace Actions {

Modified: trunk/pingus/src/actions/teleported.cpp
===================================================================
--- trunk/pingus/src/actions/teleported.cpp     2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/actions/teleported.cpp     2008-07-04 05:24:12 UTC (rev 
3658)
@@ -14,9 +14,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "../resource.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
+#include "../sprite.hpp"
 #include "teleported.hpp"
 
 namespace Actions {
@@ -25,7 +25,7 @@
   : PinguAction(p),
     sound_played(false)
 {
-  sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/bomber");
+  sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/bomber");
 }
 
 

Modified: trunk/pingus/src/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/actions/waiter.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/waiter.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -17,7 +17,6 @@
 #include "../math/vector3f.hpp"
 #include "../display/scene_context.hpp"
 #include "../pingu.hpp"
-#include "../resource.hpp"
 #include "waiter.hpp"
 
 namespace Actions {
@@ -26,7 +25,7 @@
   : PinguAction(p),
     countdown(2.0f)
 {
-  sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() + 
"/waiter/left");
+  sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/waiter/left");
 }
 
 void

Modified: trunk/pingus/src/actions/waiter.hpp
===================================================================
--- trunk/pingus/src/actions/waiter.hpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/actions/waiter.hpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -17,6 +17,7 @@
 #ifndef HEADER_PINGUS_ACTIONS_WAITER_HPP
 #define HEADER_PINGUS_ACTIONS_WAITER_HPP
 
+#include "../sprite.hpp"
 #include "../pingu_action.hpp"
 
 namespace Actions {

Modified: trunk/pingus/src/addon_menu.cpp
===================================================================
--- trunk/pingus/src/addon_menu.cpp     2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/addon_menu.cpp     2008-07-04 05:24:12 UTC (rev 3658)
@@ -24,8 +24,8 @@
 
 AddOnMenu::AddOnMenu()
 {
-  background = Resource::load_sprite("core/menu/filedialog");
-  ok_button  = Resource::load_sprite("core/start/ok");
+  background = Sprite("core/menu/filedialog");
+  ok_button  = Sprite("core/start/ok");
 }
 
 AddOnMenu::~AddOnMenu()

Modified: trunk/pingus/src/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/capture_rectangle.cpp      2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/capture_rectangle.cpp      2008-07-04 05:24:12 UTC (rev 
3658)
@@ -30,10 +30,10 @@
   : session(session_),
     pingu(0),
     owner_id(0),
-    good(Resource::load_sprite("game/cursors/capgood")),
-    bad(Resource::load_sprite("game/cursors/capbad")),
-    arrow_left(Resource::load_sprite("game/cursors/arrow_left")),
-    arrow_right(Resource::load_sprite("game/cursors/arrow_right")),
+    good(Sprite("game/cursors/capgood")),
+    bad(Sprite("game/cursors/capbad")),
+    arrow_left(Sprite("game/cursors/arrow_left")),
+    arrow_right(Sprite("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-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/components/action_button.cpp       2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -16,7 +16,6 @@
 
 #include "../globals.hpp"
 #include "../cheat.hpp"
-#include "../resource.hpp"
 #include "action_button.hpp"
 #include "../server.hpp"
 #include "../game_session.hpp"
@@ -33,8 +32,8 @@
 ActionButton::ActionButton(ActionHolder* h,
                            int x, int y, ActionName name_, int owner_id)
   : action_holder(h),
-    background (Resource::load_sprite("core/buttons/buttonbackground")),
-    backgroundhl (Resource::load_sprite("core/buttons/buttonbackgroundhl"))
+    background (Sprite("core/buttons/buttonbackground")),
+    backgroundhl (Sprite("core/buttons/buttonbackgroundhl"))
 {
   init(x, y, name_, owner_id);
 }
@@ -52,7 +51,7 @@
   font   = Fonts::pingus_small;
   font_b = Fonts::pingus_large;
 
-  sprite = Resource::load_sprite("pingus/player0/" + action_to_string(name) + 
"/right");
+  sprite = Sprite("pingus/player0/" + action_to_string(name) + "/right");
   sprite.set_play_loop(true);
 }
 
@@ -147,11 +146,11 @@
   : server (s),
     x_pos (x),
     y_pos (y),
-    background  (Resource::load_sprite("core/buttons/hbuttonbgb")),
-    backgroundhl(Resource::load_sprite("core/buttons/hbuttonbg"))
+    background  (Sprite("core/buttons/hbuttonbgb")),
+    backgroundhl(Sprite("core/buttons/hbuttonbg"))
 {
   pressed      = false;
-  sprite       = Resource::load_sprite("core/buttons/armageddon_anim");
+  sprite       = Sprite("core/buttons/armageddon_anim");
 }
 
 ArmageddonButton::~ArmageddonButton () { }
@@ -226,10 +225,10 @@
 ForwardButton::ForwardButton(GameSession* s, int x, int y)
   : session(s),
     x_pos (x), y_pos (y),
-    background  (Resource::load_sprite("core/buttons/hbuttonbgb")),
-    backgroundhl(Resource::load_sprite("core/buttons/hbuttonbg"))
+    background  (Sprite("core/buttons/hbuttonbgb")),
+    backgroundhl(Sprite("core/buttons/hbuttonbg"))
 {
-  surface = Resource::load_sprite("core/buttons/fast_forward");
+  surface = Sprite("core/buttons/fast_forward");
 }
 
 ForwardButton::~ForwardButton () {}
@@ -274,10 +273,10 @@
 PauseButton::PauseButton(GameSession* s, int x, int y)
   : session(s),
     x_pos(x), y_pos(y),
-    background  (Resource::load_sprite("core/buttons/hbuttonbgb")),
-    backgroundhl(Resource::load_sprite("core/buttons/hbuttonbg"))
+    background  (Sprite("core/buttons/hbuttonbgb")),
+    backgroundhl(Sprite("core/buttons/hbuttonbg"))
 {
-  surface = Resource::load_sprite("core/buttons/pause");
+  surface = Sprite("core/buttons/pause");
 }
 
 PauseButton::~PauseButton () {}

Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/components/menu_button.cpp 2008-07-04 05:24:12 UTC (rev 
3658)
@@ -29,8 +29,8 @@
                        const std::string& text_, const std::string& desc_)
   : menu(menu_)
 {
-  surface_p = Resource::load_sprite("core/menu/menuitem");
-  highlight = Resource::load_sprite("core/menu/menuitem_highlight");
+  surface_p = Sprite("core/menu/menuitem");
+  highlight = Sprite("core/menu/menuitem_highlight");
 
   text = text_;
   desc  = desc_;

Modified: trunk/pingus/src/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp      2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/components/pingus_counter.cpp      2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -28,7 +28,7 @@
 
 PingusCounter::PingusCounter(Server* s)
   : server(s),
-    background(Resource::load_sprite("core/buttons/info"))
+    background(Sprite("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-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/components/time_display.cpp        2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -31,7 +31,7 @@
 
 TimeDisplay::TimeDisplay (GameSession* c)
   : server(c->get_server()),
-    infinity_symbol(Resource::load_sprite("core/misc/infinity"))
+    infinity_symbol(Sprite("core/misc/infinity"))
 {
   font = Fonts::pingus_small_fixnum;
 }

Modified: trunk/pingus/src/credits.cpp
===================================================================
--- trunk/pingus/src/credits.cpp        2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/credits.cpp        2008-07-04 05:24:12 UTC (rev 3658)
@@ -60,9 +60,9 @@
 {
   scene_context = new SceneContext();
   fast_scrolling = false;
-  background = Resource::load_sprite("core/menu/startscreenbg");
+  background = Sprite("core/menu/startscreenbg");
   background.scale(Display::get_width(), Display::get_height());
-  pingu = Resource::load_sprite("core/misc/creditpingu");
+  pingu = Sprite("core/misc/creditpingu");
 
   gui_manager->add(new CreditsOkButton(this), true);
 

Modified: trunk/pingus/src/demo_session.cpp
===================================================================
--- trunk/pingus/src/demo_session.cpp   2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/demo_session.cpp   2008-07-04 05:24:12 UTC (rev 3658)
@@ -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(Resource::load_sprite("core/demo/highlight")),
+      highlight(Sprite("core/demo/highlight")),
       callback(callback_),
       highlight_func(highlight_func_)
   {}

Modified: trunk/pingus/src/display/cursor.cpp
===================================================================
--- trunk/pingus/src/display/cursor.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/display/cursor.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -20,7 +20,7 @@
 #include "cursor.hpp"
 
 Cursor::Cursor(const std::string& ident)
-  : sprite(Resource::load_sprite(ident))
+  : sprite(Sprite(ident))
 {
 }
 

Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/editor/combobox.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -27,7 +27,7 @@
 
 Combobox::Combobox(const Rect& rect)
   : RectComponent(rect),
-    sprite(Resource::load_sprite("core/editor/combobox")),
+    sprite(Sprite("core/editor/combobox")),
     current_item(-1),
     drop_down(false)
 {

Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp      2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/editor/level_objs.cpp      2008-07-04 05:24:12 UTC (rev 
3658)
@@ -170,7 +170,7 @@
 {
   if (attribs & HAS_SURFACE || attribs & HAS_SURFACE_FAKE)
     {
-      sprite = Resource::load_sprite(desc);
+      sprite = Sprite(desc);
     }
 }
 
@@ -276,19 +276,19 @@
     {
       desc.res_name = "entrances/generic";
       desc.modifier = ResourceModifierNS::ROT0;
-      sprite = Resource::load_sprite(desc);
+      sprite = Sprite(desc);
     }
   else if (section_name == "solidcolor-background")
     {
       desc.res_name = "core/editor/solidcolorbackground";
       desc.modifier = ResourceModifierNS::ROT0;
-      sprite = Resource::load_sprite(desc);
+      sprite = Sprite(desc);
     }
   else if (section_name == "starfield-background")
     {
       desc.res_name = "core/editor/starfield";
       desc.modifier = ResourceModifierNS::ROT0;
-      sprite = Resource::load_sprite(desc);
+      sprite = Sprite(desc);
     }
 }
 

Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/editor/object_selector.cpp 2008-07-04 05:24:12 UTC (rev 
3658)
@@ -45,7 +45,7 @@
   std::string   type;
   
   Groundpiece(const std::string& name, const std::string& type)
-    : Object(Resource::load_sprite(name),
+    : Object(Sprite(name),
              Resource::load_thumb_sprite(name)),
       desc(name),
       type(type)
@@ -63,7 +63,7 @@
 struct Entrance : public ObjectSelectorList::Object 
 {
   Entrance()
-    : Object(Resource::load_sprite("entrances/generic"),
+    : Object(Sprite("entrances/generic"),
              Resource::load_thumb_sprite("entrances/generic"))
   {}
 
@@ -84,7 +84,7 @@
   ResDescriptor desc;
   
   Exit(const std::string& name)
-    : Object(Resource::load_sprite(name), 
+    : Object(Sprite(name), 
              Resource::load_thumb_sprite(name)),
       desc(name)
   {}
@@ -104,7 +104,7 @@
   int z_pos;
   
   Hotspot(const std::string& name, int z_pos = 0)
-    : Object(Resource::load_sprite(name),
+    : Object(Sprite(name),
              Resource::load_thumb_sprite(name)),
       desc(name),
       z_pos(z_pos)
@@ -125,7 +125,7 @@
   ResDescriptor desc;
   
   SurfaceBackground(const std::string& name)
-    : Object(Resource::load_sprite(name),
+    : Object(Sprite(name),
              Resource::load_thumb_sprite(name)),
       desc(name)
   {}
@@ -147,7 +147,7 @@
 struct SolidColorBackground : public ObjectSelectorList::Object
 {
   SolidColorBackground() 
-    : Object(Resource::load_sprite("core/editor/solidcolorbackground"),
+    : Object(Sprite("core/editor/solidcolorbackground"),
              
Resource::load_thumb_sprite("core/editor/solidcolorbackground_thumb"))
   {}
   
@@ -162,7 +162,7 @@
 struct StarfieldBackground : public ObjectSelectorList::Object
 {
   StarfieldBackground() 
-    : Object(Resource::load_sprite("core/editor/starfield"),
+    : Object(Sprite("core/editor/starfield"),
              Resource::load_thumb_sprite("core/editor/starfield_thumb"))
   {}
   
@@ -181,7 +181,7 @@
   ResDescriptor desc;
 
   Liquid(const std::string& name) 
-    : Object(Resource::load_sprite(name),
+    : Object(Sprite(name),
              Resource::load_thumb_sprite(name)),
       desc(name)
   {}
@@ -215,9 +215,9 @@
                        const Vector2i& pos, const std::string& sprite, const 
std::string& tooltip_)
     : RectComponent(Rect(pos, Size(30, 30))),
       object_list(object_list_),
-      button_raised(Resource::load_sprite("core/editor/obj_button-raised")),
-      button_pressed(Resource::load_sprite("core/editor/obj_button-pressed")),
-      sprite(Resource::load_sprite(sprite)),
+      button_raised(Sprite("core/editor/obj_button-raised")),
+      button_pressed(Sprite("core/editor/obj_button-pressed")),
+      sprite(Sprite(sprite)),
       mouse_over(false),
       mouse_down(false),
       tooltip(tooltip_)
@@ -373,7 +373,7 @@
   for(std::vector<std::string>::const_iterator i = lst.begin(); i != 
lst.end(); ++i)
     {
       // need to reset the align to top/left
-      set->add(new ObjectSelectorList::Object(Resource::load_sprite(*i),
+      set->add(new ObjectSelectorList::Object(Sprite(*i),
                                               
Resource::load_thumb_sprite(*i)));
     }
   

Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp   2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/editor/panel.cpp   2008-07-04 05:24:12 UTC (rev 3658)
@@ -35,7 +35,7 @@
 
 public:
   PanelSeparator(const Vector2i& pos_)
-    : sprite(Resource::load_sprite("core/editor/separator")),
+    : sprite(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(Resource::load_sprite("core/editor/button-raised")),
-      button_pressed(Resource::load_sprite("core/editor/button-pressed")),
-      sprite(Resource::load_sprite(name)),
+      button_raised(Sprite("core/editor/button-raised")),
+      button_pressed(Sprite("core/editor/button-pressed")),
+      sprite(Sprite(name)),
       mouse_over(false),
       mouse_down(false),
       pos(pos_),
@@ -142,7 +142,7 @@
 
 Panel::Panel(EditorScreen* editor_)
   : editor(editor_),
-    logo(Resource::load_sprite("core/editor/logo")),
+    logo(Sprite("core/editor/logo")),
     pos(2,2)
 {  
   editor->get_gui_manager()->add(this, true);

Modified: trunk/pingus/src/editor/panel_buttons.cpp
===================================================================
--- trunk/pingus/src/editor/panel_buttons.cpp   2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/editor/panel_buttons.cpp   2008-07-04 05:24:12 UTC (rev 
3658)
@@ -39,8 +39,8 @@
    panel(p),
    is_selected(false)
 {
-  button = Resource::load_sprite("core/editor/button");
-  button_pressed = Resource::load_sprite("core/editor/button_pressed");
+  button = Sprite("core/editor/button");
+  button_pressed = Sprite("core/editor/button_pressed");
 }
 
 // Draw the button
@@ -90,7 +90,7 @@
   PanelButton(p)
 {
   tooltip = "Exit the editor";
-  sur = Resource::load_sprite("core/editor/exit");
+  sur = Sprite("core/editor/exit");
 }
 
 // When clicked, close the EditorScreen
@@ -106,7 +106,7 @@
   PanelButton(p)
 {
   tooltip = "Load existing level";
-  sur = Resource::load_sprite("core/editor/open");
+  sur = Sprite("core/editor/open");
 }
 
 // When clicked, close the EditorScreen
@@ -122,7 +122,7 @@
   PanelButton(p)
 {
   tooltip = "Save current level";
-  sur = Resource::load_sprite("core/editor/save");
+  sur = Sprite("core/editor/save");
 }
 
 // When clicked, close the EditorScreen
@@ -138,7 +138,7 @@
 PanelButtonGroundpiece::PanelButtonGroundpiece(EditorPanel *p) :
   PanelButton(p)
 {
-  sur = Resource::load_sprite("core/editor/save"); // FIXME: Update this 
sprite 
+  sur = Sprite("core/editor/save"); // FIXME: Update this sprite 
   tooltip = "Load a groundpiece";
 }
 
@@ -216,7 +216,7 @@
     head(0)
 {  
   // FIXME: Update this sprite  
-  sur = Resource::load_sprite("core/editor/save"); 
+  sur = Sprite("core/editor/save"); 
   tooltip = "Set specific level information"; 
 }
 

Modified: trunk/pingus/src/exit_menu.cpp
===================================================================
--- trunk/pingus/src/exit_menu.cpp      2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/exit_menu.cpp      2008-07-04 05:24:12 UTC (rev 3658)
@@ -106,7 +106,7 @@
   gui_manager->add(new ExitMenuYesButton(manager), true);
   gui_manager->add(new ExitMenuNoButton(manager), true);
 
-  sur = Resource::load_sprite("core/menu/exit_menu");
+  sur = Sprite("core/menu/exit_menu");
 }
 
 ExitMenu::~ExitMenu()

Modified: trunk/pingus/src/gui/checkbox.cpp
===================================================================
--- trunk/pingus/src/gui/checkbox.cpp   2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/gui/checkbox.cpp   2008-07-04 05:24:12 UTC (rev 3658)
@@ -25,7 +25,7 @@
 namespace GUI {
        
 Checkbox::Checkbox(Vector2i p, std::string label_, CheckboxListener* l) :
-       checkmark(Resource::load_sprite("core/misc/checkbox_clicked")),
+       checkmark(Sprite("core/misc/checkbox_clicked")),
        is_checked(false),
        pos(p),
        width(20),

Modified: trunk/pingus/src/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/gui/surface_button.cpp     2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/gui/surface_button.cpp     2008-07-04 05:24:12 UTC (rev 
3658)
@@ -28,9 +28,9 @@
                              const ResDescriptor& 
arg_button_mouse_over_surface)
   : x_pos (arg_x_pos), y_pos (arg_y_pos), pressed (false), mouse_over (false)
 {
-  button_surface            = Resource::load_sprite(arg_button_surface);
-  button_pressed_surface    = 
Resource::load_sprite(arg_button_pressed_surface);
-  button_mouse_over_surface = 
Resource::load_sprite(arg_button_mouse_over_surface);
+  button_surface            = Sprite(arg_button_surface);
+  button_pressed_surface    = Sprite(arg_button_pressed_surface);
+  button_mouse_over_surface = Sprite(arg_button_mouse_over_surface);
 }
 
 SurfaceButton::~SurfaceButton ()

Modified: trunk/pingus/src/level_menu.cpp
===================================================================
--- trunk/pingus/src/level_menu.cpp     2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/level_menu.cpp     2008-07-04 05:24:12 UTC (rev 3658)
@@ -110,7 +110,7 @@
       level_menu(level_menu_), current_levelset(NULL),
       page(0)
   {
-    marker      = Resource::load_sprite("core/menu/marker");
+    marker      = Sprite("core/menu/marker");
    
     std::string path = Pathname("levelsets", 
Pathname::DATA_PATH).get_sys_path();
     System::Directory directory = System::opendir(path, "*.levelset");
@@ -232,8 +232,8 @@
       current_level(-1),
       page(0)
   {
-    marker        = Resource::load_sprite("core/menu/marker2");
-    marker_locked = Resource::load_sprite("core/menu/marker_locked");
+    marker        = Sprite("core/menu/marker2");
+    marker_locked = Sprite("core/menu/marker_locked");
   }
 
   void draw(DrawingContext& gc) 
@@ -342,11 +342,11 @@
   : x_pos((Display::get_width()  - default_screen_width)/2),
     y_pos((Display::get_height() - default_screen_height)/2)
 {
-  //background = Resource::load_sprite("core/menu/filedialog");
-  background = Resource::load_sprite("core/menu/startscreenbg");
+  //background = Sprite("core/menu/filedialog");
+  background = Sprite("core/menu/startscreenbg");
   background.scale(Display::get_width(), Display::get_height());
 
-  ok_button  = Resource::load_sprite("core/start/ok");
+  ok_button  = Sprite("core/start/ok");
 
   levelset_selector = new LevelsetSelector(this, Rect(Vector2i(x_pos + 100, 
y_pos + 140), Size(600, 285)));
   level_selector    = new LevelSelector(this, Rect(Vector2i(x_pos + 100, y_pos 
+ 160), Size(600, 256)));

Modified: trunk/pingus/src/levelset.cpp
===================================================================
--- trunk/pingus/src/levelset.cpp       2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/levelset.cpp       2008-07-04 05:24:12 UTC (rev 3658)
@@ -37,7 +37,7 @@
       reader.read_string("description", description);
       std::string image;
       if (reader.read_string("image", image))
-        this->image = Resource::load_sprite(image);
+        this->image = Sprite(image);
 
       FileReader level_reader = reader.read_section("levels");
       std::vector<FileReader> sections = level_reader.get_sections();

Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp    2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/option_menu.cpp    2008-07-04 05:24:12 UTC (rev 3658)
@@ -39,8 +39,8 @@
 
 OptionMenu::OptionMenu()
 {
-  background = Resource::load_sprite("core/menu/optionmenu");
-  ok_button  = Resource::load_sprite("core/start/ok");
+  background = Sprite("core/menu/optionmenu");
+  ok_button  = Sprite("core/start/ok");
 
   x_pos = 0;
   y_pos = 0;

Modified: trunk/pingus/src/particles/ground_particle.cpp
===================================================================
--- trunk/pingus/src/particles/ground_particle.cpp      2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/particles/ground_particle.cpp      2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -21,7 +21,7 @@
 GroundParticle::GroundParticle (int x, int y, float x_a, float y_a)
   : Particle (x,y, x_a, y_a)
 {
-  surface = Resource::load_sprite("particles/ground");
+  surface = Sprite("particles/ground");
   livetime = 25 + (rand() % 10);
   time = livetime;
 }

Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp        2008-07-04 
03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp        2008-07-04 
05:24:12 UTC (rev 3658)
@@ -36,7 +36,7 @@
 
 
 PinguParticleHolder::PinguParticleHolder ()
-  : surface(Resource::load_sprite("particles/pingu_explo"))
+  : surface(Sprite("particles/pingu_explo"))
 {
 }
 

Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -33,9 +33,9 @@
 
 
 RainParticleHolder::RainParticleHolder ()
-  : rain1_surf (Resource::load_sprite("particles/rain1")),
-    rain2_surf (Resource::load_sprite("particles/rain2")),
-    rain_splash(Resource::load_sprite("particles/rain_splash"))
+  : rain1_surf (Sprite("particles/rain1")),
+    rain2_surf (Sprite("particles/rain2")),
+    rain_splash(Sprite("particles/rain_splash"))
 {
 }
 

Modified: trunk/pingus/src/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.cpp        2008-07-04 
03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/particles/smoke_particle_holder.cpp        2008-07-04 
05:24:12 UTC (rev 3658)
@@ -30,8 +30,8 @@
 
 
 SmokeParticleHolder::SmokeParticleHolder ()
-  : surf1(Resource::load_sprite("particles/smoke")),
-    surf2(Resource::load_sprite("particles/smoke2"))
+  : surf1(Sprite("particles/smoke")),
+    surf2(Sprite("particles/smoke2"))
 {
 }
 

Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -54,11 +54,11 @@
 
 
 SnowParticleHolder::SnowParticleHolder ()
-  : snow1 (Resource::load_sprite("particles/snow1")),
-    snow2 (Resource::load_sprite("particles/snow2")),
-    snow3 (Resource::load_sprite("particles/snow3")),
-    snow4 (Resource::load_sprite("particles/snow4")),
-    snow5 (Resource::load_sprite("particles/snow5")),
+  : snow1 (Sprite("particles/snow1")),
+    snow2 (Sprite("particles/snow2")),
+    snow3 (Sprite("particles/snow3")),
+    snow4 (Sprite("particles/snow4")),
+    snow5 (Sprite("particles/snow5")),
     ground(Resource::load_collision_mask("particles/ground_snow"))
 {
 }

Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp    2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/pingus_menu.cpp    2008-07-04 05:24:12 UTC (rev 3658)
@@ -68,7 +68,7 @@
   gui_manager->add(start_button,   false);
   gui_manager->add(editor_button,  false);
 
-  logo = Resource::load_sprite("core/misc/logo");
+  logo = Sprite("core/misc/logo");
 
   help = _("..:: Ctrl-g: mouse grab   ::   F10: fps counter   ::   F11: 
fullscreen   ::   F12: screenshot ::..");
 }

Modified: trunk/pingus/src/pingus_menu_manager.cpp
===================================================================
--- trunk/pingus/src/pingus_menu_manager.cpp    2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/pingus_menu_manager.cpp    2008-07-04 05:24:12 UTC (rev 
3658)
@@ -48,11 +48,11 @@
        }
        else
        {
-               background.add_layer(Resource::load_sprite("core/menu/layer1"), 
0, 0, 12, 0);
-               background.add_layer(Resource::load_sprite("core/menu/layer2"), 
0, 150, 25, 0);
-               background.add_layer(Resource::load_sprite("core/menu/layer3"), 
0, 200, 50, 0);
-               background.add_layer(Resource::load_sprite("core/menu/layer4"), 
0, 429, 100, 0);
-               background.add_layer(Resource::load_sprite("core/menu/layer5"), 
0, 500, 200, 0);
+               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);
 }

Modified: trunk/pingus/src/resource.cpp
===================================================================
--- trunk/pingus/src/resource.cpp       2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/resource.cpp       2008-07-04 05:24:12 UTC (rev 3658)
@@ -98,36 +98,12 @@
 #endif
 }
 
-Sprite
-Resource::load_sprite(const ResDescriptor& res)
+SpriteDescription*
+Resource::load_sprite_desc(const std::string& res_name)
 {
- SpriteDescription* desc = resmgr.get_sprite_description(res.res_name);
-  if (desc)
-    {
-      return Sprite(*desc, res.modifier);
-    }
-  else
-    {
-      std::cout << "Resource: Couldn't load sprite: '" << res.res_name << "'" 
<< std::endl;
-      return Sprite(Pathname("images/core/misc/404.png", Pathname::DATA_PATH));
-    }
+  return resmgr.get_sprite_description(res_name);
 }
 
-Sprite
-Resource::load_sprite(const std::string& res_name)
-{
-  SpriteDescription* desc = resmgr.get_sprite_description(res_name);
-  if (desc)
-    {
-      return Sprite(*desc);
-    }
-  else
-    {
-      std::cout << "Error: Resource: Couldn't load sprite: '" << res_name << 
"'" << std::endl;
-      return Sprite(Pathname("images/core/misc/404.png", Pathname::DATA_PATH));
-    }
-}
-
 CollisionMask
 Resource::load_collision_mask(const std::string& name)
 {
@@ -189,7 +165,7 @@
 Sprite
 Resource::load_thumb_sprite(const std::string& name)
 {
-  Sprite sprite = Resource::load_sprite(name);
+  Sprite sprite = Sprite(name);
 
   Size thumb_size;
   if (sprite.get_width() <= 48)

Modified: trunk/pingus/src/resource.hpp
===================================================================
--- trunk/pingus/src/resource.hpp       2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/resource.hpp       2008-07-04 05:24:12 UTC (rev 3658)
@@ -43,8 +43,7 @@
   /** Loads a 48x48 size thumbnail of a sprite */
   static Sprite        load_thumb_sprite(const std::string&);
 
-  static Sprite        load_sprite(const ResDescriptor&);
-  static Sprite        load_sprite(const std::string& res_name);
+  static SpriteDescription* load_sprite_desc(const std::string& res_name);
 
   static CollisionMask load_collision_mask(const std::string& res_name);
   static CollisionMask load_collision_mask(const ResDescriptor&);

Modified: trunk/pingus/src/result_screen.cpp
===================================================================
--- trunk/pingus/src/result_screen.cpp  2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/result_screen.cpp  2008-07-04 05:24:12 UTC (rev 3658)
@@ -149,13 +149,13 @@
 ResultScreenComponent::ResultScreenComponent(Result arg_result)
   : result(arg_result)
 {
-  background = Resource::load_sprite("core/menu/startscreenbg");
+  background = Sprite("core/menu/startscreenbg");
   background.scale(Display::get_width(), Display::get_height());
   
-  chalk_pingus.push_back(Resource::load_sprite("core/misc/chalk_pingu1"));
-  chalk_pingus.push_back(Resource::load_sprite("core/misc/chalk_pingu2"));
-  chalk_pingus.push_back(Resource::load_sprite("core/misc/chalk_pingu3"));
-  chalk_pingus.push_back(Resource::load_sprite("core/misc/chalk_pingu4"));
+  chalk_pingus.push_back(Sprite("core/misc/chalk_pingu1"));
+  chalk_pingus.push_back(Sprite("core/misc/chalk_pingu2"));
+  chalk_pingus.push_back(Sprite("core/misc/chalk_pingu3"));
+  chalk_pingus.push_back(Sprite("core/misc/chalk_pingu4"));
 
   if (result.max_time == -1)
     time_str = "-";

Modified: trunk/pingus/src/sprite.cpp
===================================================================
--- trunk/pingus/src/sprite.cpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/sprite.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -179,9 +179,38 @@
 
 Sprite::Sprite()
 {
-  
 }
 
+Sprite::Sprite(const std::string& name)
+{
+  SpriteDescription* desc = Resource::load_sprite_desc(name);
+  if (desc)
+    {
+      impl = boost::shared_ptr<SpriteImpl>(new SpriteImpl(*desc));
+    }
+  else
+    {
+      SpriteDescription desc;
+      desc.filename = Pathname("images/core/misc/404.png", 
Pathname::DATA_PATH);
+      impl = boost::shared_ptr<SpriteImpl>(new SpriteImpl(desc));
+    }
+}
+
+Sprite::Sprite(const ResDescriptor& res_desc)
+{
+  SpriteDescription* desc = Resource::load_sprite_desc(res_desc.res_name);
+  if (desc)
+    {
+      impl = boost::shared_ptr<SpriteImpl>(new SpriteImpl(*desc, 
res_desc.modifier));
+    }
+  else
+    {
+      SpriteDescription desc;
+      desc.filename = Pathname("images/core/misc/404.png", 
Pathname::DATA_PATH);
+      impl = boost::shared_ptr<SpriteImpl>(new SpriteImpl(desc));
+    } 
+}
+
 Sprite::Sprite(const Pathname& name)
 {
   SpriteDescription desc;

Modified: trunk/pingus/src/sprite.hpp
===================================================================
--- trunk/pingus/src/sprite.hpp 2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/sprite.hpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -28,12 +28,15 @@
 class Pathname;
 class SpriteImpl;
 class SpriteDescription;
+class ResDescriptor;
 
 /** */
 class Sprite
 {
 public:
   Sprite();
+  Sprite(const std::string&   name);
+  Sprite(const ResDescriptor& desc);
   Sprite(const Pathname& name);
   Sprite(const SpriteDescription& desc, ResourceModifierNS::ResourceModifier 
mod = ResourceModifierNS::ROT0);
   Sprite(const Surface& surface);

Modified: trunk/pingus/src/start_screen.cpp
===================================================================
--- trunk/pingus/src/start_screen.cpp   2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/start_screen.cpp   2008-07-04 05:24:12 UTC (rev 3658)
@@ -130,7 +130,7 @@
 StartScreenComponent::StartScreenComponent(const PingusLevel& p)
   : plf(p)
 {
-  background = Resource::load_sprite("core/menu/startscreenbg");
+  background = Sprite("core/menu/startscreenbg");
   background.scale(Display::get_width(), Display::get_height());
   time_str = GameTime::ticks_to_realtime_string(plf.get_time());
 }

Modified: trunk/pingus/src/state_sprite.cpp
===================================================================
--- trunk/pingus/src/state_sprite.cpp   2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/state_sprite.cpp   2008-07-04 05:24:12 UTC (rev 3658)
@@ -26,7 +26,7 @@
 void
 StateSprite::load(int state, const std::string& name)
 {
-  load(state, Resource::load_sprite(name));
+  load(state, Sprite(name));
 }
 
 void

Modified: trunk/pingus/src/story_screen.cpp
===================================================================
--- trunk/pingus/src/story_screen.cpp   2008-07-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/story_screen.cpp   2008-07-04 05:24:12 UTC (rev 3658)
@@ -142,8 +142,8 @@
   pages = story->get_pages();
 
   current_page = pages.back();
-  page_surface = Resource::load_sprite(current_page.image);
-  background   = Resource::load_sprite("core/menu/startscreenbg");
+  page_surface = Sprite(current_page.image);
+  background   = Sprite("core/menu/startscreenbg");
   
   background.scale(Display::get_width(), Display::get_height());
 }
@@ -221,7 +221,7 @@
       if (!pages.empty())
         {
           current_page = pages.back();
-          page_surface = Resource::load_sprite(current_page.image);
+          page_surface = Sprite(current_page.image);
           display_text = "";
           time_passed = 0;
           page_displayed_completly = false;

Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp     2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldmap/level_dot.cpp     2008-07-04 05:24:12 UTC (rev 
3658)
@@ -36,11 +36,11 @@
 
 LevelDot::LevelDot(FileReader reader)
   : Dot(reader.read_section("dot")),
-    green_dot_sur(Resource::load_sprite("core/worldmap/dot_green")),
-    red_dot_sur(Resource::load_sprite("core/worldmap/dot_red")),
-    inaccessible_dot_sur(Resource::load_sprite("core/worldmap/dot_invalid")),
-    
highlight_green_dot_sur(Resource::load_sprite("core/worldmap/dot_green_hl")),
-    highlight_red_dot_sur(Resource::load_sprite("core/worldmap/dot_red_hl"))
+    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"))
 {
   std::string resname;
   reader.read_string("levelname", resname); 

Modified: trunk/pingus/src/worldmap/manager.cpp
===================================================================
--- trunk/pingus/src/worldmap/manager.cpp       2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldmap/manager.cpp       2008-07-04 05:24:12 UTC (rev 
3658)
@@ -212,7 +212,7 @@
 }
 
 WorldMapManager::WorldMapManager ()
-  : levelname_bg(Resource::load_sprite("core/worldmap/levelname_bg")),
+  : levelname_bg(Sprite("core/worldmap/levelname_bg")),
     is_init(false),
     exit_worldmap(false),
     worldmap(0),

Modified: trunk/pingus/src/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldmap/pingus.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -29,11 +29,11 @@
 Pingus::Pingus (PathGraph* arg_path)
   : Drawable("pingus"),
     path(arg_path),
-    sprite_standing (Resource::load_sprite("core/worldmap/pingus_standing")),
-    arrow (Resource::load_sprite("core/worldmap/arrow"))
+    sprite_standing (Sprite("core/worldmap/pingus_standing")),
+    arrow (Sprite("core/worldmap/arrow"))
 {
-  sprite.load(Direction::LEFT,  
Resource::load_sprite("core/worldmap/pingus/left"));
-  sprite.load(Direction::RIGHT, 
Resource::load_sprite("core/worldmap/pingus/right"));
+  sprite.load(Direction::LEFT,  Sprite("core/worldmap/pingus/left"));
+  sprite.load(Direction::RIGHT, Sprite("core/worldmap/pingus/right"));
 
   final_target_node = NoNode;
   current_node = NoNode;

Modified: trunk/pingus/src/worldmap/surface_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/surface_drawable.cpp      2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/worldmap/surface_drawable.cpp      2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -35,7 +35,7 @@
   reader.read_vector("position", pos);
   reader.read_bool  ("auto-uncover", auto_uncover);
 
-  surface = Resource::load_sprite(desc);
+  surface = Sprite(desc);
   //std::cout << "XXX Desc: " << desc.res_name << std::endl;
 }
 

Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp        2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp        2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -25,9 +25,9 @@
 namespace WorldObjs {
 
 ConveyorBelt::ConveyorBelt(const FileReader& reader)
-  : left_sur  (Resource::load_sprite ("worldobjs/conveyorbelt_left")),
-    right_sur (Resource::load_sprite ("worldobjs/conveyorbelt_right")),
-    middle_sur(Resource::load_sprite ("worldobjs/conveyorbelt_middle"))
+  : left_sur  (Sprite ("worldobjs/conveyorbelt_left")),
+    right_sur (Sprite ("worldobjs/conveyorbelt_right")),
+    middle_sur(Sprite ("worldobjs/conveyorbelt_middle"))
 {
   reader.read_vector("position", pos);
   reader.read_int   ("width",    width);

Modified: trunk/pingus/src/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp     2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/entrance.cpp     2008-07-04 05:24:12 UTC (rev 
3658)
@@ -31,7 +31,7 @@
     release_rate(150),
     owner_id(0),
     type("generic"),
-    smallmap_symbol(Resource::load_sprite("core/misc/smallmap_entrance"))
+    smallmap_symbol(Sprite("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-04 03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/worldobjs/exit.cpp 2008-07-04 05:24:12 UTC (rev 3658)
@@ -29,7 +29,7 @@
 namespace WorldObjs {
 
 Exit::Exit(const FileReader& reader)
-  : smallmap_symbol(Resource::load_sprite("core/misc/smallmap_exit"))
+  : smallmap_symbol(Sprite("core/misc/smallmap_exit"))
 {
   reader.read_vector("position", pos);
   reader.read_desc  ("surface",  desc);
@@ -38,12 +38,9 @@
   // Set default owner ID to 0
   if (owner_id < 0 || owner_id > 3) owner_id = 0;
 
-  flag = Resource::load_sprite("core/misc/flag" + 
StringUtil::to_string(owner_id));
+  flag = Sprite("core/misc/flag" + StringUtil::to_string(owner_id));
 
-  sprite = Resource::load_sprite(desc);
-
-  if (verbose > 2)
-    std::cout << "Creating Exit" << std::endl;
+  sprite = Sprite(desc);
 }
 
 Exit::~Exit ()

Modified: trunk/pingus/src/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp    2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/fake_exit.cpp    2008-07-04 05:24:12 UTC (rev 
3658)
@@ -25,8 +25,8 @@
 namespace WorldObjs {
 
 FakeExit::FakeExit(const FileReader& reader)
-  : surface(Resource::load_sprite("traps/fake_exit")),
-    smallmap_symbol(Resource::load_sprite("core/misc/smallmap_exit")),
+  : surface(Sprite("traps/fake_exit")),
+    smallmap_symbol(Sprite("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-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/guillotine.cpp   2008-07-04 05:24:12 UTC (rev 
3658)
@@ -24,9 +24,9 @@
 namespace WorldObjs {
 
 Guillotine::Guillotine(const FileReader& reader)
-  : sprite_kill_right (Resource::load_sprite("traps/guillotinekill/right")),
-    sprite_kill_left (Resource::load_sprite("traps/guillotinekill/left")),
-    sprite_idle (Resource::load_sprite("traps/guillotineidle")),
+  : sprite_kill_right (Sprite("traps/guillotinekill/right")),
+    sprite_kill_left (Sprite("traps/guillotinekill/left")),
+    sprite_idle (Sprite("traps/guillotineidle")),
     killing(false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp       2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/hammer.cpp       2008-07-04 05:24:12 UTC (rev 
3658)
@@ -24,7 +24,7 @@
 namespace WorldObjs {
 
 Hammer::Hammer(const FileReader& reader)
-  : sprite(Resource::load_sprite("traps/hammer"))
+  : sprite(Sprite("traps/hammer"))
 {
   reader.read_vector("position", pos);
 }

Modified: trunk/pingus/src/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.cpp      2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/hotspot.cpp      2008-07-04 05:24:12 UTC (rev 
3658)
@@ -30,7 +30,7 @@
   reader.read_desc  ("surface",  desc);
   reader.read_float ("parallax", para);
 
-  sprite = Resource::load_sprite(desc);
+  sprite = Sprite(desc);
 }
 
 Hotspot::~Hotspot ()

Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/ice_block.cpp    2008-07-04 05:24:12 UTC (rev 
3658)
@@ -29,7 +29,7 @@
   : thickness(1.0),
     is_finished(false),
     last_contact(0),
-    block_sur(Resource::load_sprite("worldobjs/iceblock")),
+    block_sur(Sprite("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-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/info_box.cpp     2008-07-04 05:24:12 UTC (rev 
3658)
@@ -25,7 +25,7 @@
 namespace WorldObjs {
 
 InfoBox::InfoBox(const FileReader& reader)
-  : sprite(Resource::load_sprite("worldobjs/infobox")),
+  : sprite(Sprite("worldobjs/infobox")),
     is_open (false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp       2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/liquid.cpp       2008-07-04 05:24:12 UTC (rev 
3658)
@@ -40,7 +40,7 @@
   reader.read_desc  ("surface",  desc);
   reader.read_int   ("repeat",   width);
 
-  sur = Resource::load_sprite(desc);
+  sur = Sprite(desc);
 
   if (!old_width_handling)
     width = width * sur.get_width();

Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp      2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/smasher.cpp      2008-07-04 05:24:12 UTC (rev 
3658)
@@ -29,7 +29,7 @@
 namespace WorldObjs {
 
 Smasher::Smasher(const FileReader& reader)
-  : surface(Resource::load_sprite("traps/smasher")),
+  : surface(Sprite("traps/smasher")),
     smashing(false),
     downwards(false),
     count(0)

Modified: trunk/pingus/src/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp        2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/spike.cpp        2008-07-04 05:24:12 UTC (rev 
3658)
@@ -24,7 +24,7 @@
 namespace WorldObjs {
 
 Spike::Spike (const FileReader& reader)
-  : surface(Resource::load_sprite("traps/spike")),
+  : surface(Sprite("traps/spike")),
     killing(false)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.cpp   2008-07-04 
03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.cpp   2008-07-04 
05:24:12 UTC (rev 3658)
@@ -27,13 +27,13 @@
   switch (type)
     {
     case SMALL_STAR:
-      sur = Resource::load_sprite("game/stars/small_star");
+      sur = Sprite("game/stars/small_star");
       break;
     case MIDDLE_STAR:
-      sur = Resource::load_sprite("game/stars/middle_star");
+      sur = Sprite("game/stars/middle_star");
       break;
     case LARGE_STAR:
-      sur = Resource::load_sprite("game/stars/large_star");
+      sur = Sprite("game/stars/large_star");
       break;
     }
 

Modified: trunk/pingus/src/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp   2008-07-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/worldobjs/surface_background.cpp   2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -59,7 +59,7 @@
 
   Timer timer("Background creation");
 
-  bg_surface = Resource::load_sprite(desc);
+  bg_surface = Sprite(desc);
   bg_surface.fill(color);
 
   // Scaling Code

Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/switch_door.cpp  2008-07-04 05:24:12 UTC (rev 
3658)
@@ -25,11 +25,11 @@
 namespace WorldObjs {
 
 SwitchDoor::SwitchDoor(const FileReader& reader)
-  : door_box      (Resource::load_sprite("worldobjs/switchdoor_box")),
+  : door_box      (Sprite("worldobjs/switchdoor_box")),
     door_box_cmap (Resource::load_collision_mask("worldobjs/switchdoor_box")),
-    door_tile     (Resource::load_sprite("worldobjs/switchdoor_tile")),
+    door_tile     (Sprite("worldobjs/switchdoor_tile")),
     
door_tile_cmap(Resource::load_collision_mask("worldobjs/switchdoor_tile_cmap")),
-    switch_sur    (Resource::load_sprite("worldobjs/switchdoor_switch")),
+    switch_sur    (Sprite("worldobjs/switchdoor_switch")),
     is_opening(false)
 {
   FileReader subreader;

Modified: trunk/pingus/src/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp   2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/teleporter.cpp   2008-07-04 05:24:12 UTC (rev 
3658)
@@ -26,7 +26,7 @@
 namespace WorldObjs {
 
 Teleporter::Teleporter(const FileReader& reader)
-  : sprite(Resource::load_sprite("worldobjs/teleporter"))
+  : sprite(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-04 03:01:01 UTC 
(rev 3657)
+++ trunk/pingus/src/worldobjs/teleporter_target.cpp    2008-07-04 05:24:12 UTC 
(rev 3658)
@@ -26,7 +26,7 @@
 
 TeleporterTarget::TeleporterTarget(const FileReader& reader)
   : WorldObj(reader),
-    sprite(Resource::load_sprite("worldobjs/teleportertarget"))
+    sprite(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-04 
03:01:01 UTC (rev 3657)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.cpp      2008-07-04 
05:24:12 UTC (rev 3658)
@@ -21,7 +21,7 @@
 namespace WorldObjs {
 
 ThunderstormBackground:: ThunderstormBackground(const FileReader& reader)
-  : clouds_sur(Resource::load_sprite("textures/thunderstorm")),
+  : clouds_sur(Sprite("textures/thunderstorm")),
     x_pos(0)
 {
   reader.read_vector("position", pos);

Modified: trunk/pingus/src/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp    2008-07-04 03:01:01 UTC (rev 
3657)
+++ trunk/pingus/src/worldobjs/woodthing.cpp    2008-07-04 05:24:12 UTC (rev 
3658)
@@ -28,8 +28,8 @@
 WoodThing::WoodThing(const FileReader& reader)
   : Entrance(reader)
 {
-  surface  = Resource::load_sprite("entrances/woodthing_mov");
-  surface2 = Resource::load_sprite("entrances/woodthing_nmov");
+  surface  = Sprite("entrances/woodthing_mov");
+  surface2 = Sprite("entrances/woodthing_nmov");
 }
 
 void