[Super-tux-commit] supertux/src title.cpp,1.81,1.82 badguy.cpp,1.73,1.74

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26272

Modified Files:
	title.cpp badguy.cpp 
Log Message:
- changed b/g for credits
- fixed firebullet not killing some enemies

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- badguy.cpp	13 May 2004 21:02:14 -0000	1.73
+++ badguy.cpp	14 May 2004 07:42:30 -0000	1.74
@@ -961,7 +961,7 @@
       tux.holding_something = false;
     }
   }
-  
+
   physic.enable_gravity(true);
 
   /* Gain some points: */
@@ -1003,16 +1003,14 @@
 
       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;

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- title.cpp	10 May 2004 20:37:59 -0000	1.81
+++ title.cpp	14 May 2004 07:42:29 -0000	1.82
@@ -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 @@
 
   /* 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 @@
                   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 @@
 
   free_contrib_menu();
   delete bkg_title;
+  delete bkg_credits;
   delete logo;
   delete img_choose_subset;
 }