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

[Super-tux-commit] supertux/src resources.cpp,1.27,1.28 setup.cpp,1.62,1.63 setup.h,1.18,1.19 supertux.cpp,1.14,1.15 text.cpp,1.16,1.17 texture.cpp,1.16,1.17 title.cpp,1.64,1.65 world.cpp,1.44,1.45 world.h,1.31,1.32 worldmap.cpp,1.60,1.61

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

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

Modified Files:
	resources.cpp setup.cpp setup.h supertux.cpp text.cpp 
	texture.cpp title.cpp world.cpp world.h worldmap.cpp 
Log Message:
<MatzeB> fixes some remaining memory leaks

Index: text.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/text.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- text.cpp	27 Apr 2004 18:55:57 -0000	1.16
+++ text.cpp	28 Apr 2004 13:18:54 -0000	1.17
@@ -70,6 +70,12 @@
   SDL_FreeSurface(conv);
 }
 
+Text::~Text()
+{
+  delete chars;
+  delete shadow_chars;
+}
+
 void
 Text::draw(const  char* text, int x, int y, int shadowsize, int update)
 {
@@ -182,14 +188,6 @@
     }
 }
 
-Text::~Text()
-{
-  if(kind == TEXT_TEXT)
-    delete chars;
-  else if(kind == TEXT_NUM)
-    delete chars;
-}
-
 /* --- ERASE TEXT: --- */
 
 void

Index: world.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- world.h	26 Apr 2004 10:46:45 -0000	1.31
+++ world.h	28 Apr 2004 13:18:54 -0000	1.32
@@ -57,7 +57,8 @@
 
   std::vector<Upgrade> upgrades;
   std::vector<Bullet> bullets;
-  std::vector<ParticleSystem*> particle_systems;
+  typedef std::vector<ParticleSystem*> ParticleSystems;
+  ParticleSystems particle_systems;
 
 public:
   static World* current() { return current_; }

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- setup.cpp	26 Apr 2004 17:35:08 -0000	1.62
+++ setup.cpp	28 Apr 2004 13:18:54 -0000	1.63
@@ -600,7 +600,6 @@
 {
 
   /* Free global images: */
-
   delete black_text;
   delete gold_text;
   delete white_text;
@@ -608,6 +607,7 @@
   delete red_text;
   delete white_small_text;
   delete white_big_text;
+  delete yellow_nums;
 
   /* Free GUI/menu images: */
   delete checkbox;

Index: setup.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- setup.h	20 Apr 2004 11:09:34 -0000	1.18
+++ setup.h	28 Apr 2004 13:18:54 -0000	1.19
@@ -33,6 +33,7 @@
 void free_strings(char **strings, int num);
 void st_directory_setup(void);
 void st_general_setup(void);
+void st_general_free();
 void st_video_setup_sdl(void);
 void st_video_setup_gl(void);
 void st_video_setup(void);

Index: texture.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/texture.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- texture.cpp	26 Apr 2004 12:21:22 -0000	1.16
+++ texture.cpp	28 Apr 2004 13:18:54 -0000	1.17
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <iostream>
+#include <algorithm>
 #include "SDL.h"
 #include "SDL_image.h"
 #include "texture.h"
@@ -163,6 +164,17 @@
 
 Surface::~Surface()
 {
+#ifdef DEBUG
+  bool found = false;
+  for(std::list<Surface*>::iterator i = surfaces.begin(); i != surfaces.end();
+          ++i) {
+      if(*i == this) {
+          found = true; break;
+      }
+  }
+  if(!found)
+    printf("Error: Surface freed twice!!!\n");
+#endif
   surfaces.remove(this);
   delete impl;
 }

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- title.cpp	26 Apr 2004 15:03:24 -0000	1.64
+++ title.cpp	28 Apr 2004 13:18:54 -0000	1.65
@@ -362,6 +362,7 @@
 
   delete bkg_title;
   delete logo;
+  delete img_choose_subset;
 }
 
 // EOF //

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- worldmap.cpp	27 Apr 2004 19:16:01 -0000	1.60
+++ worldmap.cpp	28 Apr 2004 13:18:54 -0000	1.61
@@ -674,7 +674,7 @@
                         if (dir != NONE)
                           {
                             tux->set_direction(dir);
-                            tux->update(delta);
+                            //tux->update(delta);
                           }
 
                         std::cout << "Walk to dir: " << dir << std::endl;
@@ -724,8 +724,8 @@
     }
   else
     {
-      tux->set_direction(input_direction);
       tux->update(delta);
+      tux->set_direction(input_direction);
     }
   
   Menu* menu = Menu::current();
@@ -866,6 +866,9 @@
 
       delta *= 1.3f;
 
+      if (delta > 10.0f)
+        delta = .3f;
+      
       last_update_time = update_time;
       update_time      = st_get_ticks();
 

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- world.cpp	27 Apr 2004 19:17:15 -0000	1.44
+++ world.cpp	28 Apr 2004 13:18:54 -0000	1.45
@@ -101,6 +101,10 @@
 {
   for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
     delete *i;
+
+  for (ParticleSystems::iterator i = particle_systems.begin();
+          i != particle_systems.end(); ++i)
+    delete *i;
   
   delete level;
 }

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- supertux.cpp	26 Apr 2004 12:21:22 -0000	1.14
+++ supertux.cpp	28 Apr 2004 13:18:54 -0000	1.15
@@ -65,6 +65,7 @@
   updatescreen();
 
   unloadshared();
+  st_general_free();
   TileManager::destroy_instance();
 #ifdef DEBUG
   Surface::debug_check();

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- resources.cpp	26 Apr 2004 12:21:22 -0000	1.27
+++ resources.cpp	28 Apr 2004 13:18:54 -0000	1.28
@@ -218,6 +218,7 @@
   for (i = 0; i < 2; i++)
     delete img_flag[i];
 
+  delete img_red_glow;
   for (i = 0; i < 4; i++)
     {
       delete img_distro[i];
@@ -225,6 +226,8 @@
       delete img_cloud[1][i];
     }
 
+  delete tux_life;
+
   for (i = 0; i < NUM_SOUNDS; i++)
     free_chunk(sounds[i]);
 

[Super-tux-commit] supertux/data CREDITS,1.14,1.15

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

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

Modified Files:
	CREDITS 
Log Message:
Removed Marek's email... I must have forgotten

Index: CREDITS
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CREDITS	27 Apr 2004 21:11:41 -0000	1.14
+++ CREDITS	28 Apr 2004 12:39:01 -0000	1.15
@@ -43,7 +43,6 @@
 
 	Marek Moeckel
 Wansti
- wa...@gm...
  
 	Ingo Ruhnke
 Grumbel

[Super-tux-commit] supertux AUTHORS,1.2,1.3 INSTALL,1.3,1.4 LEVELDESIGN,1.7,1.8 README,1.3,1.4

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

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

Modified Files:
	AUTHORS INSTALL LEVELDESIGN README 
Log Message:
Applied patch from Ryan (the one sent to the mailing list).
Basically it corrects a few grammar errors from me ;) and also formats some stuff.

Index: README
===================================================================
RCS file: /cvsroot/super-tux/supertux/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	26 Apr 2004 22:11:41 -0000	1.3
+++ README	28 Apr 2004 12:15:42 -0000	1.4
@@ -6,8 +6,9 @@
  
 DESCRIPTION
 -----------
-  SuperTux is a jump'n run like game, with a strongly inspiration on
-  Nintendo's Super Mario Bros games.
+  SuperTux is a jump'n run like game, with strong inspiration from the
+  Super Mario Bros games for Nintendo.
+
   Run and jump through multiple worlds, fighting off enemies by jumping
   on them or bumping them from below.  Grabbing power-ups and other stuff
   on the way.
@@ -16,19 +17,19 @@
 STORY
 -----
 
