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

[Super-tux-commit] supertux NEWS,1.9,1.10

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

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

Modified Files:
	NEWS 
Log Message:
fixed underline


Index: NEWS
===================================================================
RCS file: /cvsroot/super-tux/supertux/NEWS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- NEWS	10 May 2004 22:23:14 -0000	1.9
+++ NEWS	9 Jun 2004 11:00:43 -0000	1.10
@@ -1,5 +1,5 @@
 Super Tux 0.1.1 (11 May 04)
-=====================
+===========================
   * new handwritten font
   * endseq bugs squished
   * build in leveleditor

[Super-tux-commit] supertux/src/screen drawing_context.cpp,1.6,1.7 drawing_context.h,1.5,1.6 font.cpp,1.3,1.4 font.h,1.2,1.3 screen.cpp,1.2,1.3 texture.cpp,1.3,1.4 texture.h,1.4,1.5

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

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

Modified Files:
	drawing_context.cpp drawing_context.h font.cpp font.h 
	screen.cpp texture.cpp texture.h 
Log Message:
- just doing some C++ifying

Index: font.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- font.cpp	2 Jun 2004 20:54:46 -0000	1.3
+++ font.cpp	9 Jun 2004 04:43:15 -0000	1.4
@@ -18,8 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+
 #include "globals.h"
 #include "defines.h"
 #include "screen.h"

Index: drawing_context.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- drawing_context.cpp	8 Jun 2004 22:21:11 -0000	1.6
+++ drawing_context.cpp	9 Jun 2004 04:43:15 -0000	1.7
@@ -16,11 +16,11 @@
 //  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  02111-1307, USA.
-#include <assert.h>
-#include "drawing_context.h"
-
-#include <iostream>
 #include <algorithm>
+#include <cassert>
+#include <iostream>
+
+#include "drawing_context.h"
 #include "texture.h"
 #include "globals.h"
 #include "font.h"

Index: drawing_context.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- drawing_context.h	8 Jun 2004 22:21:11 -0000	1.5
+++ drawing_context.h	9 Jun 2004 04:43:15 -0000	1.6
@@ -16,14 +16,16 @@
 //  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  02111-1307, USA.
-#ifndef __DRAWINGCONTEXT_H__
-#define __DRAWINGCONTEXT_H__
+#ifndef SUPERTUX_DRAWINGCONTEXT_H
+#define SUPERTUX_DRAWINGCONTEXT_H
 
 #include <vector>
 #include <string>
+
+#include "SDL.h"
+
 #include "vector.h"
 #include "screen.h"
-#include <SDL.h>
 
 class Surface;
 class Font;
@@ -170,5 +172,5 @@
   DrawingRequests drawingrequests;
 };
 
-#endif
+#endif /*SUPERTUX_DRAWINGCONTEXT_H*/
 

Index: font.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/font.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- font.h	2 Jun 2004 20:06:56 -0000	1.2
+++ font.h	9 Jun 2004 04:43:15 -0000	1.3
@@ -18,10 +18,11 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#ifndef SUPERTUX_TEXT_H
-#define SUPERTUX_TEXT_H
+#ifndef SUPERTUX_FONT_H
+#define SUPERTUX_FONT_H
 
 #include <string>
+
 #include "texture.h"
 #include "vector.h"
 
@@ -69,5 +70,5 @@
   int last_char;
 };
 
-#endif /*SUPERTUX_TEXT_H*/
+#endif /*SUPERTUX_FONT_H*/
 

Index: texture.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- texture.cpp	8 Jun 2004 22:21:11 -0000	1.3
+++ texture.cpp	9 Jun 2004 04:43:15 -0000	1.4
@@ -18,11 +18,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include <assert.h>
+#include <cassert>
 #include <iostream>
 #include <algorithm>
+
 #include "SDL.h"
 #include "SDL_image.h"
+
 #include "texture.h"
 #include "globals.h"
 #include "setup.h"

Index: texture.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- texture.h	8 Jun 2004 22:21:11 -0000	1.4
+++ texture.h	9 Jun 2004 04:43:15 -0000	1.5
@@ -21,13 +21,15 @@
 #ifndef SUPERTUX_TEXTURE_H
 #define SUPERTUX_TEXTURE_H
 
-#include <SDL.h>
 #include <string>
+#include <list>
+
 #ifndef NOOPENGL
-#include <SDL_opengl.h>
+#include "SDL_opengl.h"
 #endif
 
-#include <list>
+#include "SDL.h"
+
 #include "screen.h"
 #include "vector.h"
 

Index: screen.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/screen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen.cpp	31 May 2004 14:08:10 -0000	1.2
+++ screen.cpp	9 Jun 2004 04:43:15 -0000	1.3
@@ -18,13 +18,15 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+
 #include <unistd.h>
-#include <SDL.h>
-#include <SDL_image.h>
+
+#include "SDL.h"
+#include "SDL_image.h"
 
 #ifndef WIN32
 #include <sys/types.h>

[Super-tux-commit] supertux/src supertux.cpp,1.20,1.21

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

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

Modified Files:
	supertux.cpp 
Log Message:
- removed SDL_Flip() line.. was causing a crash on exit

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- supertux.cpp	2 Jun 2004 23:00:26 -0000	1.20
+++ supertux.cpp	9 Jun 2004 03:43:03 -0000	1.21
@@ -75,7 +75,7 @@
     }
 
     SDL_FillRect(screen, 0, 0);
-    SDL_Flip(screen);
+    //SDL_Flip(screen);
 
     unloadshared();
     st_general_free();

[Super-tux-commit] supertux/src setup.cpp,1.96,1.97

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

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

Modified Files:
	setup.cpp 
Log Message:
- fixed some memory leaks

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- setup.cpp	3 Jun 2004 22:09:31 -0000	1.96
+++ setup.cpp	9 Jun 2004 02:47:55 -0000	1.97
@@ -633,7 +633,12 @@
   delete main_menu;
   delete game_menu;
   delete options_menu;
+  delete options_keys_menu;
+  delete options_joystick_menu;
   delete highscore_menu;
