super-tux-commit — Messages about commits to the sourcecode.

[Super-tux-commit] supertux/src title.cpp,1.74,1.75

[Ricardo C. <rm...@us...>]

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

Modified Files:
	title.cpp 
Log Message:
Ooops, looks like screen wasn't scrolling in the main menu.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- title.cpp	2 May 2004 22:17:08 -0000	1.74
+++ title.cpp	3 May 2004 13:57:39 -0000	1.75
@@ -222,7 +222,8 @@
 
   tux->can_jump = true;
   float last_tux_x_pos = tux->base.x;
-  tux->action(frame_ratio);
+  session->get_world()->action(frame_ratio);
+  
 
   // disabled for now, since with the new jump code we easily get deadlocks
   // Jump if tux stays in the same position for one loop, ie. if he is

[Super-tux-commit] supertux/data/levels/world1 level13.stl,1.9,1.10

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/world1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25467/data/levels/world1

Modified Files:
	level13.stl 
Log Message:
Enabled back scrolling on this level.
It is mostly for people give it a try.

Index: level13.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- level13.stl	1 May 2004 13:28:54 -0000	1.9
+++ level13.stl	3 May 2004 13:36:19 -0000	1.10
@@ -17,6 +17,7 @@
   (bkgd_blue_bottom   255)
   (time  200)
   (gravity  10.0)
+  (back_scrolling #t)
   (particle_system "clouds")
   (theme "antarctica")
   (interactive-tm

[Super-tux-commit] supertux/src level.cpp,1.61,1.62

[Ricardo C. <rm...@us...>]

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

Modified Files:
	level.cpp 
Log Message:
Fixed the back_scrolling flag as suggested by Michael George over the mailing list.

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- level.cpp	3 May 2004 12:45:58 -0000	1.61
+++ level.cpp	3 May 2004 13:32:36 -0000	1.62
@@ -556,9 +556,9 @@
   fprintf(fi,"  (time %d)\n", time_left);
   fprintf(fi,"  (width %d)\n", width);
   if(back_scrolling)
-    fprintf(fi,"  (back_scrolling t)\n"); 
+    fprintf(fi,"  (back_scrolling #t)\n"); 
   else
-    fprintf(fi,"  (back_scrolling f)\n");
+    fprintf(fi,"  (back_scrolling #f)\n");
   fprintf(fi,"  (gravity %2.1f)\n", gravity);
   fprintf(fi,"  (background-tm ");
 

[Super-tux-commit] supertux TODO,1.24,1.25

[Matze B. <mat...@us...>]

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

Modified Files:
	TODO 
Log Message:
TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- TODO	3 May 2004 12:56:57 -0000	1.24
+++ TODO	3 May 2004 13:02:01 -0000	1.25
@@ -32,6 +32,9 @@
   per block.
 - We should reduced the width of tux collision rectangle so that he falls easier
   between 1 tile wide holes.
+- The enabled/disabled icon in the options shouldn't be a cross. Some people
+  think the options are disabled because they're crossed. Better use a green
+  check mark.
 
 Fixed
 -----

[Super-tux-commit] supertux/src gameloop.cpp,1.119,1.120

[Matze B. <mat...@us...>]

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

Modified Files:
	gameloop.cpp 
Log Message:
hiding the time while end_sequence wasn't nice

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- gameloop.cpp	3 May 2004 12:39:19 -0000	1.119
+++ gameloop.cpp	3 May 2004 13:00:35 -0000	1.120
@@ -672,14 +672,12 @@
       white_text->draw("Press ESC To Return",0,20,1);
     }
 
-  if(!end_sequence) {
-    if(!time_left.check()) {
-      white_text->draw("TIME'S UP", 224, 0, 1);
-    } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
-      sprintf(str, "%d", time_left.get_left() / 1000 );
-      white_text->draw("TIME", 224, 0, 1);
-      gold_text->draw(str, 304, 0, 1);
-    }
+  if(!time_left.check()) {
+    white_text->draw("TIME'S UP", 224, 0, 1);
+  } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
+    sprintf(str, "%d", time_left.get_left() / 1000 );
+    white_text->draw("TIME", 224, 0, 1);
+    gold_text->draw(str, 304, 0, 1);
   }
 
   sprintf(str, "%d", player_status.distros);

[Super-tux-commit] supertux TODO,1.23,1.24

[Matze B. <mat...@us...>]

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

Modified Files:
	TODO 
Log Message:
TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- TODO	2 May 2004 22:40:37 -0000	1.23
+++ TODO	3 May 2004 12:56:57 -0000	1.24
@@ -16,6 +16,9 @@
     going through the goal with a small jump, might be old_up related
 [L] fadein/out for intro/extro would be nice
 [L] when bumping a special with 2 blocks at once, it won't change direction
+[L] in the "Welcome to Antarctica" level, the blocks next to the first growup
+    look like there are 2 blocks above each other when bumping against them as
+    small tux...
 - leveleditor crashs when pressing the button with the levelsettings
 
 

[Super-tux-commit] supertux/src level.cpp,1.60,1.61

[Ricardo C. <rm...@us...>]

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

Modified Files:
	level.cpp 
Log Message:
Just changed back_scrolling save syntax.

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- level.cpp	3 May 2004 12:34:37 -0000	1.60
+++ level.cpp	3 May 2004 12:45:58 -0000	1.61
@@ -556,9 +556,9 @@
   fprintf(fi,"  (time %d)\n", time_left);
   fprintf(fi,"  (width %d)\n", width);
   if(back_scrolling)
-    fprintf(fi,"  (back_scrolling 1)\n"); 
+    fprintf(fi,"  (back_scrolling t)\n"); 
   else
-    fprintf(fi,"  (back_scrolling 0)\n");
+    fprintf(fi,"  (back_scrolling f)\n");
   fprintf(fi,"  (gravity %2.1f)\n", gravity);
   fprintf(fi,"  (background-tm ");
 

[Super-tux-commit] supertux/src gameloop.cpp,1.118,1.119

[Matze B. <mat...@us...>]

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

Modified Files:
	gameloop.cpp 
Log Message:
fix timeup issues when endsequence triggered

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- gameloop.cpp	2 May 2004 15:51:12 -0000	1.118
+++ gameloop.cpp	3 May 2004 12:39:19 -0000	1.119
@@ -611,7 +611,8 @@
         }
 
       /* Handle time: */
-      if (!time_left.check() && world->get_tux()->dying == DYING_NOT)
+      if (!time_left.check() && world->get_tux()->dying == DYING_NOT
+              && !end_sequence)
         world->get_tux()->kill(Player::KILL);
 
       /* Handle music: */
@@ -671,12 +672,14 @@
       white_text->draw("Press ESC To Return",0,20,1);
     }
 
-  if(!time_left.check()) {
-    white_text->draw("TIME'S UP", 224, 0, 1);
-  } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
-    sprintf(str, "%d", time_left.get_left() / 1000 );
-    white_text->draw("TIME", 224, 0, 1);
-    gold_text->draw(str, 304, 0, 1);
+  if(!end_sequence) {
+    if(!time_left.check()) {
+      white_text->draw("TIME'S UP", 224, 0, 1);
+    } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
+      sprintf(str, "%d", time_left.get_left() / 1000 );
+      white_text->draw("TIME", 224, 0, 1);
+      gold_text->draw(str, 304, 0, 1);
+    }
   }
 
   sprintf(str, "%d", player_status.distros);

[Super-tux-commit] supertux/src level.cpp,1.59,1.60 level.h,1.42,1.43 player.cpp,1.81,1.82 player.h,1.49,1.50 world.cpp,1.50,1.51 world.h,1.33,1.34

[Ricardo C. <rm...@us...>]

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

