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

Re: [Super-tux-commit] htdocs/development map.xml,1.2,1.3

[Ricardo C. <ri...@ae...>]

 Someone (looking at Ingo), run the Makefile, in order to update the webpag=
e.

Ricardo

Em Ter=E7a, 4 de Maio de 2004 12:39, o Ricardo Cruz escreveu:
> Update of /cvsroot/super-tux/htdocs/development
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32259/development
>
> Modified Files:
> 	map.xml
> Log Message:
> Added idea image by C. Ratchet.
>
> Index: map.xml
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/super-tux/htdocs/development/map.xml,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -d -r1.2 -r1.3
> --- map.xml	28 Feb 2004 23:23:49 -0000	1.2
> +++ map.xml	4 May 2004 11:39:09 -0000	1.3
> @@ -62,4 +62,14 @@
>        player to quickly advance to survive.
>      </p>
>    </section>
> +
> +  <section title=3D"Game ideas">
> +    <p>
> +      Here goes a few unsorted images contributed by people, in order
> +      to serve as an insipiration for the developers.
> +    </p>
> +    <subsection title=3D"Contributed by C. Ratchet">
> +      <screenshot file=3D"images/ideas1" />
> +    </subsection>
> +  </section>
>  </page>
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: Oracle 10g
> Get certified on the hottest thing ever to hit the market... Oracle 10g.
> Take an Oracle 10g class now, and we'll give you the exam FREE.
> http://ads.osdn.com/?ad_id=3D3149&alloc_id=3D8166&op=3Dclick
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit

=2D-=20
Dear Emily:
	I collected replies to an article I wrote, and now it's time to
summarize.  What should I do?
		-- Editor

Dear Editor:
	Simply concatenate all the articles together into a big file and post
that.  On USENET, this is known as a summary.  It lets people read all the
replies without annoying newsreaders getting in the way.  Do the same when
summarizing a vote.
		-- Emily Postnews Answers Your Questions on Netiquette

[Super-tux-commit] htdocs/development/images ideas1.jpg,NONE,1.1 ideas1_small.jpg,NONE,1.1

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

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

Added Files:
	ideas1.jpg ideas1_small.jpg 
Log Message:
Added idea image by C. Ratchet.

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

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

[Super-tux-commit] htdocs/development map.xml,1.2,1.3

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

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

Modified Files:
	map.xml 
Log Message:
Added idea image by C. Ratchet.

Index: map.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/development/map.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- map.xml	28 Feb 2004 23:23:49 -0000	1.2
+++ map.xml	4 May 2004 11:39:09 -0000	1.3
@@ -62,4 +62,14 @@
       player to quickly advance to survive.
     </p>
   </section>
+
+  <section title="Game ideas">
+    <p>
+      Here goes a few unsorted images contributed by people, in order
+      to serve as an insipiration for the developers.
+    </p>
+    <subsection title="Contributed by C. Ratchet">
+      <screenshot file="images/ideas1" />
+    </subsection>
+  </section>
 </page>

[Super-tux-commit] htdocs/development/images enemies2-small.jpg,1.1,NONE

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

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

Removed Files:
	enemies2-small.jpg 
Log Message:
Duplicated and not used.

--- enemies2-small.jpg DELETED ---

[Super-tux-commit] supertux/src defines.h,1.28,1.29 setup.cpp,1.68,1.69

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

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

Modified Files:
	defines.h setup.cpp 
Log Message:
Just put screen's width and height as definitions.

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- defines.h	28 Apr 2004 14:58:24 -0000	1.28
+++ defines.h	4 May 2004 11:27:39 -0000	1.29
@@ -48,6 +48,11 @@
   DYING_FALLING = 2
 };
 
+/* Screen proprities: */
+
+#define SCREEN_W 640
+#define SCREEN_H 480
+
 /* Sizes: */
 
 #define SMALL 0

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- setup.cpp	3 May 2004 12:02:53 -0000	1.68
+++ setup.cpp	4 May 2004 11:27:47 -0000	1.69
@@ -664,7 +664,7 @@
 
   if (use_fullscreen)
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_FULLSCREEN ) ; /* | SDL_HWSURFACE); */
       if (screen == NULL)
         {
           fprintf(stderr,
@@ -677,7 +677,7 @@
     }
   else
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_HWSURFACE | SDL_DOUBLEBUF );
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_HWSURFACE | SDL_DOUBLEBUF );
 
       if (screen == NULL)
         {
@@ -702,7 +702,7 @@
 
   if (use_fullscreen)
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_FULLSCREEN | SDL_OPENGL) ; /* | SDL_HWSURFACE); */
       if (screen == NULL)
         {
           fprintf(stderr,
@@ -715,7 +715,7 @@
     }
   else
     {
-      screen = SDL_SetVideoMode(640, 480, 0, SDL_OPENGL);
+      screen = SDL_SetVideoMode(SCREEN_W, SCREEN_H, 0, SDL_OPENGL);
 
       if (screen == NULL)
         {

[Super-tux-commit] supertux README,1.5,1.6

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

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

Modified Files:
	README 
Log Message:
Just added the Power/Run key to the README, as our John Spray player indicated.

Index: README
===================================================================
RCS file: /cvsroot/super-tux/supertux/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README	2 May 2004 22:40:37 -0000	1.5
+++ README	4 May 2004 00:32:25 -0000	1.6
@@ -82,8 +82,12 @@
   --------
   Both keyboards and joysticks/gamepads are supported. You can change the
   controls via the Options menu. Basically, the only keys you will need to
-  use in-game are to do the following actions: jump, duck, right left and
-  'P' to pause/unpause the game.
+  use in-game are to do the following actions: jump, duck, right, left, power
+  and 'P' to pause/unpause the game. I don't think there is anything to
+  explain about the others, but the power key, also called run, allow you
+  to run and use the power of the powerup you got. For instance, with the
+  fire flower, you can shoot bullets (note that this is the only power
+  currently implemented).
   
   Other useful keys include the Esc key, which is used to go to the menu or
   to go up a level in the menu. The menu can be navigated using the arrow

Re: [Super-tux-commit] supertux TODO,1.28,1.29

[Ricardo C. <ri...@ae...>]

 Remove that bug.

 You can easily change the pixels distance that Tux is relatively to the 
borders by changing X_SPACE.

 Anyway, I already changed it, check if you like it. If you don't, purpose 
another value for the X_SPACE.

Ricardo Cruz

Em Segunda, 3 de Maio de 2004 21:23, o Ingo Ruhnke escreveu:
> Update of /cvsroot/super-tux/supertux
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22785
>
> Modified Files:
> 	TODO
> Log Message:
> added scrolling issue
>
>
> Index: TODO
> ===================================================================
> RCS file: /cvsroot/super-tux/supertux/TODO,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -d -r1.28 -r1.29
> --- TODO	3 May 2004 19:43:49 -0000	1.28
> +++ TODO	3 May 2004 20:23:01 -0000	1.29
> @@ -8,8 +8,12 @@
>
>  Todo
>  ----
> +H: high priority
>  L: low priority
>
> +[H] Scrolling is broken, should show at leats 3/4 of the screen to
> +   Tuxs right, so that the player has a reasonably chance to see
> +   enemies early on, currenty one can only not even a half screen ahead
>  [L] change lispreader to throw exceptions instead of simply assert() on
>      syntax error
>  [L] tux sometimes makes short jumps in the endsequence, mostly when
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: Oracle 10g
> Get certified on the hottest thing ever to hit the market... Oracle 10g.
> Take an Oracle 10g class now, and we'll give you the exam FREE.
> http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit

-- 
One dusty July afternoon, somewhere around the turn of the century, Patrick
Malone was in Mulcahey's Bar, bending an elbow with the other street car
conductors from the Brooklyn Traction Company.  While they were discussing the
merits of a local ring hero, the bar goes silent.  Malone turns around to see
his wife, with a face grim as death, stalking to the bar.
	Slapping a four-bit piece down on the bar, she draws herself up to her
full five feet five inches and says to Mulcahey, "Give me what himself has
been havin' all these years."
	Mulcahey looks at Malone, who shrugs, and then back at Margaret Mary
Malone.  He sets out a glass and pours her a triple shot of Rye.  The bar is
totally silent as they watch the woman pick up the glass and knock back the
drink.  She slams the glass down on the bar, gasps, shudders slightly, and
passes out; falling straight back, stiff as a board, saved from sudden contact
with the barroom floor by the ample belly of Seamus Fogerty.
	Sometime later, she comes to on the pool table, a jacket under her
head.  Her bloodshot eyes fell upon her husband, who says, "And all these
years you've been thinkin' I've been enjoying meself."

Re: [Super-tux-commit] supertux/src world.cpp,1.51,1.52

[Ricardo C. <ri...@ae...>]

 What changed did you made?
 I only see that you changed the X_SPACE and made Tux to be even more near the 
border and changed the formatting...

 Anyway, I already committed something that makes scrolling better, IMO.

Ricardo Cruz

Em Segunda, 3 de Maio de 2004 20:46, o Ryan Flegel escreveu:
> Update of /cvsroot/super-tux/supertux/src
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14650/src
>
> Modified Files:
> 	world.cpp
> Log Message:
> - fixed scrolling bug
>
> Index: world.cpp
> ===================================================================
> RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
> retrieving revision 1.51
> retrieving revision 1.52
> diff -u -d -r1.51 -r1.52
> --- world.cpp	3 May 2004 12:34:37 -0000	1.51
> +++ world.cpp	3 May 2004 19:46:23 -0000	1.52
> @@ -306,24 +306,24 @@
>  }
>
>  // the space that it takes for the screen to start scrolling
> -#define X_SPACE 80
> +#define X_SPACE 40
>
>  /* This functions takes cares of the scrolling */
>  void World::keep_in_bounds()
>  {
> -int tux_pos_x = (int)(tux.base.x - (tux.base.width/2));
> +  int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
>
> -scroll_x += screen->w/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;
> +  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;
> +  scroll_x -= screen->w/2;
>
> -if(scroll_x < 0)
> -  scroll_x = 0;
> +  if(scroll_x < 0)
> +    scroll_x = 0;
>  }
>
>
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: Oracle 10g
> Get certified on the hottest thing ever to hit the market... Oracle 10g.
> Take an Oracle 10g class now, and we'll give you the exam FREE.
> http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit

-- 
You should never wear your best trousers when you go out to fight for
freedom and liberty.
		-- Henrik Ibsen

[Super-tux-commit] supertux/src world.cpp,1.53,1.54

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

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

Modified Files:
	world.cpp 
Log Message:
Changed the way the scrolling was calculated. Instead of calculating it relatively to the middle of the screen, calculte it relatively to the borders.
This solution is more clear (IMO) and elegant because; there isn't that ugly code anymore:
scroll_x -= screen.w / 2;
(...)
scroll_x += screen.w / 2;

Besides from that, in case we change the resolution, this makes the playbility to be not affected.

Note: if you think the scrolling is made when Tux is too much in the right or in the left, you can easily change this, by changine the SPACE_X value in world.cpp.

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- world.cpp	3 May 2004 23:06:19 -0000	1.53
+++ world.cpp	3 May 2004 23:44:28 -0000	1.54
@@ -305,28 +305,24 @@
   }
 }
 
