Tweaked scores.

[supertux.git] / src / resources.cpp

diff --git a/src/resources.cpp b/src/resources.cpp
index d139568..3913a05 100644 (file)
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -74,7 +74,8 @@ char * soundfilenames[NUM_SOUNDS] = {
                                        "/sounds/lifeup.wav",
                                        "/sounds/stomp.wav",
                                        "/sounds/kick.wav",
-                                       "/sounds/explosion.wav"
+                                       "/sounds/explosion.wav",
+                                       "/sounds/warp.wav"
                                     };
 
 
@@ -114,85 +115,46 @@ void loadshared()
 
   int i;
 
-  sprite_manager = new SpriteManager(datadir + "/supertux.strf");
+  sprite_manager = new SpriteManager(datadir + "/images/supertux.strf");
 
   /* Tuxes: */
   smalltux_star = sprite_manager->load("smalltux-star");
-  largetux_star = sprite_manager->load("largetux-star");
+  bigtux_star = sprite_manager->load("bigtux-star");
   smalltux_gameover = sprite_manager->load("smalltux-gameover");
 
   char img_name[1024];
   for (int i = 0; i < GROWING_FRAMES; i++)
     {
       sprintf(img_name, "%s/images/shared/tux-grow-left-%i.png", datadir.c_str(), i+1);
-      growingtux_left[i] = new Surface(img_name, false);
+      growingtux_left[i] = new Surface(img_name, true);
 
       sprintf(img_name, "%s/images/shared/tux-grow-right-%i.png", datadir.c_str(), i+1);
-      growingtux_right[i] = new Surface(img_name, false);
+      growingtux_right[i] = new Surface(img_name, true);
     }
 