Modified Files:
	level.cpp level.h player.cpp player.h world.cpp world.h 
Log Message:
Added back scrolling!
It is only enabled if the level explicity asks for.

Index: world.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- world.h	28 Apr 2004 20:24:34 -0000	1.33
+++ world.h	3 May 2004 12:34:37 -0000	1.34
@@ -76,6 +76,7 @@
 
   void draw();
   void action(double frame_ratio);
+  void keep_in_bounds();
 
   void play_music(int musictype);
   int get_music_type();

Index: level.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- level.h	29 Apr 2004 16:23:32 -0000	1.42
+++ level.h	3 May 2004 12:34:37 -0000	1.43
@@ -89,6 +89,7 @@
   int start_pos_x;
   int start_pos_y;
   float gravity;
+  bool back_scrolling;
 
   std::vector<BadGuyData> badguy_data;
 

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- player.cpp	1 May 2004 15:46:08 -0000	1.81
+++ player.cpp	3 May 2004 12:34:37 -0000	1.82
@@ -191,7 +191,7 @@
           base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1);
           previous_base = old_base = base;
         }
-      keep_in_bounds();
+      check_bounds();
 
       // Land:
       if (!on_ground())
@@ -734,20 +734,14 @@
 }
 
 void
-Player::keep_in_bounds()
+Player::check_bounds()
 {
-  Level* plevel = World::current()->get_level();
-
   /* Keep tux in bounds: */
   if (base.x < 0)
     { // Lock Tux to the size of the level, so that he doesn't fall of
       // on the left side
       base.x = 0;
     }
-  else if (base.x < scroll_x)
-    { 
-      base.x = scroll_x;
-    }
 
   /* Keep in-bounds, vertically: */
   if (base.y > screen->h)
@@ -755,37 +749,8 @@
       kill(KILL);
     }
 
-  int scroll_threshold = screen->w/2 - 80;
-  if (debug_mode)
-    {
-      scroll_x += screen->w/2;
-      // Backscrolling for debug mode
-      if (scroll_x < base.x - 80)
-        scroll_x = base.x - 80;
-      else if (scroll_x > base.x + 80)
-        scroll_x = base.x + 80;
-      scroll_x -= screen->w/2;
-
-      if(scroll_x < 0)
-        scroll_x = 0;
-    }
-  else
-    {
-      if (base.x > scroll_threshold + scroll_x
-          && scroll_x < ((World::current()->get_level()->width * 32) - screen->w))
-        {
-          // FIXME: Scrolling needs to be handled by a seperate View
-          // class, doing it as a player huck is ugly
-          
-          // Scroll the screen in past center:
-          scroll_x = base.x - scroll_threshold;
-          
-          // Lock the scrolling to the levelsize, so that we don't
-          // scroll over the right border
-          if (scroll_x > 32 * plevel->width - screen->w)
-            scroll_x = 32 * plevel->width - screen->w;
-        }
-    }
+  if(base.x < scroll_x)  // can happen if back scrolling is disabled
+    base.x = scroll_x;
 }
 
 // EOF //

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- player.h	2 May 2004 21:28:32 -0000	1.49
+++ player.h	3 May 2004 12:34:37 -0000	1.50
@@ -144,7 +144,7 @@
   void is_dying();
   bool is_dead();
   void player_remove_powerups();
-  void keep_in_bounds();
+  void check_bounds();
   bool on_ground();
   bool under_solid();
   void grow();

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- level.cpp	29 Apr 2004 16:23:32 -0000	1.59
+++ level.cpp	3 May 2004 12:34:37 -0000	1.60
@@ -237,6 +237,7 @@
   start_pos_y = 170;
   time_left  = 100;
   gravity    = 10.;
+  back_scrolling = false;
   bkgd_top.red   = 0;
   bkgd_top.green = 0;
   bkgd_top.blue  = 0;
@@ -311,6 +312,9 @@
       if(!reader.read_int("time",  &time_left)) {
         printf("Warning no time specified for level.\n");
       }
+      
+      back_scrolling = false;
+      reader.read_bool("back_scrolling",  &back_scrolling);
 
       bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0;
       reader.read_int("bkgd_red_top",  &bkgd_top.red);
@@ -551,6 +555,10 @@
   fprintf(fi,"  (bkgd_blue_bottom %d)\n", bkgd_bottom.blue);
   fprintf(fi,"  (time %d)\n", time_left);
   fprintf(fi,"  (width %d)\n", width);
+  if(back_scrolling)
+    fprintf(fi,"  (back_scrolling 1)\n"); 
+  else
+    fprintf(fi,"  (back_scrolling 0)\n");
   fprintf(fi,"  (gravity %2.1f)\n", gravity);
   fprintf(fi,"  (background-tm ");
 

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- world.cpp	2 May 2004 21:28:32 -0000	1.50
+++ world.cpp	3 May 2004 12:34:37 -0000	1.51
@@ -257,6 +257,7 @@
 World::action(double frame_ratio)
 {
   tux.action(frame_ratio);
+  keep_in_bounds();
 
   /* Handle bouncy distros: */
   for (unsigned int i = 0; i < bouncy_distros.size(); i++)
@@ -304,6 +305,28 @@
   }
 }
 
+// the space that it takes for the screen to start scrolling
+#define X_SPACE 80
+
+/* This functions takes cares of the scrolling */
+void World::keep_in_bounds()
+{
+int tux_pos_x = (int)(tux.base.x - (tux.base.width/2));
+
+scroll_x += screen->w/2;
+
+if (scroll_x < tux_pos_x - X_SPACE)
+  scroll_x = tux_pos_x - X_SPACE;
+else if (scroll_x > tux_pos_x + X_SPACE && level->back_scrolling)
+  scroll_x = tux_pos_x + X_SPACE;
+
+scroll_x -= screen->w/2;
+
+if(scroll_x < 0)
+  scroll_x = 0;
+}
+
+
 void
 World::collision_handler()
 {

[Super-tux-commit] supertux/src setup.cpp,1.67,1.68

[Ricardo C. <rm...@us...>]

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

Modified Files:
	setup.cpp 
Log Message:
Just added Level Editor back to the menu.
I know it isn't working very well, but this is the cvs, so we need it, in order to test it!
If you want to make a release snapshot, just comment this line.

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- setup.cpp	2 May 2004 22:44:56 -0000	1.67
+++ setup.cpp	3 May 2004 12:02:53 -0000	1.68
@@ -382,7 +382,7 @@
   main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME);
   main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB);
   main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU);
-  //main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
+  main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
   main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS);
   main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
 

[Super-tux-commit] supertux/data/images icon.xpm,1.1,1.2

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/data/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29905

Modified Files:
	icon.xpm 
Log Message:
- changed size to 32x32 to make windows happy