+  delete contrib_menu;
+  delete contrib_subset_menu;
+  delete worldmap_menu;
   delete save_game_menu;
   delete load_game_menu;
 }

[Super-tux-commit] supertux/src/screen drawing_context.cpp,1.5,1.6 drawing_context.h,1.4,1.5 texture.cpp,1.2,1.3 texture.h,1.3,1.4

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

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

Modified Files:
	drawing_context.cpp drawing_context.h texture.cpp texture.h 
Log Message:
Replaced uint32_t by Uint32. Has to be done, since *BSD do not ship with stdint.h.
Please, remove stdint.h checking from the automake.

Index: drawing_context.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- drawing_context.cpp	31 May 2004 13:43:31 -0000	1.5
+++ drawing_context.cpp	8 Jun 2004 22:21:11 -0000	1.6
@@ -35,7 +35,7 @@
 
 void
 DrawingContext::draw_surface(const Surface* surface, const Vector& position,
-    int layer, uint32_t drawing_effect)
+    int layer, Uint32 drawing_effect)
 {
   assert(surface != 0);
   
@@ -52,7 +52,7 @@
 
 void
 DrawingContext::draw_surface_part(const Surface* surface, const Vector& source,
-    const Vector& size, const Vector& dest, int layer, uint32_t drawing_effect)
+    const Vector& size, const Vector& dest, int layer, Uint32 drawing_effect)
 {
   assert(surface != 0);
 

Index: drawing_context.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- drawing_context.h	2 Jun 2004 23:33:34 -0000	1.4
+++ drawing_context.h	8 Jun 2004 22:21:11 -0000	1.5
@@ -19,7 +19,6 @@
 #ifndef __DRAWINGCONTEXT_H__
 #define __DRAWINGCONTEXT_H__
 
-#include <stdint.h>
 #include <vector>
 #include <string>
 #include "vector.h"
@@ -72,11 +71,11 @@
 
   /** Adds a drawing request for a surface into the request list */
   void draw_surface(const Surface* surface, const Vector& position, int layer,
-      uint32_t drawing_effect = NONE_EFFECT);
+      Uint32 drawing_effect = NONE_EFFECT);
   /** Adds a drawing request for part of a surface */
   void draw_surface_part(const Surface* surface, const Vector& source,
       const Vector& size, const Vector& dest, int layer,
-      uint32_t drawing_effect = NONE_EFFECT);
+      Uint32 drawing_effect = NONE_EFFECT);
   /** draws a text */
   void draw_text(Font* font, const std::string& text, const Vector& position,
       int layer);
@@ -149,7 +148,7 @@
   struct DrawingRequest
   {
     int layer;
-    uint32_t drawing_effect;
+    Uint32 drawing_effect;
 
     RequestType type;
     Vector pos;

Index: texture.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- texture.cpp	31 May 2004 13:02:21 -0000	1.2
+++ texture.cpp	8 Jun 2004 22:21:11 -0000	1.3
@@ -448,7 +448,7 @@
 }
 
 int
-SurfaceOpenGL::draw(float x, float y, Uint8 alpha, uint32_t effect)
+SurfaceOpenGL::draw(float x, float y, Uint8 alpha, Uint32 effect)
 {
   float pw = power_of_two(w);
   float ph = power_of_two(h);
@@ -503,7 +503,7 @@
 }
 
 int
-SurfaceOpenGL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect)
+SurfaceOpenGL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect)
 {
   float pw = power_of_two(int(this->w));
   float ph = power_of_two(int(this->h));
@@ -619,7 +619,7 @@
 }
 
 int
-SurfaceSDL::draw(float x, float y, Uint8 alpha, uint32_t effect)
+SurfaceSDL::draw(float x, float y, Uint8 alpha, Uint32 effect)
 {
   SDL_Rect dest;
 
@@ -671,7 +671,7 @@
 }
 
 int
-SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect)
+SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect)
 {
   SDL_Rect src, dest;
 

Index: texture.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- texture.h	31 May 2004 13:02:21 -0000	1.3
+++ texture.h	8 Jun 2004 22:21:11 -0000	1.4
@@ -27,7 +27,6 @@
 #include <SDL_opengl.h>
 #endif
 
-#include <stdint.h>
 #include <list>
 #include "screen.h"
 #include "vector.h"
@@ -116,8 +115,8 @@
   virtual ~SurfaceImpl();
   
   /** Return 0 on success, -2 if surface needs to be reloaded */
-  virtual int draw(float x, float y, Uint8 alpha, uint32_t effect = NONE_EFFECT) = 0;
-  virtual int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, uint32_t effect = NONE_EFFECT) = 0;
+  virtual int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0;
+  virtual int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0;
 #if 0
   virtual int draw_stretched(float x, float y, int w, int h, Uint8 alpha, bool update) = 0;
 #endif
@@ -134,8 +133,8 @@
   SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha);
   virtual ~SurfaceSDL();
 
-  int draw(float x, float y, Uint8 alpha, uint32_t effect = NONE_EFFECT);
-  int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, uint32_t effect = NONE_EFFECT);
+  int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT);
+  int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT);
 #if 0
   int draw_stretched(float x, float y, int w, int h, Uint8 alpha);
 #endif
@@ -153,8 +152,8 @@
   SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha);
   virtual ~SurfaceOpenGL();
 
-  int draw(float x, float y, Uint8 alpha, uint32_t effect = NONE_EFFECT);
-  int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, uint32_t effect = NONE_EFFECT);
+  int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT);
+  int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT);
 #if 0
   int draw_stretched(float x, float y, int w, int h, Uint8 alpha);
 #endif

[Super-tux-commit] supertux/src sprite.cpp,1.14,1.15 sprite.h,1.11,1.12 tile.h,1.25,1.26

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

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

Modified Files:
	sprite.cpp sprite.h tile.h 
Log Message:
Replaced uint32_t by Uint32. Has to be done, since *BSD do not ship with stdint.h.
Please, remove stdint.h checking from the automake.