-  smalltux.stand_left  = sprite_manager->load("smalltux-stand-left");
-  smalltux.stand_right = sprite_manager->load("smalltux-stand-right");
-  smalltux.walk_left   = sprite_manager->load("smalltux-walk-left");
-  smalltux.walk_right  = sprite_manager->load("smalltux-walk-right");
-  smalltux.jump_left   = sprite_manager->load("smalltux-jump-left");
-  smalltux.jump_right  = sprite_manager->load("smalltux-jump-right");
-  smalltux.kick_left   = sprite_manager->load("smalltux-kick-left");
-  smalltux.kick_right  = sprite_manager->load("smalltux-kick-right");
-  smalltux.skid_left   = sprite_manager->load("smalltux-skid-left");
-  smalltux.skid_right  = sprite_manager->load("smalltux-skid-right");
-  smalltux.grab_left   = sprite_manager->load("smalltux-grab-left");
-  smalltux.grab_right  = sprite_manager->load("smalltux-grab-right");
-  smalltux.stomp       = sprite_manager->load("stomp");
-
-  largetux.stand_left  = sprite_manager->load("largetux-stand-left");
-  largetux.stand_right = sprite_manager->load("largetux-stand-right");
-  largetux.walk_left   = sprite_manager->load("largetux-walk-left");
-  largetux.walk_right  = sprite_manager->load("largetux-walk-right");
-  largetux.jump_left   = sprite_manager->load("largetux-jump-left");
-  largetux.jump_right  = sprite_manager->load("largetux-jump-right");
-  largetux.kick_left   = sprite_manager->load("largetux-kick-left");
-  largetux.kick_right  = sprite_manager->load("largetux-kick-right");
-  largetux.skid_right  = sprite_manager->load("largetux-skid-right");
-  largetux.skid_left   = sprite_manager->load("largetux-skid-left");
-  largetux.grab_left   = sprite_manager->load("largetux-grab-left");
-  largetux.grab_right  = sprite_manager->load("largetux-grab-right");
-  largetux.duck_left   = sprite_manager->load("largetux-duck-left");
-  largetux.duck_right  = sprite_manager->load("largetux-duck-right");
-  largetux.stomp       = sprite_manager->load("stomp");
-
-  firetux.stand_left  = sprite_manager->load("firetux-stand-left");
-  firetux.stand_right = sprite_manager->load("firetux-stand-right");
-  firetux.walk_left   = sprite_manager->load("firetux-walk-left");
-  firetux.walk_right  = sprite_manager->load("firetux-walk-right");
-  firetux.jump_left   = sprite_manager->load("firetux-jump-left");
-  firetux.jump_right  = sprite_manager->load("firetux-jump-right");
-  firetux.kick_left   = sprite_manager->load("firetux-kick-left");
-  firetux.kick_right  = sprite_manager->load("firetux-kick-right");
-  firetux.skid_right  = sprite_manager->load("firetux-skid-right");
-  firetux.skid_left   = sprite_manager->load("firetux-skid-left");
-  firetux.grab_left   = sprite_manager->load("firetux-grab-left");
-  firetux.grab_right  = sprite_manager->load("firetux-grab-right");
-  firetux.duck_left   = sprite_manager->load("firetux-duck-left");
-  firetux.duck_right  = sprite_manager->load("firetux-duck-right");
-  firetux.stomp       = sprite_manager->load("stomp");
-
-  icetux.stand_left  = sprite_manager->load("icetux-stand-left");
-  icetux.stand_right = sprite_manager->load("icetux-stand-right");
-  icetux.walk_left   = sprite_manager->load("icetux-walk-left");
-  icetux.walk_right  = sprite_manager->load("icetux-walk-right");
-  icetux.jump_left   = sprite_manager->load("icetux-jump-left");
-  icetux.jump_right  = sprite_manager->load("icetux-jump-right");
-  icetux.kick_left   = sprite_manager->load("icetux-kick-left");
-  icetux.kick_right  = sprite_manager->load("icetux-kick-right");
-  icetux.skid_right  = sprite_manager->load("icetux-skid-right");
-  icetux.skid_left   = sprite_manager->load("icetux-skid-left");
-  icetux.grab_left   = sprite_manager->load("icetux-grab-left");
-  icetux.grab_right  = sprite_manager->load("icetux-grab-right");
-  icetux.duck_left   = sprite_manager->load("icetux-duck-left");
-  icetux.duck_right  = sprite_manager->load("icetux-duck-right");
-  icetux.stomp       = sprite_manager->load("stomp");
-
+  small_tux = new TuxBodyParts();
+  small_tux->head = NULL;
+  small_tux->body = sprite_manager->load("small-tux-body");
+  small_tux->arms = sprite_manager->load("small-tux-arms");
+  small_tux->feet = NULL;
+
+  big_tux = new TuxBodyParts();
+  big_tux->head = sprite_manager->load("big-tux-head");
+  big_tux->body = sprite_manager->load("big-tux-body");
+  big_tux->arms = sprite_manager->load("big-tux-arms");
+  big_tux->feet = sprite_manager->load("big-tux-feet");
+
+  fire_tux = new TuxBodyParts();
+  fire_tux->head = sprite_manager->load("big-fire-tux-head");
+  fire_tux->body = sprite_manager->load("big-tux-body");
+  fire_tux->arms = sprite_manager->load("big-tux-arms");
+  fire_tux->feet = sprite_manager->load("big-tux-feet");
+
+  ice_tux = new TuxBodyParts();
+  ice_tux->head = sprite_manager->load("big-tux-head");
+  ice_tux->body = sprite_manager->load("big-tux-body");
+  ice_tux->arms = sprite_manager->load("big-tux-arms");
+  ice_tux->feet = sprite_manager->load("big-tux-feet");
 
   /* Water: */
   img_water = new Surface(datadir + "/images/shared/water.png", false);
@@ -203,6 +165,7 @@ void loadshared()
   img_waves[1] = new Surface(datadir + "/images/shared/waves-1.png",
                              true);
 
+
   img_waves[2] = new Surface(datadir + "/images/shared/waves-2.png",
                              true);
 
@@ -264,7 +227,7 @@ void loadshared()
   for (int i = 0; i < DOOR_OPENING_FRAMES; i++)
     {
       sprintf(img_name, "%s/images/shared/door-%i.png", datadir.c_str(), i+1);
-      door_opening[i] = new Surface(img_name, false);
+      door_opening[i] = new Surface(img_name, true);
     }
 
   /* Distros: */
@@ -343,6 +306,11 @@ void unloadshared(void)
 
   delete tux_life;
 
+  delete small_tux;
+  delete big_tux;
+  delete fire_tux;
+  delete ice_tux;
+
   for (int i = 0; i < GROWING_FRAMES; i++)
   {
     delete growingtux_left[i];