-- Gwen gets captured! -
+- Penny gets captured! -
 
-  Tux and Gwen were out having a nice
+  Tux and Penny were out having a nice
   picnic on the ice fields of Antarctica.
   Suddenly, a creature jumped from
   behind an ice bush, there was a flash,
   and Tux fell asleep!
 
-  When Tux wakes up, he finds that Gwen
+  When Tux wakes up, he finds that Penny
   is missing. Where she lay before now
   lies a letter. "Tux, my arch enemy!"
   says the letter. "I have captured
-  your beautiful Gwen and have taken her
+  your beautiful Penny and have taken her
   to my fortress. The path to my fortress
   is littered with my minions. Give up on
   the thought of trying to reclaim her,
@@ -36,7 +37,7 @@
 
   Tux looks and see Nolok's fortress in
   the distance. Determined to save his
-  beloved Gwen, he begins his journey.
+  beloved Penny, he begins his journey.
 
 
 DOCUMENTATION
@@ -44,12 +45,16 @@
   Important documentation for SuperTux is contained in multiple files.
   Please see them:
 
-    AUTHORS    - Credits for who made this game.
-    CHANGES    - Changes since the previous versions of "Super Tux"
-    COPYING    - The GNU Public License, which "Super Tux" is under.
-    INSTALL    - Instructions on requirements, compiling and installing.
-    README     - (This file.)  Game story, usage, rules and controls.
-    TODO       - A wish-list for this version of "Super Tux"
+    AUTHORS     - Credits for people that contributed to the creation
+                  of SuperTux.
+    CHANGES     - Changes since the previous versions of "SuperTux"
+    COPYING     - The GNU Public License, which "SuperTux" is liscensed
+                  under.
+    INSTALL     - Instructions on requirements, compiling and installing.
+    README      - (This file.)  Game story, usage, rules and controls.
+    TODO        - A wish-list for this version of "SuperTux"
+    LEVELDESIGN - Very useful information for those that want to design
+                  levels for SuperTux.
 
 
 RUNNING THE GAME
@@ -65,11 +70,10 @@
   specifying them.
 
   The game has two frontends: SDL and OpenGL. Currently, there isn't any
-  noticiable difference between them.
-  Basically, SDL uses software to draw the game and OpenGL makes use of
-  the videocards cpu (in case the videocard has one and the drivers support
-  it). Under linux, nvidia is recommendaded (with the closed drivers), but
-  an ATI should work just fine.
+  noticiable difference between them. Basically, SDL uses software to draw
+  the game and OpenGL makes use of the videocards CPU (if the videocard has
+  one and the drivers support it). Under linux, nVidia is recommendaded
+  (with the closed drivers), but an ATI video card should work just fine.
 
 
 PLAYING THE GAME
@@ -77,17 +81,22 @@
   Controls
   --------
   Both keyboards and joysticks/gamepads are supported. You can change the
-  controls via the Options menu.
-  Basically, the only keys you will have to use is for the following actions:
-  jump, duck, right and left. Also press Esc to go to the menu and use the
-  key cursors and Enter under it. Oh, press P to pause the game.
-  In the worldmap, the arrow keys and Enter are enough.
+  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.
+  
+  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
+  keys or the mouse.
+
+  In the worldmap, the arrow keys are used to navigate and Enter enters the
+  current level.
 
   The leveleditor is controled via the mouse, but there are shortcuts that
   may make your life easier. To see the shortcuts for the buttons, just
-  do a Right-click on them.
-  In any case, we advise you to read LEVELDESIGN to have the best productivity
-  with the leveleditor.
+  do a Right-click on them. If you are interested in creating SuperTux
+  levels, we advise you to read LEVELDESIGN to learn more about the editor
+  and creating new levels.
 
 
 SCREEN LAYOUT
@@ -103,38 +112,38 @@
 -------
   Enemies
   -------
-    If you get more than one enemy at a time without landing on the ground,
+    If you kill more than one enemy at a time without landing on the ground,
     each enemy is worth more points.  For example, if there are three in a
     row and you jump on the first, it's worth 50 points.  If you bounce off
     the first and onto the second, it's worth 100 points.  If you also get
     the third, it's worth 150 points.
 
-    You can also score by shooting at the ennemies. Don't forget to get
-    the flower in order to get the ability to fire.
+    You can also score by shooting at the enemies. Don't forget to get
+    the iceflower in order to get the ability to fire.
 
 
 OPTIONS FILE
 ------------
 
-  When Super Tux starts up, it looks for an options file.
+  When SuperTux starts up, it looks for an options file.
 
   Under Linux, this file is "config" in your directory
   ($HOME/.supertux/).
-  Under Windows, this file is "supertux.dat" in the Super Tux folder.
+  Under Windows, this file is "supertux.dat" in the SuperTux folder.
   
-  This file records program's settings. It uses the LISP syntax, anyway
-  there shouldn't be any reasons for you to hand edit it.
+  This file records program's settings. It uses the LISP syntax. There
+  should be no reason to edit this file by hand.
 
 THE END
 -------
-  Thanks for trying out Super Tux.
+  Thanks for trying out SuperTux.
 
-  If you like Super Tux, please rate and review it at the
+  If you like SuperTux, please rate and review it at the
   Linux Game Tome:
 
     http://www.happypenguin.org/
 
-  Search for "Super Tux"!
+  Search for "SuperTux"!
 
 
   Thanks!

Index: LEVELDESIGN
===================================================================
RCS file: /cvsroot/super-tux/supertux/LEVELDESIGN,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LEVELDESIGN	26 Apr 2004 22:11:41 -0000	1.7
+++ LEVELDESIGN	28 Apr 2004 12:15:42 -0000	1.8
@@ -10,10 +10,9 @@
 = LEVEL FORMAT =
 
 The level format used to be pretty easy to understand, but it
-is now more complex.
-Anyway, should be pretty usefull to know a bit of it, when you
-want to do stuff just as to just change the author's name or
-something small.
+is now more complex. Anyway, should be pretty useful to know
+a bit of it, when you want to do stuff just as to just change
+the author's name or something small.
 
 It uses the Lisp syntax and is pretty intuitive. Here have a
 look at a quotation:
@@ -21,17 +20,17 @@
 
 ; This is a comment!
 (supertux-level
-; a few level's info: version, author and level's name
+; some level info: version, author and the level's name
   (version 1)
   (author "Ingo Ruhnke")
   (name "Night Chill")
 ; number of tiles used (currently the height has to be 15)
   (width  515)
   (height 15)
-; Tux starts position
+; Tux's start position
   (start_pos_x    100)
   (start_pos_y    170)
-; Background image, if any is specified, the color below will be used
+; Background image; if none is specified, the color below will be used
   (background "")
 ; Music file
   (music "Mortimers_chipdisko.mod")
@@ -47,15 +46,15 @@
   (time  300)
 ; Gravity to be used (you should let it stay in 10 for ordinary levels)
   (gravity  10)
-; The particle system allows that images can be displaying simulating weather
-; In the writing of this text, both "snow" and "clouds" are supported
+; The particle system draws images that simulate weather effects
+; As of the writing of this text, both "snow" and "clouds" are supported
   (particle_system "snow")
-; Theme is the tiles look that are used
+; Theme is the tileset that is used
   (theme "antarctica")
   (interactive-tm
-; here goes a lot of numbers that are the tiles places
+    ; here goes a lot of numbers that are the tiles places
   )
-; Reset points, there can be more than one
+; Reset points; there can be more than one
 ; Reset points are positions where the player passes through and
 ; if he dies, he will be back to there. They are invisible
   (reset-points
@@ -78,26 +77,27 @@
 USING THE BUILT-IN LEVEL EDITOR:
 --------------------------------
 
-When opening the leveleditor, a menu will appear. This
-menu can be used to select or add level subsets.
-A level subset is a collection of levels. Subsets can be chose
-during gameplay when starting a game.
+When opening the leveleditor, a menu will appear. This menu
+can be used to select or add level subsets. A level subset is
+a collection of levels. Subsets can be chose during gameplay
+when starting a game.
 
 After selecting the subset, have a look at the level editor.
 The button bar in the right is the place where you can control
 the actions related with editing. You can select levels and add
 throught there.
+
 To select tiles (foreground or background) and enemies, the button
 bar is the right place. There you can also save, test and setup
 the level. It is also possible between two selection cursors! Give
-a try to both.
-A right click in a button bar button will give you a description
-and a shortcut for it.
+a try to both. A right click in a button bar button will give you
+a description and a shortcut for it.
 
 To change a tile, just press the tile you want to change with a
-mouse left click. The current tile will be used. Depending
+left mouse click. The current tile will be used. Depending
 on the selection behavior, you can or not select more
 than one tiles.
+
 To scroll, you just have to point over the two arrow buttons, or
 use the right button click.
 
@@ -118,26 +118,29 @@
 that is developed by Ingo Ruhnke and supports a lot of different
 games, including SuperTux (or else we wouldn't mention it :) ).
 
-Anyway, it is pretty easy to use and a lot more advanced than
-the internal one. So, if you are considering in doing a few levels
-for us, it may be a good idea to check this out.
+Anyway, it is pretty easy to use and is a lot more advanced than
+the internal one. So, if you are considering doing a few levels
+for us, it would be a good idea to check this out.
 
 There isn't currently any webpage for it, just go to our webpage and
 you should find a download of this program.
 
+You can also get the latest development copy from the Subversion
+source tree:
+    svn co "svn://clanlib.org/Games/Windstille/trunk/flexlay/"
+
 The only cons it has is that you have to have an accelerated
-videocard (with the drivers working, obviously). Anyway shouldn't
-be a problem nowadays.
-For linux, we advise nvidia videocards with the use of nvidia's closed
+videocard (with the drivers working, obviously). For linux,
+we advise nvidia videocards with the use of nvidia's closed
 drivers. ATI drivers should be enough to run this game though.
 
 
 = CONCLUSION =
 
-To sum up, go and do lots of levels and HAVE FUN!!
+To sum up, go build lots of levels and HAVE FUN!!
 
-Please, send your levels or any art you created to the SuperTux's
-mailinglist or to the maintainer (look at AUTHORS).
+Please, send your levels or any art, including sketches, you
+have created to the SuperTux mailing list.
 
 
-- SuperTux developers
+    - SuperTux developers

Index: INSTALL
===================================================================
RCS file: /cvsroot/super-tux/supertux/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- INSTALL	26 Apr 2004 22:11:41 -0000	1.3
+++ INSTALL	28 Apr 2004 12:15:42 -0000	1.4
@@ -13,7 +13,7 @@
 
   SDL
   ---
-    "Super Tux" was programed using the "Simple Direct Media" layer
+    "SuperTux" was programed using the "Simple DirectMedia Layer"
     libraries by Sam Lantinga.  This means that the game can
     theoretically run under any environment that the SDL libraries support.
 
@@ -30,7 +30,7 @@
   SDL_image
   ---------
     SDL_image is also required.  (It is used to load the PNG format images
-    that come with Super Tux!)
+    that come with SuperTux!)
 
   SDL_mixer
   ---------
@@ -46,6 +46,7 @@
     For linux, nvidia vendor is the only one that makes decent drivers.
     But the ATI drivers should run with the same performance, since
     it only uses accelerated 2d, not 3d.
+
     Anyway, you can use the SDL frontend and you most likely won't
     notice any difference.
 

Index: AUTHORS
===================================================================
RCS file: /cvsroot/super-tux/supertux/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AUTHORS	26 Apr 2004 22:11:41 -0000	1.2
+++ AUTHORS	28 Apr 2004 12:15:42 -0000	1.3
@@ -1,70 +1,81 @@
 
 - Those behind SuperTux -
+=========================
+
 http://super-tux.sf.net/
 
 Last update: April 26, 2004
 
-- Project leader:
+Project Leader
+--------------
 
-Tobias Glaesser
-to...@gm...
+    Tobias Glaesser
+    tob...@gm...
 
-- Original author:
+Original author
+---------------
 
-Bill Kendrick
-n...@so...
-http://www.newbreedsoftware.com/
+    Bill Kendrick
+    nb...@so...
+    http://www.newbreedsoftware.com/
 
-- Programmers:
+Programmers
+-----------
 
-- Ricardo Cruz
-r...@ae...
-http://rpmcruz.planetaclix.pt/
+    Ricardo Cruz
+    ri...@ae...
+    http://rpmcruz.planetaclix.pt/
 
-- Ingo Ruhnke
-gr...@gm...
-http://pingus.seul.org/~grumbel/
+    Ingo Ruhnke
+    gr...@gm...
+    http://pingus.seul.org/~grumbel/
 
-- Duong-Khang NGUYEN
-ne...@us...
+    Duong-Khang NGUYEN
+    neo...@us...
 
-- Matze Braun
-m...@br...
+    Matthias Braun
+    ma...@br...
 
-- Code contributors:
+Code contributors
+-----------------
 
-Ryan Flegel
-xx...@ho...
-http://digitalhell.cjb.net/~ryan/
+    Ryan Flegel
+    xxd...@ho...
+    http://digitalhell.cjb.net/~ryan/
 
-- Graphics:
+Graphics
+--------
 
-Ingo Ruhnke
-gr...@gm...
-http://pingus.seul.org/~grumbel/
+    Ingo Ruhnke
+    gr...@gm...
+    http://pingus.seul.org/~grumbel/
 
-Christopher A. Webber
-cr...@li...
+    Christopher A. Webber
+    cr...@li...
 
-- Level Design:
+Level Design
+------------
 
-Marek Moeckel
-w...@gm...
+    Marek Moeckel
+    wa...@gm...
 
-Ingo Ruhnke
-gr...@gm...
-http://pingus.seul.org/~grumbel/
+    Ingo Ruhnke
+    gr...@gm...
+    http://pingus.seul.org/~grumbel/
 
-- Musics:
+Music
+-----
 
-Marek Moeckel
-w...@gm...
+    Marek Moeckel
+    wa...@gm...
 
-- Sounds:
+Sounds
+------
 
-Royalty free CDROMs and FTP sites sounds
+    Royalty free CDROMs and FTP sites sounds
 
-- More information and contacts:
+More information and contacts
+=============================
 
 Visit our webpage at: http://super-tux.sf.net/
 

[Super-tux-commit] supertux/src badguy.cpp,1.54,1.55

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

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

Modified Files:
	badguy.cpp 
Log Message:
Don't give score when flatting a badguy, since this leaves to unfair situations. Besides, we are already giving score for when he kills other enemies...

I also think that we should give (let's say) half of the score, when a badguy is killed by a bullet. Since it is so easy to do that... What do you say?

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- badguy.cpp	27 Apr 2004 17:09:22 -0000	1.54
+++ badguy.cpp	28 Apr 2004 12:13:00 -0000	1.55
@@ -905,9 +905,12 @@
       }
 
     make_player_jump(player);
-	      
-    World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
-    player_status.score_multiplier++;
+
+    if((kind != BAD_MRICEBLOCK && mode != dying))
+      {
+      World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
+      player_status.score_multiplier++;
+      }
 
     // check for maximum number of squiches
     squishcount++;

Re: [Super-tux-commit] supertux/data CREDITS,1.11,1.12

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

 Already did both, but I also think that nicknames doesn't belong there. Th=
ey=20
would fit much better in a credits section on the webpage.

Ricardo

Em Ter=E7a, 27 de Abril de 2004 17:13, o sik0fewl =A0 escreveu:
> >Modified Files:
> >	CREDITS
> >Log Message:
> >- added some mail addresses, but looks bloated again, might be a good id=
ea
> >to reorder it for people instead of for jobs
>
> I think it would be best to leave email address out of the CREDITS file if
> it's going to be too bloated. we can save email address for the AUTHORS
> file.
>
> --
> Ryan
>

=2D-=20
Somewhere on this globe, every ten seconds, there is a woman giving birth
to a child.  She must be found and stopped.
		-- Sam Levenson

[Super-tux-commit] supertux/src special.cpp,1.35,1.36

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

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

Modified Files:
	special.cpp 
Log Message:
Fixed bug told in the mailing list:
«- fireballs don't shoot if you are above screen (they're destroyed because
    they're off screen)»
There is not point in removing them when they are above y=0.

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- special.cpp	27 Apr 2004 21:00:58 -0000	1.35
+++ special.cpp	28 Apr 2004 11:43:47 -0000	1.36
@@ -107,7 +107,6 @@
 
   if (base.x < scroll_x ||
       base.x > scroll_x + screen->w ||
-      base.y < 0 ||
       base.y > screen->h ||
       issolid(base.x + 4, base.y + 2) ||
       issolid(base.x, base.y + 2) ||

RE: [Super-tux-commit] supertux/data CREDITS,1.11,1.12

[sik0fewl <xxd...@ho...>]

>Modified Files:
>	CREDITS
>Log Message:
>- added some mail addresses, but looks bloated again, might be a good idea 
>to reorder it for people instead of for jobs

I think it would be best to leave email address out of the CREDITS file if 
it's going to be too bloated. we can save email address for the AUTHORS 
file.

--
Ryan

_________________________________________________________________
http://join.msn.com/?pgmarket=en-ca&page=byoa/prem&xAPID=1994&DI=1034&SU=http://hotmail.com/enca&HL=Market_MSNIS_Taglines

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

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

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

Modified Files:
	TODO 
Log Message:
update


Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TODO	27 Apr 2004 19:18:48 -0000	1.4
+++ TODO	27 Apr 2004 21:49:34 -0000	1.5
@@ -12,7 +12,6 @@
 - sometimes the level restarts/you die after collecing a growup
 - mriceblock doesn't disapear after being kicked my another iceblock,
   not sure when exactly it happens, might depend on direction or so
-- supertux lifting its feet for kicking is not drawn
 - fadein/out for intro/extro would be nice
 
 

[Super-tux-commit] supertux/data/images/tilesets nolok1.png,NONE,1.1 nolok2.png,NONE,1.1 supertux.stgt,1.21,1.22

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

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

Modified Files:
	supertux.stgt 
Added Files:
	nolok1.png nolok2.png 
Log Message:
- added nolok statue to the throne room

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

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

Index: supertux.stgt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- supertux.stgt	26 Apr 2004 19:35:37 -0000	1.21
+++ supertux.stgt	27 Apr 2004 21:33:28 -0000	1.22
@@ -468,5 +468,11 @@
        (goal #t)
        (data 0)
        (editor-images "endseq.png"))
+(tile (id 134)
+      (solid #f)
+      (images "nolok1.png"))
+(tile (id 135)
+      (solid #f)
+      (images "nolok2.png"))
  )
 

[Super-tux-commit] supertux/data/levels/world1 level26.stl,1.6,1.7

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

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

Modified Files:
	level26.stl 
Log Message:
- added nolok statue to the throne room

Index: level26.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- level26.stl	27 Apr 2004 17:06:51 -0000	1.6
+++ level26.stl	27 Apr 2004 21:33:28 -0000	1.7
@@ -29,7 +29,7 @@
    64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 65 0  0  0  0  67 64 64 64 64 64 64 64 69 0  65 64 64 64 64 64 64 64 64 64 69 0  0  68 64 64 64 64 64 64 64 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 0  65 65 65 65 65 0  65 65 65 65 65 0  65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  67 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  132 132 64 64 
    64 64 69 0  0  0  0  0  0  0  0  68 65 65 65 65 65 65 65 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  102 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  0  0  0  0  62 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 0  0  0  68 64 64 64 64 64 64 65 0  0  0  0  67 64 64 64 64 64 64 69 0  0  68 64 64 64 64 64 64 64 64 69 0  0  0  66 64 64 64 64 64 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 64 64 64 64 64 64 64 64 64 64 64 64 64 0  68 64 64 64 64 0  68 64 64 64 64 0  68 64 64 64 64 64 65 65 65 65 65 65 65 0  0  0  0  65 65 65 65 65 65 65 65 0  0  0  67 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  132 132 64 64 
    64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  62 0  0  0  0  0  0  62 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 0  0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 0  0  0  0  0  62 64 64 64 64 62 66 66 62 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 64 64 69 0  65 0  0  0  0  0  0  0  0  83 102 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 64 64 64 64 65 0  0  0  0  67 64 64 64 64 64 69 0  0  68 64 64 64 64 64 64 64 64 69 0  0  0  0  66 66 66 66 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  26 26 0  0  0  0  0  0  83 102 0  0  0  0  0  0  0  0  0  0  0  65 65 0  0  0  0  65 65 0  0  0  0  65 65 65 65 64 64 64 66 66 66 66 66 66 66 66 66 66 66 66 66 0  66 66 66 66 66 0  66 66 66 66 66 0  66 66 66 66 66 66 66 66 66 66 66 66 66 0  0  0  0  68 64 64 64 64 64 64 69 0  0  0  0  66 66 66 66 66 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  132 132 64 64 
-   64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  67 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 0  0  0  67 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 0  0  0  0  0  62 64 64 64 64 62 0  0  62 64 64 64 64 69 0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 64 64 64 64 64 65 0  0  0  0  67 64 64 64 64 64 65 0  68 64 64 64 64 64 64 64 64 69 102 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 0  0  0  68 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  67 66 0  0  0  0  67 66 0  0  0  0  67 66 66 66 66 66 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 64 69 102 0  0  0  0  0  0  133 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 64 64 64 
+   64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  67 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 0  0  0  67 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 0  0  0  0  0  62 64 64 64 64 62 0  0  62 64 64 64 64 69 0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 64 64 64 64 64 65 0  0  0  0  67 64 64 64 64 64 65 0  68 64 64 64 64 64 64 64 64 69 102 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 0  0  0  68 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  67 66 0  0  0  0  67 66 0  0  0  0  67 66 66 66 66 66 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 64 69 102 0  0  0  0  0  0  133 0  0  0  0  0  0  0  0  134 135 0  0  0  0  134 135 0  0  0  0  134 135 0  0  0  0  134 135 0  0  0  0  134 135 0  0  0  65 65 65 65 65 65 65 64 64 64 
    64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 0  0  65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 0  68 64 64 64 64 69 0  0  0  0  0  62 0  0  0  0  0  68 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  0  0  0  0  62 0  0  0  0  0  0  0  0  0  0  66 66 66 66 66 66 0  0  67 66 66 66 66 0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 64 64 64 64 64 64 65 0  0  0  0  67 66 66 66 66 0  0  66 66 66 66 66 66 66 66 66 66 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 0  0  0  0  0  0  0  68 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  66 66 66 66 66 66 66 66 0  0  0  0  0  0  0  133 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 64 64 64 64 
    64 64 64 65 65 65 65 65 65 65 65 65 65 65 65 65 0  65 65 65 65 65 65 0  68 64 64 64 64 69 0  0  68 64 64 64 64 69 0  0  0  0  0  0  0  65 65 65 65 65 65 0  68 64 64 64 64 69 0  68 64 64 64 64 69 0  0  65 65 65 65 65 65 65 0  0  68 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  65 65 65 65 65 65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  62 65 65 65 62 0  0  0  65 65 65 65 65 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 64 64 64 64 64 64 64 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 62 65 65 65 65 65 0  0  0  0  62 0  0  0  0  62 0  0  0  0  65 65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  133 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 64 64 64 64 
    64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  68 64 64 64 64 69 0  68 64 64 64 64 69 0  0  68 64 64 64 64 69 0  0  0  0  65 65 0  68 64 64 64 64 69 0  68 64 64 64 64 69 0  68 64 64 64 64 69 0  0  68 64 64 64 64 64 69 0  0  68 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  68 64 64 64 64 64 64 64 64 64 64 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  65 65 65 65 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 69 0  0  0  68 64 64 64 64 64 64 64 64 64 64 64 65 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 62 65 65 0  0  68 64 64 64 64 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 69 0  0  0  0  0  0  0  0  0  0  0  68 64 64 64 64 64 64 64 69 0  0  0  65 65 65 65 65 65 0  0  65 65 65 65 65 65 0  0  65 65 65 65 65 65 0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 0  0  0  0  0  0  0  0  0  0  0  0  0  65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 64 64 64 64 64 64 64 64 64 64 

[Super-tux-commit] supertux/data CREDITS,1.13,1.14

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

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

Modified Files:
	CREDITS 
Log Message:
Improved the CREDITS a little bit:
- removed emails (Ingo, in a irc discussion, you were the 1st one to say that emails should go to the package CREDITS file, not the in-game one). I have already done that.
- and just made something here and there.

I don't really like the nicknames, but I left them there. I think we should have a credits section in the webpage and there will be the best place to put them. (OT: we also need a screenshots section and old version downloads should be avaible).
Futhermore, I would still prefer one in-game credits with descriptions.

Index: CREDITS
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CREDITS	27 Apr 2004 15:45:35 -0000	1.13
+++ CREDITS	27 Apr 2004 21:11:41 -0000	1.14
@@ -1,41 +1,42 @@
 -- SuperTux -
 	 Milestone 1
 
--
--Programming
+
+-Project leader
 
 	Tobias Glaesser
 Tobgle
- tob...@gm...
- 
+
+-Originally developed by
+
+	Bill Kendrick
+
+
+-Programmers
+
 	Ricardo Cruz
 Blacksheep
- ri...@ae...
  
 	Ingo Ruhnke
 Grumbel
- gr...@gm...
  
 	Matthias Braun
 MatzeB
- ma...@br...
 
 -Contrib Programming
 
 	Ryan Flegel
  
 	Duong-Khang NGUYEN
- neo...@us...
+
 
 -Graphics
 
 	Ingo Ruhnke
 Grumbel
- gr...@gm...
  
 	Christopher A. Webber
 Paroneayea
- cr...@li...
 
 
 -Level Design
@@ -46,30 +47,20 @@
  
 	Ingo Ruhnke
 Grumbel
- gr...@gm...
--
+
+
 -Music
 
 	Marek Moeckel
 Wansti
- wa...@gm...
 
 
--Sound
+-Sounds
 
 	Royalty free sound effects
 	CDROMs and FTP sites
 
 
--Based on the original
--SuperTux by:
-
-	Bill Kendrick
- nb...@so...
-	Wesley Poole
-	Eric Windisch
-
-
 -Thanks to
 
 	Larry Ewing
@@ -80,7 +71,6 @@
  possible in Linux
 
 
-
 -Contact
 
 	Visit our webpage at
@@ -99,7 +89,6 @@
 
 
 
-
 	Thank you for
 	playing
 
@@ -107,4 +96,4 @@
 
 
 
-	See you soon in Milestone2!
+	See you soon in Milestone2!
\ No newline at end of file

[Super-tux-commit] supertux/src special.cpp,1.34,1.35

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

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

Modified Files:
	special.cpp 
Log Message:
Matze made eggs not to be removed at all during a level saying that they shouldn't be destroyed when off the screen.
The fact is that OFFSCREEN_DISTANCE is already pretty generous, but if you don't think so, just increase it.

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- special.cpp	27 Apr 2004 17:09:35 -0000	1.34
+++ special.cpp	27 Apr 2004 21:00:58 -0000	1.35
@@ -193,13 +193,10 @@
     }
   }
 
-  /* Off screen? Kill it! */
+  /* Away from the screen? Kill it! */
   if(base.x < scroll_x - OFFSCREEN_DISTANCE) {
-    // we don't remove growups for now, when off screen
-    if(kind != UPGRADE_GROWUP) {
       remove_me();
       return;
-    }
   }
   if(base.y > screen->h) {
     remove_me();

[Super-tux-commit] supertux TODO,1.3,1.4

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

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

Modified Files:
	TODO 
Log Message:
updated todo

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TODO	27 Apr 2004 19:16:00 -0000	1.3
+++ TODO	27 Apr 2004 19:18:48 -0000	1.4
@@ -9,6 +9,10 @@
 - supertux crashs from time to time
 - leveleditor lacks enemies support (will be fixed soon by Tobias)
 - sometimes you die after being in pause modus and unpausing
+- sometimes the level restarts/you die after collecing a growup
+- mriceblock doesn't disapear after being kicked my another iceblock,
+  not sure when exactly it happens, might depend on direction or so
 - supertux lifting its feet for kicking is not drawn
+- fadein/out for intro/extro would be nice
 
 

[Super-tux-commit] supertux/src tile.cpp,1.16,1.17 world.cpp,1.43,1.44

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

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

Modified Files:
	tile.cpp world.cpp 
Log Message:
removed debug stuff

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- world.cpp	26 Apr 2004 21:09:31 -0000	1.43
+++ world.cpp	27 Apr 2004 19:17:15 -0000	1.44
@@ -78,8 +78,6 @@
 void
 World::apply_bonuses()
 {
-  std::cout << "Bonus: " << player_status.bonus << std::endl;
-
   // Apply bonuses from former levels
   switch (player_status.bonus)
     {

Index: tile.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- tile.cpp	26 Apr 2004 19:11:54 -0000	1.16
+++ tile.cpp	27 Apr 2004 19:17:15 -0000	1.17
@@ -107,7 +107,6 @@
               reader.read_bool("fullbox",   &tile->fullbox);
               reader.read_bool("distro",    &tile->distro);
               reader.read_bool("goal",      &tile->goal);
-              if(tile->goal) printf("Goal!.\n");
               reader.read_int("data",       &tile->data);
               reader.read_int("anim-speed", &tile->anim_speed);
               reader.read_int("next-tile",  &tile->next_tile);

[Super-tux-commit] supertux/src worldmap.cpp,1.59,1.60

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

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

Modified Files:
	worldmap.cpp 
Log Message:
- added credit after extro, might need a bit fadeout stuff

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- worldmap.cpp	27 Apr 2004 18:44:19 -0000	1.59
+++ worldmap.cpp	27 Apr 2004 19:16:01 -0000	1.60
@@ -684,6 +684,8 @@
                       { // Display final credits and go back to the main menu
                         display_text_file(level->extro_filename,
                                           "/images/background/arctis2.jpg");
+                        display_text_file("CREDITS",
+                                          "/images/background/oiltux.jpg");
                         quit = true;
                       }
                   }

[Super-tux-commit] supertux TODO,1.2,1.3

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

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

Modified Files:
	TODO 
Log Message:
- added credit after extro, might need a bit fadeout stuff

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TODO	27 Apr 2004 17:09:21 -0000	1.2
+++ TODO	27 Apr 2004 19:16:00 -0000	1.3
@@ -10,6 +10,5 @@
 - leveleditor lacks enemies support (will be fixed soon by Tobias)
 - sometimes you die after being in pause modus and unpausing
 - supertux lifting its feet for kicking is not drawn
-- it looks like that Tux doesn't jump and duck at the same time
-as it used to
-- worldmap movement isn't CPU independet
\ No newline at end of file
+
+

[Super-tux-commit] supertux/data extro.txt,1.1,1.2

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

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

Modified Files:
	extro.txt 
Log Message:
- added credit after extro, might need a bit fadeout stuff

Index: extro.txt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/extro.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extro.txt	25 Apr 2004 21:55:23 -0000	1.1
+++ extro.txt	27 Apr 2004 19:16:01 -0000	1.2
@@ -1,4 +1,4 @@
-- Entering Nolok's Throne Room! -
+-Entering Nolok's Throne Room!
 
 	Tux ran into Nolok's throne room,
 	frantically searching for his beloved.

[Super-tux-commit] supertux/data/images/background oiltux.jpg,NONE,1.1

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

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

Added Files:
	oiltux.jpg 
Log Message:
- added oiltux

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

[Super-tux-commit] supertux/src defines.h,1.26,1.27 text.cpp,1.15,1.16

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

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

Modified Files:
	defines.h text.cpp 
Log Message:
- decreased kick time even more, fixed type error

Index: text.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/text.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- text.cpp	27 Apr 2004 15:15:18 -0000	1.15
+++ text.cpp	27 Apr 2004 18:55:57 -0000	1.16
@@ -246,7 +246,7 @@
   string_list_type names;
   char filename[1024];
   string_list_init(&names);
-  sprintf(filename,"%s/%s", datadir.c_str(), file);
+  sprintf(filename,"%s/%s", datadir.c_str(), file.c_str());
   if((fi = fopen(filename,"r")) != NULL)
     {
       while(fgets(temp, sizeof(temp), fi) != NULL)

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- defines.h	27 Apr 2004 13:59:15 -0000	1.26
+++ defines.h	27 Apr 2004 18:55:57 -0000	1.27
@@ -87,8 +87,7 @@
 
 /* Timing constants (in ms): */
 
-#define KICKING_TIME 600
-
+#define KICKING_TIME 200
 
 /* Debugging */
 

[Super-tux-commit] supertux/src worldmap.cpp,1.58,1.59 worldmap.h,1.27,1.28

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

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

Modified Files:
	worldmap.cpp worldmap.h 
Log Message:
- made worldmap CPU independend, needs testing

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- worldmap.cpp	27 Apr 2004 15:15:18 -0000	1.58
+++ worldmap.cpp	27 Apr 2004 18:44:19 -0000	1.59
@@ -627,7 +627,7 @@
 }
 
 void
-WorldMap::update()
+WorldMap::update(float delta)
 {
   if (enter_level && !tux->is_moving())
     {
@@ -674,7 +674,7 @@
                         if (dir != NONE)
                           {
                             tux->set_direction(dir);
-                            tux->update(0.33f);
+                            tux->update(delta);
                           }
 
                         std::cout << "Walk to dir: " << dir << std::endl;
@@ -723,7 +723,7 @@
   else
     {
       tux->set_direction(input_direction);
-      tux->update(0.33f);
+      tux->update(delta);
     }
   
   Menu* menu = Menu::current();
@@ -853,33 +853,46 @@
   song = music_manager->load_music(datadir +  "/music/" + music);
   music_manager->play_music(song);
 
-  while(!quit) {
-    Point tux_pos = tux->get_pos();
-    if (1)
-      {
-        offset.x = -tux_pos.x + screen->w/2;
-        offset.y = -tux_pos.y + screen->h/2;
+  unsigned int last_update_time;
+  unsigned int update_time;
 
-        if (offset.x > 0) offset.x = 0;
-        if (offset.y > 0) offset.y = 0;
+  last_update_time = update_time = st_get_ticks();
 
-        if (offset.x < screen->w - width*32) offset.x = screen->w - width*32;
-        if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
-      } 
+  while(!quit)
+    {
+      float delta = ((float)(update_time-last_update_time))/100.0;
 
-    draw(offset);
-    get_input();
-    update();
+      delta *= 1.3f;
 
-  if(Menu::current())
-    {
-      Menu::current()->draw();
-      mouse_cursor->draw();
-    }
-    flipscreen();
+      last_update_time = update_time;
+      update_time      = st_get_ticks();
 
-    SDL_Delay(20);
-  }
+      Point tux_pos = tux->get_pos();
+      if (1)
+        {
+          offset.x = -tux_pos.x + screen->w/2;
+          offset.y = -tux_pos.y + screen->h/2;
+
+          if (offset.x > 0) offset.x = 0;
+          if (offset.y > 0) offset.y = 0;
+
+          if (offset.x < screen->w - width*32) offset.x = screen->w - width*32;
+          if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
+        } 
+
+      draw(offset);
+      get_input();
+      update(delta);
+
+      if(Menu::current())
+        {
+          Menu::current()->draw();
+          mouse_cursor->draw();
+        }
+      flipscreen();
+
+      SDL_Delay(20);
+    }
 }
 
 void

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- worldmap.h	27 Apr 2004 15:15:18 -0000	1.27
+++ worldmap.h	27 Apr 2004 18:44:19 -0000	1.28
@@ -191,7 +191,7 @@
   void get_input();
 
   /** Update Tux position */
-  void update();
+  void update(float delta);
 
   /** Draw one frame */
   void draw(const Point& offset);

[Super-tux-commit] supertux/data supertux.strf,1.25,1.26

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

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

Modified Files:
	supertux.strf 
Log Message:
- added 'falling' graphics, well, not really, but better than invisible

Index: supertux.strf
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- supertux.strf	27 Apr 2004 17:09:22 -0000	1.25
+++ supertux.strf	27 Apr 2004 18:35:18 -0000	1.26
@@ -284,6 +284,16 @@
                  "shared/mriceblock-right-1.png"
                  "shared/mriceblock-right-2.png"
                  "shared/mriceblock-right-1.png"))
+
+ (sprite (name "mriceblock-falling-right")
+         (x-hotspot 2)
+         (y-hotspot 3)
+         (images "shared/mriceblock-flat-right.png"))
+
+ (sprite (name "mriceblock-falling-left")
+         (x-hotspot 2)
+         (y-hotspot 3)
+         (images "shared/mriceblock-flat-left.png"))
  
  (sprite (name "mriceblock-flat-left")
          (x-hotspot 2)

[Super-tux-commit] supertux/src gameloop.cpp,1.113,1.114

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

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

Modified Files:
	gameloop.cpp 
Log Message:
- reset bonus on kill

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- gameloop.cpp	27 Apr 2004 15:15:16 -0000	1.113
+++ gameloop.cpp	27 Apr 2004 18:29:17 -0000	1.114
@@ -432,6 +432,7 @@
     }
   else if (!end_sequence && tux->is_dead())
     {
+      player_status.bonus = PlayerStatus::NO_BONUS;
       player_status.lives -= 1;             
 
       if (player_status.lives < 0)

[Super-tux-commit] supertux TODO,1.1,1.2

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

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

Modified Files:
	TODO 
Log Message:
<MatzeB> -adds a workaround for the disappearing eggs (they're just not removed anymore when off screen)
<MatzeB> -updates the TODO file
<MatzeB> -small fix for mrbomb exploding and hitting other mrbomb
<MatzeB> -renaming money/laptop to jumpy/mriceblock
<MatzeB> -fix for enemies running backwards

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TODO	27 Apr 2004 11:11:00 -0000	1.1
+++ TODO	27 Apr 2004 17:09:21 -0000	1.2
@@ -12,3 +12,4 @@
 - supertux lifting its feet for kicking is not drawn
 - it looks like that Tux doesn't jump and duck at the same time
 as it used to
+- worldmap movement isn't CPU independet
\ No newline at end of file

[Super-tux-commit] supertux/data supertux.strf,1.24,1.25

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

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

Modified Files:
	supertux.strf 
Log Message:
<MatzeB> -adds a workaround for the disappearing eggs (they're just not removed anymore when off screen)
<MatzeB> -updates the TODO file
<MatzeB> -small fix for mrbomb exploding and hitting other mrbomb
<MatzeB> -renaming money/laptop to jumpy/mriceblock
<MatzeB> -fix for enemies running backwards

Index: supertux.strf
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- supertux.strf	27 Apr 2004 12:08:14 -0000	1.24
+++ supertux.strf	27 Apr 2004 17:09:22 -0000	1.25
@@ -269,7 +269,7 @@
          (images "shared/firetux-grab-right-0.png"))
 
  ;; Laptop
- (sprite (name "laptop-left")
+ (sprite (name "mriceblock-left")
          (x-hotspot 2)
          (y-hotspot 3)
          (images "shared/mriceblock-left-0.png"
@@ -277,7 +277,7 @@
                  "shared/mriceblock-left-2.png"
                  "shared/mriceblock-left-1.png"))
 
- (sprite (name "laptop-right")
+ (sprite (name "mriceblock-right")
          (x-hotspot 2)
          (y-hotspot 3)
          (images "shared/mriceblock-right-0.png"
@@ -285,21 +285,21 @@
                  "shared/mriceblock-right-2.png"
                  "shared/mriceblock-right-1.png"))
  
- (sprite (name "laptop-flat-left")
+ (sprite (name "mriceblock-flat-left")
          (x-hotspot 2)
          (y-hotspot 3)
          (images "shared/mriceblock-flat-left.png"))
 
- (sprite (name "laptop-flat-right")
+ (sprite (name "mriceblock-flat-right")
          (x-hotspot 2)
          (y-hotspot 3)
          (images "shared/mriceblock-flat-right.png"))
 
-                                        ; (sprite (name "laptop-falling-left")
-                                        ;         (images "shared/laptop-falling-left.png"))
+                                        ; (sprite (name "mriceblock-falling-left")
+                                        ;         (images "shared/mriceblock-falling-left.png"))
 
-                                        ; (sprite (name "laptop-falling-right")
-                                        ;         (images "shared/laptop-falling-right.png"))
+                                        ; (sprite (name "mriceblock-falling-right")
+                                        ;         (images "shared/mriceblock-falling-right.png"))
 
  (sprite (name "snowball-squished-left")
          (x-hotspot 1)

[Super-tux-commit] supertux/src badguy.cpp,1.53,1.54 badguy.h,1.33,1.34 leveleditor.cpp,1.66,1.67 special.cpp,1.33,1.34

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

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

Modified Files:
	badguy.cpp badguy.h leveleditor.cpp special.cpp 
Log Message:
<MatzeB> -adds a workaround for the disappearing eggs (they're just not removed anymore when off screen)
<MatzeB> -updates the TODO file
<MatzeB> -small fix for mrbomb exploding and hitting other mrbomb
<MatzeB> -renaming money/laptop to jumpy/mriceblock
<MatzeB> -fix for enemies running backwards

Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- badguy.h	22 Apr 2004 19:15:22 -0000	1.33
+++ badguy.h	27 Apr 2004 17:09:35 -0000	1.34
@@ -33,15 +33,11 @@
 #include "collision.h"
 #include "sprite.h"
 
-extern Sprite* img_bsod_left;
-extern Sprite* img_bsod_right;
-extern Sprite* img_laptop_left;
-
 /* Bad guy kinds: */
 enum BadGuyKind {
   BAD_BSOD,
-  BAD_LAPTOP,
-  BAD_MONEY,
+  BAD_MRICEBLOCK,
+  BAD_JUMPY,
   BAD_MRBOMB,
   BAD_BOMB,
   BAD_STALACTITE,
@@ -85,7 +81,7 @@
     KICK,
     HELD,
 
-    MONEY_JUMP,
+    JUMPY_JUMP,
 
     BOMB_TICKING,
     BOMB_EXPLODE,
@@ -114,6 +110,7 @@
 private:
   bool removable;
   bool seen;
+  int squishcount; /// number of times this enemy was squiched
   base_type old_base;
   Timer timer;
   Physic physic;
@@ -146,8 +143,8 @@
  
 private:
   void action_bsod(float frame_ratio);
-  void action_laptop(float frame_ratio);
-  void action_money(float frame_ratio); 
+  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);

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- badguy.cpp	27 Apr 2004 11:06:02 -0000	1.53
+++ badguy.cpp	27 Apr 2004 17:09:22 -0000	1.54
@@ -37,14 +37,14 @@
 Sprite* img_bsod_squished_right;
 Sprite* img_bsod_falling_left;
 Sprite* img_bsod_falling_right;
-Sprite* img_laptop_flat_left;
-Sprite* img_laptop_flat_right;
-Sprite* img_laptop_falling_left;
-Sprite* img_laptop_falling_right;
+Sprite* img_mriceblock_flat_left;
+Sprite* img_mriceblock_flat_right;
+Sprite* img_mriceblock_falling_left;
+Sprite* img_mriceblock_falling_right;
 Sprite* img_bsod_left;
 Sprite* img_bsod_right;
-Sprite* img_laptop_left;
-Sprite* img_laptop_right;
+Sprite* img_mriceblock_left;
+Sprite* img_mriceblock_right;
 Sprite* img_jumpy_left_up;
 Sprite* img_jumpy_left_down;
 Sprite* img_jumpy_left_middle;
@@ -74,10 +74,10 @@
 
 BadGuyKind  badguykind_from_string(const std::string& str)
 {
-  if (str == "money")
-    return BAD_MONEY;
-  else if (str == "laptop" || str == "mriceblock")
-    return BAD_LAPTOP;
+  if (str == "money" || str == "jumpy") // was money in old maps
+    return BAD_JUMPY;
+  else if (str == "laptop" || str == "mriceblock") // was laptop in old maps
+    return BAD_MRICEBLOCK;
   else if (str == "bsod")
     return BAD_BSOD;
   else if (str == "mrbomb")
@@ -107,11 +107,11 @@
 {
   switch(kind)
     {
-    case BAD_MONEY:
-      return "money";
+    case BAD_JUMPY:
+      return "jumpy";
       break;
-    case BAD_LAPTOP:
-      return "laptop";
+    case BAD_MRICEBLOCK:
+      return "mriceblock";
       break;
     case BAD_BSOD:
       return "bsod";
@@ -146,7 +146,7 @@
 }
 
 BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_)
-  : removable(false)
+  : removable(false), squishcount(0)
 {
   base.x   = x;
   base.y   = y;    
@@ -173,10 +173,10 @@
   } else if(kind == BAD_MRBOMB) {
     physic.set_velocity(-BADGUY_WALK_SPEED, 0);
     set_sprite(img_mrbomb_left, img_mrbomb_right);
-  } else if (kind == BAD_LAPTOP) {
+  } else if (kind == BAD_MRICEBLOCK) {
     physic.set_velocity(-BADGUY_WALK_SPEED, 0);
-    set_sprite(img_laptop_left, img_laptop_right);
-  } else if(kind == BAD_MONEY) {
+    set_sprite(img_mriceblock_left, img_mriceblock_right);
+  } else if(kind == BAD_JUMPY) {
     set_sprite(img_jumpy_left_up, img_jumpy_left_up);
   } else if(kind == BAD_BOMB) {
     set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right);
@@ -247,7 +247,7 @@
 }
 
 void
-BadGuy::action_laptop(float frame_ratio)
+BadGuy::action_mriceblock(float frame_ratio)
 {
   Player& tux = *World::current()->get_tux();
 
@@ -264,7 +264,7 @@
     }
   else if (mode == HELD)
     { /* FIXME: The pbad object shouldn't know about pplayer objects. */
-      /* If we're holding the laptop */
+      /* If we're holding the iceblock */
       dir = tux.dir;
       if(dir==RIGHT)
         {
@@ -292,7 +292,7 @@
 
           mode=KICK;
           tux.kick_timer.start(KICKING_TIME);
-          set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+          set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
           physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
           play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER);
         }
@@ -320,7 +320,7 @@
       if(!timer.check())
         {
           mode = NORMAL;
-          set_sprite(img_laptop_left, img_laptop_right);
+          set_sprite(img_mriceblock_left, img_mriceblock_right);
           physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0);
         }
     }
@@ -413,7 +413,7 @@
 }
 
 void
-BadGuy::action_money(float frame_ratio)
+BadGuy::action_jumpy(float frame_ratio)
 {
   if (fabsf(physic.get_velocity_y()) < 2.5f)
     set_sprite(img_jumpy_left_middle, img_jumpy_left_middle);
@@ -433,9 +433,9 @@
       physic.set_velocity_y(JUMPV);
       physic.enable_gravity(true);
 
-      mode = MONEY_JUMP;
+      mode = JUMPY_JUMP;
     }
-  else if(mode == MONEY_JUMP)
+  else if(mode == JUMPY_JUMP)
     {
       mode = NORMAL;
     }
@@ -725,12 +725,12 @@
       action_bsod(frame_ratio);
       break;
 
-    case BAD_LAPTOP:
-      action_laptop(frame_ratio);
+    case BAD_MRICEBLOCK:
+      action_mriceblock(frame_ratio);
       break;
   
-    case BAD_MONEY:
-      action_money(frame_ratio);
+    case BAD_JUMPY:
+      action_jumpy(frame_ratio);
       break;
 
     case BAD_MRBOMB:
@@ -859,6 +859,8 @@
 void
 BadGuy::squish(Player* player)
 {
+  static const int MAX_ICEBLOCK_SQUICHES = 10;
+    
   if(kind == BAD_MRBOMB) {
     // mrbomb transforms into a bomb now
     World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
@@ -876,13 +878,13 @@
     physic.set_velocity_x(0);
     return;
       
-  } else if (kind == BAD_LAPTOP) {
+  } else if (kind == BAD_MRICEBLOCK) {
     if (mode == NORMAL || mode == KICK)
       {
         /* Flatten! */
         play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER);
         mode = FLAT;
-        set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+        set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
         physic.set_velocity_x(0);
 
         timer.start(4000);
@@ -899,13 +901,21 @@
         }
 
         mode = KICK;
-        set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+        set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
       }
 
     make_player_jump(player);
 	      
     World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
     player_status.score_multiplier++;
+
+    // check for maximum number of squiches
+    squishcount++;
+    if(squishcount >= MAX_ICEBLOCK_SQUICHES) {
+      kill_me();
+      return;
+    }
+    
     return;
   } else if(kind == BAD_FISH) {
     // fish can only be killed when falling down
@@ -942,8 +952,8 @@
     return;
 
   dying = DYING_FALLING;
-  if(kind == BAD_LAPTOP) {
-    set_sprite(img_laptop_falling_left, img_laptop_falling_right);
+  if(kind == BAD_MRICEBLOCK) {
+    set_sprite(img_mriceblock_falling_left, img_mriceblock_falling_right);
     if(mode == HELD) {
       mode = NORMAL;
       Player& tux = *World::current()->get_tux();  
@@ -995,13 +1005,13 @@
       pbad_c = (BadGuy*) p_c_object;
 
       /* If we're a kicked mriceblock, kill any badguys we hit */
-      if(kind == BAD_LAPTOP && mode == KICK)
+      if(kind == BAD_MRICEBLOCK && mode == KICK)
         {
           pbad_c->kill_me();
         }
 
       // a held mriceblock gets kills the enemy too but falls to ground then
-      else if(kind == BAD_LAPTOP && mode == HELD)
+      else if(kind == BAD_MRICEBLOCK && mode == HELD)
         {
           pbad_c->kill_me();
           kill_me();
@@ -1013,7 +1023,8 @@
         if (pbad_c->kind == BAD_MRBOMB)
         {
           // mrbomb transforms into a bomb now
-          World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
+          World::current()->add_bad_guy(pbad_c->base.x, pbad_c->base.y,
+                                        BAD_BOMB);
           pbad_c->remove_me();
           return;
         }
@@ -1032,8 +1043,9 @@
       /* When enemies run into eachother, make them change directions */
       else
       {
-        // Jumpy is an exception
-        if (pbad_c->kind == BAD_MONEY)
+        // Jumpy, fish, flame, stalactites are exceptions
+        if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME
+            || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH)
           break;
 
         // Bounce off of other badguy if we land on top of him
@@ -1087,7 +1099,7 @@
         }
 
         mode = KICK;
-        set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+        set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
       }
       break;
 
@@ -1102,14 +1114,14 @@
   img_bsod_squished_right = sprite_manager->load("bsod-squished-right");
   img_bsod_falling_left = sprite_manager->load("bsod-falling-left");
   img_bsod_falling_right = sprite_manager->load("bsod-falling-right");
-  img_laptop_flat_left = sprite_manager->load("laptop-flat-left");
-  img_laptop_flat_right = sprite_manager->load("laptop-flat-right");
-  img_laptop_falling_left = sprite_manager->load("laptop-falling-left");
-  img_laptop_falling_right = sprite_manager->load("laptop-falling-right");
+  img_mriceblock_flat_left = sprite_manager->load("mriceblock-flat-left");
+  img_mriceblock_flat_right = sprite_manager->load("mriceblock-flat-right");
+  img_mriceblock_falling_left = sprite_manager->load("mriceblock-falling-left");
+  img_mriceblock_falling_right = sprite_manager->load("mriceblock-falling-right");
   img_bsod_left = sprite_manager->load("bsod-left");
   img_bsod_right = sprite_manager->load("bsod-right");
-  img_laptop_left = sprite_manager->load("laptop-left");
-  img_laptop_right = sprite_manager->load("laptop-right");
+  img_mriceblock_left = sprite_manager->load("mriceblock-left");
+  img_mriceblock_right = sprite_manager->load("mriceblock-right");
   img_jumpy_left_up = sprite_manager->load("jumpy-left-up");
   img_jumpy_left_down = sprite_manager->load("jumpy-left-down");
   img_jumpy_left_middle = sprite_manager->load("jumpy-left-middle");

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- leveleditor.cpp	25 Apr 2004 16:17:17 -0000	1.66
+++ leveleditor.cpp	27 Apr 2004 17:09:35 -0000	1.67
@@ -1160,9 +1160,9 @@
           if(c == '0')  /* if it's a bad guy */
             le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD);
           else if(c == '1')
-            le_world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP);
+            le_world.add_bad_guy(xx*32, yy*32, BAD_MRICEBLOCK);
           else if(c == '2')
-            le_world.add_bad_guy(xx*32, yy*32, BAD_MONEY);
+            le_world.add_bad_guy(xx*32, yy*32, BAD_JUMPY);
 
           break;
         case SQUARE:
@@ -1206,9 +1206,9 @@
                 if(c == '0')  // if it's a bad guy
                   le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD);
                 else if(c == '1')
-                  le_world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP);
+                  le_world.add_bad_guy(xx*32, yy*32, BAD_MRICEBLOCK);
                 else if(c == '2')
-                  le_world.add_bad_guy(xx*32, yy*32, BAD_MONEY);
+                  le_world.add_bad_guy(xx*32, yy*32, BAD_JUMPY);
               }
           break;
         default:

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- special.cpp	27 Apr 2004 11:06:02 -0000	1.33
+++ special.cpp	27 Apr 2004 17:09:35 -0000	1.34
@@ -194,7 +194,14 @@
   }
 
   /* Off screen? Kill it! */
-  if((base.x < scroll_x - OFFSCREEN_DISTANCE) || base.y > screen->h) {
+  if(base.x < scroll_x - OFFSCREEN_DISTANCE) {
+    // we don't remove growups for now, when off screen
+    if(kind != UPGRADE_GROWUP) {
+      remove_me();
+      return;
+    }
+  }
+  if(base.y > screen->h) {
     remove_me();
     return;
   }