Index: tile.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- tile.h	30 May 2004 17:54:23 -0000	1.25
+++ tile.h	8 Jun 2004 22:21:11 -0000	1.26
@@ -24,7 +24,6 @@
 #include <set>
 #include <map>
 #include <vector>
-#include <stdint.h>
 #include "screen/texture.h"
 #include "globals.h"
 #include "lispreader.h"
@@ -76,7 +75,7 @@
   };
 
   /** tile attributes */
-  uint32_t attributes;
+  Uint32 attributes;
   
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sprite.cpp	31 May 2004 13:02:21 -0000	1.14
+++ sprite.cpp	8 Jun 2004 22:21:11 -0000	1.15
@@ -75,7 +75,7 @@
 
 void
 Sprite::draw(DrawingContext& context, const Vector& pos, int layer,
-    uint32_t drawing_effect)
+    Uint32 drawing_effect)
 {
   time = SDL_GetTicks();
   unsigned int frame = get_current_frame();

Index: sprite.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sprite.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sprite.h	31 May 2004 13:02:21 -0000	1.11
+++ sprite.h	8 Jun 2004 22:21:11 -0000	1.12
@@ -57,7 +57,7 @@
   /** Update the sprite and process to the next frame */
   void update(float delta);
   void draw(DrawingContext& context, const Vector& pos, int layer,
-      uint32_t drawing_effect = NONE_EFFECT);
+      Uint32 drawing_effect = NONE_EFFECT);
   int get_current_frame() const;
 
   float get_fps() { return fps; } ;

[Super-tux-commit] supertux/data/levels/test level4.stl,1.6,1.7

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

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

Modified Files:
	level4.stl 
Log Message:
- removed background from gradients test level

Index: level4.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/test/level4.stl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- level4.stl	8 Jun 2004 12:09:06 -0000	1.6
+++ level4.stl	8 Jun 2004 22:15:31 -0000	1.7
@@ -4,7 +4,7 @@
   (name "Gradients Test / Iceblock Test")
   (author "Ricardo Cruz")
   (music "Mortimers_chipdisko.mod")
-  (background "arctis.jpg")
+  (background "")
   (particle_system "")
   (bkgd_speed 0.5)
   (bkgd_red_top 0)

[Super-tux-commit] supertux TODO,1.67,1.68

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- TODO	8 Jun 2004 20:36:48 -0000	1.67
+++ TODO	8 Jun 2004 22:08:41 -0000	1.68
@@ -45,12 +45,13 @@
      - New forest tileset
      - Badguy sprites
      - Tux's buttjump animation
-[H] When bumping powerups, they should bounce away from the centre of Tux
 [H] Backgrounds should be square tiles instead of just tiling one image
      - Useful for vertical scrolling when we only want a sky background on the
        top of the level
      - Support for this is already available using a paralax tilemap layer
 
+[M] There are some weird graphical glitches when Tux bumps more than one block
+    at the same time
 [M] Save score on per-level basis to make high-score
 [M] Save time on per-level basis to make low-time-score
 [M] Add bonus score for extra time left when finishing a level

[Super-tux-commit] supertux/src special.cpp,1.57,1.58

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

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

Modified Files:
	special.cpp 
Log Message:
- fixed powerup bumping

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- special.cpp	8 Jun 2004 20:30:54 -0000	1.57
+++ special.cpp	8 Jun 2004 22:07:59 -0000	1.58
@@ -279,13 +279,18 @@
   sound_manager->play_sound(sounds[SND_BUMP_UPGRADE], Vector(base.x, base.y));
   
   // determine new direction
+  Direction old_dir = dir;
   if (player->base.x + player->base.width/2 > base.x + base.width/2)
     dir = LEFT;
   else
     dir = RIGHT;
 
-  // do a little jump and change direction
-  physic.set_velocity(-physic.get_velocity_x(), 3);
+  // do a little jump and change direction (if necessary)
+  if (dir != old_dir)
+    physic.set_velocity(-physic.get_velocity_x(), 3);
+  else
+    physic.set_velocity_y(3);
+
   physic.enable_gravity(true);
 }
 

Re: [Super-tux-commit] supertux TODO,1.63,1.64

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

 Sorry, but what do you mean by "square tiles"?

Ricardo=20

Em Ter=E7a, 8 de Junho de 2004 20:07, o Ryan Flegel escreveu:
> +[H] Backgrounds should be square tiles instead of just tiling one image
> +     - Useful for vertical scrolling when we only want a sky background =
on
> the +       top of the level
>

=2D-=20
Such a foolish notion, that war is called devotion, when the greatest
warriors are the ones who stand for peace.

[Super-tux-commit] supertux TODO,1.66,1.67

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- TODO	8 Jun 2004 20:08:46 -0000	1.66
+++ TODO	8 Jun 2004 20:36:48 -0000	1.67
@@ -28,16 +28,19 @@
         - some fixed levels still have "glitches". See the menu level where
           some of the tiles are "wrong" and don't fit
 [H] Buttjump related things
-     ? Right now only breaks bricks beneath tux - what else should it break
      - Should kill enemies with a certain range
         - Done--now needs to be tweaked
      - Animation (need images)
-     ? Should disable Tux's movement temporarily (1 second?)
+     - Should be a powerup item
+     - Should break bricks if Tux is on top of bricks, otherwise it should
+       kill enemies within a close range.
+        - After enemy-kill is used, powerup should be removed from Tux
+[H] Icebullet related things
+     - we should decide on specifics
 [H] Tux should fall while walking in tiles that have a space between.
      - Possible solution: reduce Tux's width when checking collision with tiles
 [H] stdint.h isn't a part of FreeBSD. We should probably use SDL integer
     types instead.
-[H] Dead Tux/badguys should be drawn on top of the foreground layer
 [H] Graphics
      - New forest tileset
      - Badguy sprites

[Super-tux-commit] supertux/src badguy.cpp,1.104,1.105 player.cpp,1.141,1.142

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

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

Modified Files:
	badguy.cpp player.cpp 