Index: icon.xpm
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/icon.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- icon.xpm	22 Apr 2004 11:26:39 -0000	1.1
+++ icon.xpm	3 May 2004 11:35:24 -0000	1.2
@@ -1,662 +1,497 @@
 /* XPM */
 static char * icon_xpm[] = {
-"44 44 615 2",
+"32 32 462 2",
 "  	c None",
-". 	c #59A6EF",
-"+ 	c #5AA7EF",
-"@ 	c #5DA9EF",
-"# 	c #5BA7EF",
-"$ 	c #64ACEF",
-"% 	c #61ABEF",
[...1125 lines suppressed...]
+"      s.t.u.7.v.w.x.y.z.A.B.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.      ",
+"    Q.R.S.T.U.V.W.X.Y.Z.`. +.+++++++++@+#+$+%+&+*+=+-+;+>+,+    ",
+"  '+)+!+~+{+]+6.^+/+(+_+:+<+++++++++++[+}+|+2 1+2+3+4+' 5+6+,+  ",
+"7+8+9+0+a+b+c+d+e+f+Y g+h+i+++++++++ +j+k+l+m+n+o+p+q+r+s+t+u+v+",
+"w+x+y+z+)+A+B+C+D+E+F+A.G+H+I+J+++K+L+M+M+M+N+O+P+Q+R+S+T+U+V+u+",
+"  W+x+X+Y+Z+`+ @.@+@@@g+#@++++$@Y %@&@M+M+*@M+=@-@;@>@1 S+T+U+  ",
+"    ,@'@)@!@~@{@]@^@@@/@(@I+++++_@:@&@M+M+<@M+[@}@|@1@2@3@4@    ",
+"      5@6@5@7@8@9@0@a@b@<+$@c@++++d@e@f@M+<@M+g@h@i@j@k@l@      ",
+"        m@n@o@p@q@r@s@t@u@H+A.B.++++G+v@M+M+M+w@x@y@z@A@        ",
+"          B@C@D@E@F@G@H@#@++I@J@K@L@M@N@O@P@<@Q@R@S@T@          ",
+"            U@V@W@X@Y@Z@`@I+++ #.#+#@###$#%#&#*#=#-#            ",
+"            ;#>#,#'#)#!#~#{#++]#@#^#^#$#/#(#_#:#<#              ",
+"            ++[#}#|#1#2#3#4#++++5#6#7#8#9#0#a#b#                ",
+"              c#d#e#f#g#h#i#j#k#++++l#m#n#o#p#                  ",
+"                    q#r#s#t#u#v#w#x#y#z#A#B#                    ",
+"                      C#D#E#F#G#H#I#J#K#L#                      ",
+"                        M#N#x+O#P#Q#R#S#                        ",
+"                          T#U#V#O#W#H#                          ",
+"                            X#Y#Z#`#                            ",
+"                               $.$                              "};

[Super-tux-commit] supertux/contrib/innosetup supertux.ico,NONE,1.1 supertux.iss,NONE,1.1

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/contrib/innosetup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26131/innosetup

Added Files:
	supertux.ico supertux.iss 
Log Message:
added files for windows installer

--- NEW FILE: supertux.iss ---
; Script generated by the Inno Setup Script Wizard.
; modified by Matthias Braun (thanks go to fEnio for the netpanzer script which I took as a base)

[Setup]
AppName=SuperTux
AppVerName=SuperTux 0.1.0
AppPublisher=SuperTux Development Team
AppPublisherURL=http://super-tux.sourceforge.net
AppSupportURL=http://super-tux.sourceforge.net
AppUpdatesURL=http://super-tux.sourceforge.net
DefaultDirName={pf}\SuperTux
DefaultGroupName=SuperTux
AllowNoIcons=yes
Compression=lzma
SolidCompression=yes

