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

[Super-tux-commit] supertux/src leveleditor.cpp,1.161,1.162

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

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

Modified Files:
	leveleditor.cpp 
Log Message:
Bugfix: Not current tilemaps are drawn semi-transparently.

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- leveleditor.cpp	21 Oct 2004 18:03:23 -0000	1.161
+++ leveleditor.cpp	21 Oct 2004 22:04:48 -0000	1.162
@@ -681,12 +681,12 @@
       (*i)->draw(context);
 
       context.pop_transform();
+      continue;
       }
     Background* background = dynamic_cast<Background*> (*i);
     if(background)
       {  // don't resize background
       context.push_transform();
-      context.set_translation(scroll);
       context.set_zooming(1.0);
       (*i)->draw(context);
       context.pop_transform();

[Super-tux-commit] supertux/src badguy.cpp,1.132,1.133

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

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

Modified Files:
	badguy.cpp 
Log Message:
Forgot to check for enemies on top or under screen. This should do the trick.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- badguy.cpp	21 Oct 2004 18:34:13 -0000	1.132
+++ badguy.cpp	21 Oct 2004 21:40:33 -0000	1.133
@@ -210,6 +210,8 @@
   frozen_timer.init(true);
   timer.init(true);
 
+  seen = true;
+
   dir = activation_dir;
   float dirsign = activation_dir == LEFT ? -1 : 1;
 
@@ -257,11 +259,6 @@
     base.width = 66;
     base.height = 66;
   }
-
-  base.x = start_position.x;
-  base.y = start_position.y;  
-  old_base = base;
-  seen = true;
 }
 
 Surface*
@@ -873,6 +870,18 @@
         start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
         start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
       activate(LEFT);
+    else if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
+        start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE &&
+        ((start_position.y > scroll_y + screen->h &&
+        start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) ||
+        (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+        start_position.y < scroll_y)))
+        {
+        if(start_position.x < scroll_x - screen->w/2)
+          activate(RIGHT);
+        else
+          activate(LEFT);
+        }
     /* Special case for badguys on start of the level.
      * If in the future, it's possible to set Tux start pos, this case
      * should contemplate that. */

[Super-tux-commit] supertux/data extro.txt,1.5,1.6 intro.txt,1.5,1.6

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

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

Modified Files:
	extro.txt intro.txt 
Log Message:
- Italian translations by Iknos

Index: intro.txt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/intro.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intro.txt	10 Jul 2004 14:07:33 -0000	1.5
+++ intro.txt	21 Oct 2004 19:16:43 -0000	1.6
@@ -46,4 +46,28 @@
 	O Tux olha e vê a fortaleza de Nolok
 	ao longe. Determinado em salvar a sua
 	amada Penny, ele inicia a sua viagem.")
+
+; Italian (European) by Federico Asara
+    (text-it_IT "-Penny viene catturata!
+
+	Tux e Penny stavano facendo un bel picnic
+	 nelle distese ghiacciate dell'Antarctico.
+	All'improvviso, una creatura salto fuori
+	da un cespuglio ghiacciato, ci fu un lampo 
+	di luce, e Tux svenne!
+
+	Quando Tux si risveglia, nota che Penny
+	e' scomparsa. Al suo posto giace una
+	lettera. \"Tux, mio arci-nemico!\" - c'e' 
+	scritto nella lettera. \"Ho catturato
+	la tua cara Penny e l'ho portata nella mia
+	fortezza. La strada e' piena di miei 
+	servitori. Percio' arrenditi e non pensare
+	neanche di riuscire a salvarla, non
+	hai alcuna possibilita'! -Nolok\"
+
+	Tux vede la fortezza di Nolok in 
+	lontananza. Determinato a salvare la sua
+	amata Penny, comincia il suo viaggio.")
+	
   )

Index: extro.txt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/extro.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- extro.txt	16 Jul 2004 19:23:02 -0000	1.5
+++ extro.txt	21 Oct 2004 19:16:43 -0000	1.6
@@ -72,4 +72,39 @@
 	O Tux corre para fora da fortaleza, com o
 	mapa na mão. Não, ele decide, não vou
 	desistir. A Penny está a contar com ele.")
+	
+; Italian (European) by Federico Asara  
+  (text "-Entrando nella sala del trono di Nolok!
+
+	Tux entro' correndo nella sala del trono di Nolok
+	cercando disperatamente la sua amata.
+	Ma lì non trovo' ne' lei ne' Nolok,
+	trovando invece un'altra nota.
+
+	\"Ben fatto, Tux, ben fatto. Se starai
+	leggendo questa nota, avrai rimosso il
+	mio controllo da questa fortezza ghiacciata.
+	Ma come puoi vedere, la tua cara Penny 
+	non e' qui. Non sei arrivato a pensare 
+	che questa e' una delle mie tante fortezze,
+	sparse per tutte le terre!
+
+	\"Tux, la tua ambizione e' onorabile, ma
+	anche futile. Per ogni mia fortezza
+	che conquisterai, io scappero' in un'altra,
+	e portero' Penny con me. Dai, non fare
+	lo stupido... e' meglio se ti arrendi
+	gia' da ora.\"
+
+	Tux stava tristemente uscendo dalla sala,
+	quando egli senti' qualcosa sotto il suo 
+	piede... una busta, indirizzata a lui! 
+	Dentro c'era un abbozzo di mappa con 
+	fortezze in varie terre. Nell'angolo della
+	mappa c'era la firma di Penny, un disegno
+	del suo fiore ghiacciato.
+	
+	Tux usci' correndo dalla fortezza, portando
+	con se la mappa. No, ormai ha deciso, lui 
+	non si arrendera'. Penny si fida di lui!")
   )

[Super-tux-commit] supertux/po it.po,1.3,1.4

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

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

Modified Files:
	it.po 
Log Message:
- Italian translations by Iknos

Index: it.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/it.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- it.po	20 Oct 2004 20:41:33 -0000	1.3
+++ it.po	21 Oct 2004 19:16:44 -0000	1.4
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-10-20 21:58+0200\n"
+"POT-Creation-Date: 2004-10-20 14:06-0600\n"
 "PO-Revision-Date: 2004-10-20 22:42+0200\n"
 "Last-Translator: Iknos <ze...@em...>\n"
 "Language-Team:  <it...@li...>\n"
@@ -539,7 +539,7 @@
 
 #: src/statistics.cpp:117
 msgid "Max score:"
-msgstr "Punteggio max:"
+msgstr "Punti max:"
 
 #: src/statistics.cpp:137
 msgid "Max coins collected:"
@@ -556,7 +556,7 @@
 #: src/statistics.cpp:170
 #, c-format
 msgid "Max score:             %d"
-msgstr "Max punteggio:         %d"
+msgstr "Max punti:            %d"
 
 #: src/statistics.cpp:176
 #, c-format
@@ -731,4 +731,3 @@
 #: lib/gui/menu.cpp:269
 msgid "Left Alt"
 msgstr "Alt sinistro"
-

[Super-tux-commit] supertux/src badguy.cpp,1.131,1.132

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

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

Modified Files:
	badguy.cpp 
Log Message:
Bugfix: enemies below half the screen were not appearing and were causing problems at level begin.
Dunno how did this bug only showed up after my changes, since it doesn't seem to be related.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- badguy.cpp	21 Oct 2004 18:03:22 -0000	1.131
+++ badguy.cpp	21 Oct 2004 18:34:13 -0000	1.132
@@ -159,13 +159,12 @@
 void
 BadGuy::init()
 {
-  base.x = 0;
-  base.y = 0;
+  base.x = start_position.x;
+  base.y = start_position.y;
   base.width  = 32;
   base.height = 32;
   
   mode     = NORMAL;
-  dying    = DYING_NOT;
   old_base = base;
   dir      = LEFT;
   seen     = false;
@@ -177,8 +176,6 @@
 
   specs = badguyspecs_manager->load(badguykind_to_string(kind));
 
-  set_action("hide", "hide");
-
   // if we're in a solid tile at start correct that now
   if(Sector::current()) {
   if(kind != BAD_FLAME && kind != BAD_FISH && kind != BAD_FLAMEFISH && collision_object_map(base)) 
@@ -869,12 +866,12 @@
     if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
         start_position.x < scroll_x - base.width &&
         start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-        start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE)
+        start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
       activate(RIGHT);
     else if (start_position.x > scroll_x + screen->w &&
         start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE &&
         start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-        start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE)
+        start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
       activate(LEFT);
     /* Special case for badguys on start of the level.
      * If in the future, it's possible to set Tux start pos, this case
@@ -962,6 +959,9 @@
 void
 BadGuy::draw(DrawingContext& context)
 {
+  if(!seen)
+    return;
+
   if((dir == LEFT && action_left == "hide") ||
      (dir == RIGHT && action_right == "hide"))
     return;
@@ -1217,6 +1217,9 @@
 void
 BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
 {
+  if(!seen)
+    return;
+
   BadGuy* pbad_c    = NULL;
   Bullet* pbullet_c = NULL;
 

[Super-tux-commit] supertux/src sector.h,1.16,1.17 sector.cpp,1.32,1.33 badguy.cpp,1.130,1.131 leveleditor.cpp,1.160,1.161

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

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

Modified Files:
	sector.h sector.cpp badguy.cpp leveleditor.cpp 
Log Message:
Badguys from the start of the level were not appearing. Fixed.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- badguy.cpp	19 Oct 2004 17:54:24 -0000	1.130
+++ badguy.cpp	21 Oct 2004 18:03:22 -0000	1.131
@@ -161,8 +161,8 @@
 {
   base.x = 0;
   base.y = 0;
-  base.width  = 0;
-  base.height = 0;
+  base.width  = 32;
+  base.height = 32;
   
   mode     = NORMAL;
   dying    = DYING_NOT;
@@ -188,20 +188,6 @@
       while(collision_object_map(base))
         --base.y;
     }
-
-  if(Sector::current()->camera) {
-    Vector scroll = Sector::current()->camera->get_translation();
-
-    if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE &&
-        start_position.x < scroll.x + screen->w + X_OFFSCREEN_DISTANCE &&
-        start_position.y > scroll.y - Y_OFFSCREEN_DISTANCE &&
-        start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) {
-      activate(LEFT);
-    }
-  } } else {
-    if(start_position.x >= 0 && start_position.x < screen->w
-        && start_position.y >= 0 && start_position.y < screen->h)
-      activate(LEFT);
   }
 }
 
@@ -229,7 +215,7 @@
 
   dir = activation_dir;
   float dirsign = activation_dir == LEFT ? -1 : 1;
-  
+
   set_action("left", "right");
   if(kind == BAD_MRBOMB) {
     physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
@@ -772,14 +758,6 @@
     check_horizontal_bump();
 
   fall();
-#if 0
-  // jump when we're about to fall
-  if (physic.get_velocity_y() == 0 && 
-          !issolid(base.x+base.width/2, base.y + base.height)) {
-    physic.enable_gravity(true);
-    physic.set_velocity_y(2);
-  }
-#endif
 
   physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
@@ -794,6 +772,13 @@
 
   fall();
 
+  // jump when we're about to fall
+  if (physic.get_velocity_y() == 0 && 
+          !issolid(base.x+base.width/2, base.y + base.height)) {
+    physic.enable_gravity(true);
+    physic.set_velocity_y(2);
+  }
+
   physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
   if (dying != DYING_FALLING)
     collision_swept_object_map(&old_base,&base);
@@ -876,37 +861,44 @@
          kill_me(0);
       }
 
-  if(!seen) {
-    /* activate badguys if they're just inside the offscreen_distance around the
-     * screen. Don't activate them inside the screen, since that might have the
-     * effect of badguys suddenly popping up from nowhere
+  if(!seen)
+    {
+    /* Activate badguys if they're just around the screen to avoid
+     * the effect of having badguys suddenly popping up from nowhere.
      */
     if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
-        start_position.x < scroll_x - base.width)
+        start_position.x < scroll_x - base.width &&
+        start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+        start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE)
       activate(RIGHT);