Log Message:
- draw dead badguys/Tux above foreground tiles

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- player.cpp	8 Jun 2004 17:44:28 -0000	1.141
+++ player.cpp	8 Jun 2004 20:31:24 -0000	1.142
@@ -705,7 +705,7 @@
     {
       if (dying == DYING_SQUISHED)
         {
-          smalltux_gameover->draw(context, pos, LAYER_OBJECTS+1);
+          smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1);
         }
       else
         {

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- badguy.cpp	1 Jun 2004 21:09:37 -0000	1.104
+++ badguy.cpp	8 Jun 2004 20:31:24 -0000	1.105
@@ -970,7 +970,7 @@
     return;
 
   if(dying == DYING_FALLING && physic.get_velocity_y() < 0)
-    sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS, VERTICAL_FLIP);
+    sprite->draw(context, Vector(base.x, base.y), LAYER_FOREGROUNDTILES+1, VERTICAL_FLIP);
   else
     sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
 

[Super-tux-commit] supertux/data/images/shared icebullet-1.png,1.2,1.3

[Marek M. <wa...@us...>]

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

Modified Files:
	icebullet-1.png 
Log Message:
Improved ice bullet using Benjamin's images
(It's not much, but it's something)


Index: icebullet-1.png
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/shared/icebullet-1.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs40rKHT and /tmp/cvsqW4Cm9 differ

[Super-tux-commit] supertux/src special.cpp,1.56,1.57

[Marek M. <wa...@us...>]

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

Modified Files:
	special.cpp 
Log Message:
Improved ice bullet using Benjamin's images
(It's not much, but it's something)


Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- special.cpp	8 Jun 2004 13:23:17 -0000	1.56
+++ special.cpp	8 Jun 2004 20:30:54 -0000	1.57
@@ -367,8 +367,8 @@
   img_star      = sprite_manager->load("star");
   img_1up       = sprite_manager->load("1up");
 
-  img_firebullet    = sprite_manager->load("firebullet");
-  img_icebullet    = sprite_manager->load("icebullet");
+  img_firebullet = sprite_manager->load("firebullet");
+  img_icebullet  = sprite_manager->load("icebullet");
 }
 
 void free_special_gfx()

[Super-tux-commit] supertux/data supertux.strf,1.41,1.42

[Marek M. <wa...@us...>]

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

Modified Files:
	supertux.strf 
Log Message:
Improved ice bullet using Benjamin's images
(It's not much, but it's something)


Index: supertux.strf
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- supertux.strf	7 Jun 2004 19:52:17 -0000	1.41
+++ supertux.strf	8 Jun 2004 20:30:54 -0000	1.42
@@ -638,7 +638,6 @@
          (x-hotspot 12)
          (fps 20)
          (images "shared/icebullet-1.png"))
