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

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

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

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

Modified Files:
	collision.cpp 
Log Message:
apparently we get a 0 tile from time to time, no idea yet why

Index: collision.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- collision.cpp	29 Apr 2004 13:44:58 -0000	1.20
+++ collision.cpp	29 Apr 2004 13:54:21 -0000	1.21
@@ -56,7 +56,7 @@
   for(int x = starttilex; x*32 < max_x; ++x) {
     for(int y = starttiley; y*32 < max_y; ++y) {
       Tile* tile = tilemanager.get(level.get_tile_at(x, y));
-      if(tile->solid)
+      if(tile && tile->solid)
         return true;
     }
   }

[Super-tux-commit] supertux/src collision.cpp,1.19,1.20 level.cpp,1.56,1.57 level.h,1.39,1.40 player.cpp,1.73,1.74

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

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

Modified Files:
	collision.cpp level.cpp level.h player.cpp 
Log Message:
-optimized and cleaned up collision_object_map
-fixed collision detection moving tux far away from his last position
-fixed fuck code not resetting old_base.

All in all ducking and sliding in small areas should work like expected now.



Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- player.cpp	29 Apr 2004 00:43:06 -0000	1.73
+++ player.cpp	29 Apr 2004 13:44:58 -0000	1.74
@@ -456,6 +456,8 @@
       duck = false;
       base.y -= 32;
       base.height = 64;
+      // changing base size confuses collision otherwise
+      old_base = previous_base = base;                        
     }
 }
 
@@ -468,13 +470,6 @@
   size = BIG;
   base.height = 64;
   base.y -= 32;
-  // eventually go in duck mode if there's no space
-  if(collision_object_map(base))
-    {
-      base.height = 32;
-      base.y += 32;
-      duck = true;
-    }
 
   old_base = previous_base = base;
 }

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- level.cpp	28 Apr 2004 18:45:24 -0000	1.56
+++ level.cpp	29 Apr 2004 13:44:58 -0000	1.57
@@ -733,7 +733,7 @@
 }
 
 unsigned int 
-Level::gettileid(float x, float y)
+Level::gettileid(float x, float y) const
 {
   int xx, yy;
   unsigned int c;
@@ -749,4 +749,13 @@
   return c;
 }
 
+unsigned int
+Level::get_tile_at(int x, int y) const
+{
+  if(x < 0 || x > width || y < 0 || y > 14)
+    return 0;
+  
+  return ia_tiles[y][x];
+}
+
 /* EOF */

Index: collision.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- collision.cpp	26 Apr 2004 21:10:59 -0000	1.19
+++ collision.cpp	29 Apr 2004 13:44:58 -0000	1.20
@@ -42,48 +42,41 @@
           one.y <= two.y + two.height + off_y - 1);
 }
 
-bool collision_object_map(const base_type& pbase)
+bool collision_object_map(const base_type& base)
 {
-  int v = (int)pbase.height / 16;
-  int h = (int)pbase.width / 16;
-
-  if(issolid(pbase.x + 1, pbase.y + 1) ||
-     issolid(pbase.x + pbase.width -1, pbase.y + 1) ||
-     issolid(pbase.x +1, pbase.y + pbase.height -1) ||
-     issolid(pbase.x + pbase.width -1, pbase.y + pbase.height - 1))
-    return true;
-
-  for(int i = 1; i < h; ++i)
-    {
-      if(issolid(pbase.x + i*16,pbase.y + 1))
-        return true;
-    }
+  const Level& level = *World::current()->get_level();
+  TileManager& tilemanager = *TileManager::instance();
 
-  for(int i = 1; i < h; ++i)
-    {
-      if(  issolid(pbase.x + i*16,pbase.y + pbase.height - 1))
-        return true;
-    }
+  // we make the collision rectangle 1 pixel smaller
+  int starttilex = int(base.x+1) / 32;
+  int starttiley = int(base.y+1) / 32;
+  int max_x = int(base.x + base.width);
+  int max_y = int(base.y + base.height);
 
-  for(int i = 1; i < v; ++i)
-    {
-      if(  issolid(pbase.x + 1, pbase.y + i*16))
-        return true;
-    }
-  for(int i = 1; i < v; ++i)
-    {
-      if(  issolid(pbase.x + pbase.width - 1, pbase.y + i*16))
+  for(int x = starttilex; x*32 < max_x; ++x) {
+    for(int y = starttiley; y*32 < max_y; ++y) {
+      Tile* tile = tilemanager.get(level.get_tile_at(x, y));
+      if(tile->solid)
         return true;
     }
+  }
 
   return false;
 }
 
 void* collision_func(const base_type& base, tiletestfunction function)
 {
-  for(float x = base.x; x < base.x + base.width; x += 32) {
-    for(float y = base.y; y < base.y + base.height; y += 32) {
-      Tile* tile = gettile(x, y);
+  const Level& level = *World::current()->get_level();
+  TileManager& tilemanager = *TileManager::instance();
+  
+  int starttilex = int(base.x) / 32;
+  int starttiley = int(base.y) / 32;
+  int max_x = int(base.x + base.width);
+  int max_y = int(base.y + base.height);
+
+  for(int x = starttilex; x*32 < max_x; ++x) {
+    for(int y = starttiley; y*32 < max_y; ++y) {
+      Tile* tile = tilemanager.get(level.get_tile_at(x, y));
       void* result = function(tile);
       if(result != 0)
         return result;
@@ -168,6 +161,8 @@
 
   steps = (int)(lpath / (float)16);
 
+  float orig_x = old->x;
+  float orig_y = old->y;
   old->x += xd;
   old->y += yd;
 
@@ -234,10 +229,14 @@
         }
     }
 
+  if((xd > 0 && current->x < orig_x) || (xd < 0 && current->x > orig_x))
+    current->x = orig_x;
+  if((yd > 0 && current->y < orig_y) || (yd < 0 && current->y > orig_y))
+    current->y = orig_y;
+
   *old = *current;
 }
 
-
 Tile* gettile(float x, float y)
 {
   return TileManager::instance()->get(World::current()->get_level()->gettileid(x, y));

Index: level.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- level.h	28 Apr 2004 18:45:24 -0000	1.39
+++ level.h	29 Apr 2004 13:44:58 -0000	1.40
@@ -131,7 +131,11 @@
   void change_size (int new_width);
 
   /** Return the id of the tile at position x/y */
-  unsigned int gettileid(float x, float y);
+  unsigned int gettileid(float x, float y) const;
+  /** returns the id of the tile at position x,y
+   * (these are logical and not pixel coordinates)
+   */
+  unsigned int get_tile_at(int x, int y) const;
 
   void load_image(Surface** ptexture, std::string theme, const char * file, int use_alpha);
 };

[Super-tux-commit] supertux/src setup.cpp,1.64,1.65

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

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

Modified Files:
	setup.cpp 
Log Message:
power -> power/run

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- setup.cpp	28 Apr 2004 20:51:25 -0000	1.64
+++ setup.cpp	29 Apr 2004 13:36:30 -0000	1.65
@@ -419,7 +419,7 @@
   options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, 0,&keymap.right);
   options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, 0,&keymap.jump);
   options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, 0,&keymap.duck);
-  options_keys_menu->additem(MN_CONTROLFIELD,"Power", 0,0, 0,&keymap.fire);
+  options_keys_menu->additem(MN_CONTROLFIELD,"Power/Run", 0,0, 0,&keymap.fire);
   options_keys_menu->additem(MN_HL,"",0,0);
   options_keys_menu->additem(MN_BACK,"Back",0,0);
 

[Super-tux-commit] supertux/data Makefile.am,1.9,1.10

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

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