[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

[Files]
Source: "D:\supertux\supertux.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\AUTHORS"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\ChangeLog"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\COPYING"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\jpeg.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\libpng1.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\NEWS"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\README"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\SDL_image.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\SDL_mixer.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\TODO"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\zlib.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\supertux\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs
Source: "D:\supertux\contrib\innosetup\supertux.ico"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

[Icons]
Name: "{group}\SuperTux"; Filename: "{app}\supertux.exe"; WorkingDir: "{app}"; IconFilename: "{app}\supertux.ico"
Name: "{group}\{cm:UninstallProgram,SuperTux}"; Filename: "{uninstallexe}"
Name: "{userdesktop}\SuperTux"; Filename: "{app}\supertux.exe"; WorkingDir: "{app}"; IconFilename: "{app}\supertux.ico"; Tasks: desktopicon

[Run]
Filename: "{app}\supertux.exe"; Description: "{cm:LaunchProgram,SuperTux}"; Flags: nowait postinstall skipifsilent

[UninstallDelete]
Type: filesandordirs; Name: "{app}\.supertux"
Type: filesandordirs; Name: "{app}\stdout.txt"
Type: filesandordirs; Name: "{app}\stderr.txt"

--- NEW FILE: supertux.ico ---
(This appears to be a binary file; contents omitted.)

[Super-tux-commit] supertux/contrib/innosetup - New directory

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/contrib/innosetup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25978/innosetup

Log Message:
Directory /cvsroot/super-tux/supertux/contrib/innosetup added to the repository

[Super-tux-commit] supertux Makefile.am,1.4,1.5

[Ingo R. <gr...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
- makefile fixes

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	2 May 2004 22:40:37 -0000	1.4
+++ Makefile.am	2 May 2004 23:22:28 -0000	1.5
@@ -1,5 +1,5 @@
 SUBDIRS = src data
 
-EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py
+EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py $(wildcard mk/autoconf/*.m4) autogen.sh
 
 # EOF #

[Super-tux-commit] supertux/src leveleditor.cpp,1.75,1.76 setup.cpp,1.66,1.67

[Ingo R. <gr...@us...>]

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

Modified Files:
	leveleditor.cpp setup.cpp 
Log Message:
- -Wall fixing
- removed level editor from menu, since it crashes on settings and is thus not useable in release

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- setup.cpp	1 May 2004 16:39:08 -0000	1.66
+++ setup.cpp	2 May 2004 22:44:56 -0000	1.67
@@ -382,7 +382,7 @@
   main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME);
   main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB);
   main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU);
-  main_menu->additem(MN_ACTION,"Level editor",0,0, MNID_LEVELEDITOR);
+  //main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
   main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS);
   main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
 

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- leveleditor.cpp	2 May 2004 21:28:32 -0000	1.75
+++ leveleditor.cpp	2 May 2004 22:44:56 -0000	1.76
@@ -784,8 +784,9 @@
     if(TileManager::instance()->get(le_current.tile)->editor_images.size() > 0)
       TileManager::instance()->get(le_current.tile)->editor_images[0]->draw( 19 * 32, 14 * 32);
   }
-  if(le_current.IsObject())
-    printf("");
+  
+  //if(le_current.IsObject())
+  //printf("");
 
   if(le_current_level != NULL)
   {

[Super-tux-commit] supertux Makefile.am,1.3,1.4 NEWS,1.6,1.7 README,1.4,1.5 TODO,1.22,1.23

[Ingo R. <gr...@us...>]

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

Modified Files:
	Makefile.am NEWS README TODO 
Log Message:
- small bugfixes in README and Co


Index: README
===================================================================
RCS file: /cvsroot/super-tux/supertux/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README	28 Apr 2004 12:15:42 -0000	1.4
+++ README	2 May 2004 22:40:37 -0000	1.5
@@ -47,7 +47,7 @@
 
     AUTHORS     - Credits for people that contributed to the creation
                   of SuperTux.
-    CHANGES     - Changes since the previous versions of "SuperTux"
+    NEWS        - Changes since the previous versions of "SuperTux"
     COPYING     - The GNU Public License, which "SuperTux" is liscensed
                   under.
     INSTALL     - Instructions on requirements, compiling and installing.

Index: NEWS
===================================================================
RCS file: /cvsroot/super-tux/supertux/NEWS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NEWS	12 Apr 2004 01:29:36 -0000	1.6
+++ NEWS	2 May 2004 22:40:37 -0000	1.7
@@ -1,9 +1,15 @@
-Super Tux 0.0.7 (         )
-===========================
+Super Tux 0.1.0 (3 May 04)
+==========================
+  * completly new graphics
+  * a basic storyline
+  * new enemies
+  * new music
+  * a worldmap
+  * 26 fully playable levels
+  * configurable joystick and keyboard support
   * new s-expr based file-format
-  * converter script for levels (levelconverter-0.0.6_0.0.7.py)
-  * experimental worldmap code
-  * switched to C++
+  * converter script for old levels (levelconverter-0.0.6_0.0.7.py)
+  * switched completly to C++
   * automagic detection of the datafile location, no more requirement
     to run 'make install'
   * Win32 port

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	2 May 2004 18:47:06 -0000	1.3
+++ Makefile.am	2 May 2004 22:40:37 -0000	1.4
@@ -1,5 +1,5 @@
 SUBDIRS = src data
 
-EXTRA_DIST = contrib/levelconvert.py TODO
+EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py
 
 # EOF #

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- TODO	2 May 2004 22:29:55 -0000	1.22
+++ TODO	2 May 2004 22:40:37 -0000	1.23
@@ -2,7 +2,7 @@
 - To do for Milestone1 -
 http://super-tux.sf.net/
 
-Last update: April 26, 2004
+Last update: May 3, 2004
 
 These are mostly bugs:
 

[Super-tux-commit] supertux TODO,1.21,1.22

[Matze B. <mat...@us...>]

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

Modified Files:
	TODO 
Log Message:
TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- TODO	2 May 2004 21:38:01 -0000	1.21
+++ TODO	2 May 2004 22:29:55 -0000	1.22
@@ -16,8 +16,8 @@
     going through the goal with a small jump, might be old_up related
 [L] fadein/out for intro/extro would be nice
 [L] when bumping a special with 2 blocks at once, it won't change direction
+- leveleditor crashs when pressing the button with the levelsettings
 
-- leveleditor lacks enemies support (will be fixed soon by Tobias)
 
 Stuff for past milestone1:
 --------------------------
@@ -33,6 +33,7 @@
 Fixed
 -----
 
+- leveleditor lacks enemies support (will be fixed soon by Tobias)
 - points aren't reset when gameover
 - when jumping into the exit with a star, the endgame music will change back to
   levelmusic after a short time

[Super-tux-commit] supertux ChangeLog,1.4,1.5

[Ingo R. <gr...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
- added changelog entries

Index: ChangeLog
===================================================================
RCS file: /cvsroot/super-tux/supertux/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	26 Apr 2004 22:11:41 -0000	1.4
+++ ChangeLog	2 May 2004 22:27:05 -0000	1.5
@@ -2,12 +2,3856 @@
 - SuperTux changes -
 http://super-tux.sf.net/
 
-Last update: April 26, 2004
+Last update: May 3, 2004
 
-0.1
+Milestone 0.1.0 - May 3, 2004
+------------------------
+  2004-05-03 00:21  grumbel
+
[...3829 lines suppressed...]
+
+  * Makefile.cvs: fixed missing seperator
+
+2004-03-16 22:12  tobgle
+
+  * src/type.h: consistent SDL include
+
+2004-03-16 16:06  tobgle
+
+  * src/: lispreader.c, lispreader.h: initial
+
+2004-03-16 16:05  tobgle
+
+  * Makefile.cvs, src/Makefile.am: compile lispreader
 
-  FIXME: paste mesages from the sourceforge cvs mailing list
-to here
 
 0.0.6 - March 15th, 2004
 ---------------------------

[Super-tux-commit] supertux/src button.cpp,1.18,1.19 button.h,1.16,1.17

[Matze B. <mat...@us...>]

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

Modified Files:
	button.cpp button.h 
Log Message:
fixed potential bug in Button class event handler

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- button.h	2 May 2004 21:28:32 -0000	1.16
+++ button.h	2 May 2004 22:26:04 -0000	1.17
@@ -71,8 +71,8 @@
   Button* event(SDL_Event &event);
   void additem(Button* pbutton, int tag);
   Button* button_panel_event(SDL_Event& event);
-  void set_button_size(int w, int h) { bw = w; bh = h; }
-  Button* manipulate_button(int i) { if(item.size()-1 < i) { return item[item.size()-1]; } else { return item[i]; } };
+  void set_button_size(int w, int h);
+  Button* manipulate_button(int i);
 
 private:
   int bw, bh;

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- button.cpp	2 May 2004 21:28:32 -0000	1.18
+++ button.cpp	2 May 2004 22:26:04 -0000	1.19
@@ -144,48 +144,38 @@
 {
   SDLKey key = event.key.keysym.sym;
 
-  if(event.motion.x > rect.x && event.motion.x < rect.x + rect.w &&
-      event.motion.y > rect.y && event.motion.y < rect.y + rect.h)
+  if(event.type == SDL_MOUSEBUTTONDOWN || event.type == SDL_MOUSEBUTTONUP)
     {
-      if(event.type == SDL_MOUSEBUTTONDOWN)
-        {
-          if(event.button.button == SDL_BUTTON_LEFT)
-            {
-              state = BUTTON_PRESSED;
-            }
-          else
-            {
-              show_info = true;
-            }
-        }
-      else if(event.type == SDL_MOUSEBUTTONUP)
-        {
-          if(event.button.button == SDL_BUTTON_LEFT && state == BUTTON_PRESSED)
-            {
-              state = BUTTON_CLICKED;
-            }
-          else if(event.button.button != SDL_BUTTON_LEFT && state != BUTTON_PRESSED)
-            {
-              show_info = true;
-            }
-        }
+      if(event.button.x < rect.x || event.button.x >= rect.x + rect.w ||
+         event.button.y < rect.y || event.button.y >= rect.y + rect.h)
+        return;
 
-      if(state != BUTTON_PRESSED && state != BUTTON_CLICKED)
+      if(event.button.button != SDL_BUTTON_LEFT)
         {
-          state = BUTTON_HOVER;
-          mouse_cursor->set_state(MC_LINK);
+          show_info = true;
+          return;
         }
+
+      if(event.type == SDL_MOUSEBUTTONDOWN)
+        state = BUTTON_PRESSED;
+      else
+        state = BUTTON_CLICKED;
     }
-  else if((event.type != SDL_KEYDOWN && event.type != SDL_KEYUP) || event.type == SDL_MOUSEMOTION)
+  else if(event.type == SDL_MOUSEMOTION)
     {
-      state = BUTTON_NONE;
+      if(event.motion.x < rect.x || event.motion.x >= rect.x + rect.w ||
+         event.motion.y < rect.y || event.motion.y >= rect.y + rect.h)
+        state = BUTTON_NONE;
+      else
+        state = BUTTON_HOVER;
+
+      popup_timer.start(1500);
       if(show_info)
         {
           show_info = false;
-        }
+        }                           
     }
-
-  if(event.type == SDL_KEYDOWN)
+  else if(event.type == SDL_KEYDOWN)
     {
       if(key == shortcut)
         state = BUTTON_PRESSED;
@@ -195,16 +185,6 @@
       if(state == BUTTON_PRESSED && key == shortcut)
         state = BUTTON_CLICKED;
     }
-  else if(event.type == SDL_MOUSEMOTION)
-    {
-      popup_timer.start(1500);
-    
-      if(show_info)
-        {
-          show_info = false;
-        }
-    }
-    
 }
 
 int Button::get_state()
@@ -292,3 +272,16 @@
 
 }
 
+void ButtonPanel::set_button_size(int w, int h)
+{
+  bw = w;
+  bh = h;
+}
+
+Button* ButtonPanel::manipulate_button(int i)
+{
+  if(int(item.size())-1 < i)
+    return item[item.size()-1];
+  else
+    return item[i];
+}

[Super-tux-commit] supertux/contrib levelconvert.py,1.1,NONE

[Ingo R. <gr...@us...>]

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

Removed Files:
	levelconvert.py 
Log Message:
- removed old convert script, the working one is still in place

--- levelconvert.py DELETED ---

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

[Ingo R. <gr...@us...>]

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

Modified Files:
	title.cpp 
Log Message:
- fixed intro jumping

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- title.cpp	2 May 2004 21:28:32 -0000	1.73
+++ title.cpp	2 May 2004 22:17:08 -0000	1.74
@@ -212,7 +212,7 @@
       random_timer.start(rand() % 3000 + 3000);
       walking = !walking;
     }
-  
+
   // Wrap around at the end of the level back to the beginnig
   if(plevel->width * 32 - 320 < tux->base.x)
     {
@@ -220,15 +220,17 @@
       scroll_x = tux->base.x - 320;
     }
 
+  tux->can_jump = true;
   float last_tux_x_pos = tux->base.x;
   tux->action(frame_ratio);
 
-#if 0 // disabled for now, since with the new jump code we easily get deadlocks
+  // disabled for now, since with the new jump code we easily get deadlocks
   // Jump if tux stays in the same position for one loop, ie. if he is
   // stuck behind a wall
   if (last_tux_x_pos == tux->base.x)
-    walking = false;
-#endif
+    {
+      walking = false;
+    }
 
   tux->draw();
 }
@@ -294,6 +296,13 @@
       if (Menu::current() == main_menu)
         logo->draw( 160, 30);
 
+      white_small_text->draw(" SuperTux " VERSION "\n"
+                             "Copyright (c) 2003 SuperTux Devel Team\n"
+                             "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+                             "are welcome to redistribute it under certain conditions; see the file COPYING\n"
+                             "for details.\n",
+                             0, 420, 0);
+
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
       if(menu)

[Super-tux-commit] supertux TODO,1.20,1.21

[Matze B. <mat...@us...>]

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

Modified Files:
	TODO 
Log Message:
TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- TODO	2 May 2004 18:47:06 -0000	1.20
+++ TODO	2 May 2004 21:38:01 -0000	1.21
@@ -8,20 +8,27 @@
 
 Todo
 ----
-- change lispreader to throw exceptions instead of simply assert() on
-   syntax error
-- tux sometimes makes short jumps in the endsequence, mostly when
-  going through the goal with a small jump, might be old_up related
-- fadein/out for intro/extro would be nice
-- the can_jump flag should be based on a time instead of the 2 tiles check.
-  Since the 2 tiles flag won't help when you're jumping over a hole. Better use
-  a timer that is started when up is pressed, when you then land and the timer
-  is below a certain time, you can do the jump.
-- when bumping a special with 2 blocks at once, it won't change direction
+L: low priority
+
+[L] change lispreader to throw exceptions instead of simply assert() on
+    syntax error
+[L] tux sometimes makes short jumps in the endsequence, mostly when
+    going through the goal with a small jump, might be old_up related
+[L] fadein/out for intro/extro would be nice
+[L] when bumping a special with 2 blocks at once, it won't change direction
 
 - leveleditor lacks enemies support (will be fixed soon by Tobias)
-- sometimes you die after being in pause modus and unpausing - still true?
 
+Stuff for past milestone1:
+--------------------------
+Note that this list is far from complete, but lists some bugs that we don't want
+to touch before milestone1 at the moment.
+- You shouldn't be able to stand on invisible blocks, before you bumped them
+- bombs should explode directly when hit by another bomb or a mr.iceblock
+- we only have a global counter for multiple coin blocks. This should be handled
+  per block.
+- We should reduced the width of tux collision rectangle so that he falls easier
+  between 1 tile wide holes.
 
 Fixed
 -----

[Super-tux-commit] htdocs/images game4-010.jpg,NONE,1.1 game4-010.png,NONE,1.1 game4-010_small.jpg,NONE,1.1

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/htdocs/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16523/images

Added Files:
	game4-010.jpg game4-010.png game4-010_small.jpg 
Log Message:
- more screenshots

--- NEW FILE: game4-010.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: game4-010.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: game4-010_small.jpg ---
(This appears to be a binary file; contents omitted.)

[Super-tux-commit] htdocs contact.xml,NONE,1.1 Makefile,1.13,1.14 default.css,1.2,1.3 default.xsl,1.8,1.9 download.xml,1.4,1.5 index.xml,1.2,1.3 menu.xml,1.2,1.3 submenu.xml,1.4,1.5 welcome.xml,1.2,1.3

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16294

Modified Files:
	Makefile default.css default.xsl download.xml index.xml 
	menu.xml submenu.xml welcome.xml 
Added Files:
	contact.xml 
Log Message:
- more webpage cleanup

Index: index.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.xml	2 May 2004 13:26:13 -0000	1.2
+++ index.xml	2 May 2004 21:36:11 -0000	1.3
@@ -10,6 +10,7 @@
       graphics. Together with a little story we hope to provide a good
       gaming experince with this first Milestone release.
     </p>
+
     <p>
       The following links should help to keep the overview a bit:
     </p>
@@ -25,14 +26,4 @@
     </ul>
   </section>
 
-  <section title="Contact">
-    <p>
-      Development is mainly coordinated via IRC (#supertux at
-      irc.freenode.net) and the <a
-      href="http://lists.sourceforge.net/lists/listinfo/super-tux-devel">SuperTux
-      Mailing list</a>, be sure to visit both once in a while or you
-      might miss critical stuff.
-    </p>
-  </section>
-
 </page>
\ No newline at end of file

Index: download.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/download.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- download.xml	2 May 2004 13:26:13 -0000	1.4
+++ download.xml	2 May 2004 21:36:11 -0000	1.5
@@ -1,19 +1,16 @@
 <?xml version="1.0"?>
 <page title="SuperTux">
-  <section title="SuperTux">
-    <subsection title="SuperTux Milestone1 - 0.1.0">
-      <p>
-      The newest version of SuperTux is Milestone1, 0.1.0, released in
-        May 2, 2004. You can get it from: <a
-        href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.0.tar.bz2?download">here</a>.
-      </p>
+  <section title="Download">
+    <subsection title="SuperTux (Milestone1) 0.1.0 - May 2, 2004">
+      <ul>
+        <li>Source: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.0.tar.bz2?download">supertux-0.1.0.tar.bz2</a></li>
+      </ul>
     </subsection>
 
-    <subsection title="SuperTux 0.0.6">
-      <p>
-        SuperTux is 0.0.6, released in March 15, 2004. Get it from: <a
-          href="http://prdownloads.sourceforge.net/super-tux/supertux-0.0.6.tar.bz2?download">here</a>.
-      </p>
+    <subsection title="SuperTux 0.0.6 - March 15, 2004">
+      <ul>
+        <li>Source: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.0.6.tar.bz2?download">supertux-0.0.6.tar.bz2</a></li>
+      </ul>
     </subsection>
 
     <subsection title="CVS">
@@ -25,10 +22,6 @@
       <p>
         <tt>cvs -z3 -d:pserver:ano...@cv...:/cvsroot/super-tux co supertux</tt>
       </p>
-
-      <p>
-        We hope you like it! - SuperTux authors
-      </p>
     </subsection>
   </section>
 

--- NEW FILE: contact.xml ---
<?xml version="1.0"?>
<page title="SuperTux">
  <section title="Contact">
    <p>
      Development is mainly coordinated via IRC and the mailing lists,
      be sure to visit both once in a while or you might miss critical
      stuff.
    </p>
      
    <subsection title="Mailing List">
      <dl>
        <dt><a
        href="mailto:sup...@li...">sup...@li...</a>
        - List for comments critics and everything development
        related</dt>

        <dd><a href="http://sourceforge.net/mailarchive/forum.php?forum_id=36963">Archive</a></dd>
        <dd><a href="http://lists.sourceforge.net/mailman/listinfo/super-tux-devel">Subscribe/Unsubscribe</a></dd>
      </dl>

      <dl>
        <dt><a
        href="mailto:sup...@li...">sup...@li...</a>
          - List for commits to CVS, mainly interesting for people working directly with the source</dt>

        <dd><a href="http://sourceforge.net/mailarchive/forum.php?forum_id=39400">Archive</a></dd>
        <dd><a href="http://lists.sourceforge.net/mailman/listinfo/super-tux-commit">Subscribe/Unsubscribe</a></dd>
      </dl>
    </subsection>

    <subsection title="IRC">
      <p>
      Server:  <a href="irc://irc.freenode.net/#supertux">irc.freenode.net</a><br/>
      Channel: #supertux<br/>
      </p>
    </subsection>
  </section>
</page>
Index: submenu.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/submenu.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- submenu.xml	29 Apr 2004 00:11:44 -0000	1.4
+++ submenu.xml	2 May 2004 21:36:11 -0000	1.5
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 
 <submenu>
-  <item file="index.html">Intro</item>
-  <item file="authors.html">Authors</item>
+  <item file="welcome.html">About</item>
   <item file="screenshots.html">Screenshots</item>
+  <item file="authors.html">Authors</item>
   <item file="download.html">Download</item>
+  <item file="contact.html">Contact</item>
 </submenu>

Index: default.xsl
===================================================================
RCS file: /cvsroot/super-tux/htdocs/default.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- default.xsl	2 May 2004 13:26:13 -0000	1.8
+++ default.xsl	2 May 2004 21:36:11 -0000	1.9
@@ -12,8 +12,8 @@
   <xsl:param name="filename"/>
   <xsl:param name="lastchange"/>  
   <xsl:param name="section"/>  
-  <xsl:param name="basedir"/>  
-  
+  <xsl:param name="basedir" />       
+
   <xsl:template match="node()|@*">
     <xsl:copy><xsl:apply-templates select="@* | node()" /></xsl:copy>
   </xsl:template>
@@ -131,7 +131,7 @@
 
   <xsl:template match="submenu/item">
     <xsl:choose>
-      <xsl:when test="contains(@file, substring-after($filename, '/'))">
+      <xsl:when test="(contains(@file, substring-after($filename, '/')) and substring-after($filename, '/') != '') or contains(@file, $filename)">
         <td><a class="active" href="{@file}"><xsl:apply-templates /></a></td>
       </xsl:when>
       <xsl:otherwise>

Index: menu.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/menu.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- menu.xml	15 Mar 2004 17:43:07 -0000	1.2
+++ menu.xml	2 May 2004 21:36:11 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <menu>
-  <item section="."           file="index.html">SuperTux</item>
+  <item section="."           file="welcome.html">SuperTux</item>
   <item section="milestone1"  file="milestone1/index.html">Milestone1</item>
   <item section="development" file="development/index.html">Development</item>
   <item section="sfnet"       file="http://sourceforge.net/projects/super-tux/">SF.Net</item>

Index: welcome.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/welcome.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- welcome.xml	2 May 2004 13:26:13 -0000	1.2
+++ welcome.xml	2 May 2004 21:36:11 -0000	1.3
@@ -40,14 +40,4 @@
     </p>
   </section>
 
-  <section title="Contact">
-    <p>
-      Development is mainly coordinated via IRC (#supertux at
-      irc.freenode.net) and the <a
-      href="http://lists.sourceforge.net/lists/listinfo/super-tux-devel">SuperTux
-      Mailing list</a>, be sure to visit both once in a while or you
-      might miss critical stuff.
-    </p>
-  </section>
-
 </page>
\ No newline at end of file

Index: Makefile
===================================================================
RCS file: /cvsroot/super-tux/htdocs/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	2 May 2004 13:26:13 -0000	1.13
+++ Makefile	2 May 2004 21:35:56 -0000	1.14
@@ -2,6 +2,7 @@
   welcome.html \
   download.html \
   authors.html \
+  contact.html \
   screenshots.html \
   \
   development/index.html   \
@@ -31,10 +32,13 @@
 	LASTCHANGE=`date -I`; \
         echo Filename: $$FILENAME ; \
         echo Section: $$SECTION ; \
+        if [ "x$$SECTION" = "xsfnet" -o "x$$SECTION" = "x." ]; then BASEDIR=""; \
+	else BASEDIR="../"; fi; \
 	xalan \
           -PARAM filename   "'$${FILENAME%%.xml}'" \
           -PARAM section    "'$${SECTION}'" \
           -PARAM lastchange "'$${LASTCHANGE}'" \
+          -PARAM basedir    "'$${BASEDIR}'" \
           -IN $< \
           -OUT $@ \
           -XSL default.xsl

Index: default.css
===================================================================
RCS file: /cvsroot/super-tux/htdocs/default.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- default.css	6 Mar 2004 22:25:13 -0000	1.2
+++ default.css	2 May 2004 21:36:11 -0000	1.3
@@ -46,7 +46,7 @@
   margin: 0em;
   padding: 0em;
   margin-bottom: .5em;
-  background-color: #f2f2f9;
+  background-color: #d2d2e9; /* #f2f2f9;*/
   border-bottom-style: solid;
   border-top-style:    solid;
 }

[Super-tux-commit] supertux/src badguy.cpp,1.64,1.65 badguy.h,1.36,1.37 button.cpp,1.17,1.18 button.h,1.15,1.16 gameobjs.h,1.8,1.9 leveleditor.cpp,1.74,1.75 player.h,1.48,1.49 special.h,1.19,1.20 title.cpp,1.72,1.73 type.h,1.14,1.15 world.cpp,1.49,1.50

[Tobias Gl??er <to...@us...>]

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

Modified Files:
	badguy.cpp badguy.h button.cpp button.h gameobjs.h 
	leveleditor.cpp player.h special.h title.cpp type.h world.cpp 
Log Message:
leveleditor related improvements

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- player.h	30 Apr 2004 09:48:34 -0000	1.48
+++ player.h	2 May 2004 21:28:32 -0000	1.49
@@ -104,7 +104,7 @@
 extern PlayerSprite largetux;
 extern PlayerSprite firetux;
 
-class Player
+class Player : public GameObject
 {
 public:
   enum HurtMode { KILL, SHRINK };
@@ -123,8 +123,6 @@
   int frame_;
   int frame_main;
 
-  base_type  base;
-  base_type  old_base;
   base_type  previous_base;
   Timer invincible_timer;
   Timer skidding_timer;
@@ -151,6 +149,8 @@
   bool under_solid();
   void grow();
   
+  std::string type() { return "Player";};
+  
 private:
   void handle_horizontal_input();
   void handle_vertical_input();

Index: type.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/type.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- type.h	20 Apr 2004 11:09:34 -0000	1.14
+++ type.h	2 May 2004 21:28:32 -0000	1.15
@@ -21,6 +21,7 @@
 #ifndef SUPERTUX_TYPE_H
 #define SUPERTUX_TYPE_H
 
+#include <string>
 #include "SDL.h"
 
 /* 'Base' type for game objects */
@@ -36,6 +37,41 @@
 };
 
 
+/* Base class for all dynamic game object. */
+class GameObject
+{
+
+friend bool operator<(const GameObject& lhs, const GameObject& rhs)
+{
+ if( lhs.base.x < rhs.base.x )
+ return true;
+ else if( lhs.base.x == rhs.base.x && lhs.base.y < rhs.base.y)
+ return true;
+ else
+ return false;
+}
+
+friend bool operator>(const GameObject& lhs, const GameObject& rhs)
+{
+ if( lhs.base.x > rhs.base.x )
+ return true;
+ else if( lhs.base.x == rhs.base.x && lhs.base.y > rhs.base.y)
+ return true;
+ else
+ return false;
+}
+
+public:
+GameObject() {};
+virtual ~GameObject() {};
+virtual void action(double frame_ratio) = 0;
+virtual void draw() = 0;
+virtual std::string type() = 0;
+
+base_type base;
+base_type old_base;
+};
+
 struct string_list_type
 {
   int num_items;

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gameobjs.h	20 Apr 2004 11:09:33 -0000	1.8
+++ gameobjs.h	2 May 2004 21:28:32 -0000	1.9
@@ -31,14 +31,14 @@
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro
+class BouncyDistro : public GameObject
 {
  public:
-  base_type base;
   
   void init(float x, float y);
   void action(double frame_ratio);
   void draw(); 
+  std::string type() { return "BouncyDistro"; };
 };
 
 extern Surface* img_distro[4];
@@ -48,41 +48,41 @@
 
 class Tile;
 
-class BrokenBrick
+class BrokenBrick : public GameObject
 {
  public:
-  base_type base;
   Timer timer;
   Tile* tile;
 
   void init(Tile* tile, float x, float y, float xm, float ym);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "BrokenBrick"; };
 };
 
-class BouncyBrick
+class BouncyBrick : public GameObject
 {
  public:
   float offset;
   float offset_m;
   int shape;
-  base_type base;
 
   void init(float x, float y);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "BouncyBrick"; };
 };
 
-class FloatingScore
+class FloatingScore : public GameObject
 {
  public:
   int value;
   Timer timer;
-  base_type base;
   
   void init(float x, float y, int s);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "FloatingScore"; };
 };
 
 #endif 