-
   ; Trampoline
   (sprite (name "trampoline-1")
          (x-hotspot 0)

[Super-tux-commit] supertux/po es.po,1.4,1.5

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

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

Modified Files:
	es.po 
Log Message:
- updated es.po

Index: es.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/es.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es.po	7 Jun 2004 22:43:23 -0000	1.4
+++ es.po	8 Jun 2004 20:18:17 -0000	1.5
@@ -1,21 +1,22 @@
-# translation of es.po to 
-# translation of supertux.po to 
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR SuperTux Development Team, 2004.
-# Javier Beaumont <de...@zi...>, 2004.
+# Spanish translation for SuperTux package.
+# Translation of supertux.pot to es_ES
+# This file is distributed under the same license as the SuperTux package.
+# Copyright (C) 2004 SuperTux Development Team.
+# Javier Beaumont <dem...@us...>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: SuperTux-CVS\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
 "POT-Creation-Date: 2004-06-07 23:38+0100\n"
-"PO-Revision-Date: 2004-06-03 22:29+0200\n"
-"Last-Translator: Javier Beaumont <de...@zi...>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2004-06-08 21:03+0200\n"
+"Last-Translator: Javier Beaumont <dem...@us...>\n"
+"Language-Team: Spanish Team <sup...@li...>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: src/gameloop.cpp:163
 msgid "by "
@@ -31,11 +32,11 @@
 
 #: src/gameloop.cpp:707
 msgid "Press ESC To Return"
-msgstr "Pulsa ESC para sair"
+msgstr "Pulsa ESC para volver"
 
 #: src/gameloop.cpp:712
 msgid "TIME's UP"
-msgstr "PASADO DE TIEMPO"
+msgstr "FUERA DE TIEMPO"
 
 #: src/gameloop.cpp:716
 msgid "TIME"
@@ -67,7 +68,7 @@
 #: src/gameloop.cpp:803
 #, c-format
 msgid "Slot %d - Savegame"
-msgstr "Slot %d - Juego grabado"
+msgstr "Slot %d - Juego salvado"
 
 #: src/gameloop.cpp:806
 #, c-format
@@ -104,11 +105,11 @@
 
 #: src/menu.cpp:271
 msgid "Space"
-msgstr "Espácio"
+msgstr "Espácio"
 
 #: src/menu.cpp:274
 msgid "Right Shift"
-msgstr "Shift direcho"
+msgstr "Shift derecho"
 
 #: src/menu.cpp:277
 msgid "Left Shift"
@@ -156,7 +157,7 @@
 
 #: src/setup.cpp:398
 msgid "OpenGL    "
-msgstr ""
+msgstr "OpenGL    "
 
 #: src/setup.cpp:400
 msgid "OpenGL (not supported)"
@@ -172,7 +173,7 @@
 
 #: src/setup.cpp:406 src/setup.cpp:411
 msgid "Music     "
-msgstr "Música     "
+msgstr "Música     "
 
 #: src/setup.cpp:413
 msgid "Show FPS  "
@@ -180,11 +181,11 @@
 
 #: src/setup.cpp:414
 msgid "Setup Keys"
-msgstr ""
+msgstr "Configurar las teclas"
 
 #: src/setup.cpp:417
 msgid "Setup Joystick"
-msgstr ""
+msgstr "Configurar el Joystick"
 
 #: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
 #: src/title.cpp:104 src/title.cpp:141
@@ -193,7 +194,7 @@
 
 #: src/setup.cpp:422
 msgid "Keyboard Setup"
-msgstr "Configuración del teclado"
+msgstr "Configurar el teclado"
 
 #: src/setup.cpp:424
 msgid "Left move"
@@ -221,15 +222,15 @@
 
 #: src/setup.cpp:436
 msgid "Joystick Setup"
-msgstr "Configuración del Joystick"
+msgstr "Configurar el Joystick"
 
 #: src/setup.cpp:440
 msgid "A button"
-msgstr "Botón A"
+msgstr "Botón A"
 
 #: src/setup.cpp:441
 msgid "B button"
-msgstr "Botón B"
+msgstr "Botón B"
 
 #: src/setup.cpp:458
 msgid "Save Game"
@@ -256,15 +257,17 @@
 msgstr "Introduce tu nombre:"
 
 #: src/setup.cpp:1036
-#, fuzzy
 msgid "  SuperTux  "
-msgstr " SuperTux "
+msgstr "  SuperTux  "
 
 #: src/setup.cpp:1036
 msgid ""
 "\n"
 "  Please see the file \"README.txt\" for more details.\n"
 msgstr ""
+"\n"
+"  Por favor mira el fichero \"README.txt\" para más detalles."
+"\n"
 
 #: src/setup.cpp:1038
 #, c-format
@@ -272,6 +275,8 @@
 "Usage: %s [OPTIONS] FILENAME\n"
 "\n"
 msgstr ""
+"Uso: %s [OPCIONES] NOMBRE_DEL_FICHERO\n"
+"\n"
 
 #: src/setup.cpp:1039
 msgid ""
@@ -302,6 +307,29 @@
 "  --version           Display the version of SuperTux you're running.\n"
 "\n"
 msgstr ""
+"Opciones de pantalla:\n"
+"  --fullscreen        Funciona a pantalla completa.\n"
+"  --opengl            En el caso de que se haya compilado con soporte para OpenGL, esto lo activara\n"
+"                      y SuperTux hará uso de ello.\n"
+"  --sdl               Usar SDL como render gráfico (software)\n"
+"\n"
+"Opciones de sonido:\n"
+"  --disable-sound     En el caso de que se haya compilado con soporte para sonido, esto\n"
+"                      desactivará el sonido para esta sesión de juego.\n"
+"  --disable-music     Igual que el anterior, pero esto desactiva la música.\n"
+"\n"
+"Opciones varias:\n"
+"  -j, --joystick NUM  Usa el joystick NUM (por defecto: 0)\n"
+"  --joymap XAXIS:YAXIS:A:B:START\n"
+"                      Define como deben estar mapeados los botones y el eje del joystick\n"
+"  --leveleditor       Abre el editor de niveles en un fichero. (Solo funciona cuando se le pasa el nombre de un fichero.)\n"
+"  -d, --datadir DIR   Carga los datos del juego desde DIR (Por defecto: automático)\n"
+"  --debug-mode        Activa el modo de depuración, que es útil para desarrolladores.\n"
+"  --help              Muestra un mensaje de ayuda con una lista de los comandos de linea\n"
+"                      opciones, licencia y controles del juego.\n"
+"  --usage             Muestra un breve mensaje listando las opciones de los comandos de linea.\n"
+"  --version           Muestra la versión de SuperTux que estás ejecutando.\n"
+"\n"
 
 #: src/setup.cpp:1095
 #, c-format
@@ -309,9 +337,10 @@
 "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
 "debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"
 msgstr ""
+"Uso: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
+"debug-mode] | [--usage | --help | --version] [--leveleditor] NOMBRE_DEL_FICHERO\n"
 
 #: src/title.cpp:277
-#, fuzzy
 msgid ""
 "Copyright (c) 2003 SuperTux Devel Team\n"
 "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
@@ -319,7 +348,6 @@
 "COPYING\n"
 "for details.\n"
 msgstr ""
-"\n"
 "Copyright (c) 2003 El equipo de SuperTux\n"
 "Este juego viene sin ABSOLUTAMENTE NINGUNA GARANTIA. Esto es software libre, "
 "y tu\n"
@@ -330,14 +358,9 @@
 #: src/title.cpp:327
 #, c-format
 msgid "Are you sure you want to delete slot %d?"
-msgstr "¿Estás seguro de que quieres borrar el slot %d?"
+msgstr "¿Estás seguro de que quieres borrar el slot %d?"
 
 #: src/worldmap.cpp:724
 msgid "GAMEOVER"
 msgstr "FIN DEL JUEGO"
 
-#~ msgid " SuperTux "
-#~ msgstr " SuperTux "
-
-#~ msgid "Key Setup"
-#~ msgstr "Configurar teclas"

[Super-tux-commit] supertux TODO,1.65,1.66

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- TODO	8 Jun 2004 20:05:03 -0000	1.65
+++ TODO	8 Jun 2004 20:08:46 -0000	1.66
@@ -20,8 +20,6 @@
 [?] Default keyboard setup should change. Up will be needed for other features
     like going through doors and looking up, etc.
 
-[H] Make sure there are no invalid tile numbers in the level files
-     - Tile 6 occurs in world1/level5.stl as well as other levels
 [H] Worldmap needs to allow multiple maps
      - or just one big map with multiple worlds?
 [H] Change resolution to 800x600

[Super-tux-commit] supertux TODO,1.64,1.65

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- TODO	8 Jun 2004 19:07:43 -0000	1.64
+++ TODO	8 Jun 2004 20:05:03 -0000	1.65
@@ -22,15 +22,13 @@
 
 [H] Make sure there are no invalid tile numbers in the level files
      - Tile 6 occurs in world1/level5.stl as well as other levels
-[H] Adding objects should be done by adding them into a queue and then
-    physically added at the end of Sector::action()
-     - may cause crashes otherwise (due to iterators)
-     - see world1/level7.stl, killing the bombs
 [H] Worldmap needs to allow multiple maps
      - or just one big map with multiple worlds?
 [H] Change resolution to 800x600
      - Levels need to be updated to resolution
-         (half of the levels have been already updated)
+        - half of the levels have been already updated
+        - some fixed levels still have "glitches". See the menu level where
+          some of the tiles are "wrong" and don't fit
 [H] Buttjump related things
      ? Right now only breaks bricks beneath tux - what else should it break
      - Should kill enemies with a certain range
@@ -50,6 +48,7 @@
 [H] Backgrounds should be square tiles instead of just tiling one image
      - Useful for vertical scrolling when we only want a sky background on the
        top of the level
+     - Support for this is already available using a paralax tilemap layer
 
 [M] Save score on per-level basis to make high-score
 [M] Save time on per-level basis to make low-time-score
@@ -61,8 +60,6 @@
 [M] tux get killed if he kicks a iceblock while at the same time bouncing on
 [M] You shouldn't be able to stand on invisible blocks, before you bumped them
     the roof
-[M] bombs should explode directly when hit by another bomb or a mr.iceblock
-     - right now they transform into a "squished mrbomb"
 
 [L] Allow any object to be inside of a [?] box, ie. trampoline or badguy
 [L] in the "Welcome to Antarctica" level, the blocks next to the first growup

[Super-tux-commit] supertux/src sector.cpp,1.6,1.7

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

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

Modified Files:
	sector.cpp 
Log Message:
- oops, forgot to remove commented area

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sector.cpp	8 Jun 2004 19:48:33 -0000	1.6
+++ sector.cpp	8 Jun 2004 19:57:18 -0000	1.7
@@ -275,30 +275,6 @@
 Sector::add_object(GameObject* object)
 {
   gameobjects_new.push_back(object);
-#if 0
-  BadGuy* badguy = dynamic_cast<BadGuy*> (object);
-  if(badguy)
-    badguys.push_back(badguy);
-  Bullet* bullet = dynamic_cast<Bullet*> (object);
-  if(bullet)
-    bullets.push_back(bullet);
-  Upgrade* upgrade = dynamic_cast<Upgrade*> (object);
-  if(upgrade)
-    upgrades.push_back(upgrade);
-  Trampoline* trampoline = dynamic_cast<Trampoline*> (object);
-  if(trampoline)
-    trampolines.push_back(trampoline);
-  FlyingPlatform* flying_platform = dynamic_cast<FlyingPlatform*> (object);
-  if(flying_platform)
-    flying_platforms.push_back(flying_platform);
-  InteractiveObject* interactive_object 
-      = dynamic_cast<InteractiveObject*> (object);
-  if(interactive_object)
-    interactive_objects.push_back(interactive_object);
-
-  gameobjects.push_back(object);
-
-#endif
 }
 
 void

[Super-tux-commit] supertux/data/levels/default icyisland.stwm,1.1,NONE

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

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

Removed Files:
	icyisland.stwm 
Log Message:
- data/levels/default/ moved to data/levels/worldmap/

--- icyisland.stwm DELETED ---

[Super-tux-commit] supertux/data/levels/worldmap icyisland.stwm,NONE,1.1

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

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

Added Files:
	icyisland.stwm 
Log Message:
- added missing worldmap from Ricardo's change

--- NEW FILE: icyisland.stwm ---
;; Generated with Flexlay Editor
(supertux-worldmap
  (name "Icyisland")
  (properties 
    (name  "Icyisland")
    (music "SALCON.MOD"))
  (tilemap 
    (width  40)
    (height 30)
    (data
       9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  
       9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  11 12 9  9  9  9  9  9  9  9  9  9  9  9  
       9  9  9  9  9  9  9  11 16 12 11 16 16 16 16 12 9  9  9  9  11 16 16 12 9  9  14 13 9  9  9  9  9  9  9  9  9  9  9  9  
       9  9  9  11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9  9  14 18 18 13 9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  
       9  9  11 22 58 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9  9  9  9  9  9  11 16 16 16 16 12 9  9  9  9  9  9  9  9  
       9  9  15 19 59 19 20 13 9  9  15 31 35 29 29 28 19 19 60 23 16 12 9  9  9  11 22 19 24 25 26 23 12 11 16 16 12 9  9  9  
       9  9  15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 39 19 20 18 13 9  9  11 22 19 19 30 36 34 26 23 22 19 19 23 12 9  9  
       9  9  15 19 47 19 23 22 19 19 19 19 24 26 47 24 26 47 19 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9  9  
       9  9  15 19 37 39 19 48 40 40 40 39 30 28 47 30 28 37 40 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9  9  
       9  9  15 19 19 47 19 47 24 25 26 37 40 40 42 24 25 25 26 20 18 18 18 21 24 25 25 26 37 40 40 40 40 40 39 31 27 23 12 9  
       9  9  14 18 21 47 19 47 30 29 28 19 24 25 25 33 35 29 28 17 9  9  9  15 30 29 36 27 19 19 19 19 19 60 47 31 34 26 17 9  
       9  9  9  9  15 37 40 42 19 19 24 25 33 35 29 29 28 20 18 13 9  9  9  14 18 21 31 27 48 40 40 40 40 40 42 30 36 27 17 9  
       9  9  9  9  15 19 19 24 25 25 33 32 35 28 20 18 18 13 9  9  9  9  9  9  9  15 31 27 47 24 25 25 25 26 19 19 30 28 17 9  
       9  9  9  9  14 21 19 31 32 32 32 35 28 20 13 9  9  11 16 12 9  9  9  9  9  15 30 28 47 30 36 32 35 28 20 21 19 20 13 9  
       9  9  11 12 9  14 21 30 29 29 29 28 20 13 9  11 16 22 20 13 9  9  9  9  9  14 21 19 37 39 31 32 27 20 13 14 21 17 9  9  
       9  9  14 13 11 12 14 18 18 18 18 18 13 9  9  14 18 18 13 9  9  9  9  9  9  9  14 21 19 47 30 36 27 17 9  9  14 13 9  9  
       9  9  9  9  14 13 9  9  9  9  11 16 16 16 12 9  9  11 16 12 9  9  9  9  9  9  9  14 21 47 19 31 27 17 9  9  9  9  9  9  
       9  9  9  9  9  11 16 16 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12 9  9  9  9  9  15 47 19 30 28 17 9  9  9  9  9  9  
       9  9  9  11 16 22 49 50 51 24 26 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 9  9  9  9  9  9  
       9  9  9  15 24 26 52 53 54 30 28 19 30 29 29 28 19 30 29 29 36 34 25 26 24 26 48 40 40 42 17 9  9  9  9  9  9  9  9  9  
       9  9  9  15 31 27 55 56 57 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 30 28 47 20 18 18 13 9  9  9  9  9  9  9  9  9  
       9  9  9  15 31 34 25 26 19 47 19 47 24 26 47 19 47 24 26 47 19 24 26 48 40 40 42 23 12 9  9  9  9  11 12 9  9  9  9  9  
       9  9  9  15 30 29 29 28 19 37 40 42 31 27 47 19 47 30 28 47 19 30 28 47 19 19 24 26 17 9  9  9  9  14 13 9  9  9  9  9  
       9  9  9  14 18 18 18 18 21 24 26 19 30 28 47 60 47 19 48 42 24 26 48 42 24 25 33 27 17 9  9  9  9  9  9  9  9  9  9  9  
       9  9  9  9  9  9  9  9  15 30 28 24 25 26 37 40 42 19 47 19 30 28 47 19 30 29 36 27 17 9  9  9  9  9  9  9  9  9  9  9  
       9  9  9  11 12 9  9  9  14 18 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 9  9  11 16 16 12 9  9  9  9  9  
       9  9  9  14 13 9  9  9  9  9  14 21 31 32 32 34 25 25 25 25 26 19 19 20 13 14 18 18 13 9  9  14 21 60 23 12 9  9  9  9  
       9  9  9  9  9  9  9  9  9  9  9  15 30 29 29 29 29 29 29 29 28 19 20 13 11 12 9  9  9  9  9  9  14 18 18 13 9  9  9  9  
       9  9  9  9  9  9  9  9  9  9  9  14 18 18 18 18 18 18 18 18 18 18 13 9  14 13 9  9  9  9  9  9  9  9  9  9  9  9  9  9  
       9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  
           ))


  (levels
    (level (name "world1/level1.stl")
           (x 4)
           (y 6))
    (level (name "world1/level2.stl")
           (x 4)
           (y 8))
    (level (name "world1/level3.stl")
           (x 5)
           (y 11))
    (level (name "world1/level4.stl")
           (x 7)
           (y 11))
    (level (name "world1/level5.stl")
           (x 7)
           (y 8))
    (level (name "world1/level6.stl")
           (x 11)
           (y 9))
    (level (name "world1/level7.stl")
           (x 14)
           (y 9))
    (level (name "world1/level8.stl")
           (x 17)
           (y 6))
    (level (name "world1/level9.stl")
           (x 14)
           (y 6))
    (level (name "world1/level10.stl")
           (x 21)
           (y 8))
    (level (name "world1/level11.stl")
           (x 26)
           (y 7))
    (level (name "world1/level12.stl")
           (x 28)
           (y 9))
    (level (name "world1/level13.stl")
           (x 31)
           (y 9))
    (level (name "world1/level14.stl")
           (x 34)
           (y 11))
    (level (name "world1/level15.stl")
           (x 29)
           (y 11))
    (level (name "world1/level16.stl")
           (x 28)
           (y 13))
    (level (name "world1/level17.stl")
           (x 29)
           (y 16))
    (level (name "world1/level18.stl")
           (x 27)
           (y 19))
    (level (name "world1/level19.stl")
           (x 23)
           (y 22))
    (level (name "world1/level20.stl")
           (x 20)
           (y 25))
    (level (name "world1/level21.stl")
           (x 18)
           (y 23))
    (level (name "world1/level22.stl")
           (x 19)
           (y 20))
    (level (name "world1/level23.stl")
           (x 14)
           (y 24))
    (level (name "world1/level24.stl")
           (x 14)
           (y 20))
    (level (name "world1/level25.stl")
           (x 10)
           (y 22))
    (level (name "world1/level26.stl")
           (x 7)
           (y 20)
           (extro-filename "extro.txt"))
  )


)

[Super-tux-commit] supertux/data/levels/worldmap - New directory

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

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

Log Message:
Directory /cvsroot/super-tux/supertux/data/levels/worldmap added to the repository

[Super-tux-commit] supertux/src sector.cpp,1.5,1.6 sector.h,1.3,1.4

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

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

Modified Files:
	sector.cpp sector.h 
Log Message:
- don't add new objects until end of Sector::action()
- fixes cases where adding a new object while iterating over the objects can cause a crash

Index: sector.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sector.h	2 Jun 2004 23:33:35 -0000	1.3
+++ sector.h	8 Jun 2004 19:48:33 -0000	1.4
@@ -148,6 +148,7 @@
   InteractiveObjects interactive_objects;
   typedef std::vector<GameObject*> GameObjects;
   GameObjects gameobjects;
+  GameObjects gameobjects_new; // For newly created objects
 
 private:
   typedef std::vector<SpawnPoint*> SpawnPoints;

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sector.cpp	8 Jun 2004 17:44:29 -0000	1.5
+++ sector.cpp	8 Jun 2004 19:48:33 -0000	1.6
@@ -274,7 +274,8 @@
 void
 Sector::add_object(GameObject* object)
 {
-  // XXX a bit hackish, at least try to keep the number of these things down...
+  gameobjects_new.push_back(object);
+#if 0
   BadGuy* badguy = dynamic_cast<BadGuy*> (object);
   if(badguy)
     badguys.push_back(badguy);
@@ -296,6 +297,8 @@
     interactive_objects.push_back(interactive_object);
 
   gameobjects.push_back(object);
+
+#endif
 }
 
 void
@@ -397,6 +400,35 @@
       ++i;
     }
   }