Modified Files:
	Makefile.am 
Log Message:
- added missing files

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	25 Apr 2004 22:24:44 -0000	1.9
+++ Makefile.am	29 Apr 2004 13:30:37 -0000	1.10
@@ -1,5 +1,8 @@
 EXTRA_DIST = \
   supertux.strf \
+  intro.txt \
+  extro.txt \
+  CREDITS \
   $(wildcard sounds/*.wav) \
   images/icon.png \
   images/icon.xpm \
@@ -27,8 +30,7 @@
   $(wildcard levels/*/info) \
   $(wildcard music/*.mod) \
   $(wildcard music/*.MOD) \
-  $(wildcard sounds/*.wav) \
-  CREDITS
+  $(wildcard sounds/*.wav)
 
 nobase_dist_pkgdata_DATA = $(EXTRA_DIST)
 

[Super-tux-commit] supertux/src title.cpp,1.68,1.69

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

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

Modified Files:
	title.cpp 
Log Message:
When removing a slot, keep the menu in the slots' menu.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- title.cpp	29 Apr 2004 10:34:45 -0000	1.68
+++ title.cpp	29 Apr 2004 13:02:02 -0000	1.69
@@ -354,7 +354,7 @@
                   }
 
                 update_time = st_get_ticks();
-                Menu::set_current(main_menu);
+                Menu::set_current(load_game_menu);
                 }
               else if (process_load_game_menu())
                 {

[Super-tux-commit] htdocs/milestone1/images rollsnow.gif,NONE,1.1

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

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

Added Files:
	rollsnow.gif 
Log Message:
updates

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

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

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

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

Added Files:
	fontbasic.xcf game-005.jpg game-005_small.jpg game-006.jpg 
	game-006_small.jpg game1-004.jpg game1-004_small.jpg 
	game2-004.jpg game2-004_small.jpg game3-004.jpg 
	game3-004_small.jpg intro-005.jpg intro-005_small.jpg 
	leveleditor-006.jpg leveleditor-006_small.jpg menu-006.jpg 
	menu-006_small.jpg 
Log Message:
updates

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Super-tux-commit] htdocs welcome.xml,NONE,1.1 Makefile,1.11,1.12 authors.xml,1.1,1.2

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

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

Modified Files:
	Makefile authors.xml 
Added Files:
	welcome.xml 
Log Message:
updates

Index: authors.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/authors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- authors.xml	28 Apr 2004 14:34:05 -0000	1.1
+++ authors.xml	29 Apr 2004 12:05:12 -0000	1.2
@@ -6,78 +6,78 @@
       (as a note, noone earns money by making this game, our only incentivation is the amusement of doing it.)
     </p>
 
-<b>Project leader</b>
-
-	Tobias (Tobgle) Glaesser
-	tob...@gm...
-
-<b>Original author</b>
-
-	Bill Kendrick
-	nb...@so...
-	http://www.newbreedsoftware.com/
-
-<b>Programmers</b>
-
-	Tobias (Tobgle) Glaesser
-	tob...@gm...
-
-	Ricardo (Blacksheep) Cruz
-	ri...@ae... / http://rpmcruz.planetaclix.pt/ 
-
-	Ingo (Grumbel) Ruhnke
-	gr...@gm... / http://pingus.seul.org/~grumbel/
- 
-	Matthias (MatzeB) Braun
-	ma...@br...
-
-<b>Contrib Programming</b>
-
-	Ryan Flegel
-	xxd...@ho... / http://digitalhell.cjb.net/~ryan/
-
-	Duong-Khang NGUYEN
-	neo...@us...
-
-<b>Graphics</b>
-
-	Ingo (Grumbel) Ruhnke
-	gr...@gm... / http://pingus.seul.org/~grumbel/
-
-	Christopher A. (Paroneayea) Webber
-	cr...@li...
-
-<b>Level Design</b>
-
-	Marek (Wansti) Moeckel
-	wa...@gm... 
-
-	Ingo (Grumbel) Ruhnke
-	gr...@gm... / http://pingus.seul.org/~grumbel/
-
-<b>Music</b>
-
-	Marek (Wansti) Moeckel
-	wa...@gm...
-
-	Mystical
-
-	Mortimer Twang
-
-<b>Sounds</b>
-
-	Royalty free sound effects from
-	CDROMs and FTP sites
-
-
-<b>Thanks to</b>
-
-	Larry Ewing
-Creator of Tux, the Linux penguin
-
-	SDL and OpenGL
-For giving such a great gaming experience possible in Linux
-
+<b>Project leader</b><br/>
+<br/>
+	Tobias (Tobgle) Glaesser<br/>
+	tob...@gm...<br/>
+<br/>
+<b>Original author</b><br/>
+<br/>
+	Bill Kendrick<br/>
+	nb...@so...<br/>
+	http://www.newbreedsoftware.com/<br/>
+<br/>
+<b>Programmers</b><br/>
+<br/>
+	Tobias (Tobgle) Glaesser<br/>
+	tob...@gm...<br/>
+<br/>
+	Ricardo (Blacksheep) Cruz<br/>
+	ri...@ae... / http://rpmcruz.planetaclix.pt/ <br/>
+<br/>
+	Ingo (Grumbel) Ruhnke<br/>
+	gr...@gm... / http://pingus.seul.org/~grumbel/<br/>
+ <br/>
+	Matthias (MatzeB) Braun<br/>
+	ma...@br...<br/>
+<br/>
+<b>Contrib Programming</b><br/>
+<br/>
+	Ryan Flegel<br/>
+	xxd...@ho... / http://digitalhell.cjb.net/~ryan/<br/>
+<br/>
+	Duong-Khang NGUYEN<br/>
+	neo...@us...<br/>
+<br/>
+<b>Graphics</b><br/>
+<br/>
+	Ingo (Grumbel) Ruhnke<br/>
+	gr...@gm... / http://pingus.seul.org/~grumbel/<br/>
+<br/>
+	Christopher A. (Paroneayea) Webber<br/>
+	cr...@li...<br/>
+<br/>
+<b>Level Design</b><br/>
+<br/>
+	Marek (Wansti) Moeckel<br/>
+	wa...@gm... <br/>
+<br/>
+	Ingo (Grumbel) Ruhnke<br/>
+	gr...@gm... / http://pingus.seul.org/~grumbel/<br/>
+<br/>
+<b>Music</b><br/>
+<br/>
+	Marek (Wansti) Moeckel<br/>
+	wa...@gm...<br/>
+<br/>
+	Mystical<br/>
+<br/>
+	Mortimer Twang<br/>
+<br/>
+<b>Sounds</b><br/>
+<br/>
+	Royalty free sound effects from<br/>
+	CDROMs and FTP sites<br/>
+<br/>
+<br/>
+<b>Thanks to</b><br/>
+<br/>
+	Larry Ewing<br/>
+Creator of Tux, the Linux penguin<br/>
+<br/>
+	SDL and OpenGL<br/>
+For giving such a great gaming experience possible in Linux<br/>
+<br/>
 
 We hope you enjoy our work.
 - SuperTux team

--- NEW FILE: welcome.xml ---
<?xml version="1.0"?>
<page title="SuperTux">
  <section title="SuperTux">
    <p>
      SuperTux is currently getting an overvault. Thus this webpage is a
      bit chaotic at the moment and will most likly stay that way for
      the next few weeks.
    </p>
    <p>
      The following links should help to keep the overview a bit:
    </p>
    <ul>
      <li><a href="http://www.newbreedsoftware.com/supertux/">The
          orignial webpage of SuperTux</a>, ie. the one that was used
        before the overvault started</li>

      <li><a href="milestone1/index.html">The Milestone1 webpage</a>,
        ie. the one that contains all the information for the next
        version (the one created for GotM)</li>
      
      <li><a href="development/index.html">The generic Development
          webpage</a>, ie the one that contains information and ideas
        for future development, its mainly only here for
        brainstorming, its not meant to be implemented</li>
    </ul>
  </section>

  <section title="Contact">
    <p>
      Development is mainly coordinated via IRC (#supertux at
      irc.freenode.net) and the <a
      href="http://lists.sourceforge.net/lists/listinfo/super-tux-devel">SuperTux
      Mailing list</a>, be sure to visit both once in a while or you
      might miss critical stuff.
    </p>
  </section>

</page>
Index: Makefile
===================================================================
RCS file: /cvsroot/super-tux/htdocs/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	29 Apr 2004 00:11:43 -0000	1.11
+++ Makefile	29 Apr 2004 12:05:12 -0000	1.12
@@ -2,7 +2,7 @@
   welcome.html \
   download.html \
   authors.html \
-  screemshots.html \
+  screenshots.html \
   \
   development/index.html   \
   development/map.html     \
@@ -45,10 +45,11 @@
 	mkdir -p output/milestone1/
 	mkdir -p output/development/images/
 	mkdir -p output/milestone1/images/
-	cp -v index.php output/
+	cp -v output/welcome.html output/index.html
 	cp -v default.css output/
 	cp -v default.css output/development/
 	cp -v default.css output/milestone1/
+	cp -v images/*.jpg output/images/
 	cp -v milestone1/images/*.jpg output/milestone1/images/
 	cp -v milestone1/images/*.png output/milestone1/images/
 	cp -v milestone1/images/*.gif output/milestone1/images/

[Super-tux-commit] supertux/src menu.cpp,1.60,1.61 menu.h,1.52,1.53

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

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

Modified Files:
	menu.cpp menu.h 
Log Message:
Added a flickering cursor for input menu fields. The code is kinda of sucky, so feel free to clean it up.

Unfortanely, there isn't any '_' charcter, so I have to use '-' :(
I hope, we will soon add a new row of characters.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- menu.cpp	29 Apr 2004 10:34:45 -0000	1.60
+++ menu.cpp	29 Apr 2004 11:32:13 -0000	1.61
@@ -39,6 +39,8 @@
 #include "timer.h"
 #include "high_scores.h"
 
+#define FLICK_CURSOR_TIME 500
+
 Surface* checkbox;
 Surface* checkbox_checked;
 Surface* back;
@@ -165,6 +167,10 @@
   pnew_item->id = id;
   pnew_item->int_p = int_p_;
 
+  pnew_item->input_flickering = false;
+  pnew_item->input_flickering_timer.init(true);
+  pnew_item->input_flickering_timer.start(FLICK_CURSOR_TIME);
+
   return pnew_item;
 }
 
@@ -190,6 +196,31 @@
     }
 }
 
+char* MenuItem::get_input_with_symbol(bool active_item)
+{
+if(!active_item)
+  input_flickering = true;
+else
+  {
+  if(input_flickering_timer.get_left() < 0)
+    {
+    if(input_flickering)
+      input_flickering = false;
+    else
+      input_flickering = true;
+    input_flickering_timer.start(FLICK_CURSOR_TIME);
+    }
+  }
+
+char str[1024];
+if(input_flickering)
+  sprintf(str,"%s-",input);
+else
+  sprintf(str,"%s ",input);
+
+return (char*)str;
+}
+
 /* Set ControlField a key */
 void Menu::get_controlfield_key_into_input(MenuItem *item)
 {
@@ -461,7 +492,7 @@
   int y_pos       = pos_y + 24*index - menu_height/2 + 12 + effect_offset;
   int shadow_size = 2;
   int text_width  = strlen(pitem.text) * font_width;
-  int input_width = strlen(pitem.input) * font_width;
+  int input_width = (strlen(pitem.input)+ 1) * font_width;
   int list_width  = strlen(string_list_active(pitem.list)) * font_width;
   Text* text_font = white_text;
 
@@ -521,7 +552,15 @@
         if(pitem.kind == MN_CONTROLFIELD)
           get_controlfield_key_into_input(&pitem);
 
-        gold_text->draw_align(pitem.input,
+        if(pitem.kind == MN_TEXTFIELD || pitem.kind == MN_NUMFIELD)
+          {
+          if(active_item == index)
+            gold_text->draw_align(pitem.get_input_with_symbol(true), x_pos + text_pos, y_pos, A_HMIDDLE, A_VMIDDLE, 2);
+          else
+            gold_text->draw_align(pitem.get_input_with_symbol(false), x_pos + text_pos, y_pos, A_HMIDDLE, A_VMIDDLE, 2);
+          }
+        else
+          gold_text->draw_align(pitem.input,
                               x_pos + text_pos, y_pos,
                               A_HMIDDLE, A_VMIDDLE, 2);
 

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- menu.h	29 Apr 2004 10:34:45 -0000	1.52
+++ menu.h	29 Apr 2004 11:32:13 -0000	1.53
@@ -102,6 +102,11 @@
   void change_input(const char *text);
 
   static MenuItem* create(MenuItemKind kind, const char *text, int init_toggle, Menu* target_menu, int id, int* int_p);
+
+  char* get_input_with_symbol(bool active_item);   // returns the text with an input symbol
+private:
+  bool input_flickering;
+  Timer input_flickering_timer;
 };
 
 class Menu

[Super-tux-commit] supertux/src gameobjs.cpp,1.14,1.15

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

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

Modified Files:
	gameobjs.cpp 
Log Message:
added missing #include <algorithm>

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gameobjs.cpp	28 Apr 2004 20:28:38 -0000	1.14
+++ gameobjs.cpp	29 Apr 2004 10:45:24 -0000	1.15
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
+#include <algorithm>
 #include "world.h"
 #include "tile.h"
 #include "gameloop.h"

[Super-tux-commit] supertux/src menu.cpp,1.59,1.60 menu.h,1.51,1.52 title.cpp,1.67,1.68

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

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

Modified Files:
	menu.cpp menu.h title.cpp 
Log Message:
Added removing of slots when Delete is pressed.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- menu.cpp	29 Apr 2004 10:00:51 -0000	1.59
+++ menu.cpp	29 Apr 2004 10:34:45 -0000	1.60
@@ -644,6 +644,11 @@
   return dummyitem;
 }
 
+int Menu::get_active_item_id()
+{
+return item[active_item].id;
+}
+
 bool
 Menu::isToggled(int id)
 {

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- title.cpp	28 Apr 2004 18:45:26 -0000	1.67
+++ title.cpp	29 Apr 2004 10:34:45 -0000	1.68
@@ -337,7 +337,26 @@
             }
           else if(menu == load_game_menu)
             {
-              if (process_load_game_menu())
+              if(event.key.keysym.sym == SDLK_DELETE)
+                {
+                int slot = menu->get_active_item_id();
+                char str[1024];
+                sprintf(str,"Are you sure you want to delete slot %d?", slot);
+                
+                Menu::set_current(0);
+                draw_background();
+
+                if(confirm_dialog(str))
+                  {
+                  sprintf(str,"%s/slot%d.stsg", st_save_dir, slot);
+                  printf("Removing: %s\n",str);
+                  remove(str);
+                  }
+
+                update_time = st_get_ticks();
+                Menu::set_current(main_menu);
+                }
+              else if (process_load_game_menu())
                 {
                   // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
                   // reset tux

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- menu.h	29 Apr 2004 10:00:51 -0000	1.51
+++ menu.h	29 Apr 2004 10:34:45 -0000	1.52
@@ -173,6 +173,8 @@
   MenuItem& get_item(int index) { return item[index]; }
   MenuItem& get_item_by_id(int id);
 
+  int get_active_item_id();
+
   bool isToggled(int id);
 
   void Menu::get_controlfield_key_into_input(MenuItem *item);

[Super-tux-commit] supertux/src leveleditor.cpp,1.69,1.70 menu.cpp,1.58,1.59 menu.h,1.50,1.51

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

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

Modified Files:
	leveleditor.cpp menu.cpp menu.h 
Log Message:
Created a simple confirm_dialog. Currently only used by the level editor, but can be used, for instance, by slot delete confirmation.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- menu.cpp	28 Apr 2004 20:51:24 -0000	1.58
+++ menu.cpp	29 Apr 2004 10:00:51 -0000	1.59
@@ -60,6 +60,44 @@
 std::vector<Menu*> Menu::last_menus;
 Menu* Menu::current_ = 0;
 
+/* just displays a Yes/No text that can be used to confirm stuff */
+bool confirm_dialog(char *text)
+{
+white_text->drawf(text,0,0,A_HMIDDLE,A_VMIDDLE,2);
+red_text->drawf("(Y)es/(N)o",0,20,A_HMIDDLE,A_VMIDDLE,2);
+flipscreen();
+SDL_Event event;
+int done = 0;
+bool confirm = false;
+while(done == 0)
+  {
+  while(SDL_PollEvent(&event))
+    switch(event.type)
+      {
+      case SDL_KEYDOWN:		// key pressed
+        switch(event.key.keysym.sym)
+          {
+          case SDLK_y:
+            done = 1;
+            confirm = true;
+            break;
+          case SDLK_n:
+            done = 1;
+            break;
+          default:
+            break;
+          }
+        break;
+      case SDL_QUIT:		// quit signal
+        done = 1;
+      default:
+        break;
+      }
+  SDL_Delay(50);
+  }
+return confirm;
+}
+
 void
 Menu::push_current(Menu* pmenu)
 {

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- menu.h	25 Apr 2004 21:55:39 -0000	1.50
+++ menu.h	29 Apr 2004 10:00:51 -0000	1.51
@@ -67,6 +67,8 @@
   MNID_APPLY
   };
 
+bool confirm_dialog(char *text);
+
 /* Kinds of menu items */
 enum MenuItemKind {
   MN_ACTION,

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- leveleditor.cpp	28 Apr 2004 20:07:20 -0000	1.69
+++ leveleditor.cpp	29 Apr 2004 10:00:50 -0000	1.70
@@ -970,38 +970,13 @@
                         {
                           Level new_lev;
                           char str[1024];
-                          int d = 0;
-                          sprintf(str,"Level %d doesn't exist.",le_level+1);
-                          white_text->drawf(str,0,-18,A_HMIDDLE,A_VMIDDLE,2);
-                          white_text->drawf("Do you want to create it?",0,0,A_HMIDDLE,A_VMIDDLE,2);
-                          red_text->drawf("(Y)es/(N)o",0,20,A_HMIDDLE,A_VMIDDLE,2);
-                          flipscreen();
-                          while(d == 0)
+                          sprintf(str,"Level %d doesn't exist. Create it?",le_level+1);
+                          if(confirm_dialog(str))
                             {
-                              while(SDL_PollEvent(&event))
-                                switch(event.type)
-                                  {
-                                  case SDL_KEYDOWN:		// key pressed
-                                    switch(event.key.keysym.sym)
-                                      {
-                                      case SDLK_y:
-                                        new_lev.init_defaults();
-                                        new_lev.save(le_level_subset.name.c_str(),++le_level);
-                                        le_level_subset.levels = le_level;
-                                        le_goto_level(le_level);
-                                        d = 1;
-                                        break;
-                                      case SDLK_n:
-                                        d = 1;
-                                        break;
-                                      default:
-                                        break;
-                                      }
-                                    break;
-                                  default:
-                                    break;
-                                  }
-                              SDL_Delay(50);
+                            new_lev.init_defaults();
+                            new_lev.save(le_level_subset.name.c_str(),++le_level);
+                            le_level_subset.levels = le_level;
+                            le_goto_level(le_level);
                             }
                         }
                     }

[Super-tux-commit] supertux/src defines.h,1.27,1.28 intro.cpp,1.18,1.19 text.cpp,1.17,1.18 text.h,1.14,1.15 title.cpp,1.65,1.66 worldmap.cpp,1.62,1.63

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

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

Modified Files:
	defines.h intro.cpp text.cpp text.h title.cpp worldmap.cpp 
Log Message:
Made display_text_file() to get the scroll speed as an argument. This way we can make the intro slower than the credits, for instance. It was just impossible to read them.
Anyway, you can easily change their speed in defines.h .

Also fixes a bug that was making the text to take while before starting to be displayed.

Index: text.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/text.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- text.cpp	28 Apr 2004 13:18:54 -0000	1.17
+++ text.cpp	28 Apr 2004 14:58:24 -0000	1.18
@@ -221,22 +221,23 @@
 
 /* --- SCROLL TEXT FUNCTION --- */
 
-#define MAX_VEL 10
-#define SPEED   1
-#define SCROLL  60
+#define MAX_VEL     10
+#define SPEED_INC   1.0
+#define SCROLL      60
 #define ITEMS_SPACE 4
 
-void display_text_file(const std::string& file, const std::string& surface)
+void display_text_file(const std::string& file, const std::string& surface, float scroll_speed)
 {
   Surface* sur = new Surface(datadir + surface, IGNORE_ALPHA);
-  display_text_file(file, sur);
+  display_text_file(file, sur, scroll_speed);
   delete sur;
 }
 
-void display_text_file(const std::string& file, Surface* surface)
+void display_text_file(const std::string& file, Surface* surface, float scroll_speed)
 {
   int done;
-  int scroll, speed;
+  int scroll;
+  float speed;
   int y;
   int length;
   FILE* fi;
@@ -265,7 +266,7 @@
 
 
   scroll = 0;
-  speed = 2;
+  speed = scroll_speed;
   done = 0;
 
   length = names.num_items;
@@ -283,10 +284,10 @@
             switch(event.key.keysym.sym)
               {
               case SDLK_UP:
-                speed -= SPEED;
+                speed -= SPEED_INC;
                 break;
               case SDLK_DOWN:
-                speed += SPEED;
+                speed += SPEED_INC;
                 break;
               case SDLK_SPACE:
               case SDLK_RETURN:
@@ -321,19 +322,19 @@
         switch(names.item[i][0])
           {
           case ' ':
-            white_small_text->drawf(names.item[i]+1, 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
+            white_small_text->drawf(names.item[i]+1, 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
             y += white_small_text->h+ITEMS_SPACE;
             break;
           case '	':
-            white_text->drawf(names.item[i]+1, 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
+            white_text->drawf(names.item[i]+1, 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
             y += white_text->h+ITEMS_SPACE;
             break;
           case '-':
-            white_big_text->drawf(names.item[i]+1, 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
+            white_big_text->drawf(names.item[i]+1, 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
             y += white_big_text->h+ITEMS_SPACE;
             break;
           default:
-            blue_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
+            blue_text->drawf(names.item[i], 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
             y += blue_text->h+ITEMS_SPACE;
             break;
           }
@@ -341,10 +342,10 @@
 
       flipscreen();
 
-      if(60+screen->h+y-scroll < 0 && 20+60+screen->h+y-scroll < 0)
+      if(screen->h+y-scroll < 0 && 20+screen->h+y-scroll < 0)
         done = 1;
 
-      scroll += speed;
+      scroll += (int)speed;
       if(scroll < 0)
         scroll = 0;
 

Index: defines.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/defines.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- defines.h	27 Apr 2004 18:55:57 -0000	1.27
+++ defines.h	28 Apr 2004 14:58:24 -0000	1.28
@@ -89,6 +89,11 @@
 
 #define KICKING_TIME 200
 
+/* Scrolling text speed */
+
+#define SCROLL_SPEED_CREDITS 2.0
+#define SCROLL_SPEED_MESSAGE 1.0
+
 /* Debugging */
 
 #ifdef DEBUG

Index: text.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/text.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- text.h	27 Apr 2004 15:15:18 -0000	1.14
+++ text.h	28 Apr 2004 14:58:24 -0000	1.15
@@ -24,8 +24,8 @@
 #include <string>
 #include "texture.h"
 
-void display_text_file(const std::string& file, const std::string& surface);
-void display_text_file(const std::string& file, Surface* surface);
+void display_text_file(const std::string& file, const std::string& surface, float scroll_speed);
+void display_text_file(const std::string& file, Surface* surface, float scroll_speed);
 
 /* Kinds of texts. */
 enum {

Index: intro.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- intro.cpp	26 Apr 2004 17:35:08 -0000	1.18
+++ intro.cpp	28 Apr 2004 14:58:24 -0000	1.19
@@ -33,6 +33,6 @@
 
 void draw_intro()
 {
-display_text_file("intro.txt", "/images/background/arctis2.jpg");
+display_text_file("intro.txt", "/images/background/arctis2.jpg", SCROLL_SPEED_MESSAGE);
 }
 

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- title.cpp	28 Apr 2004 13:18:54 -0000	1.65
+++ title.cpp	28 Apr 2004 14:58:24 -0000	1.66
@@ -313,7 +313,7 @@
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_title);
+                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- worldmap.cpp	28 Apr 2004 14:02:02 -0000	1.62
+++ worldmap.cpp	28 Apr 2004 14:58:24 -0000	1.63
@@ -683,9 +683,9 @@
                     if (!level->extro_filename.empty())
                       { // Display final credits and go back to the main menu
                         display_text_file(level->extro_filename,
-                                          "/images/background/extro.jpg");
+                                          "/images/background/extro.jpg", SCROLL_SPEED_MESSAGE);
                         display_text_file("CREDITS",
-                                          "/images/background/oiltux.jpg");
+                                          "/images/background/oiltux.jpg", SCROLL_SPEED_CREDITS);
                         quit = true;
                       }
                   }

[Super-tux-commit] supertux/data intro.txt,1.2,1.3

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

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

Modified Files:
	intro.txt 
Log Message:
- fixed typo, and gwen/penny

Index: intro.txt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/intro.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- intro.txt	29 Apr 2004 00:53:19 -0000	1.2
+++ intro.txt	29 Apr 2004 00:53:58 -0000	1.3
@@ -1,16 +1,16 @@
--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,
@@ -18,5 +18,4 @@
 
 	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.

[Super-tux-commit] supertux/src gameloop.cpp,1.116,1.117 worldmap.cpp,1.64,1.65

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

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

Modified Files:
	gameloop.cpp worldmap.cpp 
Log Message:
- fixed align of lives display to handle >10 lives

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- worldmap.cpp	29 Apr 2004 00:15:11 -0000	1.64
+++ worldmap.cpp	29 Apr 2004 00:51:23 -0000	1.65
@@ -826,7 +826,7 @@
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
-      gold_text->draw(str, 585, 0);
+      gold_text->draw_align(str, 617, 0, A_RIGHT, A_TOP);
       tux_life->draw(565+(18*3), 0);
     }
   else

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- gameloop.cpp	29 Apr 2004 00:15:10 -0000	1.116
+++ gameloop.cpp	29 Apr 2004 00:51:21 -0000	1.117
@@ -692,7 +692,7 @@
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
-      gold_text->draw(str, 585, 20);
+      gold_text->draw_align(str, 617, 20, A_RIGHT, A_TOP);
       tux_life->draw(565+(18*3), 20);
     }
   else

[Super-tux-commit] supertux/src player.cpp,1.72,1.73 player.h,1.44,1.45

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

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

Modified Files:
	player.cpp player.h 
Log Message:
- removed auto-repeat of jump events, now one has to press again to jump and can't just hold button, makes the game a little bit more difficult, but removes the ugly situations with largetux stuck directly under a tile and bouncing up and down all the time

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- player.cpp	29 Apr 2004 00:15:10 -0000	1.72
+++ player.cpp	29 Apr 2004 00:43:06 -0000	1.73
@@ -371,7 +371,7 @@
 void
 Player::handle_vertical_input()
 {
-  if(input.up == DOWN)
+  if(input.up == DOWN && input.old_up == UP)
     {
       if (on_ground())
         {
@@ -410,6 +410,7 @@
     {
       handle_vertical_input();
     }
+  input.old_up = input.up;
 
   /* Shoot! */
 

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- player.h	29 Apr 2004 00:15:10 -0000	1.44
+++ player.h	29 Apr 2004 00:43:17 -0000	1.45
@@ -65,6 +65,7 @@
   int right;
   int left;
   int up;
+  int old_up;
   int down;
   int fire;
   int old_fire;

[Super-tux-commit] supertux/src badguy.cpp,1.58,1.59 gameloop.cpp,1.115,1.116 gameloop.h,1.47,1.48 music_manager.cpp,1.2,1.3 music_manager.h,1.1,1.2 player.cpp,1.71,1.72 player.h,1.43,1.44 special.cpp,1.38,1.39 text.cpp,1.18,1.19 worldmap.cpp,1.63,1.64

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

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

Modified Files:
	badguy.cpp gameloop.cpp gameloop.h music_manager.cpp 
	music_manager.h player.cpp player.h special.cpp text.cpp 
	worldmap.cpp 
Log Message:
<MatzeB> -updates the TODO file
<MatzeB> -should really fix the problems when picking up specials
<MatzeB> -should fix mriceblock not falling down
<MatzeB> -you can duck again while jumping
<MatzeB> -textscroller isn't framerate limited anymore
<MatzeB> -changes to the endsequence code, so that you can always hear the complete music single

grumbel: removed the duck while jumping thing, since that is reserved for the butt-jump

Index: text.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/text.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- text.cpp	28 Apr 2004 14:58:24 -0000	1.18
+++ text.cpp	29 Apr 2004 00:15:11 -0000	1.19
@@ -222,7 +222,7 @@
 /* --- SCROLL TEXT FUNCTION --- */
 
 #define MAX_VEL     10
-#define SPEED_INC   1.0
+#define SPEED_INC   0.01
 #define SCROLL      60
 #define ITEMS_SPACE 4
 
@@ -236,7 +236,7 @@
 void display_text_file(const std::string& file, Surface* surface, float scroll_speed)
 {
   int done;
-  int scroll;
+  float scroll;
   float speed;
   int y;
   int length;
@@ -266,13 +266,14 @@
 
 
   scroll = 0;
-  speed = scroll_speed;
+  speed = scroll_speed / 50;
   done = 0;
 
   length = names.num_items;
 
   SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
+  Uint32 lastticks = SDL_GetTicks();
   while(done == 0)
     {
       /* in case of input, exit */
@@ -322,19 +323,23 @@
         switch(names.item[i][0])
           {
           case ' ':
-            white_small_text->drawf(names.item[i]+1, 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
+            white_small_text->drawf(names.item[i]+1, 0, screen->h+y-int(scroll),
+                A_HMIDDLE, A_TOP, 1);
             y += white_small_text->h+ITEMS_SPACE;
             break;
           case '	':
-            white_text->drawf(names.item[i]+1, 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
+            white_text->drawf(names.item[i]+1, 0, screen->h+y-int(scroll),
+                A_HMIDDLE, A_TOP, 1);
             y += white_text->h+ITEMS_SPACE;
             break;
           case '-':
-            white_big_text->drawf(names.item[i]+1, 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
+            white_big_text->drawf(names.item[i]+1, 0, screen->h+y-int(scroll),
+                A_HMIDDLE, A_TOP, 3);
             y += white_big_text->h+ITEMS_SPACE;
             break;
           default:
-            blue_text->drawf(names.item[i], 0, screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
+            blue_text->drawf(names.item[i], 0, screen->h+y-int(scroll),
+                A_HMIDDLE, A_TOP, 1);
             y += blue_text->h+ITEMS_SPACE;
             break;
           }
@@ -345,11 +350,13 @@
       if(screen->h+y-scroll < 0 && 20+screen->h+y-scroll < 0)
         done = 1;
 
-      scroll += (int)speed;
+      Uint32 ticks = SDL_GetTicks();
+      scroll += speed * (ticks - lastticks);
+      lastticks = ticks;
       if(scroll < 0)
         scroll = 0;
 
-      SDL_Delay(35);
+      SDL_Delay(10);
     }
   string_list_free(&names);
 

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- player.h	26 Apr 2004 14:40:17 -0000	1.43
+++ player.h	29 Apr 2004 00:15:10 -0000	1.44
@@ -146,6 +146,7 @@
   void keep_in_bounds();
   bool on_ground();
   bool under_solid();
+  void grow();
   
 private:
   void handle_horizontal_input();

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- player.cpp	28 Apr 2004 14:12:37 -0000	1.71
+++ player.cpp	29 Apr 2004 00:15:10 -0000	1.72
@@ -455,11 +455,30 @@
       duck = false;
       base.y -= 32;
       base.height = 64;
-      old_base = previous_base = base;
     }
 }
 
 void
+Player::grow()
+{
+  if(size == BIG)
+    return;
+  
+  size = BIG;
+  base.height = 64;
+  base.y -= 32;
+  // eventually go in duck mode if there's no space
+  if(collision_object_map(base))
+    {
+      base.height = 32;
+      base.y += 32;
+      duck = true;
+    }
+
+  old_base = previous_base = base;
+}
+
+void
 Player::grabdistros()
 {
   /* Grab distros: */

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- special.cpp	28 Apr 2004 20:34:24 -0000	1.38
+++ special.cpp	29 Apr 2004 00:15:10 -0000	1.39
@@ -330,20 +330,13 @@
       if (kind == UPGRADE_GROWUP)
         {
           play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER);
-          pplayer->size = BIG;
-          pplayer->base.height = 64;
-	  pplayer->base.y -= 32;
+          pplayer->grow();
         }
       else if (kind == UPGRADE_ICEFLOWER)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+          pplayer->grow();
           pplayer->got_coffee = true;
-          if (pplayer->size == SMALL)
-            {
-              pplayer->size = BIG;
-              pplayer->base.height = 64;
-              pplayer->base.y -= 32;
-            }
         }
       else if (kind == UPGRADE_HERRING)
         {

Index: music_manager.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/music_manager.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- music_manager.h	24 Apr 2004 14:49:03 -0000	1.1
+++ music_manager.h	29 Apr 2004 00:15:10 -0000	1.2
@@ -38,7 +38,7 @@
   MusicRef load_music(const std::string& file);
   bool exists_music(const std::string& filename);
   
-  void play_music(const MusicRef& music);
+  void play_music(const MusicRef& music, int loops = -1);
   void halt_music();
 
   void enable_music(bool enable);

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- badguy.cpp	28 Apr 2004 21:23:14 -0000	1.58
+++ badguy.cpp	29 Apr 2004 00:15:10 -0000	1.59
@@ -205,11 +205,11 @@
 {
   Player& tux = *World::current()->get_tux();
 
-  if(dying == DYING_NOT)
+  if(mode != HELD)
     fall();
   
   /* Move left/right: */
-  if (mode == NORMAL || mode == KICK)
+  if (mode != HELD)
     {
       // move
       physic.apply(frame_ratio, base.x, base.y);

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- worldmap.cpp	28 Apr 2004 14:58:24 -0000	1.63
+++ worldmap.cpp	29 Apr 2004 00:15:11 -0000	1.64
@@ -681,7 +681,11 @@
                       }
 
                     if (!level->extro_filename.empty())
-                      { // Display final credits and go back to the main menu
+                      { 
+                        MusicRef theme =
+                          music_manager->load_music(datadir + "/music/theme.mod");
+                        music_manager->play_music(theme);
+                        // Display final credits and go back to the main menu
                         display_text_file(level->extro_filename,
                                           "/images/background/extro.jpg", SCROLL_SPEED_MESSAGE);
                         display_text_file("CREDITS",

Index: gameloop.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gameloop.h	26 Apr 2004 19:11:53 -0000	1.47
+++ gameloop.h	29 Apr 2004 00:15:10 -0000	1.48
@@ -59,7 +59,12 @@
 
   /** If true the end_sequence will be played, user input will be
       ignored while doing that */
-  bool end_sequence;
+  enum EndSequenceState {
+    NO_ENDSEQUENCE,
+    ENDSEQUENCE_RUNNING, // tux is running right
+    ENDSEQUENCE_WAITING  // waiting for the end of the music
+  };
+  EndSequenceState end_sequence;
   float last_x_pos;
 
   bool game_pause;

Index: music_manager.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/music_manager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- music_manager.cpp	25 Apr 2004 14:27:49 -0000	1.2
+++ music_manager.cpp	29 Apr 2004 00:15:10 -0000	1.3
@@ -82,7 +82,7 @@
 }
 
 void
-MusicManager::play_music(const MusicRef& musicref)
+MusicManager::play_music(const MusicRef& musicref, int loops)
 {
   if(!audio_device)
     return;
@@ -97,7 +97,7 @@
   current_music->refcount++;
   
   if(music_enabled)
-    Mix_PlayMusic(current_music->music, -1);
+    Mix_PlayMusic(current_music->music, loops);
 }
 
 void

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- gameloop.cpp	28 Apr 2004 17:27:14 -0000	1.115
+++ gameloop.cpp	29 Apr 2004 00:15:10 -0000	1.116
@@ -58,7 +58,7 @@
 GameSession* GameSession::current_ = 0;
 
 GameSession::GameSession(const std::string& subset_, int levelnb_, int mode)
-  : world(0), st_gl_mode(mode), levelnb(levelnb_), end_sequence(false),
+  : world(0), st_gl_mode(mode), levelnb(levelnb_), end_sequence(NO_ENDSEQUENCE),
     subset(subset_)
 {
   current_ = this;
@@ -77,7 +77,7 @@
 {
   game_pause   = false;
   exit_status  = NONE;
-  end_sequence = false;
+  end_sequence = NO_ENDSEQUENCE;
 
   fps_timer.init(true);
   frame_timer.init(true);
@@ -194,12 +194,13 @@
 void
 GameSession::process_events()
 {
-  if (end_sequence)
+  if (end_sequence != NO_ENDSEQUENCE)
     {
       Player& tux = *world->get_tux();
-          
+         
+      tux.input.fire  = UP;
       tux.input.left  = UP;
-      tux.input.right = DOWN; 
+      tux.input.right = DOWN;
       tux.input.down  = UP; 
 
       if (int(last_x_pos) == int(tux.base.x))
@@ -246,7 +247,7 @@
             }
         }
     }
-  else
+  else // normal mode
     {
       if(!Menu::current() && !game_pause)
         st_pause_ticks_stop();
@@ -417,19 +418,28 @@
   Tile* endtile = collision_goal(tux->base);
 
   // fallback in case the other endpositions don't trigger
-  if (tux->base.x >= endpos || (endtile && endtile->data >= 1)
-      || (end_sequence && !endsequence_timer.check()))
+  if (!end_sequence && tux->base.x >= endpos)
+    {
+      end_sequence = ENDSEQUENCE_WAITING;
+      last_x_pos = -1;
+      music_manager->play_music(level_end_song, 0);
+      endsequence_timer.start(7000);
+    }
+  else if(end_sequence && !endsequence_timer.check())
     {
       exit_status = LEVEL_FINISHED;
       return;
     }
+  else if(end_sequence == ENDSEQUENCE_RUNNING && endtile && endtile->data >= 1)
+    {
+      end_sequence = ENDSEQUENCE_WAITING;
+    }
   else if(!end_sequence && endtile && endtile->data == 0)
     {
-      end_sequence = true;
+      end_sequence = ENDSEQUENCE_RUNNING;
       last_x_pos = -1;
-      music_manager->halt_music();
-      music_manager->play_music(level_end_song);
-      endsequence_timer.start(5000); // 5 seconds until we finish the map
+      music_manager->play_music(level_end_song, 0);
+      endsequence_timer.start(7000); // 5 seconds until we finish the map
     }
   else if (!end_sequence && tux->is_dead())
     {
@@ -455,8 +465,6 @@
 void
 GameSession::action(double frame_ratio)
 {
-  check_end_conditions();
-  
   if (exit_status == NONE)
     {
       // Update Tux and the World
@@ -570,9 +578,10 @@
           while (frame_ratio > 0)
             {
               // Update the world
-              if (end_sequence)
+              check_end_conditions();
+              if (end_sequence == ENDSEQUENCE_RUNNING)
                 action(.5f);
-              else
+              else if(end_sequence == NO_ENDSEQUENCE)
                 action(1.0f);
               frame_ratio -= 1.0f;
             }

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

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

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

Modified Files:
	TODO 
Log Message:
<MatzeB> -updates the TODO file
<MatzeB> -should really fix the problems when picking up specials
<MatzeB> -should fix mriceblock not falling down
<MatzeB> -you can duck again while jumping
<MatzeB> -textscroller isn't framerate limited anymore
<MatzeB> -changes to the endsequence code, so that you can always hear the complete music single

grumbel: removed the duck while jumping thing, since that is reserved for the butt-jump

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TODO	27 Apr 2004 21:49:34 -0000	1.5
+++ TODO	29 Apr 2004 00:15:10 -0000	1.6
@@ -6,12 +6,14 @@
 
 These are mostly bugs:
 
-- supertux crashs from time to time
+- supertux crashs from time to time - fixed
 - 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
+- sometimes you die after being in pause modus and unpausing - still true?
+- sometimes the level restarts/you die after collecing a growup - fixed
 - mriceblock doesn't disapear after being kicked my another iceblock,
-  not sure when exactly it happens, might depend on direction or so
+  not sure when exactly it happens, might depend on direction or so - fixed
+- mriceblock doesn't fall down when being squished in the air - fixed
+- It's not possible to duck while jumping - fixed
+- Intro/Extro textspeed is CPU dependent - fixed
 - fadein/out for intro/extro would be nice
 
-

[Super-tux-commit] htdocs screenshots.xml,NONE,1.1 Makefile,1.10,1.11 submenu.xml,1.3,1.4

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

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

Modified Files:
	Makefile submenu.xml 
Added Files:
	screenshots.xml 
Log Message:
Added a screenshots section!
Ingo, please reflect the changes into the webpage.

--- NEW FILE: screenshots.xml ---
<?xml version="1.0"?>
<page title="SuperTux">

  <section title="Screenshots">
    <p>
      Welcome to our SuperTux screenshots album!
    </p>

    <p>
      Milestone1(0.1) shots will be here pretty soon! This version will be released any time now ;)
    </p>

    <p>
      Some shots from our lastest work (0.0.6), released at March 15, 2004.
      Basically this was a code clean-up version. Features a leveleditor and an OpenGL front-end. Menu as improved a lot, and fonts were also remade.
    </p>

    <screenshot file="images/menu-006" />
    <screenshot file="images/game-006" />
    <screenshot file="images/leveleditor-006" />

    <p>
      A couple of shots from our 0.0.5 release, released at December 29, 2003.
      Graphics were improved a lot. Also this version features a menu, and internal clean-ups have started.
    </p>

    <screenshot file="images/intro-005" />
    <screenshot file="images/game-005" />

    <p>
      Wow! These are really ancients shots from versions prior to 0.0.5.
      Graphics were a bit ugly, but it was already playble and had a SuperMario1 feel.
    </p>
    
    <screenshot file="images/game1-004" />
    <screenshot file="images/game2-004" />
    <screenshot file="images/game3-004" />
  </section>

</page>

Index: Makefile
===================================================================
RCS file: /cvsroot/super-tux/htdocs/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	28 Apr 2004 21:32:31 -0000	1.10
+++ Makefile	29 Apr 2004 00:11:43 -0000	1.11
@@ -2,6 +2,7 @@
   welcome.html \
   download.html \
   authors.html \
+  screemshots.html \
   \
   development/index.html   \
   development/map.html     \

Index: submenu.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/submenu.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- submenu.xml	28 Apr 2004 14:34:05 -0000	1.3
+++ submenu.xml	29 Apr 2004 00:11:44 -0000	1.4
@@ -3,5 +3,6 @@
 <submenu>
   <item file="index.html">Intro</item>
   <item file="authors.html">Authors</item>
+  <item file="screenshots.html">Screenshots</item>
   <item file="download.html">Download</item>
 </submenu>

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

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

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

Added Files:
	game-005.png game-005_small.png game-006.png 
	game-006_small.png game1-004.png game1-004_small.png 
	game2-004.png game2-004_small.png game3-004.png 
	game3-004_small.png intro-005.png intro-005_small.png 
	leveleditor-006.png leveleditor-006_small.png menu-006.png 
	menu-006_small.png 
Log Message:
Added a screenshots section!
Ingo, please reflect the changes into the webpage.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Super-tux-commit] supertux/data/music fortress-fast.mod,1.4,1.5 fortress.mod,1.4,1.5 Mortimers_chipdisko-fast.mod,1.2,1.3 Mortimers_chipdisko.mod,1.2,1.3 SALCON-fast.MOD,1.2,1.3 SALCON.MOD,1.2,1.3 theme.mod,1.2,1.3

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

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

Modified Files:
	fortress-fast.mod fortress.mod Mortimers_chipdisko-fast.mod 
	Mortimers_chipdisko.mod SALCON-fast.MOD SALCON.MOD theme.mod 
Log Message:
Marek update for musics.
It looks like due to a SDL_mixer bug, all musics loaded need to have the same channel.

Index: fortress-fast.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/fortress-fast.mod,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsjDIunE and /tmp/cvsy0aclY differ

Index: Mortimers_chipdisko.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/Mortimers_chipdisko.mod,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs2VUMUb and /tmp/cvsWJRr7v differ

Index: SALCON.MOD
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/SALCON.MOD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsPGxh5z and /tmp/cvskMI0CU differ

Index: fortress.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/fortress.mod,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvs5ALoBH and /tmp/cvs0inSj2 differ

Index: Mortimers_chipdisko-fast.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/Mortimers_chipdisko-fast.mod,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsQWualT and /tmp/cvsQnGD7d differ

Index: theme.mod
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/theme.mod,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsSzDer1 and /tmp/cvsSXB0nm differ

Index: SALCON-fast.MOD
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/music/SALCON-fast.MOD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsruoofi and /tmp/cvs9NJ1iD differ

[Super-tux-commit] htdocs/milestone1/images actions10.jpg,NONE,1.1 actions8.jpg,NONE,1.1 actions9.jpg,NONE,1.1 fish.png,NONE,1.1 flyingsnow.png,NONE,1.1 jumpy.png,NONE,1.1 jumpy2.png,NONE,1.1 mrbomb2.png,NONE,1.1 mriceblock2.png,NONE,1.1 spiky2.png,NONE,1.1 spiky3.png,NONE,1.1

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

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

Added Files:
	actions10.jpg actions8.jpg actions9.jpg fish.png 
	flyingsnow.png jumpy.png jumpy2.png mrbomb2.png 
	mriceblock2.png spiky2.png spiky3.png 
Log Message:
stuff

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

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

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

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

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

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

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

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

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

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

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

[Super-tux-commit] htdocs Makefile,1.9,1.10 download.xml,1.2,1.3

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

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

Modified Files:
	Makefile download.xml 
Log Message:
- removed patent banner

Index: download.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/download.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- download.xml	16 Mar 2004 14:12:52 -0000	1.2
+++ download.xml	28 Apr 2004 21:32:31 -0000	1.3
@@ -2,9 +2,9 @@
 <page title="SuperTux">
   <section title="SuperTux">
     <p>
-      Lastest version of SuperTux is 0.0.5, released in December 23, 2003.
+      Lastest version of SuperTux is 0.0.6, released in March 15, 2004.
       Get it from: <a
-href="http://prdownloads.sourceforge.net/super-tux/supertux-0.0.5.tar.bz2?download">here</a>.
+        href="http://prdownloads.sourceforge.net/super-tux/supertux-0.0.6.tar.bz2?download">here</a>.
     </p>
     <p>
       The development version can be getted via CVS with the following

Index: Makefile
===================================================================
RCS file: /cvsroot/super-tux/htdocs/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	28 Apr 2004 14:34:05 -0000	1.9
+++ Makefile	28 Apr 2004 21:32:31 -0000	1.10
@@ -1,5 +1,5 @@
 HTMLOUT = \
-  index.html \
+  welcome.html \
   download.html \
   authors.html \
   \
@@ -50,6 +50,7 @@
 	cp -v default.css output/milestone1/
 	cp -v milestone1/images/*.jpg output/milestone1/images/
 	cp -v milestone1/images/*.png output/milestone1/images/
+	cp -v milestone1/images/*.gif output/milestone1/images/
 	cp -v development/images/*.jpg output/development/images/
 	cp -v development/images/*.png output/development/images/
 

[Super-tux-commit] htdocs/milestone1 enemies.xml,1.3,1.4 gameplay.xml,1.3,1.4 menu.xml,1.1,1.2

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

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

Modified Files:
	enemies.xml gameplay.xml menu.xml 
Log Message:
- removed patent banner

Index: menu.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/milestone1/menu.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- menu.xml	28 Feb 2004 23:23:49 -0000	1.1
+++ menu.xml	28 Apr 2004 21:32:32 -0000	1.2
@@ -6,5 +6,4 @@
   <item file="levels.html">Levels</item>
   <item file="tilesets.html">Tilesets</item>
   <item file="enemies.html">Enemies</item>
-  <item file="download.html">Download</item>
 </menu>

Index: gameplay.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/milestone1/gameplay.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gameplay.xml	6 Mar 2004 22:25:13 -0000	1.3
+++ gameplay.xml	28 Apr 2004 21:32:32 -0000	1.4
@@ -17,6 +17,8 @@
         <li>on-enemy jump    (at least 1 tile width, ie. so that you can jump from one enemy to the next)</li>
       </ul>
       <img src="images/actions8.jpg" /><br />
+      <img src="images/actions9.jpg" /><br />
+      <img src="images/actions10.jpg" /><br />
     </subsection>
 
     <subsection title="Interaction with Enemies">

Index: enemies.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/milestone1/enemies.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- enemies.xml	6 Mar 2004 22:25:13 -0000	1.3
+++ enemies.xml	28 Apr 2004 21:32:32 -0000	1.4
@@ -21,7 +21,7 @@
     </subsection>
 
     <subsection title="Mr. Bomb">
-      <picture file="images/mrbomb.png">
+      <picture file="images/mrbomb2.png">
         Pretty much every game has some kind of exploding enemy, so
         SuperTux should have something like that too. For the moment
         this should be our Mr. Bomb, a plain and simple Bomb running
@@ -30,7 +30,7 @@
     </subsection>
 
     <subsection title="Mr. IceBlock">
-      <picture file="images/mriceblock.png">
+      <picture file="images/mriceblock2.png">
         Mr. IceBlock could be the most basic enemy in SuperTux, he
         just walks around without having any 'special attacks' or
         something like that. Jumping on Mr. IceBlock should flatten
@@ -45,6 +45,18 @@
       </picture>
     </subsection>
 
+    <subsection title="Bouncing Snowball">
+      <picture file="images/rollsnow.gif">
+        A bouncing/rolling ball that bounces around on the playfield
+      </picture>
+    </subsection>
+
+    <subsection title="Flying Snowball">
+      <picture file="images/flyingsnow.png">
+        Flies vertically up and down a bit
+      </picture>
+    </subsection>
+
     <subsection title="Mr. Crystal">
       <picture file="images/mrcrystal.png">
         When Tux jumps on MrCrystal, MrCrystal will break into pieces.
@@ -52,12 +64,24 @@
     </subsection>
 
     <subsection title="Spiky">
-      <picture file="images/spiky.png">
+      <picture file="images/spiky3.png">
         Spiky has spikes which makes it impossible for Tux to kill him
         by jumping on him.
       </picture>
     </subsection>
 
+    <subsection title="Jumpy Spiky">
+      <picture file="images/jumpy2.png">
+        Moneybag replacement, jumps up and down and is not killable by jumping
+      </picture>
+    </subsection>
+
+    <subsection title="Fish">
+      <picture file="images/fish.png">
+        Jumps up and down
+      </picture>
+    </subsection>
+
     <subsection title="Unsorted">
       <screenshot file="images/enemies" />
     </subsection>

[Super-tux-commit] supertux/data/images/tilesets run1.png,NONE,1.1 run2.png,NONE,1.1 run3.png,NONE,1.1 run4.png,NONE,1.1 supertux.stgt,1.22,1.23

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

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

Modified Files:
	supertux.stgt 
Added Files:
	run1.png run2.png run3.png run4.png 
Log Message:
- fixed author of level7
- added 'tutorial' for run

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

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

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

--- NEW FILE: run4.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.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- supertux.stgt	27 Apr 2004 21:33:28 -0000	1.22
+++ supertux.stgt	28 Apr 2004 21:27:15 -0000	1.23
@@ -474,5 +474,18 @@
 (tile (id 135)
       (solid #f)
       (images "nolok2.png"))
+
+(tile (id 136)
+       (solid #f)
+       (images "run1.png"))
+(tile (id 137)
+       (solid #f)
+       (images "run2.png"))
+(tile (id 138)
+       (solid #f)
+       (images "run3.png"))
+(tile (id 139)
+       (solid #f)
+       (images "run4.png"))
  )