Index: special.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- special.h	26 Apr 2004 21:09:31 -0000	1.19
+++ special.h	2 May 2004 21:28:32 -0000	1.20
@@ -40,19 +40,20 @@
 void load_special_gfx();
 void free_special_gfx();
 
-class Upgrade
+class Upgrade : public GameObject
 {
 public:
   UpgradeKind kind;
   Direction  dir;
-  base_type base;
-  base_type old_base;
   Physic physic;
 
   void init(float x, float y, Direction dir, UpgradeKind kind);
   void action(double frame_ratio);
   void draw();
   void collision(void* p_c_object, int c_object, CollisionType type);
+  std::string type() { return "Upgrade"; };
+  
+  ~Upgrade() {};
 
 private:
   /** removes the Upgrade from the global upgrade list. Note that after this
@@ -64,7 +65,7 @@
   void bump(Player* player);
 };
 
-class Bullet
+class Bullet : public GameObject
 {
  public:
   int life_count;
@@ -75,6 +76,7 @@
   void action(double frame_ratio);
   void draw();
   void collision(int c_object);
+  std::string type() { return "Bullet"; };
 
 private:
   /** removes the Upgrade from the global upgrade list. Note that after this

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- button.cpp	25 Apr 2004 21:55:23 -0000	1.17
+++ button.cpp	2 May 2004 21:28:32 -0000	1.18
@@ -75,6 +75,7 @@
   state = BUTTON_NONE;
   show_info = false;
   bkgd = NULL;
+  game_object = NULL;
 }
 
 void Button::change_icon(std::string icon_file, int /*mw*/, int /*mh*/)
