- changed b/g for credits

- fixed firebullet not killing some enemies

SVN-Revision: 1172

diff --git a/src/badguy.cpp b/src/badguy.cpp
index be19b1a..4667d58 100644 (file)
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -961,7 +961,7 @@ BadGuy::kill_me(int score)
       tux.holding_something = false;
     }
   }
-  
+
   physic.enable_gravity(true);
 
   /* Gain some points: */
@@ -1003,16 +1003,14 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
 
       if(pbullet_c->kind == FIRE_BULLET)
         {
-        if(kind == BAD_MRICEBLOCK || kind == BAD_STALACTITE ||
-            kind == BAD_FISH || kind == BAD_BOUNCINGSNOWBALL ||
-            kind == BAD_FLYINGSNOWBALL || kind == BAD_FLYINGSNOWBALL)
-        kill_me(10);
+        if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME)
+          kill_me(10);
         }
       else if(pbullet_c->kind == ICE_BULLET)
         {
-        if(kind == BAD_FLAME)
-          kill_me(10);
-        else
+        //if(kind == BAD_FLAME)
+        //  kill_me(10);
+        //else
           frozen_timer.start(FROZEN_TIME);
         }
       break;

diff --git a/src/title.cpp b/src/title.cpp
index d31ce95..f9e2ef5 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -52,6 +52,7 @@
 #include "resources.h"
 
 static Surface* bkg_title;
+static Surface* bkg_credits;
 static Surface* logo;
 static Surface* img_choose_subset;
 
@@ -227,6 +228,7 @@ void title(void)
 
   /* Load images: */
   bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA);
+  bkg_credits = new Surface(datadir + "/images/background/oiltux.jpg", IGNORE_ALPHA);
   logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA);
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
 
@@ -303,7 +305,7 @@ void title(void)
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
+                  display_text_file("CREDITS", bkg_credits, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:
@@ -370,6 +372,7 @@ void title(void)
 
   free_contrib_menu();
   delete bkg_title;
+  delete bkg_credits;
   delete logo;
   delete img_choose_subset;
 }