-// the space that it takes for the screen to start scrolling
-#define X_SPACE 40
+// the space that it takes for the screen to start scrolling, regarding
+// screen bounds (in pixels)
+#define X_SPACE 160
 
 /* 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)
+  if (scroll_x < tux_pos_x - (screen->w - X_SPACE))
+    scroll_x = tux_pos_x - (screen->w - X_SPACE);
+  else if (scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
     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 title.cpp,1.75,1.76

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

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

Modified Files:
	title.cpp 
Log Message:
Improved the intro demo, in order to make it more elegant.
I haven't testedt powerups and tux collision yet, though.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- title.cpp	3 May 2004 13:57:39 -0000	1.75
+++ title.cpp	3 May 2004 23:27:31 -0000	1.76
@@ -165,12 +165,12 @@
 
 void draw_demo(GameSession* session, double frame_ratio)
 {
-  World::set_current(session->get_world());
-  //World* world  = session->get_world();
+  World* world  = session->get_world();
+  World::set_current(world);
   Level* plevel = session->get_level();
-  Player* tux = session->get_world()->get_tux();
+  Player* tux = world->get_tux();
 
-  session->get_world()->play_music(LEVEL_MUSIC);
+  world->play_music(LEVEL_MUSIC);
   
   /* FIXME:
   // update particle systems
@@ -188,14 +188,14 @@
   */
 
   // Draw interactive tiles:
-  for (int y = 0; y < 15; ++y)
+/*  for (int y = 0; y < 15; ++y)
     {
       for (int x = 0; x < 21; ++x)
         {
           Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
                      plevel->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
         }
-    }
+    }*/
 
   global_frame_counter++;
   tux->key_event((SDLKey) keymap.right,DOWN);
@@ -222,7 +222,7 @@
 
   tux->can_jump = true;
   float last_tux_x_pos = tux->base.x;
-  session->get_world()->action(frame_ratio);
+  world->action(frame_ratio);
   
 
   // disabled for now, since with the new jump code we easily get deadlocks
@@ -233,7 +233,7 @@
       walking = false;
     }
 
-  tux->draw();
+  world->draw();
 }
 
 /* --- TITLE SCREEN --- */

[Super-tux-commit] supertux/src button.cpp,1.20,1.21 level.cpp,1.63,1.64 level.h,1.44,1.45 leveleditor.cpp,1.79,1.80 lispreader.cpp,1.17,1.18 menu.h,1.56,1.57 type.h,1.15,1.16 world.cpp,1.52,1.53

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

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

Modified Files:
	button.cpp level.cpp level.h leveleditor.cpp lispreader.cpp 
	menu.h type.h world.cpp 
Log Message:
leveleditor related improvements. Added bkgd_speed.

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- menu.h	3 May 2004 17:56:16 -0000	1.56
+++ menu.h	3 May 2004 23:06:19 -0000	1.57
@@ -79,9 +79,11 @@
   MNID_AUTHOR,
   MNID_SONG,
   MNID_BGIMG,
+  MNID_PARTICLE,
   MNID_LENGTH,
   MNID_TIME,
   MNID_GRAVITY,
+  MNID_BGSPEED,
   MNID_TopRed,
   MNID_TopGreen,
   MNID_TopBlue,

Index: level.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- level.h	3 May 2004 17:29:40 -0000	1.44
+++ level.h	3 May 2004 23:06:19 -0000	1.45
@@ -85,6 +85,7 @@
   Color bkgd_top;
   Color bkgd_bottom;
   int width;
+  int bkgd_speed;
   int start_pos_x;
   int start_pos_y;
   float gravity;

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- world.cpp	3 May 2004 19:46:23 -0000	1.52
+++ world.cpp	3 May 2004 23:06:19 -0000	1.53
@@ -176,7 +176,7 @@
   /* Draw the real background */
   if(get_level()->bkgd_image[0] != '\0')
     {
-      int s = ((int)scroll_x / 2)%640;
+      int s = (int)((float)scroll_x * ((float)level->bkgd_speed/60.)) % screen->w;
       level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h);
       level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h);
     }

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- level.cpp	3 May 2004 17:29:40 -0000	1.63
+++ level.cpp	3 May 2004 23:06:19 -0000	1.64
@@ -237,6 +237,7 @@
   time_left  = 100;
   gravity    = 10.;
   back_scrolling = false;
+  bkgd_speed = 2;
   bkgd_top.red   = 0;
   bkgd_top.green = 0;
   bkgd_top.blue  = 0;
@@ -315,6 +316,10 @@
       back_scrolling = false;
       reader.read_bool("back_scrolling",  &back_scrolling);
 
+      bkgd_speed = 2;
+      reader.read_int("bkgd_speed",  &bkgd_speed);
+
+      
       bkgd_top.red = bkgd_top.green = bkgd_top.blue = 0;
       reader.read_int("bkgd_red_top",  &bkgd_top.red);
       reader.read_int("bkgd_green_top",  &bkgd_top.green);
@@ -543,6 +548,7 @@
   fprintf(fi,"  (music \"%s\")\n", song_title.c_str());
   fprintf(fi,"  (background \"%s\")\n", bkgd_image.c_str());
   fprintf(fi,"  (particle_system \"%s\")\n", particle_system.c_str());
+  fprintf(fi,"  (bkgd_speed \"%d\")\n", bkgd_speed);
   fprintf(fi,"  (bkgd_red_top %d)\n", bkgd_top.red);
   fprintf(fi,"  (bkgd_green_top %d)\n", bkgd_top.green);
   fprintf(fi,"  (bkgd_blue_top %d)\n", bkgd_top.blue);

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- leveleditor.cpp	3 May 2004 20:35:57 -0000	1.79
+++ leveleditor.cpp	3 May 2004 23:06:19 -0000	1.80
@@ -469,9 +469,11 @@
   level_settings_menu->additem(MN_TEXTFIELD,"Author  ",0,0,MNID_AUTHOR);
   level_settings_menu->additem(MN_STRINGSELECT,"Song    ",0,0,MNID_SONG);
   level_settings_menu->additem(MN_STRINGSELECT,"Bg-Image",0,0,MNID_BGIMG);
+  level_settings_menu->additem(MN_STRINGSELECT,"Particle",0,0,MNID_PARTICLE);  
   level_settings_menu->additem(MN_NUMFIELD,"Length ",0,0,MNID_LENGTH);
   level_settings_menu->additem(MN_NUMFIELD,"Time   ",0,0,MNID_TIME);
   level_settings_menu->additem(MN_NUMFIELD,"Gravity",0,0,MNID_GRAVITY);
+  level_settings_menu->additem(MN_NUMFIELD,"Bg-Img-Speed",0,0,MNID_BGSPEED);  
   level_settings_menu->additem(MN_NUMFIELD,"Top Red    ",0,0,MNID_TopRed);
   level_settings_menu->additem(MN_NUMFIELD,"Top Green  ",0,0,MNID_TopGreen);
   level_settings_menu->additem(MN_NUMFIELD,"Top Blue   ",0,0,MNID_TopBlue);
@@ -598,11 +600,16 @@
   string_list_copy(level_settings_menu->get_item_by_id(MNID_SONG).list, dfiles("music/",NULL, "-fast"));
   string_list_copy(level_settings_menu->get_item_by_id(MNID_BGIMG).list, dfiles("images/background",NULL, NULL));
   string_list_add_item(level_settings_menu->get_item_by_id(MNID_BGIMG).list,"");
+  string_list_add_item(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,"");
+  string_list_add_item(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,"snow");
+  string_list_add_item(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,"clouds");
 
   if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_SONG).list,le_current_level->song_title.c_str())) != -1)
     level_settings_menu->get_item_by_id(MNID_SONG).list->active_item = i;
   if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_BGIMG).list,le_current_level->bkgd_image.c_str())) != -1)
     level_settings_menu->get_item_by_id(MNID_BGIMG).list->active_item = i;
+  if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,le_current_level->particle_system.c_str())) != -1)
+    level_settings_menu->get_item_by_id(MNID_PARTICLE).list->active_item = i;
 
   sprintf(str,"%d",le_current_level->width);
   level_settings_menu->get_item_by_id(MNID_LENGTH).change_input(str);
@@ -610,6 +617,8 @@
   level_settings_menu->get_item_by_id(MNID_TIME).change_input(str);
   sprintf(str,"%2.0f",le_current_level->gravity);
   level_settings_menu->get_item_by_id(MNID_GRAVITY).change_input(str);
+  sprintf(str,"%d",le_current_level->bkgd_speed);
+  level_settings_menu->get_item_by_id(MNID_BGSPEED).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_top.red);
   level_settings_menu->get_item_by_id(MNID_TopRed).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_top.green);
@@ -643,6 +652,11 @@
     le_current_level->bkgd_image = string_list_active(level_settings_menu->get_item_by_id(MNID_BGIMG).list);
     i = true;
   }
+  
+  if(le_current_level->particle_system.compare(string_list_active(level_settings_menu->get_item_by_id(MNID_PARTICLE).list)) != 0)
+  {
+    le_current_level->particle_system = string_list_active(level_settings_menu->get_item_by_id(MNID_PARTICLE).list);
+  }
 
   if(i)
   {
@@ -654,6 +668,7 @@
   le_current_level->change_size(atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input));
   le_current_level->time_left = atoi(level_settings_menu->get_item_by_id(MNID_BGIMG).input);
   le_current_level->gravity = atof(level_settings_menu->get_item_by_id(MNID_GRAVITY).input);