@@ -109,6 +110,11 @@
       bkgd->draw(rect.x,rect.y);
     }
   icon->draw(rect.x,rect.y);
+  if(game_object != NULL)
+  {
+  game_object->draw();
+  }
+  
   if(show_info)
     {
       char str[80];
@@ -131,6 +137,7 @@
 Button::~Button()
 {
   delete icon;
+  delete game_object;
 }
 
 void Button::event(SDL_Event &event)

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- leveleditor.cpp	2 May 2004 16:08:22 -0000	1.74
+++ leveleditor.cpp	2 May 2004 21:28:32 -0000	1.75
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2003 Ricardo Cruz <ri...@ae...>
 //  Copyright (C) 2003 Tobias Glaesser <tob...@gm...>
@@ -13,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
[...1765 lines suppressed...]
 {
   le_current_level->save("test", le_level);
-  
+
   GameSession session("test",le_level, ST_GL_TEST);
   session.run();
   player_status.reset();
@@ -1283,8 +1421,8 @@
   done_ = 0;
 
   while(done_ == 0)
-    {
-      done_ = wait_for_event(event);
-      SDL_Delay(50);
-    }
+  {
+    done_ = wait_for_event(event);
+    SDL_Delay(50);
+  }
 }

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- badguy.h	28 Apr 2004 18:45:24 -0000	1.36
+++ badguy.h	2 May 2004 21:28:32 -0000	1.37
@@ -45,7 +45,8 @@
   BAD_BOUNCINGSNOWBALL,
   BAD_FLYINGSNOWBALL,
   BAD_SPIKY,
-  BAD_SNOWBALL
+  BAD_SNOWBALL,
+  NUM_BadGuyKinds
 };
 
 BadGuyKind  badguykind_from_string(const std::string& str);