+
+  /* add newly created objects */
+  for(std::vector<GameObject*>::iterator i = gameobjects_new.begin();
+      i != gameobjects_new.end(); ++i)
+  {
+          BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
+          if(badguy)
+            badguys.push_back(badguy);
+          Bullet* bullet = dynamic_cast<Bullet*> (*i);
+          if(bullet)
+            bullets.push_back(bullet);
+          Upgrade* upgrade = dynamic_cast<Upgrade*> (*i);
+          if(upgrade)
+            upgrades.push_back(upgrade);
+          Trampoline* trampoline = dynamic_cast<Trampoline*> (*i);
+          if(trampoline)
+            trampolines.push_back(trampoline);
+          FlyingPlatform* flying_platform = dynamic_cast<FlyingPlatform*> (*i);
+          if(flying_platform)
+            flying_platforms.push_back(flying_platform);
+          InteractiveObject* interactive_object 
+              = dynamic_cast<InteractiveObject*> (*i);
+          if(interactive_object)
+            interactive_objects.push_back(interactive_object);
+
+          gameobjects.push_back(*i);
+  }
+  gameobjects_new.clear();
+
 }
 
 void

[Super-tux-commit] supertux TODO,1.63,1.64

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

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

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- TODO	7 Jun 2004 20:53:35 -0000	1.63
+++ TODO	8 Jun 2004 19:07:43 -0000	1.64
@@ -17,9 +17,6 @@
 ?: bug or feature?
     - needs discussion
 