+  le_current_level->bkgd_speed = atoi(level_settings_menu->get_item_by_id(MNID_BGSPEED).input);
   le_current_level->bkgd_top.red = atoi(level_settings_menu->get_item_by_id(MNID_TopRed).input);
   le_current_level->bkgd_top.green = atoi(level_settings_menu->get_item_by_id(MNID_TopGreen).input);
   le_current_level->bkgd_top.blue = atoi(level_settings_menu->get_item_by_id(MNID_TopBlue).input);
@@ -756,7 +771,7 @@
   }
 
   if(le_selection_mode == CURSOR)
-    le_selection->draw( cursor_x - pos_x, cursor_y);
+    le_selection->draw( cursor_x - scroll_x, cursor_y);
   else if(le_selection_mode == SQUARE)
   {
     int w, h;
@@ -780,6 +795,10 @@
     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())
+  {
+     le_current.obj->draw_on_screen(19 * 32, 14 * 32);
+  }
 
   //if(le_current.IsObject())
   //printf("");
@@ -833,7 +852,7 @@
   /* Draw the real background */
   if(le_current_level->bkgd_image[0] != '\0')
   {
-    s = pos_x / 30;
+    s = (int)((float)pos_x * ((float)le_current_level->bkgd_speed/60.)) % screen->w;
     le_current_level->img_bkgd->draw_part(s,0,0,0,
                                           le_current_level->img_bkgd->w - s - 32, le_current_level->img_bkgd->h);
     le_current_level->img_bkgd->draw_part(0,0,screen->w - s - 32 ,0,s,
@@ -843,6 +862,17 @@
   {
     drawgradient(le_current_level->bkgd_top, le_current_level->bkgd_bottom);
   }
+  
+  if(le_current.IsTile())
+  {
+  Tile::draw(cursor_x, cursor_y,le_current.tile,128);
+  if(!TileManager::instance()->get(le_current.tile)->images.empty())
+  fillrect(cursor_x,cursor_y,TileManager::instance()->get(le_current.tile)->images[0]->w,TileManager::instance()->get(le_current.tile)->images[0]->h,50,50,50,50);
+  }
+  if(le_current.IsObject())
+  {
+  le_current.obj->move_to(cursor_x, cursor_y);
+  }
 
   /*       clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue); */
 
@@ -1150,6 +1180,8 @@
             {
               if(pbutton->get_state() == BUTTON_CLICKED)
               {
+	        if(le_current.IsObject())
+		le_current.obj->move_to(pbutton->get_pos().x,pbutton->get_pos().y);
                 le_current.Tile(pbutton->get_tag());
               }
             }
@@ -1160,6 +1192,8 @@
             {
               if(pbutton->get_state() == BUTTON_CLICKED)
               {
+	        if(le_current.IsObject())
+		le_current.obj->move_to(pbutton->get_pos().x,pbutton->get_pos().y);
                 le_current.Object(pbutton->get_game_object());
               }
             }
@@ -1204,7 +1238,7 @@
             {
               BadGuy* pbadguy = dynamic_cast<BadGuy*>(le_current.obj);
 
-              le_world.bad_guys.push_back(BadGuy(cursor_x, cursor_y,pbadguy->kind,false));
+              le_world.bad_guys.push_back(BadGuy(cursor_x+scroll_x, cursor_y,pbadguy->kind,false));
               le_current_level->badguy_data.push_back(&le_world.bad_guys.back());
             }
           }
@@ -1220,7 +1254,7 @@
     }
     else if(le_move_left_bt->get_state() == BUTTON_HOVER)
     {
-      pos_x -= 64;
+      pos_x -= 32;
     }
 
     if(le_move_right_bt->get_state() == BUTTON_PRESSED)
@@ -1229,7 +1263,7 @@
     }
     else if(le_move_right_bt->get_state() == BUTTON_HOVER)
     {
-      pos_x += 64;
+      pos_x += 32;
     }
   }
 

Index: type.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/type.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- type.h	2 May 2004 21:28:32 -0000	1.15
+++ type.h	3 May 2004 23:06:19 -0000	1.16
@@ -23,6 +23,7 @@
 
 #include <string>
 #include "SDL.h"
+#include "scene.h"
 
 /* 'Base' type for game objects */
 
@@ -41,32 +42,30 @@
 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;
+/* Draw ignoring the scroll_x value. FIXME: Hack? Should be discussed. @tobgle*/
+void draw_on_screen(float x = -1, float y = -1)
+{
+ base_type btmp = base;
+ if(x != -1 || y != -1)
+ {
+ btmp = base;
+ if(x != -1)
+ base.x = x;
+ if(y != -1)
+ base.y = y;
+ }
+ float tmp = scroll_x;
+ scroll_x = 0; draw();
+ scroll_x = tmp; 
+ base = btmp;
+};
+void move_to(float x, float y) { base.x = x; base.y = y; };
 
 base_type base;
 base_type old_base;

Index: lispreader.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- lispreader.cpp	26 Apr 2004 15:03:24 -0000	1.17
+++ lispreader.cpp	3 May 2004 23:06:19 -0000	1.18
@@ -1043,7 +1043,10 @@
   if (obj)
     {
       if (!lisp_integer_p(lisp_car(obj)))
-        st_abort("LispReader expected type integer at token: ", name);
+      {
+        //st_abort("LispReader expected type integer at token: ", name); /* Instead of giving up, we return with false now. */
+	return false;
+	}
       *i = lisp_integer(lisp_car(obj));
       return true;
     }

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- button.cpp	3 May 2004 20:35:57 -0000	1.20
+++ button.cpp	3 May 2004 23:06:19 -0000	1.21
@@ -101,7 +101,7 @@
   icon->draw(rect.x,rect.y);
   if(game_object != NULL)
   {
-    game_object->draw();
+    game_object->draw_on_screen();
   }
 
   if(show_info)

[Super-tux-commit] supertux/src button.cpp,1.19,1.20 leveleditor.cpp,1.78,1.79 texture.cpp,1.19,1.20 texture.h,1.20,1.21 tile.cpp,1.17,1.18 tile.h,1.15,1.16

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

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

Modified Files:
	button.cpp leveleditor.cpp texture.cpp texture.h tile.cpp 
	tile.h 
Log Message:
more leveleditor related improvements

Index: tile.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- tile.h	26 Apr 2004 19:11:54 -0000	1.15
+++ tile.h	3 May 2004 20:35:59 -0000	1.16
@@ -43,7 +43,8 @@
   std::vector<Surface*> editor_images;
   
   std::vector<std::string>  filenames;
-
+  std::vector<std::string> editor_filenames;
+  
   /** solid tile that is indestructable by Tux */
   bool solid;
 

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- leveleditor.cpp	3 May 2004 17:56:15 -0000	1.78
+++ leveleditor.cpp	3 May 2004 20:35:57 -0000	1.79
@@ -367,7 +367,7 @@
             le_current_level->load_gfx();
             le_world.activate_bad_guys();
             subset_new_menu->get_item_by_id(MNID_SUBSETNAME).change_input("");
-	    
+
             Menu::set_current(subset_settings_menu);
             break;
           }
@@ -498,7 +498,18 @@
         sit != (*it).tiles.end(); ++sit, ++i)
     {
       std::string imagefile = "/images/tilesets/" ;
-      imagefile += TileManager::instance()->get(*sit)->filenames[0];
+      if(!TileManager::instance()->get(*sit)->filenames.empty())
+      {
+        imagefile += TileManager::instance()->get(*sit)->filenames[0];
+      }
+      else if(!TileManager::instance()->get(*sit)->editor_filenames.empty())
+      {
+        imagefile += TileManager::instance()->get(*sit)->editor_filenames[0];
+      }
+      else
+      {
+        imagefile += "notile.png";
+      }
       Button* button = new Button(imagefile, it->name, SDLKey(SDLK_a + i),
                                   0, 0, 32, 32);
       tilegroups_map[it->name]->additem(button, *sit);
@@ -580,20 +591,20 @@
 {
   char str[80];
   int i;
-  
+
   level_settings_menu->get_item_by_id(MNID_NAME).change_input(le_current_level->name.c_str());
   level_settings_menu->get_item_by_id(MNID_AUTHOR).change_input(le_current_level->author.c_str());
-  
+
   string_list_copy(level_settings_menu->get_item_by_id(MNID_SONG).list, dfiles("music/",NULL, "-fast"));
   string_list_copy(level_settings_menu->get_item_by_id(MNID_BGIMG).list, dfiles("images/background",NULL, NULL));
   string_list_add_item(level_settings_menu->get_item_by_id(MNID_BGIMG).list,"");
-  
+
   if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_SONG).list,le_current_level->song_title.c_str())) != -1)
     level_settings_menu->get_item_by_id(MNID_SONG).list->active_item = i;
   if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_BGIMG).list,le_current_level->bkgd_image.c_str())) != -1)
     level_settings_menu->get_item_by_id(MNID_BGIMG).list->active_item = i;
-  
-  sprintf(str,"%d",le_current_level->width);  
+
+  sprintf(str,"%d",le_current_level->width);
   level_settings_menu->get_item_by_id(MNID_LENGTH).change_input(str);
   sprintf(str,"%d",le_current_level->time_left);
   level_settings_menu->get_item_by_id(MNID_TIME).change_input(str);
@@ -769,7 +780,7 @@
     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("");
 
@@ -1013,16 +1024,16 @@
             x = event.motion.x;
             y = event.motion.y;
 
-	    if(le_current.IsTile())
-	    {
-            cursor_x = ((int)(pos_x + x) / 32) * 32;
-            cursor_y = ((int) y / 32) * 32;
-	    }
-	    else
-	    {
-	    cursor_x = x;
-	    cursor_y = y;
-	    }
+            if(le_current.IsTile())
+            {
+              cursor_x = ((int)(pos_x + x) / 32) * 32;
+              cursor_y = ((int) y / 32) * 32;
+            }
+            else
+            {
+              cursor_x = x;
+              cursor_y = y;
+            }
 
             if(le_mouse_pressed[LEFT])
             {
@@ -1192,9 +1203,9 @@
             if(type == "BadGuy")
             {
               BadGuy* pbadguy = dynamic_cast<BadGuy*>(le_current.obj);
-	      
+
               le_world.bad_guys.push_back(BadGuy(cursor_x, cursor_y,pbadguy->kind,false));
-	      le_current_level->badguy_data.push_back(&le_world.bad_guys.back());
+              le_current_level->badguy_data.push_back(&le_world.bad_guys.back());
             }
           }
         }