@@ -53,24 +54,10 @@
 void load_badguy_gfx();
 void free_badguy_gfx();
 
-struct BadGuyData
-{
-  BadGuyKind kind;
-  int x;
-  int y;
-  bool stay_on_platform;
-
-  BadGuyData(BadGuyKind kind_, int x_, int y_, bool stay_on_platform_) 
-    : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {}
-
-  BadGuyData()
-    : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
-};
-
 class Player;
 
 /* Badguy type: */
-class BadGuy
+class BadGuy : public GameObject
 {
 public:
   /* Enemy modes: */
@@ -95,7 +82,6 @@
   };
 public:
   DyingType  dying;
-  base_type  base;
   BadGuyKind kind;
   BadGuyMode mode;
 
@@ -110,7 +96,6 @@
   bool removable;
   bool seen;
   int squishcount; /// number of times this enemy was squiched
-  base_type old_base;
   Timer timer;
   Physic physic;
 
@@ -122,8 +107,9 @@
 public:
   BadGuy(float x, float y, BadGuyKind kind, bool stay_on_platform);
 
-  void action(float frame_ratio);
+  void action(double frame_ratio);
   void draw();
+  std::string type() { return "BadGuy"; };
 
   void collision(void* p_c_object, int c_object,
                  CollisionType type = COLLISION_NORMAL);
@@ -141,17 +127,17 @@
   bool is_removable() const { return removable; }
  
 private:
-  void action_mriceblock(float frame_ratio);
-  void action_jumpy(float frame_ratio); 
-  void action_bomb(float frame_ratio);
-  void action_mrbomb(float frame_ratio);
-  void action_stalactite(float frame_ratio);
-  void action_flame(float frame_ratio);
-  void action_fish(float frame_ratio);
-  void action_bouncingsnowball(float frame_ratio);
-  void action_flyingsnowball(float frame_ratio);
-  void action_spiky(float frame_ratio);
-  void action_snowball(float frame_ratio);
+  void action_mriceblock(double frame_ratio);
+  void action_jumpy(double frame_ratio); 
+  void action_bomb(double frame_ratio);
+  void action_mrbomb(double frame_ratio);
+  void action_stalactite(double frame_ratio);
+  void action_flame(double frame_ratio);
+  void action_fish(double frame_ratio);
+  void action_bouncingsnowball(double frame_ratio);
+  void action_flyingsnowball(double frame_ratio);
+  void action_spiky(double frame_ratio);
+  void action_snowball(double frame_ratio);
 
   /** handles falling down. disables gravity calculation when we're back on
    * ground */
@@ -174,6 +160,21 @@
   void set_sprite(Sprite* left, Sprite* right);
 };
 