-[?] When jumping into a brick and there is a powerup, it should change
-    direction or not, depending where the collision was. It currently sucks.
-     - Discuss this, is that really what we want?
 [?] Default keyboard setup should change. Up will be needed for other features
     like going through doors and looking up, etc.
 
@@ -49,6 +46,10 @@
      - New forest tileset
      - Badguy sprites
      - Tux's buttjump animation
+[H] When bumping powerups, they should bounce away from the centre of Tux
+[H] Backgrounds should be square tiles instead of just tiling one image
+     - Useful for vertical scrolling when we only want a sky background on the
+       top of the level
 
 [M] Save score on per-level basis to make high-score
 [M] Save time on per-level basis to make low-time-score

[Super-tux-commit] supertux/src player.cpp,1.140,1.141 resources.cpp,1.38,1.39 sector.cpp,1.4,1.5

[Marek M. <wa...@us...>]

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

Modified Files:
	player.cpp resources.cpp sector.cpp 
Log Message:
Fixed crashes at tiles that are not defined in supertux.stgt - throwing a warning instead
Removed all undefined tiles from the world1 levels
Renamed "Level Done" music


Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- player.cpp	8 Jun 2004 07:12:37 -0000	1.140
+++ player.cpp	8 Jun 2004 17:44:28 -0000	1.141
@@ -289,7 +289,7 @@
           if (isbrick(base.x, base.y) ||
               isfullbox(base.x, base.y))
             {
-              Sector::current()->trygrabdistro(
+	      Sector::current()->trygrabdistro(
                   Vector(base.x, base.y - 32), BOUNCE);
               Sector::current()->trybumpbadguy(Vector(base.x, base.y - 64));
 
@@ -303,7 +303,7 @@
           if (isbrick(base.x+ 31, base.y) ||
               isfullbox(base.x+ 31, base.y))
             {
-              Sector::current()->trygrabdistro(
+	      Sector::current()->trygrabdistro(
                   Vector(base.x+ 31, base.y - 32), BOUNCE);
               Sector::current()->trybumpbadguy(Vector(base.x+ 31, base.y - 64));
 
@@ -658,7 +658,6 @@
     {
       Sector::current()->trygrabdistro(Vector(base.x, base.y), NO_BOUNCE);
       Sector::current()->trygrabdistro(Vector(base.x+ 31, base.y), NO_BOUNCE);
-
       Sector::current()->trygrabdistro(
           Vector(base.x, base.y + base.height), NO_BOUNCE);
       Sector::current()->trygrabdistro(
@@ -666,7 +665,7 @@
 
       if(size == BIG)
         {
-          Sector::current()->trygrabdistro(
+	  Sector::current()->trygrabdistro(
               Vector(base.x, base.y + base.height / 2), NO_BOUNCE);
           Sector::current()->trygrabdistro(
               Vector(base.x+ 31, base.y + base.height / 2), NO_BOUNCE);

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sector.cpp	1 Jun 2004 21:09:37 -0000	1.4
+++ sector.cpp	8 Jun 2004 17:44:29 -0000	1.5
@@ -747,9 +747,14 @@
   Tile* tile = solids->get_tile_at(pos);
   if (!tile)
   {
-    char errmsg[64];
+    /*char errmsg[64];
     sprintf(errmsg, "Invalid tile at %i,%i", (int)((pos.x+1)/32*32), (int)((pos.y+1)/32*32));
-    throw SuperTuxException(errmsg, __FILE__, __LINE__);
+    throw SuperTuxException(errmsg, __FILE__, __LINE__); */
+    
+    //Bad tiles (i.e. tiles that are not defined in supertux.stgt but appear in the map) are changed to ID 0 (blank tile)
+    std::cout << "Warning: Undefined tile at " <<(int)pos.x/32 << "/" << (int)pos.y/32 << " (ID: " << (int)solids->get_tile_id_at(pos) << ")" << std::endl;
+    solids->change_at(pos,0);
+    tile = solids->get_tile_at(pos);
   }
 
 
@@ -767,6 +772,7 @@
                                                                             
   player_status.score = player_status.score + SCORE_DISTRO;
   player_status.distros++;
+
 }
                                                                                 
 /* Try to bump a bad guy from below: */

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- resources.cpp	7 Jun 2004 19:52:46 -0000	1.38
+++ resources.cpp	8 Jun 2004 17:44:29 -0000	1.39
@@ -227,7 +227,7 @@
 
   /* Herring song */
   herring_song = sound_manager->load_music(datadir + "/music/SALCON.MOD");
-  level_end_song = sound_manager->load_music(datadir + "/music/tux-leveldone.mod");
+  level_end_song = sound_manager->load_music(datadir + "/music/leveldone.mod");
 }