@@ -1281,10 +1292,10 @@
       /* if there is a bad guy over there, remove it */
       for(i = 0; i < le_world.bad_guys.size(); ++i)
         if(rectcollision(cursor_base,le_world.bad_guys[i].base))
-	{
+        {
           le_world.bad_guys.erase(le_world.bad_guys.begin() + i);
-	  le_current_level->badguy_data.erase(le_current_level->badguy_data.begin() + i);
-	  }
+          le_current_level->badguy_data.erase(le_current_level->badguy_data.begin() + i);
+        }
 
       break;
     case SQUARE:

Index: texture.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/texture.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- texture.cpp	1 May 2004 16:39:08 -0000	1.19
+++ texture.cpp	3 May 2004 20:35:58 -0000	1.20
@@ -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
@@ -30,7 +30,7 @@
 Surface::Surfaces Surface::surfaces;
 
 SurfaceData::SurfaceData(SDL_Surface* temp, int use_alpha_)
-  : type(SURFACE), surface(0), use_alpha(use_alpha_)
+    : type(SURFACE), surface(0), use_alpha(use_alpha_)
 {
   // Copy the given surface and make sure that it is not stored in
   // video memory
@@ -48,19 +48,17 @@
 }
 
 SurfaceData::SurfaceData(const std::string& file_, int use_alpha_)
-  : type(LOAD), surface(0), file(file_), use_alpha(use_alpha_)
-{
-}
-  
+    : type(LOAD), surface(0), file(file_), use_alpha(use_alpha_)
+{}
+
 SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_)
-  : type(LOAD_PART), surface(0), file(file_), use_alpha(use_alpha_),
+    : type(LOAD_PART), surface(0), file(file_), use_alpha(use_alpha_),
     x(x_), y(y_), w(w_), h(h_)
-{
-}
+{}
 
 SurfaceData::~SurfaceData()
 {
-  SDL_FreeSurface(surface);  
+  SDL_FreeSurface(surface);
 }
 
 SurfaceImpl*
@@ -80,14 +78,14 @@
 SurfaceData::create_SurfaceSDL()
 {
   switch(type)
-    {
-    case LOAD:
-      return new SurfaceSDL(file, use_alpha);
-    case LOAD_PART:
-      return new SurfaceSDL(file, x, y, w, h, use_alpha);
-    case SURFACE:
-      return new SurfaceSDL(surface, use_alpha);
-    }
+  {
+  case LOAD:
+    return new SurfaceSDL(file, use_alpha);
+  case LOAD_PART:
+    return new SurfaceSDL(file, x, y, w, h, use_alpha);
+  case SURFACE:
+    return new SurfaceSDL(surface, use_alpha);
+  }
   assert(0);
 }
 
@@ -96,14 +94,14 @@
 {
 #ifndef NOOPENGL
   switch(type)
-    {
-    case LOAD:
-      return new SurfaceOpenGL(file, use_alpha);
-    case LOAD_PART:
-      return new SurfaceOpenGL(file, x, y, w, h, use_alpha);
-    case SURFACE:
-      return new SurfaceOpenGL(surface, use_alpha);
-    }
+  {
+  case LOAD:
+    return new SurfaceOpenGL(file, use_alpha);
+  case LOAD_PART:
+    return new SurfaceOpenGL(file, x, y, w, h, use_alpha);
+  case SURFACE:
+    return new SurfaceOpenGL(surface, use_alpha);
+  }
 #endif
   assert(0);
 }
@@ -114,7 +112,8 @@
 {
   int value = 1;
 
-  while ( value < input ) {
+  while ( value < input )
+  {
     value <<= 1;
   }
   return value;
@@ -122,38 +121,38 @@
 #endif
 
 Surface::Surface(SDL_Surface* surf, int use_alpha)
-  : data(surf, use_alpha), w(0), h(0)
+    : data(surf, use_alpha), w(0), h(0)
 {
   impl = data.create();
-  if (impl) 
-    {
-      w = impl->w;
-      h = impl->h;
-    }
+  if (impl)
+  {
+    w = impl->w;
+    h = impl->h;
+  }
   surfaces.push_back(this);
 }
 
 Surface::Surface(const std::string& file, int use_alpha)
-  : data(file, use_alpha), w(0), h(0)
+    : data(file, use_alpha), w(0), h(0)
 {
   impl = data.create();
-  if (impl) 
-    {
-      w = impl->w;
-      h = impl->h;
-    }
+  if (impl)
+  {
+    w = impl->w;
+    h = impl->h;
+  }
   surfaces.push_back(this);
 }
 
 Surface::Surface(const std::string& file, int x, int y, int w, int h, int use_alpha)
-  : data(file, x, y, w, h, use_alpha), w(0), h(0)
+    : data(file, x, y, w, h, use_alpha), w(0), h(0)
 {
   impl = data.create();
-  if (impl) 
-    {
-      w = impl->w;
-      h = impl->h;
-    }
+  if (impl)
+  {
+    w = impl->w;
+    h = impl->h;
+  }
   surfaces.push_back(this);
 }
 
@@ -162,11 +161,11 @@
 {
   delete impl;
   impl = data.create();
-  if (impl) 
-    {
-      w = impl->w;
-      h = impl->h;  
-    }
+  if (impl)
+  {
+    w = impl->w;
+    h = impl->h;
+  }
 }
 
 Surface::~Surface()
@@ -174,10 +173,12 @@
 #ifdef DEBUG
   bool found = false;
   for(std::list<Surface*>::iterator i = surfaces.begin(); i != surfaces.end();
-          ++i) {
-      if(*i == this) {
-          found = true; break;
-      }
+      ++i)
+  {
+    if(*i == this)
+    {
+      found = true; break;
+    }
   }
   if(!found)
     printf("Error: Surface freed twice!!!\n");
@@ -190,49 +191,61 @@
 Surface::reload_all()
 {
   for(Surfaces::iterator i = surfaces.begin(); i != surfaces.end(); ++i)
-    {
-      (*i)->reload();
-    }
+  {
+    (*i)->reload();
+  }
 }
 
 void
 Surface::debug_check()
 {
   for(Surfaces::iterator i = surfaces.begin(); i != surfaces.end(); ++i)
-    {
-      printf("Surface not freed: T:%d F:%s.\n", (*i)->data.type, 
-          (*i)->data.file.c_str());
-    }
+  {
+    printf("Surface not freed: T:%d F:%s.\n", (*i)->data.type,
+           (*i)->data.file.c_str());
+  }
 }
 
 void
 Surface::draw(float x, float y, Uint8 alpha, bool update)
 {
-  if (impl) 
-    {
-      if (impl->draw(x, y, alpha, update) == -2)
-        reload();
-    }
+  if (impl)
+  {
+    if (impl->draw(x, y, alpha, update) == -2)
+      reload();
+  }
 }
 
 void
 Surface::draw_bg(Uint8 alpha, bool update)
 {
   if (impl)
-    {
-      if (impl->draw_bg(alpha, update) == -2)
-        reload();
-    }
+  {
+    if (impl->draw_bg(alpha, update) == -2)
+      reload();
+  }
 }
 
 void
 Surface::draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, bool update)
 {
   if (impl)
-    {
-      if (impl->draw_part(sx, sy, x, y, w, h, alpha, update) == -2)
-        reload();
-    }
+  {
+    if (impl->draw_part(sx, sy, x, y, w, h, alpha, update) == -2)
+      reload();
+  }
+}
+
+void
+Surface::resize(int w_, int h_)
+{
+  if (impl)
+  {
+  w = w_;
+  h = h_;
+    if (impl->resize(w_,h_) == -2)
+      reload();
+  }
 }
 
 SDL_Surface*
@@ -284,7 +297,7 @@
 
   SDL_FreeSurface(temp);
   SDL_FreeSurface(conv);
-  
+
   return sdl_surface;
 }
 
@@ -293,7 +306,7 @@
 {
   SDL_Surface* sdl_surface;
   SDL_Surface* temp;
-  
+
   temp = IMG_Load(file.c_str());
 
   if (temp == NULL)
@@ -303,7 +316,7 @@
     sdl_surface = SDL_DisplayFormat(temp);
   else
     sdl_surface = SDL_DisplayFormatAlpha(temp);
-  
+
   if (sdl_surface == NULL)
     st_abort("Can't covert to display format", file);
 
@@ -315,22 +328,22 @@
   return sdl_surface;
 }
 
-SDL_Surface* 
+SDL_Surface*
 sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, int use_alpha)
 {
   SDL_Surface* sdl_surface;
   Uint32 saved_flags;
   Uint8  saved_alpha;
-  
+
   /* Save the alpha blending attributes */
   saved_flags = sdl_surf->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
   saved_alpha = sdl_surf->format->alpha;
   if ( (saved_flags & SDL_SRCALPHA)
        == SDL_SRCALPHA )
-    {
-      SDL_SetAlpha(sdl_surf, 0, 0);
-    }
-   
+  {
+    SDL_SetAlpha(sdl_surf, 0, 0);
+  }
+
   if(use_alpha == IGNORE_ALPHA && !use_gl)
     sdl_surface = SDL_DisplayFormat(sdl_surf);
   else
@@ -339,10 +352,10 @@
   /* Restore the alpha blending attributes */
   if ( (saved_flags & SDL_SRCALPHA)
        == SDL_SRCALPHA )
-    {
-      SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha);
-    }
-  
+  {
+    SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha);
+  }
+
   if (sdl_surface == NULL)
     st_abort("Can't covert to display format", "SURFACE");
 
@@ -355,8 +368,7 @@
 //---------------------------------------------------------------------------
 
 SurfaceImpl::SurfaceImpl()
-{
-}
+{}
 
 SurfaceImpl::~SurfaceImpl()
 {
@@ -368,6 +380,20 @@
   return sdl_surface;
 }
 
+int SurfaceImpl::resize(int w_, int h_)
+{
+  w = w_;
+  h = h_;
+  SDL_Rect dest;
+  dest.x = 0;
+  dest.y = 0;
+  dest.w = w;
+  dest.h = h;
+  int ret = SDL_SoftStretch(sdl_surface, NULL,
+                  sdl_surface, &dest);
+  return ret;
+}
+
 #ifndef NOOPENGL
 SurfaceOpenGL::SurfaceOpenGL(SDL_Surface* surf, int use_alpha)
 {
@@ -378,7 +404,7 @@
   h = sdl_surface->h;
 }
 
-SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int use_alpha) 
+SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int use_alpha)
 {
   sdl_surface = sdl_surface_from_file(file, use_alpha);
   create_gl(sdl_surface,&gl_texture);
@@ -413,11 +439,11 @@
   h = power_of_two(surf->h),
 
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-  conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
-                                0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
+      conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
+                                  0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
 #else
-  conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
-                              0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
+      conv = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, surf->format->BitsPerPixel,
+                                  0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
 #endif
 
   /* Save the alpha blending attributes */
@@ -425,18 +451,18 @@
   saved_alpha = surf->format->alpha;
   if ( (saved_flags & SDL_SRCALPHA)
        == SDL_SRCALPHA )
-    {
-      SDL_SetAlpha(surf, 0, 0);
-    }
+  {
+    SDL_SetAlpha(surf, 0, 0);
+  }
 
   SDL_BlitSurface(surf, 0, conv, 0);
 
   /* Restore the alpha blending attributes */
   if ( (saved_flags & SDL_SRCALPHA)
        == SDL_SRCALPHA )
-    {
-      SDL_SetAlpha(surf, saved_flags, saved_alpha);
-    }
+  {
+    SDL_SetAlpha(surf, saved_flags, saved_alpha);
+  }
 
   glGenTextures(1, &*tex);
   glBindTexture(GL_TEXTURE_2D , *tex);
@@ -447,7 +473,7 @@
   glPixelStorei(GL_UNPACK_ROW_LENGTH, conv->pitch / conv->format->BytesPerPixel);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, conv->pixels);
   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-      
+
   SDL_FreeSurface(conv);
 }
 
@@ -474,12 +500,12 @@
   glTexCoord2f(0, (float)h / ph);
   glVertex2f(x, (float)h+y);
   glEnd();
-  
+
   glDisable(GL_TEXTURE_2D);
   glDisable(GL_BLEND);
-  
+
   (void) update; // avoid compiler warning
-  
+
   return 0;
 }
 
@@ -504,7 +530,7 @@
   glTexCoord2f(0, (float)h / ph);
   glVertex2f(0, screen->h);
   glEnd();
-  
+
   glDisable(GL_TEXTURE_2D);
 
   (void) update; // avoid compiler warning
@@ -577,30 +603,30 @@
   dest.y = (int)y;
   dest.w = w;
   dest.h = h;
-  
+
   if(alpha != 255)
-    {
+  {
     /* Copy the SDL surface, then make it using alpha and use it to blit into the screen */
     SDL_Surface* sdl_surface_copy = SDL_CreateRGBSurface (sdl_surface->flags,
-      sdl_surface->w, sdl_surface->h, sdl_surface->format->BitsPerPixel,
-      sdl_surface->format->Rmask, sdl_surface->format->Gmask, sdl_surface->format->Bmask,
-      sdl_surface->format->Amask);
+                                    sdl_surface->w, sdl_surface->h, sdl_surface->format->BitsPerPixel,
+                                    sdl_surface->format->Rmask, sdl_surface->format->Gmask, sdl_surface->format->Bmask,
+                                    sdl_surface->format->Amask);
 
     SDL_BlitSurface(sdl_surface, NULL, sdl_surface_copy, NULL);
-      
+
     SDL_SetAlpha(sdl_surface_copy ,SDL_SRCALPHA,alpha);
 
     int ret = SDL_BlitSurface(sdl_surface_copy, NULL, screen, &dest);
-  
+
     if (update == UPDATE)
       SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
-    
+
     SDL_FreeSurface (sdl_surface_copy) ;
     return ret;
-    }
- 
+  }
+
   int ret = SDL_BlitSurface(sdl_surface, NULL, screen, &dest);
-  
+
   if (update == UPDATE)
     SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
 
@@ -611,7 +637,7 @@
 SurfaceSDL::draw_bg(Uint8 alpha, bool update)
 {
   SDL_Rect dest;
-  
+
   dest.x = 0;
   dest.y = 0;
   dest.w = screen->w;
@@ -619,9 +645,9 @@
 
   if(alpha != 255)
     SDL_SetAlpha(sdl_surface ,SDL_SRCALPHA,alpha);
-  
+
   int ret = SDL_SoftStretch(sdl_surface, NULL, screen, &dest);
-  
+
   if (update == UPDATE)
     SDL_UpdateRect(screen, dest.x, dest.y, dest.w, dest.h);
 
@@ -645,17 +671,16 @@
 
   if(alpha != 255)
     SDL_SetAlpha(sdl_surface ,SDL_SRCALPHA,alpha);
-  
+
   int ret = SDL_BlitSurface(sdl_surface, &src, screen, &dest);
 
   if (update == UPDATE)
     update_rect(screen, dest.x, dest.y, dest.w, dest.h);
-  
+
   return ret;
 }
 
 SurfaceSDL::~SurfaceSDL()
-{
-}
+{}
 
 /* EOF */