+struct BadGuyData
+{
+  BadGuyKind kind;
+  int x;
+  int y;
+  bool stay_on_platform;
+
+  BadGuyData(BadGuy* pbadguy) : kind(pbadguy->kind), x((int)pbadguy->base.x), y((int)pbadguy->base.y), stay_on_platform(pbadguy->stay_on_platform)  {};
+  BadGuyData(BadGuyKind kind_, int x_, int y_, bool stay_on_platform_) 
+    : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {}
+
+  BadGuyData()
+    : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {}
+};
+
 #endif /*SUPERTUX_BADGUY_H*/
 
 /* Local Variables: */

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- badguy.cpp	1 May 2004 15:46:08 -0000	1.64
+++ badguy.cpp	2 May 2004 21:28:32 -0000	1.65
@@ -203,7 +203,7 @@
 }
 
 void
-BadGuy::action_mriceblock(float frame_ratio)
+BadGuy::action_mriceblock(double frame_ratio)
 {
   Player& tux = *World::current()->get_tux();
 
@@ -374,7 +374,7 @@
 }
 
 void
-BadGuy::action_jumpy(float frame_ratio)
+BadGuy::action_jumpy(double frame_ratio)
 {
   if (fabsf(physic.get_velocity_y()) < 2.5f)
     set_sprite(img_jumpy_left_middle, img_jumpy_left_middle);
@@ -414,7 +414,7 @@
 }
 
 void
-BadGuy::action_mrbomb(float frame_ratio)
+BadGuy::action_mrbomb(double frame_ratio)
 {
   if (dying == DYING_NOT)
     check_horizontal_bump(true);
@@ -427,7 +427,7 @@
 }
 
 void
-BadGuy::action_bomb(float frame_ratio)
+BadGuy::action_bomb(double frame_ratio)
 {
   static const int TICKINGTIME = 1000;
   static const int EXPLODETIME = 1000;
@@ -464,7 +464,7 @@
 }
 
 void
-BadGuy::action_stalactite(float frame_ratio)
+BadGuy::action_stalactite(double frame_ratio)
 {
   Player& tux = *World::current()->get_tux();
 
@@ -506,7 +506,7 @@
 }
 
 void
-BadGuy::action_flame(float frame_ratio)
+BadGuy::action_flame(double frame_ratio)
 {
     static const float radius = 100;
     static const float speed = 0.02;
@@ -517,7 +517,7 @@
 }
 
 void
-BadGuy::action_fish(float frame_ratio)
+BadGuy::action_fish(double frame_ratio)
 {
   static const float JUMPV = 6;
   static const int WAITTIME = 1000;
@@ -550,7 +550,7 @@
 }
 
 void
-BadGuy::action_bouncingsnowball(float frame_ratio)
+BadGuy::action_bouncingsnowball(double frame_ratio)
 {
   static const float JUMPV = 4.5;
     
@@ -584,7 +584,7 @@
 }
 
 void
-BadGuy::action_flyingsnowball(float frame_ratio)
+BadGuy::action_flyingsnowball(double frame_ratio)
 {
   static const float FLYINGSPEED = 1;
   static const int DIRCHANGETIME = 1000;
@@ -624,7 +624,7 @@
 }
 
 void
-BadGuy::action_spiky(float frame_ratio)
+BadGuy::action_spiky(double frame_ratio)
 {
   if (dying == DYING_NOT)
     check_horizontal_bump();
@@ -645,7 +645,7 @@
 }
 
 void
-BadGuy::action_snowball(float frame_ratio)
+BadGuy::action_snowball(double frame_ratio)
 {
   if (dying == DYING_NOT)
     check_horizontal_bump();
@@ -658,7 +658,7 @@
 }
 
 void
-BadGuy::action(float frame_ratio)
+BadGuy::action(double frame_ratio)
 {
   // Remove if it's far off the screen:
   if (base.x < scroll_x - OFFSCREEN_DISTANCE)
@@ -725,6 +725,8 @@
     case BAD_SNOWBALL:
       action_snowball(frame_ratio);
       break;
+    default:
+      break;
     }
 }
 

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- title.cpp	2 May 2004 16:08:22 -0000	1.72
+++ title.cpp	2 May 2004 21:28:32 -0000	1.73
@@ -294,13 +294,6 @@
       if (Menu::current() == main_menu)
         logo->draw( 160, 30);
 
-      white_small_text->draw(" SuperTux " VERSION "\n"
-                             "Copyright (c) 2003 SuperTux Devel Team\n"
-                             "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
-                             "are welcome to redistribute it under certain conditions; see the file COPYING\n"
-                             "for details.\n",
-                             0, 420, 0);
-
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
       if(menu)

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- world.cpp	2 May 2004 15:51:12 -0000	1.49
+++ world.cpp	2 May 2004 21:28:32 -0000	1.50
@@ -297,7 +297,7 @@
       /* ++i handled at end of the loop */) {
     if ((*i)->is_removable()) {
       delete *i;
-      i = bad_guys.erase(i);
+      i =  bad_guys.erase(i);
     } else {
       ++i;
     }

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- button.h	20 Apr 2004 11:09:33 -0000	1.15
+++ button.h	2 May 2004 21:28:32 -0000	1.16
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tob...@gm...>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -34,49 +34,51 @@
 class ButtonPanel;
 
 class Button
-  {
-    friend class ButtonPanel;
+{
+  friend class ButtonPanel;
 
-  public:
-    Button(std::string icon_file, std::string info, SDLKey shortcut, int x, int y, int mw = -1, int h = -1);
-    ~Button();
-    void event(SDL_Event& event);
-    void draw();
-    int get_state();
-    void change_icon(std::string icon_file, int mw, int mh);
-    int get_tag()
-    {
-      return tag;
-    }
+public:
+  Button(std::string icon_file, std::string info, SDLKey shortcut, int x, int y, int mw = -1, int h = -1);
+  ~Button();
+  void event(SDL_Event& event);
+  void draw();
+  int get_state();
+  void change_icon(std::string icon_file, int mw, int mh);
+  SDL_Rect get_pos() { return rect; }
+  int get_tag(){return tag; }
+  void set_game_object(GameObject* game_object_) { game_object = game_object_; }
+  GameObject* get_game_object() { return game_object; };
 
-  private:
-    static Timer popup_timer;
-    Surface* icon;
-    Surface* bkgd;
-    std::string info;
-    SDLKey shortcut;
-    SDL_Rect rect;
-    bool show_info;
-    ButtonState state;
-    int tag;
-  };
+private:
+  static Timer popup_timer;
+  GameObject* game_object;
+  Surface* icon;
+  Surface* bkgd;
+  std::string info;
+  SDLKey shortcut;
+  SDL_Rect rect;
+  bool show_info;
+  ButtonState state;
+  int tag;
+};
 
 class ButtonPanel
-  {
-  public:
-    ButtonPanel(int x, int y, int w, int h);
-    ~ButtonPanel();
-    void draw();
-    Button* event(SDL_Event &event);
-    void additem(Button* pbutton, int tag);
-    Button* button_panel_event(SDL_Event& event);
-    void set_button_size(int w, int h) { bw = w; bh = h; }
+{
+public:
+  ButtonPanel(int x, int y, int w, int h);
+  ~ButtonPanel();
+  void draw();
+  Button* event(SDL_Event &event);
+  void additem(Button* pbutton, int tag);
+  Button* button_panel_event(SDL_Event& event);
+  void set_button_size(int w, int h) { bw = w; bh = h; }
+  Button* manipulate_button(int i) { if(item.size()-1 < i) { return item[item.size()-1]; } else { return item[i]; } };
 
-  private:
-    int bw, bh;
-    bool hidden;
-    SDL_Rect rect;
-    std::vector<Button*> item;
-  };
+private:
+  int bw, bh;
+  bool hidden;
+  SDL_Rect rect;
+  std::vector<Button*> item;
+};
 
 #endif /*SUPERTUX_BUTTON_H*/