-    else if(start_position.x > scroll_y - Y_OFFSCREEN_DISTANCE &&
-        start_position.y < scroll_y - base.height)
-      activate(LEFT);
-    else if(start_position.x > scroll_x + screen->w &&
-        start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE)
+    else if (start_position.x > scroll_x + screen->w &&
+        start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE &&
+        start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+        start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE)
       activate(LEFT);
-    else if(start_position.y > scroll_y + screen->h &&
-        start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
+    /* Special case for badguys on start of the level.
+     * If in the future, it's possible to set Tux start pos, this case
+     * should contemplate that. */
+    else if (start_position.x > 0 && start_position.x < screen->w &&
+             start_position.y > 0 && start_position.y < screen->h)
       activate(LEFT);
-  } else {
+    }
+  else
+    {
     if(base.x + base.width < scroll_x - X_OFFSCREEN_DISTANCE*4
       || base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE*4
       || base.y + base.height < scroll_y - Y_OFFSCREEN_DISTANCE*4
-      || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4) {
+      || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4)
+      {
       seen = false;
       if(dying != DYING_NOT)
         remove_me();
+      }
     }
-  }
-  
+
   if(!seen)
     return;
-  
+
   switch (kind)
     {
     case BAD_MRICEBLOCK:
@@ -1007,7 +999,7 @@
   else
     {
       // FIXME: Using the image size for the physics and collision is
-      // a bad idea, since images should always overlap there physical
+      // a bad idea, since images should always overlap their physical
       // representation
       if(left != 0) {
         if(base.width == 0 && base.height == 0) {
@@ -1205,7 +1197,7 @@
 void
 BadGuy::explode(bool right_way)
 {
-  BadGuy *badguy = Sector::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
+  BadGuy *badguy = Sector::current()->add_bad_guy(base.x, base.y, BAD_BOMB, true);
   if(right_way)
     {
     badguy->timer.start(0);

Index: sector.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sector.h	23 Sep 2004 17:47:46 -0000	1.16
+++ sector.h	21 Oct 2004 18:03:22 -0000	1.17
@@ -107,7 +107,7 @@
       const Vector& movement, Tile* tile);
   void add_bouncy_brick(const Vector& pos);
                                                                                 
-  BadGuy* add_bad_guy(float x, float y, BadGuyKind kind);
+  BadGuy* add_bad_guy(float x, float y, BadGuyKind kind, bool activate);
                                                                                 
   void add_upgrade(const Vector& pos, Direction dir, UpgradeKind kind);
   bool add_bullet(const Vector& pos, float xm, Direction dir);

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sector.cpp	23 Sep 2004 17:47:49 -0000	1.32
+++ sector.cpp	21 Oct 2004 18:03:22 -0000	1.33
@@ -701,10 +701,12 @@
 }
 
 BadGuy*
-Sector::add_bad_guy(float x, float y, BadGuyKind kind)
+Sector::add_bad_guy(float x, float y, BadGuyKind kind, bool activate)
 {
   BadGuy* badguy = new BadGuy(kind, x, y);
   add_object(badguy);
+  if(activate)
+    badguy->activate(LEFT);
   return badguy;
 }
                                                                                 

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- leveleditor.cpp	19 Oct 2004 16:27:50 -0000	1.160
+++ leveleditor.cpp	21 Oct 2004 18:03:23 -0000	1.161
@@ -132,7 +132,7 @@
 
   BadGuyKind kind = BadGuyKind(i);
   BadGuy badguy(kind, 0,0);
-//  badguy.activate(LEFT);
+  badguy.activate(LEFT);
 
   Surface *img = badguy.get_image();
   tiles_board->add_button(Button(img, "", SDLKey(SDLK_1+i)), -(i+1));
@@ -623,7 +623,7 @@
           {
           BadGuyKind kind = BadGuyKind((-id)-1);
           BadGuy badguy(kind, 0,0);
-//          badguy.activate(LEFT);
+          badguy.activate(LEFT);
           Surface *img = badguy.get_image();
 
           context.draw_surface(img, Vector(event.button.x - 8,
@@ -786,8 +786,8 @@
 for(Sector::GameObjects::iterator i = sector->gameobjects.begin(); i != sector->gameobjects.end(); i++)
   {
   BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
-//  if(badguy)
-//    badguy->activate(LEFT);
+  if(badguy)
+    badguy->activate(LEFT);
 
   TileMap* tilemap = dynamic_cast<TileMap*> (*i);
   if(tilemap)
@@ -869,7 +869,7 @@
   else if(newtile == OBJ_DOOR)
     sector->add_object(new Door(x, y));
   else
-    sector->add_object(new BadGuy(BadGuyKind((-newtile)-1), x, y));
+    sector->add_bad_guy(x, y, BadGuyKind((-newtile)-1), true);
 
   sector->update_game_objects();
   }

[Super-tux-commit] supertux/data/levels/test level11.stl,1.5,1.6

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

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

Modified Files:
	level11.stl 
Log Message:
Fixed level to be "executable".

Index: level11.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/test/level11.stl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- level11.stl	9 Jun 2004 17:04:13 -0000	1.5
+++ level11.stl	21 Oct 2004 17:56:01 -0000	1.6
@@ -10,7 +10,7 @@
     (camera
       (mode "normal")
     )
-    (playerspawn
+    (spawn-points
       (name "main")
       (x 100)
       (y 170)
@@ -90,7 +90,7 @@
       (sector "main")
       (spawnpoint "main")
     )
-    (playerspawn
+    (spawn-points
       (name "main")    
       (x 300)
       (y 170)

[Super-tux-commit] supertux/src worldmap.cpp,1.124,1.125

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

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

Modified Files:
	worldmap.cpp 
Log Message:
Bugfix: only level 1 title and statistics were being displayed in worldmap.

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- worldmap.cpp	6 Oct 2004 21:37:50 -0000	1.124
+++ worldmap.cpp	21 Oct 2004 17:08:17 -0000	1.125
@@ -1143,16 +1143,17 @@
         {
           if (i->pos == tux->get_tile_pos())
             {
-                if(i->title == "")
-                  get_level_title(*i);
+              if(i->title == "")
+                get_level_title(*i);
 
-                context.draw_text(white_text, i->title, 
-                    Vector(screen->w/2, screen->h - white_text->get_height() - 30),
-                    CENTER_ALLIGN, LAYER_FOREGROUND1);
+              context.draw_text(white_text, i->title, 
+                  Vector(screen->w/2,
+                         screen->h - white_text->get_height() - 30),
+                  CENTER_ALLIGN, LAYER_FOREGROUND1);
 
-                i->statistics.draw_worldmap_info(context);
-                }
+              i->statistics.draw_worldmap_info(context);
               break;
+            }
         }
       for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
         {
@@ -1161,7 +1162,8 @@
                /* Display an in-map message in the map, if any as been selected */
               if(!i->map_message.empty() && !i->passive_message)
                 context.draw_text(gold_text, i->map_message, 
-                    Vector(screen->w/2, screen->h - white_text->get_height() - 60),
+                    Vector(screen->w/2,
+                           screen->h - white_text->get_height() - 60),
                     CENTER_ALLIGN, LAYER_FOREGROUND1);
               break;
             }

[Super-tux-commit] supertux/lib/video surface.h,1.7,1.8 surface.cpp,1.11,1.12

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

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

Modified Files:
	surface.h surface.cpp 
Log Message:
Apply filters when reloading Surfaces.
Fixes bug that after changing video mode, player only looked right and enemies left.

Index: surface.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface.h	19 Oct 2004 17:45:38 -0000	1.7
+++ surface.h	20 Oct 2004 21:08:50 -0000	1.8
@@ -72,6 +72,10 @@
       ConstructorType type;
       SDL_Surface* surface;
       std::string file;
+
+      struct Filter { int type; Color color; };
+      std::vector<Filter> applied_filters;
+
       bool use_alpha;
       int x;
       int y;

Index: surface.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- surface.cpp	19 Oct 2004 17:45:38 -0000	1.11
+++ surface.cpp	20 Oct 2004 21:08:51 -0000	1.12
@@ -194,12 +194,21 @@
   {
     w = impl->w;
     h = impl->h;
+    for(std::vector<SurfaceData::Filter>::iterator i =
+        data.applied_filters.begin(); i != data.applied_filters.end();
+        i++)
+      impl->apply_filter(i->type, i->color);
   }
 }
 
 void Surface::apply_filter(int filter, Color color)
 {
 impl->apply_filter(filter, color);
+
+SurfaceData::Filter apply_filter;
+apply_filter.type = filter;
+apply_filter.color = color;
+data.applied_filters.push_back(apply_filter);
 }
 
 Surface::~Surface()

[Super-tux-commit] supertux/po it.po,1.2,1.3

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

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

Modified Files:
	it.po 
Log Message:
updated Italian translation

Index: it.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/it.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- it.po	20 Oct 2004 20:06:18 -0000	1.2
+++ it.po	20 Oct 2004 20:41:33 -0000	1.3
@@ -1,14 +1,14 @@
-# translation of supertux.po to 
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR SuperTux Development Team.
+# translation of supertux.pot to Italian
+# This file is distributed under the same license as the supertux package.
+# Copyright (C) 2004 SuperTux Development Team.
 # Iknos <ze...@em...>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: supertux\n"
+"Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
 "POT-Creation-Date: 2004-10-20 21:58+0200\n"
-"PO-Revision-Date: 2004-10-19 22:01+0200\n"
+"PO-Revision-Date: 2004-10-20 22:42+0200\n"
 "Last-Translator: Iknos <ze...@em...>\n"
 "Language-Team:  <it...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@
 
 #: src/gameloop.cpp:850 src/worldmap.cpp:1111
 msgid "SCORE"
-msgstr "PUNTEGGIO"
+msgstr "PUNTI"
 
 #: src/gameloop.cpp:855
 msgid "Press ESC To Return"
@@ -68,7 +68,7 @@
 #: src/gameloop.cpp:919
 #, c-format
 msgid "SCORE: %d"
-msgstr "PUNTEGGIO: %d"
+msgstr "PUNTI: %d"
 
 #: src/gameloop.cpp:922 src/worldmap.cpp:955
 #, c-format
@@ -242,7 +242,7 @@
 # Questo e' l'editor di livelli integrato. E' stato costruito per essere intuitivo\n
 # e semplice da usare.\n
 # \n
-# Per aprire un livello, per prima cosa 
+# Per aprire un livello, per prima cosa
 #: src/leveleditor.cpp:921
 msgid ""
 "This is the built-in level editor. It's aim is to be intuitive\n"
@@ -731,3 +731,4 @@
 #: lib/gui/menu.cpp:269
 msgid "Left Alt"
 msgstr "Alt sinistro"
+

[Super-tux-commit] supertux/po it.po,1.1,1.2

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

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

Modified Files:
	it.po 
Log Message:
updated Italian translation

Index: it.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/it.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it.po	20 Oct 2004 17:39:09 -0000	1.1
+++ it.po	20 Oct 2004 20:06:18 -0000	1.2
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: supertux\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-10-19 22:27+0200\n"
+"POT-Creation-Date: 2004-10-20 21:58+0200\n"
 "PO-Revision-Date: 2004-10-19 22:01+0200\n"
 "Last-Translator: Iknos <ze...@em...>\n"
 "Language-Team:  <it...@li...>\n"
@@ -89,7 +89,7 @@
 
 #: src/leveleditor.cpp:70 src/leveleditor.cpp:80 src/misc.cpp:125
 #: src/misc.cpp:136 src/misc.cpp:149 src/misc.cpp:160 src/title.cpp:142
-#: src/title.cpp:213
+#: src/title.cpp:220
 msgid "Back"
 msgstr "Indietro"
 
@@ -161,81 +161,81 @@
 msgid "Eraser"
 msgstr "Gomma"
 
-#: src/leveleditor.cpp:137
+#: src/leveleditor.cpp:141
 msgid "Trampoline"
 msgstr "Trampolino"
 
-#: src/leveleditor.cpp:138
+#: src/leveleditor.cpp:142
 msgid "Flying Platform"
 msgstr "Piattaforma volante"
 
-#: src/leveleditor.cpp:139
+#: src/leveleditor.cpp:143
 msgid "Door"
 msgstr "Porta"
 
-#: src/leveleditor.cpp:142
+#: src/leveleditor.cpp:146
 msgid "Edtit foreground tiles"
 msgstr "Modifica piastrelle anteriori"
 
-#: src/leveleditor.cpp:144
+#: src/leveleditor.cpp:148
 msgid "Edit interactive tiles"
 msgstr "Modifica piastrelle interattive"
 
-#: src/leveleditor.cpp:146
+#: src/leveleditor.cpp:150
 msgid "Edit background tiles"
 msgstr "Modifica piastrelle posteriori"
 
-#: src/leveleditor.cpp:150
+#: src/leveleditor.cpp:154
 msgid "Next sector"
 msgstr "Prossimo settore"
 
-#: src/leveleditor.cpp:151
+#: src/leveleditor.cpp:155
 msgid "Prevous sector"
 msgstr "Settore precedente"
 
-#: src/leveleditor.cpp:152
+#: src/leveleditor.cpp:156
 msgid "Next level"
 msgstr "Prossimo livello"
 
-#: src/leveleditor.cpp:153
+#: src/leveleditor.cpp:157
 msgid "Prevous level"
 msgstr "Livello precedente"
 
-#: src/leveleditor.cpp:154
+#: src/leveleditor.cpp:158
 msgid "Save level"
 msgstr "Salva livello"
 
-#: src/leveleditor.cpp:155
+#: src/leveleditor.cpp:159
 msgid "Test level"
 msgstr "Prova il livello"
 
-#: src/leveleditor.cpp:156
+#: src/leveleditor.cpp:160
 msgid "Setup level"
 msgstr "Configura livello"
 
-#: src/leveleditor.cpp:238 src/leveleditor.cpp:714 src/leveleditor.cpp:739
-#: src/leveleditor.cpp:830
+#: src/leveleditor.cpp:242 src/leveleditor.cpp:718 src/leveleditor.cpp:743
+#: src/leveleditor.cpp:834
 msgid "Level not saved. Wanna to?"
 msgstr "Livello non salvato. Vuoi salvarlo?"
 
-#: src/leveleditor.cpp:353
+#: src/leveleditor.cpp:357
 #, c-format
 msgid "Level %d doesn't exist. Create it?"
 msgstr "Il livello %d non esiste. Lo vuoi creare?"
 
-#: src/leveleditor.cpp:556 src/misc.cpp:96
+#: src/leveleditor.cpp:560 src/misc.cpp:96
 msgid "Level Editor"
 msgstr "Editor di livelli"
 
-#: src/leveleditor.cpp:579
+#: src/leveleditor.cpp:583
 msgid "F1 for help"
 msgstr "Premi F1 per aiuto"
 
-#: src/leveleditor.cpp:581
+#: src/leveleditor.cpp:585
 msgid "Choose a level subset"
 msgstr "Scegli un subset di livelli"
 
-#: src/leveleditor.cpp:765
+#: src/leveleditor.cpp:769
 msgid "No more sectors exist. Create another?"
 msgstr "Non esistono altri settori. Crearne un'altro?"
 
@@ -243,7 +243,7 @@
 # e semplice da usare.\n
 # \n
 # Per aprire un livello, per prima cosa 
-#: src/leveleditor.cpp:917
+#: src/leveleditor.cpp:921
 msgid ""
 "This is the built-in level editor. It's aim is to be intuitive\n"
 "and simple to use, so it should be pretty straight forward.\n"
@@ -313,7 +313,7 @@
 "Use the mouse wheel to scroll that group of buttons. You will find\n"
 "enemies and game objects in the bottom.\n"
 
-#: src/leveleditor.cpp:953
+#: src/leveleditor.cpp:957
 msgid ""
 "The Foreground/Interactive/Background buttons may be used to\n"
 "see and edit the respective layer. Level's have three tiles layers:\n"
@@ -377,11 +377,11 @@
 "including SuperTux. It is an independent project.\n"
 "Webpage: http://pingus.seul.org/~grumbel/flexlay/"
 
-#: src/leveleditor.cpp:993
+#: src/leveleditor.cpp:997
 msgid "- Level Editor's Help -"
 msgstr "- Guida all'editor di livelli -"
 
-#: src/leveleditor.cpp:997
+#: src/leveleditor.cpp:1001
 #, c-format
 msgid "Press any key to continue - Page %d/%d"
 msgstr "Premi un tasto qualsiasi per continuare - Pagina %d su %d"
@@ -574,7 +574,7 @@
 msgstr "Min tempo impiegato:   %d / %d"
 
 # Updated year from 2003 to 2004
-#: src/title.cpp:367
+#: src/title.cpp:374
 msgid ""
 "Copyright (c) 2003 SuperTux Devel Team\n"
 "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
@@ -586,7 +586,7 @@
 "redistribuirlo sotto determinate condizioni; guarda il file COPYING\n"
 "per maggiori informazioni.\n"
 
-#: src/title.cpp:419
+#: src/title.cpp:426
 msgid "Are you sure you want to delete slot"
 msgstr "Sei sicuro di voler cancellare lo slot"
 

[Super-tux-commit] supertux/po LINGUAS,1.7,1.8

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

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

Modified Files:
	LINGUAS 
Log Message:
updated po/LINGUAS

Index: LINGUAS
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/LINGUAS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LINGUAS	20 Jul 2004 13:18:22 -0000	1.7
+++ LINGUAS	20 Oct 2004 17:50:48 -0000	1.8
@@ -1,6 +1,7 @@
 # Set of available languages.
 de
 es
+it
 pt
 fr
 nl

[Super-tux-commit] supertux/po it.po,NONE,1.1

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

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

Added Files:
	it.po 
Log Message:
added Italian translation by Iknos

--- NEW FILE: it.po ---
# translation of supertux.po to 
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR SuperTux Development Team.
# Iknos <ze...@em...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: supertux\n"
"Report-Msgid-Bugs-To: sup...@li...\n"
"POT-Creation-Date: 2004-10-19 22:27+0200\n"
"PO-Revision-Date: 2004-10-19 22:01+0200\n"
"Last-Translator: Iknos <ze...@em...>\n"
"Language-Team:  <it...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.9\n"

#: src/gameloop.cpp:205
msgid "by "
msgstr "da "

#: src/gameloop.cpp:211
msgid "Level Vertically Flipped!"
msgstr "Livello invertito verticalmente!"

#: src/gameloop.cpp:215
msgid "Best Level Statistics"
msgstr "Statistiche migliori del livello"

#: src/gameloop.cpp:670
msgid "PAUSE - Press 'P' To Play"
msgstr "PAUSA - Premi 'P' per giocare"

#: src/gameloop.cpp:675
msgid "Playing: "
msgstr "Giocando: "

#: src/gameloop.cpp:850 src/worldmap.cpp:1111
msgid "SCORE"
msgstr "PUNTEGGIO"

#: src/gameloop.cpp:855
msgid "Press ESC To Return"
msgstr "Premi ESC per ritornare"

#: src/gameloop.cpp:860
msgid "TIME's UP"
msgstr "IL TEMPO E' FINITO"

#: src/gameloop.cpp:864
msgid "TIME"
msgstr "TEMPO"

#: src/gameloop.cpp:871 src/gameloop.cpp:872 src/worldmap.cpp:1115
msgid "COINS"
msgstr "MONETE"

#: src/gameloop.cpp:893 src/gameloop.cpp:894 src/worldmap.cpp:1136
#: src/worldmap.cpp:1137
msgid "LIVES"
msgstr "VITE"

#: src/gameloop.cpp:916
msgid "Result:"
msgstr "Risultato:"

#: src/gameloop.cpp:919
#, c-format
msgid "SCORE: %d"
msgstr "PUNTEGGIO: %d"

#: src/gameloop.cpp:922 src/worldmap.cpp:955
#, c-format
msgid "COINS: %d"
msgstr "MONETE: %d"

#: src/gameloop.cpp:956
msgid "Slot"
msgstr "Slot"

#: src/gameloop.cpp:956
msgid "Free"
msgstr "Libero"

#: src/leveleditor.cpp:64
msgid "Load Subset"
msgstr "Carica subset"

#: src/leveleditor.cpp:70 src/leveleditor.cpp:80 src/misc.cpp:125
#: src/misc.cpp:136 src/misc.cpp:149 src/misc.cpp:160 src/title.cpp:142
#: src/title.cpp:213
msgid "Back"
msgstr "Indietro"

#: src/leveleditor.cpp:73
msgid "New Level Subset"
msgstr "Nuovo subset di livelli"

#: src/leveleditor.cpp:75
msgid "Filename   "
msgstr "Nome file  "

#: src/leveleditor.cpp:76
msgid "Title      "
msgstr "Titolo     "

#: src/leveleditor.cpp:77
msgid "Description"
msgstr "Descrizione"

#: src/leveleditor.cpp:78
msgid "Create"
msgstr "Crea"

#: src/leveleditor.cpp:83
msgid "Level Editor Menu"
msgstr "Menu editor di livelli"

#: src/leveleditor.cpp:85
msgid "Return to Level Editor"
msgstr "Ritorna all'editor"

#: src/leveleditor.cpp:86
msgid "Create Level Subset"
msgstr "Crea subset di livelli"

#: src/leveleditor.cpp:87
msgid "Load Level Subset"
msgstr "Carica subset di livelli"

#: src/leveleditor.cpp:89
msgid "Quit Level Editor"
msgstr "Esci dall'editor"

#: src/leveleditor.cpp:92
msgid "Level Settings"
msgstr "Impostazioni livello"

#: src/leveleditor.cpp:94
msgid "Name    "
msgstr "Nome    "

#: src/leveleditor.cpp:95
msgid "Author  "
msgstr "Autore "

#: src/leveleditor.cpp:96
msgid "Width   "
msgstr "Largh. "

#: src/leveleditor.cpp:97
msgid "Height  "
msgstr "Altezza"

#: src/leveleditor.cpp:99
msgid "Apply"
msgstr "Applica"

#: src/leveleditor.cpp:109
msgid "Eraser"
msgstr "Gomma"

#: src/leveleditor.cpp:137
msgid "Trampoline"
msgstr "Trampolino"

#: src/leveleditor.cpp:138
msgid "Flying Platform"
msgstr "Piattaforma volante"

#: src/leveleditor.cpp:139
msgid "Door"
msgstr "Porta"

#: src/leveleditor.cpp:142
msgid "Edtit foreground tiles"
msgstr "Modifica piastrelle anteriori"

#: src/leveleditor.cpp:144
msgid "Edit interactive tiles"
msgstr "Modifica piastrelle interattive"

#: src/leveleditor.cpp:146
msgid "Edit background tiles"
msgstr "Modifica piastrelle posteriori"

#: src/leveleditor.cpp:150
msgid "Next sector"
msgstr "Prossimo settore"

#: src/leveleditor.cpp:151
msgid "Prevous sector"
msgstr "Settore precedente"

#: src/leveleditor.cpp:152
msgid "Next level"
msgstr "Prossimo livello"

#: src/leveleditor.cpp:153
msgid "Prevous level"
msgstr "Livello precedente"

#: src/leveleditor.cpp:154
msgid "Save level"
msgstr "Salva livello"

#: src/leveleditor.cpp:155
msgid "Test level"
msgstr "Prova il livello"

#: src/leveleditor.cpp:156
msgid "Setup level"
msgstr "Configura livello"

#: src/leveleditor.cpp:238 src/leveleditor.cpp:714 src/leveleditor.cpp:739
#: src/leveleditor.cpp:830
msgid "Level not saved. Wanna to?"
msgstr "Livello non salvato. Vuoi salvarlo?"

#: src/leveleditor.cpp:353
#, c-format
msgid "Level %d doesn't exist. Create it?"
msgstr "Il livello %d non esiste. Lo vuoi creare?"

#: src/leveleditor.cpp:556 src/misc.cpp:96
msgid "Level Editor"
msgstr "Editor di livelli"

#: src/leveleditor.cpp:579
msgid "F1 for help"
msgstr "Premi F1 per aiuto"

#: src/leveleditor.cpp:581
msgid "Choose a level subset"
msgstr "Scegli un subset di livelli"

#: src/leveleditor.cpp:765
msgid "No more sectors exist. Create another?"
msgstr "Non esistono altri settori. Crearne un'altro?"

# Questo e' l'editor di livelli integrato. E' stato costruito per essere intuitivo\n
# e semplice da usare.\n
# \n
# Per aprire un livello, per prima cosa 
#: src/leveleditor.cpp:917
msgid ""
"This is the built-in level editor. It's aim is to be intuitive\n"
"and simple to use, so it should be pretty straight forward.\n"
"\n"
"To open a level, first you'll have to select a level subset from\n"
"the menu (or create your own).\n"
"A level subset is basically a collection of levels.\n"
"They can then be played from the Contrib menu.\n"
"\n"
"To access the menu from the level editor, just press Esc.\n"
"\n"
"You are currently looking to the level, to scroll it, just\n"
"press the right mouse button and drag the mouse. It will move like\n"
"a strategy game.\n"
"You can also use the arrow keys and Page Up/Down.\n"
"\n"
"'+' and '-' keys can be used to zoom in/out the level.\n"
"\n"
"You probably already noticed those floating group of buttons.\n"
"Each one serves a different purpose. To select a certain button\n"
"just press the Left mouse button on it. A few buttons have key\n"
"shortcuts, you can know it by pressing the Right mouse button on\n"
"it. That will also show what that button does.\n"
"Group of buttons can also be move around by just dragging them,\n"
"while pressing the Left mouse button.\n"
"\n"
"Let's learn a bit of what each group of buttons do, shall we?\n"
"\n"
"To starting putting tiles and objects around use the bigger gropup\n"
"of buttons. Each button is a different tile. To put it on the level,\n"
"just press it and then left click in the level.\n"
"You can also copy tiles from the level by using the middle mouse button.\n"
"Use the mouse wheel to scroll that group of buttons. You will find\n"
"enemies and game objects in the bottom.\n"
msgstr ""
"This is the built-in level editor. It's aim is to be intuitive\n"
"and simple to use, so it should be pretty straight forward.\n"
"\n"
"To open a level, first you'll have to select a level subset from\n"
"the menu (or create your own).\n"
"A level subset is basically a collection of levels.\n"
"They can then be played from the Contrib menu.\n"
"\n"
"To access the menu from the level editor, just press Esc.\n"
"\n"
"You are currently looking to the level, to scroll it, just\n"
"press the right mouse button and drag the mouse. It will move like\n"
"a strategy game.\n"
"You can also use the arrow keys and Page Up/Down.\n"
"\n"
"'+' and '-' keys can be used to zoom in/out the level.\n"
"\n"
"You probably already noticed those floating group of buttons.\n"
"Each one serves a different purpose. To select a certain button\n"
"just press the Left mouse button on it. A few buttons have key\n"
"shortcuts, you can know it by pressing the Right mouse button on\n"
"it. That will also show what that button does.\n"
"Group of buttons can also be move around by just dragging them,\n"
"while pressing the Left mouse button.\n"
"\n"
"Let's learn a bit of what each group of buttons do, shall we?\n"
"\n"
"To starting putting tiles and objects around use the bigger gropup\n"
"of buttons. Each button is a different tile. To put it on the level,\n"
"just press it and then left click in the level.\n"
"You can also copy tiles from the level by using the middle mouse button.\n"
"Use the mouse wheel to scroll that group of buttons. You will find\n"
"enemies and game objects in the bottom.\n"

#: src/leveleditor.cpp:953
msgid ""
"The Foreground/Interactive/Background buttons may be used to\n"
"see and edit the respective layer. Level's have three tiles layers:\n"
"Foreground - tiles are drawn in top of everything and have no contact\n"
"with the player.\n"
"Interactive - these are the tiles that have contact with the player.\n"
"Background - tiles are drawn in bottom of everything and have no contact\n"
"with the player.\n"
"The unselected layers will be drawn semi-transparently.\n"
"\n"
"At last, but not least, the group of buttons that's left serves\n"
"to do related actions with the level.\n"
"From left to right:\n"
"Mini arrows - can be used to choose other sectors.\n"
"Sectors are mini-levels, so to speak, that can be accessed using a door.\n"
"Big arrows - choose other level in the same level subset.\n"
"Diskette - save the level\n"
"Tux - test the level\n"
"Tools - set a few settings for the level, incluiding resizing it.\n"
"\n"
"We have reached the end of this Howto.\n"
"\n"
"Don't forget to send us a few cool levels. :)\n"
"\n"
"Enjoy,\n"
"  SuperTux development team\n"
"\n"
"ps: If you are looking for something more powerfull, you can give it a\n"
"try to FlexLay. FlexLay is a level editor that supports several games,\n"
"including SuperTux. It is an independent project.\n"
"Webpage: http://pingus.seul.org/~grumbel/flexlay/"
msgstr ""
"The Foreground/Interactive/Background buttons may be used to\n"
"see and edit the respective layer. Level's have three tiles layers:\n"
"Foreground - tiles are drawn in top of everything and have no contact\n"
"with the player.\n"
"Interactive - these are the tiles that have contact with the player.\n"
"Background - tiles are drawn in bottom of everything and have no contact\n"
"with the player.\n"
"The unselected layers will be drawn semi-transparently.\n"
"\n"
"At last, but not least, the group of buttons that's left serves\n"
"to do related actions with the level.\n"
"From left to right:\n"
"Mini arrows - can be used to choose other sectors.\n"
"Sectors are mini-levels, so to speak, that can be accessed using a door.\n"
"Big arrows - choose other level in the same level subset.\n"
"Diskette - save the level\n"
"Tux - test the level\n"
"Tools - set a few settings for the level, incluiding resizing it.\n"
"\n"
"We have reached the end of this Howto.\n"
"\n"
"Don't forget to send us a few cool levels. :)\n"
"\n"
"Enjoy,\n"
"  SuperTux development team\n"
"\n"
"ps: If you are looking for something more powerfull, you can give it a\n"
"try to FlexLay. FlexLay is a level editor that supports several games,\n"
"including SuperTux. It is an independent project.\n"
"Webpage: http://pingus.seul.org/~grumbel/flexlay/"

#: src/leveleditor.cpp:993
msgid "- Level Editor's Help -"
msgstr "- Guida all'editor di livelli -"

#: src/leveleditor.cpp:997
#, c-format
msgid "Press any key to continue - Page %d/%d"
msgstr "Premi un tasto qualsiasi per continuare - Pagina %d su %d"

#: src/misc.cpp:93 src/misc.cpp:152
msgid "Start Game"
msgstr "Inizia a giocare"

#: src/misc.cpp:94 src/title.cpp:112
msgid "Contrib Levels"
msgstr "Livelli aggiuntivi"

#: src/misc.cpp:95 src/misc.cpp:100 src/misc.cpp:175 src/misc.cpp:182
msgid "Options"
msgstr "Opzioni"

#: src/misc.cpp:97
msgid "Credits"
msgstr "Crediti"

#: src/misc.cpp:98
msgid "Quit"
msgstr "Esci"

#: src/misc.cpp:103
msgid "OpenGL    "
msgstr "OpenGL    "

#: src/misc.cpp:105
msgid "OpenGL (not supported)"
msgstr "OpenGL (non supportato)"

#: src/misc.cpp:107
msgid "Fullscreen"
msgstr "A tutto schermo"

#: src/misc.cpp:110 src/misc.cpp:115
msgid "Sound     "
msgstr "Suono     "

#: src/misc.cpp:111 src/misc.cpp:116
msgid "Music     "
msgstr "Musica    "

#: src/misc.cpp:118
msgid "Show FPS  "
msgstr "Mostra FPS"

#: src/misc.cpp:119
msgid "Setup Keys"
msgstr "Configura tasti"

#: src/misc.cpp:122
msgid "Setup Joystick"
msgstr "Configura Joystick"

#: src/misc.cpp:127
msgid "Keyboard Setup"
msgstr "Configurazione tastiera"

#: src/misc.cpp:129
msgid "Left move"
msgstr "Sinistra"

#: src/misc.cpp:130
msgid "Right move"
msgstr "Destra"

#: src/misc.cpp:131
msgid "Up/Activate"
msgstr "Su/Attivare"

#: src/misc.cpp:132
msgid "Down/Duck"
msgstr "Giu'/Abbassarsi"

#: src/misc.cpp:133
msgid "Jump"
msgstr "Salto"

#: src/misc.cpp:134
msgid "Power/Run"
msgstr "Potere/Corsa"

#: src/misc.cpp:140
msgid "Joystick Setup"
msgstr "Configurazione Joystick"

#: src/misc.cpp:144
msgid "A button"
msgstr "Pulstante A"

#: src/misc.cpp:145
msgid "B button"
msgstr "Pulsante B"

#: src/misc.cpp:162
msgid "Save Game"
msgstr "Salva il gioco"

#: src/misc.cpp:172 src/misc.cpp:179
msgid "Pause"
msgstr "Pausa"

#: src/misc.cpp:174 src/misc.cpp:181
msgid "Continue"
msgstr "Continua"

#: src/misc.cpp:177
msgid "Abort Level"
msgstr "Chiudi il livello"

#: src/misc.cpp:184
msgid "Quit Game"
msgstr "Chiudi il gioco"

#: src/misc.cpp:186
msgid "Enter your name:"
msgstr "Scrivi il tuo nome:"

#: src/player.cpp:1240
#, c-format
msgid "Good! x%d"
msgstr "Bene! x%d"

#: src/player.cpp:1242
#, c-format
msgid "Great! x%d"
msgstr "Grande! x%d"

#: src/player.cpp:1244
#, c-format
msgid "Awesome! x%d"
msgstr "Ottimo! x%d"

#: src/player.cpp:1246
#, c-format
msgid "Incredible! x%d"
msgstr "Incredibile! x%d"

#: src/player.cpp:1248
#, c-format
msgid "Godlike! ;-) x%d"
msgstr "DIVINO! ;-) x%d"

# TOO much similiar to "Incredible!", 2 strings ago =)
#: src/player.cpp:1250
#, c-format
msgid "Unbelievable!! x%d"
msgstr "Incredibile!! x%d"

#: src/statistics.cpp:113
msgid "- Best Level Statistics -"
msgstr "- Statistiche migliori del livello -"

#: src/statistics.cpp:117
msgid "Max score:"
msgstr "Punteggio max:"

#: src/statistics.cpp:137
msgid "Max coins collected:"
msgstr "Monete max:"

#: src/statistics.cpp:139
msgid "Max fragging:"
msgstr "Vittime max:"

#: src/statistics.cpp:141
msgid "Min time needed:"
msgstr "Tempo minimo impiegato:"

#: src/statistics.cpp:170
#, c-format
msgid "Max score:             %d"
msgstr "Max punteggio:         %d"

#: src/statistics.cpp:176
#, c-format
msgid "Max coins collected:   %d / %d"
msgstr "Max monete:            %d / %d"

#: src/statistics.cpp:180
#, c-format
msgid "Max fragging:          %d / %d"
msgstr "Max vittime:           %d / %d"

#: src/statistics.cpp:184
#, c-format
msgid "Min time needed:       %d / %d"
msgstr "Min tempo impiegato:   %d / %d"

# Updated year from 2003 to 2004
#: src/title.cpp:367
msgid ""
"Copyright (c) 2003 SuperTux Devel Team\n"
"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
"are welcome to redistribute it under certain conditions; see the file "
"COPYING\n"
"for details.\n"
msgstr ""
"Questo gioco NON fornisce ALCUNA GARANZIA. E' software libero, e tu puoi\n"
"redistribuirlo sotto determinate condizioni; guarda il file COPYING\n"
"per maggiori informazioni.\n"

#: src/title.cpp:419
msgid "Are you sure you want to delete slot"
msgstr "Sei sicuro di voler cancellare lo slot"

#: src/worldmap.cpp:952
msgid "GAMEOVER"
msgstr "GAMEOVER"

#: src/worldmap.cpp:959
msgid "Total Statistics"
msgstr "Statistiche totali"

#: lib/app/setup.cpp:774
#, c-format
msgid ""
"Usage: %s [OPTIONS] FILENAME\n"
"\n"
msgstr "Utilizzo: %s [OPZIONI] NOME_FILE\n"

# --help Display a help message summarizing command-line options, license and game controls.
# Modified to Display this message
#: lib/app/setup.cpp:775
msgid ""
"Display Options:\n"
"  -f, --fullscreen    Run in fullscreen mode.\n"
"  -w, --window        Run in window mode.\n"
"  --opengl            If OpenGL support was compiled in, this will tell\n"
"                      SuperTux to make use of it.\n"
"  --sdl               Use the SDL software graphical renderer\n"
"\n"
"Sound Options:\n"
"  --disable-sound     If sound support was compiled in,  this will\n"
"                      disable sound for this session of the game.\n"
"  --disable-music     Like above, but this will disable music.\n"
"\n"
"Misc Options:\n"
"  -j, --joystick NUM  Use joystick NUM (default: 0)\n"
"  --joymap XAXIS:YAXIS:A:B:START\n"
"                      Define how joystick buttons and axis should be mapped\n"
"  --leveleditor       Opens the leveleditor in a file.\n"
"  --worldmap          Opens the specified worldmap file.\n"
"  --flip-levels       Flip levels upside-down.\n"
"  -d, --datadir DIR   Load Game data from DIR (default: automatic)\n"
"  --debug             Enables the debug mode, which is useful for "
"developers.\n"
"  --help              Display a help message summarizing command-line\n"
"                      options, license and game controls.\n"
"  --usage             Display a brief message summarizing command-line "
"options.\n"
"  --version           Display the version of SuperTux you're running.\n"
"\n"
msgstr ""
"Opzioni video:\n"
"  -f, --fullscreen    Avvia il gioco in modalita' tutto schermo.  -w, --"
"window        Avvia il gioco in una finestra.\n"
"  --opengl            Se il supporto OpenGL e' stato compilato, lo usa.\n"
"  --sdl               Usa il rendering software SDL.\n"
"\n"
"Opzioni audio:\n"
"  --disable-sound     Non usa il suono anche se il supporto audio e' stato "
"compilato.\n"
"  --disable-music     Come sopra, ma disabilita la musica.\n"
"\n"
"Opzioni varie:\n"
"  -j, --joystick NUM  Usa il joystick NUM (default: 0).\n"
"  --joymap XAXIS:YAXIS:A:B:START\n"
"                      Definisce come i pulsanti e le assi del joystick "
"vadano mappate.\n"
"  --leveleditor       Apre l'editor di livelli nel file specificato.\n"
"  --worldmap          Apre la mappa specificata.\n"
"  --flip-levels       Inverte i livelli dall'alto al basso.\n"
"  -d, --datadir DIR   Usa come directory data DIR (default: automatico).\n"
"  --debug             Attiva la modalità DEBUG, utile per gli sviluppatori.\n"
"  --help              Mostra questo messaggio.\n"
"  --usage             Mostra una breve guida all'uso delle opzioni da linea "
"di comando .\n"
"  --version           Mostra la versione di SuperTux che hai installata.\n"
"\n"

#: lib/app/setup.cpp:834
#, c-format
msgid ""
"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
"debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--flip-"
"levels] FILENAME\n"
msgstr ""
"Utilizzo: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] "
"[--debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] [--"
"flip-levels] NOME_FILE\n"

#: lib/gui/menu.cpp:67
msgid "Yes"
msgstr "Si"

#: lib/gui/menu.cpp:68
msgid "No"
msgstr "No"

#: lib/gui/menu.cpp:236
msgid "Up cursor"
msgstr "Freccia su"

#: lib/gui/menu.cpp:239
msgid "Down cursor"
msgstr "Freccia giu'"

#: lib/gui/menu.cpp:242
msgid "Left cursor"
msgstr "Freccia sinistra"

#: lib/gui/menu.cpp:245
msgid "Right cursor"
msgstr "Freccia destra"

#: lib/gui/menu.cpp:248
msgid "Return"
msgstr "Invio"

#: lib/gui/menu.cpp:251
msgid "Space"
msgstr "Spazio"

#: lib/gui/menu.cpp:254
msgid "Right Shift"
msgstr "Shift destro"

#: lib/gui/menu.cpp:257
msgid "Left Shift"
msgstr "Shift sinistro"

#: lib/gui/menu.cpp:260
msgid "Right Control"
msgstr "Ctrl destro"

#: lib/gui/menu.cpp:263
msgid "Left Control"
msgstr "Ctrl sinistro"

#: lib/gui/menu.cpp:266
msgid "Right Alt"
msgstr "Alt destro"

#: lib/gui/menu.cpp:269
msgid "Left Alt"
msgstr "Alt sinistro"

[Super-tux-commit] supertux/data/images/shared bouncingsnowball-right-0.png,1.1,NONE bouncingsnowball-right-1.png,1.1,NONE bouncingsnowball-right-2.png,1.1,NONE bouncingsnowball-right-3.png,1.1,NONE bouncingsnowball-right-4.png,1.1,NONE bouncingsnowball-right-5.png,1.1,NONE flyingsnowball-squished-right.png,1.1,NONE mrbombx-right-0.png,1.1,NONE mrbombx-right-1.png,1.1,NONE mriceblock-right-0.png,1.1,NONE mriceblock-right-1.png,1.1,NONE mriceblock-right-2.png,1.1,NONE mriceblock-right-3.png,1.1,NONE snowball-squished-right.png,1.1,NONE mrbomb-right-0.png,1.2,NONE mrbomb-right-1.png,1.2,NONE mrbomb-right-2.png,1.2,NONE mrbomb-right-3.png,1.2,NONE snowball-right-0.png,1.2,NONE snowball-right-1.png,1.2,NONE snowball-right-2.png,1.2,NONE spiky-right-0.png,1.2,NONE spiky-right-1.png,1.2,NONE spiky-right-2.png,1.2,NONE mriceblock-flat-right.png,1.3,NONE

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

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

Removed Files:
	bouncingsnowball-right-0.png bouncingsnowball-right-1.png 
	bouncingsnowball-right-2.png bouncingsnowball-right-3.png 
	bouncingsnowball-right-4.png bouncingsnowball-right-5.png 
	flyingsnowball-squished-right.png mrbombx-right-0.png 
	mrbombx-right-1.png mriceblock-right-0.png 
	mriceblock-right-1.png mriceblock-right-2.png 
	mriceblock-right-3.png snowball-squished-right.png 
	mrbomb-right-0.png mrbomb-right-1.png mrbomb-right-2.png 
	mrbomb-right-3.png snowball-right-0.png snowball-right-1.png 
	snowball-right-2.png spiky-right-0.png spiky-right-1.png 
	spiky-right-2.png mriceblock-flat-right.png 
Log Message:
Removing bad guys facing right images.
No longer needed, since it is now mirrored in code.
There might be more images that are not needed.

--- mrbomb-right-2.png DELETED ---

--- flyingsnowball-squished-right.png DELETED ---

--- bouncingsnowball-right-0.png DELETED ---

--- mriceblock-right-2.png DELETED ---

--- mriceblock-right-0.png DELETED ---

--- mriceblock-right-1.png DELETED ---

--- spiky-right-0.png DELETED ---

--- bouncingsnowball-right-5.png DELETED ---

--- bouncingsnowball-right-2.png DELETED ---

--- bouncingsnowball-right-3.png DELETED ---

--- snowball-right-1.png DELETED ---

--- snowball-right-0.png DELETED ---

--- mriceblock-flat-right.png DELETED ---

--- mrbomb-right-0.png DELETED ---

--- mrbomb-right-1.png DELETED ---

--- bouncingsnowball-right-1.png DELETED ---

--- mrbombx-right-0.png DELETED ---

--- spiky-right-2.png DELETED ---

--- snowball-squished-right.png DELETED ---

--- spiky-right-1.png DELETED ---

--- mrbombx-right-1.png DELETED ---

--- bouncingsnowball-right-4.png DELETED ---

--- snowball-right-2.png DELETED ---

--- mriceblock-right-3.png DELETED ---

--- mrbomb-right-3.png DELETED ---

[Super-tux-commit] supertux/src badguy.cpp,1.129,1.130

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

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

Modified Files:
	badguy.cpp 
Log Message:
Bugfix: Jumpy and Flying Snowball faced player even when dead.
Bug reported by Marek.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- badguy.cpp	19 Oct 2004 16:27:49 -0000	1.129
+++ badguy.cpp	19 Oct 2004 17:54:24 -0000	1.130
@@ -520,10 +520,13 @@
     }
 
   // set direction based on tux
-  if(tux.base.x > base.x)
-    dir = RIGHT;
-  else
-    dir = LEFT;
+  if(dying == DYING_NOT)
+    {
+    if(tux.base.x > base.x)
+      dir = RIGHT;
+    else
+      dir = LEFT;
+    }
 
   // move
   physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
@@ -742,11 +745,14 @@
   if(dying == DYING_NOT || dying == DYING_SQUISHED)
     collision_swept_object_map(&old_base, &base);
 
-  // set direction based on tux
-  if(Sector::current()->player->base.x > base.x)
-    dir = RIGHT;
-  else
-    dir = LEFT;
+  if(dying == DYING_NOT)
+    {
+    // set direction based on tux
+    if(Sector::current()->player->base.x > base.x)
+      dir = RIGHT;
+    else
+      dir = LEFT;
+    }
 
   // Handle dying timer:
   if (dying == DYING_SQUISHED && !timer.check())

[Super-tux-commit] supertux/lib/special sprite.h,1.15,1.16 sprite.cpp,1.27,1.28

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

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

Modified Files:
	sprite.h sprite.cpp 
Log Message:
Mirror actions now cache the horizontal flipped Surfaces, rather than flipping them during blitting.
It wastes more memory, but the problem is that SDL fontend got considered slower, especially when a vertical flipping was done at the same time (ie. Bad Guy falling facing right).

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sprite.cpp	18 Oct 2004 21:09:26 -0000	1.27
+++ sprite.cpp	19 Oct 2004 17:48:23 -0000	1.28
@@ -56,7 +56,6 @@
     for(std::vector<Surface*>::iterator i_sur = i_act->second->surfaces.begin();
         i_sur != i_act->second->surfaces.end(); ++i_sur)
       {
-      if(!i_act->second->mirror)
         delete *i_sur;
       }
     delete i_act->second;
@@ -86,26 +85,30 @@
     for(std::vector<Surface*>::iterator i = action->surfaces.begin();
         i < action->surfaces.end(); i++)
       {
-        (*i)->apply_mask(Color(mask_color));
+        (*i)->apply_filter(MASK_FILTER, Color(mask_color));
       }
     }
 
-  action->mirror = false;
   std::string mirror_action;
   lispreader.read_string("mirror-action", mirror_action);
   if(!mirror_action.empty())
     {
-    action->mirror = true;
     Action* act_tmp = get_action(mirror_action);
     if(act_tmp == NULL)
       std::cerr << "Warning: Could not mirror action. Action not found\n"
                    "Mirror actions must be defined after the real one!\n";
     else
-      action->surfaces = act_tmp->surfaces;
+      {
+      for(int i = 0; i < act_tmp->surfaces.size(); i++)
+        {
+        Surface* surface = new Surface(sdl_surface_from_sdl_surface(
+            act_tmp->surfaces[i]->impl->get_sdl_surface(), true), true);
+        surface->apply_filter(HORIZONTAL_FLIP_FILTER);
+        action->surfaces.push_back(surface);
+        }
+      }
     }
-
-  // Load images
-  if(!action->mirror)
+  else // Load images
     {
     std::vector<std::string> images;
     if(!lispreader.read_string_vector("images", images))
@@ -270,8 +273,7 @@
               << "/" << get_action_name() << std::endl;
   else
     context.draw_surface(action->surfaces[(int)frame],
-            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order,
-            action->mirror ? drawing_effect | HORIZONTAL_FLIP : drawing_effect);
+            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order, drawing_effect);
 }
 
 void
@@ -286,8 +288,7 @@
               << "/" << get_action_name() << std::endl;
   else
     context.draw_surface_part(action->surfaces[(int)frame], source, size,
-            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order,
-            action->mirror ? drawing_effect | HORIZONTAL_FLIP : drawing_effect);
+            pos - Vector(action->x_offset, action->y_offset), layer + action->z_order, drawing_effect);
 }
 
 int

Index: sprite.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sprite.h	9 Sep 2004 10:00:00 -0000	1.15
+++ sprite.h	19 Oct 2004 17:48:22 -0000	1.16
@@ -50,7 +50,7 @@
 
         /** Mirror is used to avoid duplicating left and right side
             sprites */
-        bool mirror;
+//        bool mirror;
 
         std::vector<Surface*> surfaces;
         };

[Super-tux-commit] supertux/lib/video surface.h,1.6,1.7 surface.cpp,1.10,1.11

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

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

Modified Files:
	surface.h surface.cpp 
Log Message:
Added filter to horizontal flip Surfaces.

Index: surface.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface.h	27 Aug 2004 20:34:56 -0000	1.6
+++ surface.h	19 Oct 2004 17:45:38 -0000	1.7
@@ -59,7 +59,9 @@
 
   /// types of filters
   enum {
-    MASK_FILTER
+    HORIZONTAL_FLIP_FILTER,
+    MASK_FILTER,
+    NONE_FILTER
   };
 
   /** This class holds all the data necessary to construct a surface */
@@ -118,7 +120,7 @@
 
       void resize(int widht, int height);
 
-      void apply_mask(Color color);
+      void apply_filter(int filter, Color color = Color(0,0,0));
     };
 
   /** Surface implementation, all implementation have to inherit from
@@ -146,7 +148,7 @@
 
       SDL_Surface* get_sdl_surface() const; // @evil@ try to avoid this function
 
-      virtual void apply_mask(Color color) = 0;
+      virtual void apply_filter(int filter, Color color = Color(0,0,0)) = 0;
     };
 
   class SurfaceSDL : public SurfaceImpl
@@ -162,7 +164,7 @@
       int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT);
       int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT);
 
-      void apply_mask(Color color);
+      void apply_filter(int filter, Color color);
     };
 
 #ifndef NOOPENGL
@@ -183,7 +185,7 @@
       int draw_part(float sx, float sy, float x, float y, float w, float h,  Uint8 alpha, Uint32 effect = NONE_EFFECT);
       int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT);
 
-      void apply_mask(Color color);
+      void apply_filter(int filter, Color color);
 
     private:
       void create_gl(SDL_Surface * surf, GLuint * tex);

Index: surface.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- surface.cpp	16 Sep 2004 11:26:14 -0000	1.10
+++ surface.cpp	19 Oct 2004 17:45:38 -0000	1.11
@@ -197,9 +197,9 @@
   }
 }
 
-void Surface::apply_mask(Color color)
+void Surface::apply_filter(int filter, Color color)
 {
-impl->apply_mask(color);
+impl->apply_filter(filter, color);
 }
 
 Surface::~Surface()
@@ -255,7 +255,25 @@
 void
 apply_filter_to_surface(SDL_Surface* surface, int filter, Color color)
 {
-if(filter == MASK_FILTER)
+if(filter == HORIZONTAL_FLIP_FILTER)
+  {
+  SDL_Surface* sur_copy = sdl_surface_from_sdl_surface(surface, true);
+  SDL_BlitSurface(surface, NULL, sur_copy, NULL);
+  SDL_SetAlpha(sur_copy,0,0);
+
+  SDL_Rect src, dst;
+  src.y = dst.y = 0;
+  src.w = dst.w = 1;
+  src.h = dst.h = sur_copy->h;
+  for(int x = 0; x < sur_copy->w; x++)
+    {
+    src.x = x; dst.x = sur_copy->w - x;
+    SDL_BlitSurface(sur_copy, &src, surface, &dst);
+    }
+
+  SDL_FreeSurface(sur_copy);
+  }
+else if(filter == MASK_FILTER)
   {
   SDL_Surface* sur_copy = sdl_surface_from_sdl_surface(surface, true);
 
@@ -841,9 +859,9 @@
 }
 
 void
-SurfaceOpenGL::apply_mask(Color color)
+SurfaceOpenGL::apply_filter(int filter, Color color)
 {
-  ::apply_filter_to_surface(sdl_surface, MASK_FILTER, color);
+  ::apply_filter_to_surface(sdl_surface, filter, color);
   create_gl(sdl_surface,&gl_texture);
 
   w = sdl_surface->w;
@@ -1053,9 +1071,9 @@
 }
 
 void
-SurfaceSDL::apply_mask(Color color)
+SurfaceSDL::apply_filter(int filter, Color color)
 {
-  ::apply_filter_to_surface(sdl_surface, MASK_FILTER, color);
+  ::apply_filter_to_surface(sdl_surface, filter, color);
 
   w = sdl_surface->w;
   h = sdl_surface->h;

[Super-tux-commit] supertux/src badguy.cpp,1.128,1.129 leveleditor.cpp,1.159,1.160

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

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

Modified Files:
	badguy.cpp leveleditor.cpp 
Log Message:
Bugfix: enemies ordinary pictures were not being displayed in the leveleditor's selection bar.
Bugfix: removed Bomb badguy from selection bar.
Also, changed in badguy's when activate() happens: <= 0...

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- badguy.cpp	19 Oct 2004 12:27:51 -0000	1.128
+++ badguy.cpp	19 Oct 2004 16:27:49 -0000	1.129
@@ -199,8 +199,8 @@
       activate(LEFT);
     }
   } } else {
-    if(start_position.x > 0 && start_position.x <= screen->w
-        && start_position.y > 0 && start_position.y <= screen->h)
+    if(start_position.x >= 0 && start_position.x < screen->w
+        && start_position.y >= 0 && start_position.y < screen->h)
       activate(LEFT);
   }
 }
@@ -284,6 +284,21 @@
 Surface*
 BadGuy::get_image()
 {
+// Set action as the "default" one.
+specs->sprite->set_action("left");
+if(BAD_JUMPY)
+  specs->sprite->set_action("left-up");
+else if(kind == BAD_BOMB)
+  specs->sprite->set_action("ticking-left");
+else if(kind == BAD_FLAME)
+  specs->sprite->set_action("normal");
+else if(kind == BAD_STALACTITE)
+  specs->sprite->set_action("normal");
+else if(kind == BAD_FISH)
+  specs->sprite->set_action("normal");
+else if(kind == BAD_FLAMEFISH)
+  specs->sprite->set_action("normal");
+
 return specs->sprite->get_frame(0);
 }
 

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- leveleditor.cpp	18 Oct 2004 20:42:11 -0000	1.159
+++ leveleditor.cpp	19 Oct 2004 16:27:50 -0000	1.160
@@ -126,9 +126,13 @@
   }
 for(int i = 0; i < NUM_BadGuyKinds; i++)
   {
+  // filter bomb, since it is only for internal use, not for levels
+  if(i == BAD_BOMB)
+    continue;
+
   BadGuyKind kind = BadGuyKind(i);
   BadGuy badguy(kind, 0,0);
-  badguy.activate(LEFT);
+//  badguy.activate(LEFT);
 
   Surface *img = badguy.get_image();
   tiles_board->add_button(Button(img, "", SDLKey(SDLK_1+i)), -(i+1));
@@ -619,7 +623,7 @@
           {
           BadGuyKind kind = BadGuyKind((-id)-1);
           BadGuy badguy(kind, 0,0);
-          badguy.activate(LEFT);
+//          badguy.activate(LEFT);
           Surface *img = badguy.get_image();
 
           context.draw_surface(img, Vector(event.button.x - 8,
@@ -782,8 +786,8 @@
 for(Sector::GameObjects::iterator i = sector->gameobjects.begin(); i != sector->gameobjects.end(); i++)
   {
   BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
-  if(badguy)
-    badguy->activate(LEFT);
+//  if(badguy)
+//    badguy->activate(LEFT);
 
   TileMap* tilemap = dynamic_cast<TileMap*> (*i);
   if(tilemap)

[Super-tux-commit] supertux/src title.cpp,1.125,1.126 gameloop.cpp,1.189,1.190

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

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

Modified Files:
	title.cpp gameloop.cpp 
Log Message:
Do fading for Contrib Worldmaps, as well.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- title.cpp	9 Oct 2004 22:54:58 -0000	1.125
+++ title.cpp	19 Oct 2004 16:25:50 -0000	1.126
@@ -161,6 +161,13 @@
 
     std::string map_filename = *it;
 
+    // some fading
+    fadeout(256);
+    DrawingContext context;
+      context.draw_text(white_text, "Loading...",
+                        Vector(screen->w/2, screen->h/2), CENTER_ALLIGN, LAYER_FOREGROUND1);
+      context.do_drawing();
+
     worldmap.set_map_filename(map_filename);
 
     // hack to erase the extension

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- gameloop.cpp	7 Oct 2004 17:50:21 -0000	1.189
+++ gameloop.cpp	19 Oct 2004 16:25:51 -0000	1.190
@@ -970,12 +970,11 @@
 
       if (access(slotfile.c_str(), F_OK) != 0)
         {
+          shrink_fade(Vector(screen->w/2,screen->h/2), 600);
           draw_intro();
         }
 
-      // shrink_fade(Point((screen->w/2),(screen->h/2)), 1000);
       fadeout(256);
-
       DrawingContext context;
       context.draw_text(white_text, "Loading...",
                         Vector(screen->w/2, screen->h/2), CENTER_ALLIGN, LAYER_FOREGROUND1);

[Super-tux-commit] supertux/src badguy.cpp,1.127,1.128

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

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

Modified Files:
	badguy.cpp 
Log Message:
Bugfix: bomb ticking always has the left direction.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- badguy.cpp	18 Oct 2004 21:41:17 -0000	1.127
+++ badguy.cpp	19 Oct 2004 12:27:51 -0000	1.128
@@ -1189,8 +1189,8 @@
     {
     badguy->timer.start(0);
     badguy->mode = BOMB_TICKING;
-    badguy->dir = dir;
     }
+  badguy->dir = dir;
 
   remove_me();
 }

[Super-tux-commit] supertux/src badguy.cpp,1.126,1.127

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

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

Modified Files:
	badguy.cpp 
Log Message:
Made Jumy and Flying Snowball look at player. And maybe other stuff.

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- badguy.cpp	18 Oct 2004 21:09:27 -0000	1.126
+++ badguy.cpp	18 Oct 2004 21:41:17 -0000	1.127
@@ -236,7 +236,7 @@
   } else if (kind == BAD_MRICEBLOCK) {
     physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
   } else if(kind == BAD_JUMPY) {
-    set_action("left-up", "left-up");
+    set_action("left-up", "right-up");
   } else if(kind == BAD_BOMB) {
     set_action("ticking-left", "ticking-right");
     // hack so that the bomb doesn't hurt until it expldes...           
@@ -257,7 +257,6 @@
     set_action("normal", "normal");
     physic.enable_gravity(true);
   } else if(kind == BAD_FLYINGSNOWBALL) {
-    set_action("normal", "normal");
     physic.enable_gravity(false);
   } else if(kind == BAD_SPIKY) {
     physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
@@ -473,7 +472,7 @@
 {
   if(frozen_timer.check())
     {
-    set_action("left-iced", "left-iced");
+    set_action("left-iced", "right-iced");
     return;
     }
 
@@ -481,11 +480,11 @@
 
   // XXX: These tests *should* use location from ground, not velocity
   if (fabsf(vy) > 5.6f)
-    set_action("left-down", "left-down");
+    set_action("left-down", "right-down");
   else if (fabsf(vy) > 5.3f)
-    set_action("left-middle", "left-middle");
+    set_action("left-middle", "right-middle");
   else
-    set_action("left-up", "left-up");
+    set_action("left-up", "right-up");
 
   Player& tux = *Sector::current()->player;
 
@@ -728,6 +727,12 @@
   if(dying == DYING_NOT || dying == DYING_SQUISHED)
     collision_swept_object_map(&old_base, &base);
 
+  // set direction based on tux
+  if(Sector::current()->player->base.x > base.x)
+    dir = RIGHT;
+  else
+    dir = LEFT;
+
   // Handle dying timer:
   if (dying == DYING_SQUISHED && !timer.check())
     remove_me();
@@ -972,8 +977,6 @@
   action_left = left;
   action_right = right;
 
-std::cerr << "set_action(" << left << ", " << right << ") of " << badguykind_to_string(kind) << std::endl;
-
 #if 0
   if (1)
     {
@@ -1112,7 +1115,7 @@
     return;
   } else if(kind == BAD_FLYINGSNOWBALL) {
     squish_me(player);
-    set_action("squished", "squished");
+    set_action("squished-left", "squished-right");
     return;
   } else if(kind == BAD_SNOWBALL) {
     squish_me(player);
@@ -1186,6 +1189,7 @@
     {
     badguy->timer.start(0);
     badguy->mode = BOMB_TICKING;
+    badguy->dir = dir;
     }
 
   remove_me();

[Super-tux-commit] supertux/data/images supertux.strf,1.19,1.20

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

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

Modified Files:
	supertux.strf 
Log Message:
Made Jumy and Flying Snowball look at player. And maybe other stuff.

Index: supertux.strf
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- supertux.strf	18 Oct 2004 21:10:35 -0000	1.19
+++ supertux.strf	18 Oct 2004 21:41:17 -0000	1.20
@@ -799,15 +799,15 @@
          (y-offset 3)
          (mirror-action "left"))
 
- (action (name "falling-right")
+ (action (name "falling-left")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-right.png"))
+         (images "shared/mriceblock-flat-left.png"))
 
- (action (name "falling-left")
+ (action (name "falling-right")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-left.png"))
+         (mirror-action "falling-left"))
  
  (action (name "flat-left")
          (x-offset 2)
@@ -853,20 +853,40 @@
          (y-offset 8)
          (images "shared/jumpy-left-up-0.png"))
        (action
+         (name "right-up")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-up"))
+       (action
          (name "left-down")
          (x-offset 7)
          (y-offset 8)
          (images "shared/jumpy-left-down-0.png"))
        (action
+         (name "right-down")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-down"))
+       (action
          (name "left-middle")
          (x-offset 7)
          (y-offset 8)
          (images "shared/jumpy-left-middle-0.png"))
        (action
+         (name "right-middle")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-middle"))
+       (action
          (name "left-iced")
          (x-offset 7)
          (y-offset 8)
-         (images "shared/jumpy-iced-left-up-0.png")))
+         (images "shared/jumpy-iced-left-up-0.png"))
+       (action
+         (name "right-iced")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-iced")))
 
      (sprite (name "mrbomb")
        (action
@@ -1003,17 +1023,27 @@
 
  (sprite (name "flyingsnowball")
        (action
-         (name "normal")
+         (name "left")
          (x-offset 4)
          (y-offset 3)
          (images "shared/flyingsnowball-left-0.png"
                  "shared/flyingsnowball-left-1.png"))
+       (action
+         (name "right")
+         (x-offset 4)
+         (y-offset 3)
+         (mirror-action "left"))
 
        (action
-         (name "squished")
+         (name "squished-left")
          (x-offset 4)
          (y-offset -12)
-         (images "shared/flyingsnowball-squished-left.png")))
+         (images "shared/flyingsnowball-squished-left.png"))
+       (action
+         (name "squished-right")
+         (x-offset 4)
+         (y-offset -12)
+         (mirror-action "squished-left")))
 
  (sprite (name "spiky")
        (action

[Super-tux-commit] supertux/data/images supertux.strf,1.18,1.19

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

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

Modified Files:
	supertux.strf 
Log Message:
Just organized into sections: Player / Bad Guys / Game elements / Game Objects sprites.

Index: supertux.strf
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- supertux.strf	18 Oct 2004 16:54:13 -0000	1.18
+++ supertux.strf	18 Oct 2004 21:10:35 -0000	1.19
@@ -1060,7 +1060,8 @@
           (y-offset 0)
           (images "shared/walkingtree-left-small-1.png")))
 
-
+;; Game elements follow
+          
  (sprite (name "egg")
        (action
          (images "shared/egg.png")))
@@ -1106,6 +1107,9 @@
          (x-offset 12)
          (fps 20)
          (images "shared/icebullet-1.png")))
+
+;; Game Objects follow
+
   ; Trampoline
   (sprite (name "trampoline")
        (action

[Super-tux-commit] supertux/src badguy.cpp,1.125,1.126 player.cpp,1.188,1.189

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

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

Modified Files:
	badguy.cpp player.cpp 
Log Message:
Implemented mirror actions correctly. Bugfix: right direction of bad guys now working.
Also fixed bomb exploding animation and also badguys being draw in top left of level.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- player.cpp	9 Oct 2004 18:01:01 -0000	1.188
+++ player.cpp	18 Oct 2004 21:09:28 -0000	1.189
@@ -992,7 +992,7 @@
   else if (safe_timer.started() && global_frame_counter%2)
     ;  // don't draw Tux
   else
-    tux_body->draw(context, pos, layer, dir == LEFT ? HORIZONTAL_FLIP : NONE_EFFECT);
+    tux_body->draw(context, pos, layer);
 
   // Draw blinking star overlay
   if (invincible_timer.started() &&

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- badguy.cpp	18 Oct 2004 16:52:28 -0000	1.125
+++ badguy.cpp	18 Oct 2004 21:09:27 -0000	1.126
@@ -68,6 +68,8 @@
     return BAD_WINGLING;
   else if (str == "walkingtree")
     return BAD_WALKINGTREE;
+  else if(str == "bomb")  // not to be used as a real bad guys
+      return BAD_BOMB;
   else
     {
       return BAD_INVALID;
@@ -116,6 +118,9 @@
       break;
     case BAD_WALKINGTREE:
       return "walkingtree";
+    case BAD_BOMB:  // not to be used as a real bad guys
+      return "bomb";
+      break;
     default:
       return "snowball";
     }
@@ -172,6 +177,8 @@
 
   specs = badguyspecs_manager->load(badguykind_to_string(kind));
 
+  set_action("hide", "hide");
+
   // if we're in a solid tile at start correct that now
   if(Sector::current()) {
   if(kind != BAD_FLAME && kind != BAD_FISH && kind != BAD_FLAMEFISH && collision_object_map(base)) 
@@ -965,6 +972,8 @@
   action_left = left;
   action_right = right;
 
+std::cerr << "set_action(" << left << ", " << right << ") of " << badguykind_to_string(kind) << std::endl;
+
 #if 0
   if (1)
     {

[Super-tux-commit] supertux/lib/special sprite.cpp,1.26,1.27

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

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

Modified Files:
	sprite.cpp 
Log Message:
Implemented mirror actions correctly. Bugfix: right direction of bad guys now working.
Also fixed bomb exploding animation and also badguys being draw in top left of level.

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sprite.cpp	9 Sep 2004 10:40:42 -0000	1.26
+++ sprite.cpp	18 Oct 2004 21:09:26 -0000	1.27
@@ -271,7 +271,7 @@
   else
     context.draw_surface(action->surfaces[(int)frame],
             pos - Vector(action->x_offset, action->y_offset), layer + action->z_order,
-            drawing_effect);
+            action->mirror ? drawing_effect | HORIZONTAL_FLIP : drawing_effect);
 }
 
 void
@@ -287,7 +287,7 @@
   else
     context.draw_surface_part(action->surfaces[(int)frame], source, size,
             pos - Vector(action->x_offset, action->y_offset), layer + action->z_order,
-            drawing_effect);
+            action->mirror ? drawing_effect | HORIZONTAL_FLIP : drawing_effect);
 }
 
 int