Index: tile.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- tile.cpp	27 Apr 2004 19:17:15 -0000	1.17
+++ tile.cpp	3 May 2004 20:35:59 -0000	1.18
@@ -83,7 +83,7 @@
 
           if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
             {
-	      std::vector<std::string> editor_filenames;
+	      
 	     
               Tile* tile = new Tile;
               tile->id      = -1;
@@ -111,7 +111,7 @@
               reader.read_int("anim-speed", &tile->anim_speed);
               reader.read_int("next-tile",  &tile->next_tile);
               reader.read_string_vector("images",  &tile->filenames);
-	      reader.read_string_vector("editor-images", &editor_filenames);
+	      reader.read_string_vector("editor-images", &tile->editor_filenames);
 
               for(std::vector<std::string>::iterator it = tile->
                   filenames.begin();
@@ -124,8 +124,8 @@
                                datadir +  "/images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
-              for(std::vector<std::string>::iterator it = editor_filenames.begin();
-                  it != editor_filenames.end();
+              for(std::vector<std::string>::iterator it = tile->editor_filenames.begin();
+                  it != tile->editor_filenames.end();
                   ++it)
                 {
                   Surface* cur_image;

Index: texture.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/texture.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- texture.h	1 May 2004 16:39:08 -0000	1.20
+++ texture.h	3 May 2004 20:35:58 -0000	1.21
@@ -85,6 +85,7 @@
   void draw(float x, float y, Uint8 alpha = 255, bool update = false);
   void draw_bg(Uint8 alpha = 255, bool update = false);
   void draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha = 255, bool update = false);
+  void Surface::resize(int w_, int h_);
 };
 
 /** Surface implementation, all implementation have to inherit from
@@ -106,6 +107,7 @@
   virtual int draw(float x, float y, Uint8 alpha, bool update) = 0;
   virtual int draw_bg(Uint8 alpha, bool update) = 0;
   virtual int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, bool update) = 0;
+  int resize(int w_, int h_);
 
   SDL_Surface* get_sdl_surface() const; // @evil@ try to avoid this function
 };

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- button.cpp	2 May 2004 22:26:04 -0000	1.19
+++ button.cpp	3 May 2004 20:35:57 -0000	1.20
@@ -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,32 +34,21 @@
   char filename[1024];
 
   if(!icon_file.empty())
-    {
-      snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file.c_str());
-      if(!faccessible(filename))
-        snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
-    }
-  else
-    {
+  {
+    snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file.c_str());
+    if(!faccessible(filename))
       snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
-    }
+  }
+  else
+  {
+    snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
+  }
 
   if(mw != -1 || mh != -1)
-    {
-      icon = new Surface(filename,USE_ALPHA);
-      if(mw != -1)
-        icon->w = mw;
-      if(mh != -1)
-        icon->h = mh;
-
-      SDL_Rect dest;
-      dest.x = 0;
-      dest.y = 0;
-      dest.w = icon->w;
-      dest.h = icon->h;
-      SDL_SoftStretch(icon->impl->get_sdl_surface(), NULL,
-          icon->impl->get_sdl_surface(), &dest);
-    }
+  {
+    icon = new Surface(filename,USE_ALPHA);
+    icon->resize(mw,mh);
+  }
   else
     icon = new Surface(filename,USE_ALPHA);
 
@@ -83,15 +72,15 @@
   char filename[1024];
 
   if(!icon_file.empty())
-    {
-      snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file.c_str());
-      if(!faccessible(filename))
-        snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
-    }
-  else
-    {
+  {
+    snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file.c_str());
+    if(!faccessible(filename))
       snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
-    }
+  }
+  else
+  {
+    snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
+  }
 
   delete icon;
   icon = new Surface(filename,USE_ALPHA);
@@ -101,33 +90,33 @@
 {
   if(state == BUTTON_HOVER)
     if(!popup_timer.check())
-     show_info = true;
+      show_info = true;
 
   fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);
   fillrect(rect.x+1,rect.y+1,rect.w-2,rect.h-2,175,175,175,200);
   if(bkgd != NULL)
-    {
-      bkgd->draw(rect.x,rect.y);
-    }
+  {
+    bkgd->draw(rect.x,rect.y);
+  }
   icon->draw(rect.x,rect.y);
   if(game_object != NULL)
   {
-  game_object->draw();
+    game_object->draw();
   }
-  
+
   if(show_info)
-    {
-      char str[80];
-      int i = -32;
+  {
+    char str[80];
+    int i = -32;
 
-      if(0 > rect.x - (int)strlen(info.c_str()) * white_small_text->w)
-        i = rect.w + strlen(info.c_str()) * white_small_text->w;
+    if(0 > rect.x - (int)strlen(info.c_str()) * white_small_text->w)
+      i = rect.w + strlen(info.c_str()) * white_small_text->w;
 
-      if(!info.empty())
-        white_small_text->draw(info.c_str(), i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y, 1);
-      sprintf(str,"(%s)", SDL_GetKeyName(shortcut));
-      white_small_text->draw(str, i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2, 1);
-    }
+    if(!info.empty())
+      white_small_text->draw(info.c_str(), i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y, 1);
+    sprintf(str,"(%s)", SDL_GetKeyName(shortcut));
+    white_small_text->draw(str, i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2, 1);
+  }
   if(state == BUTTON_PRESSED)
     fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);
   else if(state == BUTTON_HOVER)
@@ -145,65 +134,65 @@
   SDLKey key = event.key.keysym.sym;
 
   if(event.type == SDL_MOUSEBUTTONDOWN || event.type == SDL_MOUSEBUTTONUP)
-    {
-      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(event.button.button != SDL_BUTTON_LEFT)
-        {
-          show_info = true;
-          return;
-        }
+  {
+    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(event.type == SDL_MOUSEBUTTONDOWN)
-        state = BUTTON_PRESSED;
-      else
-        state = BUTTON_CLICKED;
+    if(event.button.button != SDL_BUTTON_LEFT)
+    {
+      show_info = true;
+      return;
     }
+
+    if(event.type == SDL_MOUSEBUTTONDOWN)
+      state = BUTTON_PRESSED;
+    else
+      state = BUTTON_CLICKED;
+  }
   else if(event.type == SDL_MOUSEMOTION)
-    {
-      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;
+  {
+    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;
-        }                           
-    }
-  else if(event.type == SDL_KEYDOWN)
+    popup_timer.start(1500);
+    if(show_info)
     {
-      if(key == shortcut)
-        state = BUTTON_PRESSED;
+      show_info = false;
     }
+  }
+  else if(event.type == SDL_KEYDOWN)
+  {
+    if(key == shortcut)
+      state = BUTTON_PRESSED;
+  }
   else if(event.type == SDL_KEYUP)
-    {
-      if(state == BUTTON_PRESSED && key == shortcut)
-        state = BUTTON_CLICKED;
-    }
+  {
+    if(state == BUTTON_PRESSED && key == shortcut)
+      state = BUTTON_CLICKED;
+  }
 }
 
 int Button::get_state()
 {
   int rstate;
   if(state == BUTTON_CLICKED)
-    {
-      rstate = state;
-      state = BUTTON_NONE;
-      return rstate;
-    }
+  {
+    rstate = state;
+    state = BUTTON_NONE;
+    return rstate;
+  }
   else
-    {
-      return state;
-    }
+  {
+    return state;
+  }
 }
 
 ButtonPanel::ButtonPanel(int x, int y, int w, int h)
-{ 
+{
   bw = 32;
   bh = 32;
   rect.x = x;
@@ -216,27 +205,27 @@
 Button* ButtonPanel::event(SDL_Event& event)
 {
   if(!hidden)
+  {
+    for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it)
     {
-      for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it)
-        {
-          (*it)->event(event);
-          if((*it)->state != BUTTON_NONE)
-            return (*it);
-        }
-      return NULL;
+      (*it)->event(event);
+      if((*it)->state != BUTTON_NONE)
+        return (*it);
     }
+    return NULL;
+  }
   else
-    {
-      return NULL;
-    }
+  {
+    return NULL;
+  }
 }
 
 ButtonPanel::~ButtonPanel()
 {
   for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it)
-    {
-      delete (*it);
-    }
+  {
+    delete (*it);
+  }
   item.clear();
 }
 
@@ -244,13 +233,13 @@
 {
 
   if(hidden == false)
+  {
+    fillrect(rect.x,rect.y,rect.w,rect.h,100,100,100,200);
+    for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it)
     {
-      fillrect(rect.x,rect.y,rect.w,rect.h,100,100,100,200);
-      for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it)
-        {
-          (*it)->draw();
-        }
+      (*it)->draw();
     }
+  }
 }
 
 void ButtonPanel::additem(Button* pbutton, int tag)

[Super-tux-commit] supertux/data/images/tilesets supertux.stgt,1.23,1.24

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

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

Modified Files:
	supertux.stgt 
Log Message:
more tilegroups

Index: supertux.stgt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- supertux.stgt	28 Apr 2004 21:27:15 -0000	1.23
+++ supertux.stgt	3 May 2004 20:35:25 -0000	1.24
@@ -8,7 +8,11 @@
  (tilegroup (name "Darksnow") (tiles 32 33 34 35 36 37 38 39 40 41 42 43))
  (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62))
  (tilegroup (name "Background") (tiles 24 25 63 70 71 72 73 74 106 107 108 109 110 111))
- (tilegroup (name "Oldschool-Background") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101))
+ (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101))
+ (tilegroup (name "Points") (tiles 132 133))
+ (tilegroup (name "Bonus") (tiles 26 44 45 46 82 83 84 102 103 104 105 112 128))
+ (tilegroup (name "Goodies") (tiles 126 127 136 137 138 139))
+ (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60))
  (tile (id 0)
        (images "notile.png"))
 

[Super-tux-commit] supertux TODO,1.28,1.29

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

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

Modified Files:
	TODO 
Log Message:
added scrolling issue


Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- TODO	3 May 2004 19:43:49 -0000	1.28
+++ TODO	3 May 2004 20:23:01 -0000	1.29
@@ -8,8 +8,12 @@
 
 Todo
 ----
+H: high priority
 L: low priority
 
+[H] Scrolling is broken, should show at leats 3/4 of the screen to
+   Tuxs right, so that the player has a reasonably chance to see
+   enemies early on, currenty one can only not even a half screen ahead
 [L] change lispreader to throw exceptions instead of simply assert() on
     syntax error
 [L] tux sometimes makes short jumps in the endsequence, mostly when

[Super-tux-commit] supertux/src world.cpp,1.51,1.52

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

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

Modified Files:
	world.cpp 
Log Message:
- fixed scrolling bug

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- world.cpp	3 May 2004 12:34:37 -0000	1.51
+++ world.cpp	3 May 2004 19:46:23 -0000	1.52
@@ -306,24 +306,24 @@
 }
 
 // the space that it takes for the screen to start scrolling
-#define X_SPACE 80
+#define X_SPACE 40
 
 /* This functions takes cares of the scrolling */
 void World::keep_in_bounds()
 {
-int tux_pos_x = (int)(tux.base.x - (tux.base.width/2));
+  int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
 
-scroll_x += screen->w/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;
+  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;
+  scroll_x -= screen->w/2;
 
-if(scroll_x < 0)
-  scroll_x = 0;
+  if(scroll_x < 0)
+    scroll_x = 0;
 }
 
 

[Super-tux-commit] supertux TODO,1.27,1.28

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

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

Modified Files:
	TODO 
Log Message:
added another issue


Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- TODO	3 May 2004 19:36:31 -0000	1.27
+++ TODO	3 May 2004 19:43:49 -0000	1.28
@@ -26,6 +26,8 @@
     small tux...
 [L] Life counter should be decreased once the die-animation starts,
    not when it ends
+[L] Enemies should turn upside down after being hit by an kicked
+   iceblock
 - leveleditor crashs when pressing the button with the levelsettings
 
 

[Super-tux-commit] supertux TODO,1.26,1.27

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

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

Modified Files:
	TODO 
Log Message:
added item


Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- TODO	3 May 2004 17:18:01 -0000	1.26
+++ TODO	3 May 2004 19:36:31 -0000	1.27
@@ -24,6 +24,8 @@
 [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...
+[L] Life counter should be decreased once the die-animation starts,
+   not when it ends
 - leveleditor crashs when pressing the button with the levelsettings
 
 

[Super-tux-commit] htdocs download.xml,1.6,1.7 screenshots.xml,1.2,1.3

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

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

Modified Files:
	download.xml screenshots.xml 
Log Message:
- more screenshots


Index: screenshots.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/screenshots.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screenshots.xml	2 May 2004 13:26:13 -0000	1.2
+++ screenshots.xml	3 May 2004 19:29:43 -0000	1.3
@@ -21,6 +21,20 @@
         <screenshot file="images/game3-010" />
         <screenshot file="images/game4-010" />
       </center>
+      
+      <subsubsection title="Flexlay">
+        <p>
+          Flexlay is the editor that was used to build most of the
+          levels in Milestone1 and the Worldmap. It provides a few
+          more features than the build in one (zoom, minimap, worldmap
+          support), but requires a few more dependencies and OpenGL on
+          the other side.
+        </p>
+        <center>
+          <screenshot file="images/flexlay-1" />
+          <screenshot file="images/flexlay-2" />
+        </center>
+      </subsubsection>
     </subsection>
 
     <subsection title="SuperTux 0.0.6">

Index: download.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/download.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- download.xml	3 May 2004 15:40:22 -0000	1.6
+++ download.xml	3 May 2004 19:29:43 -0000	1.7
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page title="SuperTux">
-  <section title="Download">
+  <section title="SuperTux Download">
     <subsection title="SuperTux (Milestone1) 0.1.0 - May 2, 2004">
       <ul>
         <li>Source: <a href="http://pingus.seul.org/~grumbel/tmp/supertux-0.1.0.tar.bz2">supertux-0.1.0.tar.bz2</a></li>
@@ -26,4 +26,22 @@
     </subsection>
   </section>
 
+  <section title="Flexlay Editor Download">
+    <p>
+      There exist two leveleditors for SuperTux, the build in one
+      that comes with SuperTux and is available via the InGame Menu
+      (not present in 0.1.0, but will be included again in 0.1.1)
+      and the external one, which is known as Flexlay. Flexlay is a
+      seperate project with no webpage yet, however its available
+      via Subversion from:
+    </p>
+    <p>
+      <tt>svn co "svn://clanlib.org/Games/Windstille/trunk/flexlay/</tt>
+    </p>
+
+    <p>
+      It needs <a href="http://www.clanlib.org">ClanLib-0.7-CVS</a>
+      and Guile to compile.
+    </p>
+  </section>
 </page>

[Super-tux-commit] htdocs/images flexlay-1.jpg,NONE,1.1 flexlay-1.png,NONE,1.1 flexlay-1_small.jpg,NONE,1.1 flexlay-2.jpg,NONE,1.1 flexlay-2.png,NONE,1.1 flexlay-2_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-serv10807/images

Added Files:
	flexlay-1.jpg flexlay-1.png flexlay-1_small.jpg flexlay-2.jpg 
	flexlay-2.png flexlay-2_small.jpg 
Log Message:
- more screenshots


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

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

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

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

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

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

[Super-tux-commit] htdocs/images game-005_small.png,1.1,NONE game-006_small.png,1.1,NONE game1-004_small.png,1.1,NONE game2-004_small.png,1.1,NONE game3-004_small.png,1.1,NONE intro-005_small.png,1.1,NONE leveleditor-006_small.png,1.1,NONE menu-006_small.png,1.1,NONE

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

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

Removed Files:
	game-005_small.png game-006_small.png game1-004_small.png 
	game2-004_small.png game3-004_small.png intro-005_small.png 
	leveleditor-006_small.png menu-006_small.png 
Log Message:
- removed obsolete thumbnails, are now in jpg format

--- game1-004_small.png DELETED ---

--- menu-006_small.png DELETED ---

--- game-006_small.png DELETED ---

--- game2-004_small.png DELETED ---

--- intro-005_small.png DELETED ---

--- game-005_small.png DELETED ---

--- leveleditor-006_small.png DELETED ---

--- game3-004_small.png DELETED ---

[Super-tux-commit] supertux/src leveleditor.cpp,1.77,1.78 menu.h,1.55,1.56

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

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

Modified Files:
	leveleditor.cpp menu.h 
Log Message:
leveleditor menu IDisation and little improvements

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- menu.h	3 May 2004 17:29:40 -0000	1.55
+++ menu.h	3 May 2004 17:56:16 -0000	1.56
@@ -62,6 +62,17 @@
   MNID_SUBSETSETTINGS,
   MNID_QUITLEVELEDITOR
   };
+  
+enum LevelEditorSubsetSettingsIDs {
+  MNID_TITLE,
+  MNID_DESCRIPTION,
+  MNID_SAVE_CHANGES
+  };
+  
+enum LevelEditorSubsetNewIDs {
+ MNID_SUBSETNAME,
+ MNID_CREATESUBSET
+};
 
 enum LevelEditorSettingsMenuIDs {
   MNID_NAME,

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- leveleditor.cpp	3 May 2004 17:29:40 -0000	1.77
+++ leveleditor.cpp	3 May 2004 17:56:15 -0000	1.78
@@ -170,11 +170,6 @@
 static SDL_Event event;
 TileMapType active_tm;
 
-// menu items for subset creation menu
-enum {
-  MNID_CREATESUBSET
-};
-
 void le_set_defaults()
 {
   if(le_current_level != NULL)
@@ -326,7 +321,7 @@
           if(i >= 1)
           {
             le_level_subset->load(level_subsets.item[i-1]);
-            leveleditor_menu->item[3].kind = MN_GOTO;
+            leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO;
             le_level = 1;
             le_world.arrays_free();
             delete le_current_level;
@@ -340,8 +335,7 @@
             le_current_level->load_gfx();
             le_world.activate_bad_guys();
 
-            // FIXME:?
-            Menu::set_current(leveleditor_menu);
+            Menu::set_current(NULL);
           }
           break;
         }
@@ -357,9 +351,9 @@
           switch (i = subset_new_menu->check())
           {
           case MNID_CREATESUBSET:
-            LevelSubset::create(subset_new_menu->item[2].input);
-            le_level_subset->load(subset_new_menu->item[2].input);
-            leveleditor_menu->item[3].kind = MN_GOTO;
+            LevelSubset::create(subset_new_menu->get_item_by_id(MNID_SUBSETNAME).input);
+            le_level_subset->load(subset_new_menu->get_item_by_id(MNID_SUBSETNAME).input);
+            leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO;
             le_level = 1;
             le_world.arrays_free();
             delete le_current_level;
@@ -372,23 +366,23 @@
             le_set_defaults();
             le_current_level->load_gfx();
             le_world.activate_bad_guys();
-            subset_new_menu->item[2].change_input("");
-            // FIXME:? show_menu = true;
-            Menu::set_current(leveleditor_menu);
+            subset_new_menu->get_item_by_id(MNID_SUBSETNAME).change_input("");
+	    
+            Menu::set_current(subset_settings_menu);
             break;
           }
         }
       }
       else if(menu == subset_settings_menu)
       {
-        if(le_level_subset->title.compare(subset_settings_menu->item[2].input) == 0 && le_level_subset->description.compare(subset_settings_menu->item[3].input) == 0  )
-          subset_settings_menu->item[5].kind = MN_DEACTIVE;
+        if(le_level_subset->title.compare(subset_settings_menu->get_item_by_id(MNID_TITLE).input) == 0 && le_level_subset->description.compare(subset_settings_menu->get_item_by_id(MNID_DESCRIPTION).input) == 0  )
+          subset_settings_menu->get_item_by_id(MNID_SAVE_CHANGES).kind = MN_DEACTIVE;
         else
-          subset_settings_menu->item[5].kind = MN_ACTION;
+          subset_settings_menu->get_item_by_id(MNID_SAVE_CHANGES).kind = MN_ACTION;
 
         switch (i = subset_settings_menu->check())
         {
-        case 5:
+        case MNID_SAVE_CHANGES:
           save_subset_settings_menu();
           //FIXME:show_menu = true;
           Menu::set_current(leveleditor_menu);

[Super-tux-commit] supertux/src level.cpp,1.62,1.63 level.h,1.43,1.44 leveleditor.cpp,1.76,1.77 menu.h,1.54,1.55

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

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

Modified Files:
	level.cpp level.h leveleditor.cpp menu.h 
Log Message:
leveleditor improvements

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- level.cpp	3 May 2004 13:32:36 -0000	1.62
+++ level.cpp	3 May 2004 17:29:40 -0000	1.63
@@ -229,7 +229,6 @@
 {
   name       = "UnNamed";
   author     = "UnNamed";
-  theme      = "antarctica";
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
@@ -332,8 +331,6 @@
       reader.read_string("name",  &name);
       author = "unknown author";
       reader.read_string("author", &author);
-      if(!reader.read_string("theme",  &theme))
-        st_abort("No theme specified in level file", "");
       song_title = "";
       reader.read_string("music",  &song_title);
       bkgd_image = "";
@@ -543,7 +540,6 @@
   fprintf(fi,"  (version %d)\n", 1);
   fprintf(fi,"  (name \"%s\")\n", name.c_str());
   fprintf(fi,"  (author \"%s\")\n", author.c_str());
-  fprintf(fi,"  (theme \"%s\")\n", theme.c_str());
   fprintf(fi,"  (music \"%s\")\n", song_title.c_str());
   fprintf(fi,"  (background \"%s\")\n", bkgd_image.c_str());
   fprintf(fi,"  (particle_system \"%s\")\n", particle_system.c_str());
@@ -626,7 +622,6 @@
   reset_points.clear();
   name.clear();
   author.clear();
-  theme.clear();
   song_title.clear();
   bkgd_image.clear();
 
@@ -653,8 +648,7 @@
 }
 
 /* Load a level-specific graphic... */
-void
-Level::load_image(Surface** ptexture, string theme,const  char * file, int use_alpha)
+void Level::load_image(Surface** ptexture, string theme,const  char * file, int use_alpha)
 {
   char fname[1024];
 

Index: level.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- level.h	3 May 2004 12:34:37 -0000	1.43
+++ level.h	3 May 2004 17:29:40 -0000	1.44
@@ -75,7 +75,6 @@
 
   std::string name;
   std::string author;
-  std::string theme;
   std::string song_title;
   std::string bkgd_image;
   std::string particle_system;

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- menu.h	30 Apr 2004 11:20:42 -0000	1.54
+++ menu.h	3 May 2004 17:29:40 -0000	1.55
@@ -64,6 +64,19 @@
   };
 
 enum LevelEditorSettingsMenuIDs {
+  MNID_NAME,
+  MNID_AUTHOR,
+  MNID_SONG,
+  MNID_BGIMG,
+  MNID_LENGTH,
+  MNID_TIME,
+  MNID_GRAVITY,
+  MNID_TopRed,
+  MNID_TopGreen,
+  MNID_TopBlue,
+  MNID_BottomRed,
+  MNID_BottomGreen,
+  MNID_BottomBlue,
   MNID_APPLY
   };
 

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- leveleditor.cpp	2 May 2004 22:44:56 -0000	1.76
+++ leveleditor.cpp	3 May 2004 17:29:40 -0000	1.77
@@ -273,9 +273,9 @@
       {
         switch (level_settings_menu->check())
         {
-        case MNID_SUBSETSETTINGS:
+        case MNID_APPLY:
           apply_level_settings_menu();
-          Menu::set_current(leveleditor_menu);
+          Menu::set_current(NULL);
           break;
 
         default:
@@ -471,20 +471,19 @@
   level_settings_menu->arrange_left = true;
   level_settings_menu->additem(MN_LABEL,"Level Settings",0,0);
   level_settings_menu->additem(MN_HL,"",0,0);
-  level_settings_menu->additem(MN_TEXTFIELD,"Name    ",0,0);
-  level_settings_menu->additem(MN_TEXTFIELD,"Author  ",0,0);
-  level_settings_menu->additem(MN_STRINGSELECT,"Theme   ",0,0);
-  level_settings_menu->additem(MN_STRINGSELECT,"Song    ",0,0);
-  level_settings_menu->additem(MN_STRINGSELECT,"Bg-Image",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Length ",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Time   ",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Gravity",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Top Red    ",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Top Green  ",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Top Blue   ",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Bottom Red ",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Bottom Green",0,0);
-  level_settings_menu->additem(MN_NUMFIELD,"Bottom Blue",0,0);
+  level_settings_menu->additem(MN_TEXTFIELD,"Name    ",0,0,MNID_NAME);
+  level_settings_menu->additem(MN_TEXTFIELD,"Author  ",0,0,MNID_AUTHOR);
+  level_settings_menu->additem(MN_STRINGSELECT,"Song    ",0,0,MNID_SONG);
+  level_settings_menu->additem(MN_STRINGSELECT,"Bg-Image",0,0,MNID_BGIMG);
+  level_settings_menu->additem(MN_NUMFIELD,"Length ",0,0,MNID_LENGTH);
+  level_settings_menu->additem(MN_NUMFIELD,"Time   ",0,0,MNID_TIME);
+  level_settings_menu->additem(MN_NUMFIELD,"Gravity",0,0,MNID_GRAVITY);
+  level_settings_menu->additem(MN_NUMFIELD,"Top Red    ",0,0,MNID_TopRed);
+  level_settings_menu->additem(MN_NUMFIELD,"Top Green  ",0,0,MNID_TopGreen);
+  level_settings_menu->additem(MN_NUMFIELD,"Top Blue   ",0,0,MNID_TopBlue);
+  level_settings_menu->additem(MN_NUMFIELD,"Bottom Red ",0,0,MNID_BottomRed);
+  level_settings_menu->additem(MN_NUMFIELD,"Bottom Green",0,0,MNID_BottomGreen);
+  level_settings_menu->additem(MN_NUMFIELD,"Bottom Blue",0,0,MNID_BottomBlue);
   level_settings_menu->additem(MN_HL,"",0,0);
   level_settings_menu->additem(MN_ACTION,"Apply Changes",0,0,MNID_APPLY);
 
@@ -587,39 +586,37 @@
 {
   char str[80];
   int i;
-
-  level_settings_menu->item[2].change_input(le_current_level->name.c_str());
-  level_settings_menu->item[3].change_input(le_current_level->author.c_str());
-  sprintf(str,"%d",le_current_level->width);
-
-  string_list_copy(level_settings_menu->item[4].list, dsubdirs("images/themes", "solid0.png"));
-  string_list_copy(level_settings_menu->item[5].list, dfiles("music/",NULL, "-fast"));
-  string_list_copy(level_settings_menu->item[6].list, dfiles("images/background",NULL, NULL));
-  string_list_add_item(level_settings_menu->item[6].list,"");
-  if((i = string_list_find(level_settings_menu->item[4].list,le_current_level->theme.c_str())) != -1)
-    level_settings_menu->item[3].list->active_item = i;
-  if((i = string_list_find(level_settings_menu->item[5].list,le_current_level->song_title.c_str())) != -1)
-    level_settings_menu->item[4].list->active_item = i;
-  if((i = string_list_find(level_settings_menu->item[6].list,le_current_level->bkgd_image.c_str())) != -1)
-    level_settings_menu->item[5].list->active_item = i;
-
-  level_settings_menu->item[7].change_input(str);
+  
+  level_settings_menu->get_item_by_id(MNID_NAME).change_input(le_current_level->name.c_str());
+  level_settings_menu->get_item_by_id(MNID_AUTHOR).change_input(le_current_level->author.c_str());
+  
+  string_list_copy(level_settings_menu->get_item_by_id(MNID_SONG).list, dfiles("music/",NULL, "-fast"));
+  string_list_copy(level_settings_menu->get_item_by_id(MNID_BGIMG).list, dfiles("images/background",NULL, NULL));
+  string_list_add_item(level_settings_menu->get_item_by_id(MNID_BGIMG).list,"");
+  
+  if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_SONG).list,le_current_level->song_title.c_str())) != -1)
+    level_settings_menu->get_item_by_id(MNID_SONG).list->active_item = i;
+  if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_BGIMG).list,le_current_level->bkgd_image.c_str())) != -1)
+    level_settings_menu->get_item_by_id(MNID_BGIMG).list->active_item = i;
+  
+  sprintf(str,"%d",le_current_level->width);  
+  level_settings_menu->get_item_by_id(MNID_LENGTH).change_input(str);
   sprintf(str,"%d",le_current_level->time_left);
-  level_settings_menu->item[8].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_TIME).change_input(str);
   sprintf(str,"%2.0f",le_current_level->gravity);
-  level_settings_menu->item[9].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_GRAVITY).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_top.red);
-  level_settings_menu->item[10].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_TopRed).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_top.green);
-  level_settings_menu->item[11].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_TopGreen).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_top.blue);
-  level_settings_menu->item[12].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_TopBlue).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_bottom.red);
-  level_settings_menu->item[13].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_BottomRed).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_bottom.green);
-  level_settings_menu->item[14].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_BottomGreen).change_input(str);
   sprintf(str,"%d",le_current_level->bkgd_bottom.blue);
-  level_settings_menu->item[15].change_input(str);
+  level_settings_menu->get_item_by_id(MNID_BottomBlue).change_input(str);
 }
 
 void update_subset_settings_menu()
@@ -633,18 +630,12 @@
   int i;
   i = false;
 
-  le_current_level->name = level_settings_menu->item[2].input;
-  le_current_level->author = level_settings_menu->item[3].input;
-
-  if(le_current_level->bkgd_image.compare(string_list_active(level_settings_menu->item[6].list)) != 0)
-  {
-    le_current_level->bkgd_image = string_list_active(level_settings_menu->item[6].list);
-    i = true;
-  }
+  le_current_level->name = level_settings_menu->get_item_by_id(MNID_NAME).input;
+  le_current_level->author = level_settings_menu->get_item_by_id(MNID_AUTHOR).input;
 
-  if(le_current_level->theme.compare(string_list_active(level_settings_menu->item[4].list)) != 0)
+  if(le_current_level->bkgd_image.compare(string_list_active(level_settings_menu->get_item_by_id(MNID_BGIMG).list)) != 0)
   {
-    le_current_level->theme = string_list_active(level_settings_menu->item[4].list);
+    le_current_level->bkgd_image = string_list_active(level_settings_menu->get_item_by_id(MNID_BGIMG).list);
     i = true;
   }
 
@@ -653,17 +644,17 @@
     le_current_level->load_gfx();
   }
 
-  le_current_level->song_title = string_list_active(level_settings_menu->item[5].list);
+  le_current_level->song_title = string_list_active(level_settings_menu->get_item_by_id(MNID_SONG).list);
 
-  le_current_level->change_size(atoi(level_settings_menu->item[7].input));
-  le_current_level->time_left = atoi(level_settings_menu->item[8].input);
-  le_current_level->gravity = atof(level_settings_menu->item[9].input);
-  le_current_level->bkgd_top.red = atoi(level_settings_menu->item[10].input);
-  le_current_level->bkgd_top.green = atoi(level_settings_menu->item[11].input);
-  le_current_level->bkgd_top.blue = atoi(level_settings_menu->item[12].input);
-  le_current_level->bkgd_bottom.red = atoi(level_settings_menu->item[13].input);
-  le_current_level->bkgd_bottom.green = atoi(level_settings_menu->item[14].input);
-  le_current_level->bkgd_bottom.blue = atoi(level_settings_menu->item[15].input);
+  le_current_level->change_size(atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input));
+  le_current_level->time_left = atoi(level_settings_menu->get_item_by_id(MNID_BGIMG).input);
+  le_current_level->gravity = atof(level_settings_menu->get_item_by_id(MNID_GRAVITY).input);
+  le_current_level->bkgd_top.red = atoi(level_settings_menu->get_item_by_id(MNID_TopRed).input);
+  le_current_level->bkgd_top.green = atoi(level_settings_menu->get_item_by_id(MNID_TopGreen).input);
+  le_current_level->bkgd_top.blue = atoi(level_settings_menu->get_item_by_id(MNID_TopBlue).input);
+  le_current_level->bkgd_bottom.red = atoi(level_settings_menu->get_item_by_id(MNID_BottomRed).input);
+  le_current_level->bkgd_bottom.green = atoi(level_settings_menu->get_item_by_id(MNID_BottomGreen).input);
+  le_current_level->bkgd_bottom.blue = atoi(level_settings_menu->get_item_by_id(MNID_BottomBlue).input);
 }
 
 void save_subset_settings_menu()

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

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

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

Modified Files:
	TODO 
Log Message:
- added issues

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- TODO	3 May 2004 13:02:01 -0000	1.25
+++ TODO	3 May 2004 17:18:01 -0000	1.26
@@ -16,6 +16,11 @@
     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] tux get killed if he kicks a iceblock while at the same time
+   bouncing on the roof
+[L] tux can be killed by back bouncing iceblocks in the exit sequence
+   (all enemies should be removed/turned to coins once the exit
+   sequence started)
 [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...

[Super-tux-commit] htdocs/milestone1 submenu.xml,1.1,1.2

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

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

Modified Files:
	submenu.xml 
Log Message:
- added news, fixed typo

Index: submenu.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/milestone1/submenu.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- submenu.xml	3 Mar 2004 21:30:56 -0000	1.1
+++ submenu.xml	3 May 2004 15:40:22 -0000	1.2
@@ -7,5 +7,4 @@
   <item file="tilesets.html">Tilesets</item>
   <item file="enemies.html">Enemies</item>
   <item file="misc.html">Misc</item>
-  <item file="download.html">Download</item>
 </submenu>

[Super-tux-commit] htdocs news.xml,NONE,1.1 Makefile,1.14,1.15 default.css,1.3,1.4 download.xml,1.5,1.6 submenu.xml,1.5,1.6

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

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

Modified Files:
	Makefile default.css download.xml submenu.xml 
Added Files:
	news.xml 
Log Message:
- added news, fixed typo

--- NEW FILE: news.xml ---
<?xml version="1.0"?>
<page title="SuperTux">
  <section title="News">
    <news>
      <item date="3. May 2004">
        Windows Binary for SuperTux is released, go to the
        <a href="download.html">download section</a> to download it.
      </item>

      <item date="2. May 2004">
        SuperTux Milestone1, aka 0.1.0 as been released, featuring 26
        levels, a worldmap and completly reworked graphics, go to the
        <a href="download.html">download section</a> to download it.
      </item>
    </news>
  </section>
</page>

Index: download.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/download.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- download.xml	2 May 2004 21:36:11 -0000	1.5
+++ download.xml	3 May 2004 15:40:22 -0000	1.6
@@ -3,7 +3,8 @@
   <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>
+        <li>Source: <a href="http://pingus.seul.org/~grumbel/tmp/supertux-0.1.0.tar.bz2">supertux-0.1.0.tar.bz2</a></li>
+        <li>Windows Binary: <a href="http://www.stud.uni-karlsruhe.de/~uxsm/supertux-0.1.0-setup.exe">supertux-0.1.0-setup.exe</a></li>
       </ul>
     </subsection>
 
@@ -15,8 +16,8 @@
 
     <subsection title="CVS">
       <p>
-        The development version can be getted via CVS with the following
-        command:
+        The development version can be received via CVS with the
+        following command:
       </p>
 
       <p>

Index: Makefile
===================================================================
RCS file: /cvsroot/super-tux/htdocs/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	2 May 2004 21:35:56 -0000	1.14
+++ Makefile	3 May 2004 15:40:19 -0000	1.15
@@ -1,4 +1,5 @@
 HTMLOUT = \
+  news.html \
   welcome.html \
   download.html \
   authors.html \

Index: submenu.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/submenu.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- submenu.xml	2 May 2004 21:36:11 -0000	1.5
+++ submenu.xml	3 May 2004 15:40:22 -0000	1.6
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
 <submenu>
+  <item file="news.html">News</item>
   <item file="welcome.html">About</item>
   <item file="screenshots.html">Screenshots</item>
   <item file="authors.html">Authors</item>

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