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

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

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

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

Modified Files:
	level.cpp 
Log Message:
added/updated some .cvsignores

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- level.cpp	28 Nov 2004 14:56:49 -0000	1.113
+++ level.cpp	5 Dec 2004 17:19:35 -0000	1.114
@@ -141,7 +141,7 @@
   int version = 2;
   writer->write_int("version", version);
 
-  writer->write_string("name", name);
+  writer->write_string("name", name, true);
   writer->write_string("author", author);
   writer->write_int("time", timelimit);
   writer->write_string("end-sequence-animation",

[Super-tux-commit] supertux/data/locale .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
supertux.pot

[Super-tux-commit] supertux/data/levels/world2 .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
messages.pot

[Super-tux-commit] supertux/data/levels/test .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
messages.pot

[Super-tux-commit] supertux/data/levels/bonus1 .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
messages.pot

[Super-tux-commit] supertux/data/levels/contribs .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
messages.pot

[Super-tux-commit] supertux/data/levels/world1 .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
messages.pot

[Super-tux-commit] supertux/data/levels/misc .cvsignore,NONE,1.1

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

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

Added Files:
	.cvsignore 
Log Message:
added/updated some .cvsignores

--- NEW FILE: .cvsignore ---
messages.pot

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

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

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

Modified Files:
	credits.txt 
Log Message:
forgot to add new files

Index: credits.txt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/credits.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- credits.txt	5 Dec 2004 16:57:09 -0000	1.2
+++ credits.txt	5 Dec 2004 17:04:42 -0000	1.3
@@ -2,7 +2,7 @@
 (supertux-text
   (background "oiltux.jpg")
 
-  (text "-- SuperTux -
+  (text (_ "-- SuperTux -
 	Milestone 1
 
 
@@ -106,111 +106,5 @@
 
 
 
-	See you soon in Milestone2!")
-
-; Portuguese (European) by Ricardo Cruz
-  (text-pt_PT "-- SuperTux -
-	 Milestone 1
-
-
--Responsável pela Manutenção
-
-	Tobias (tobgle) Glaesser
-
-
--Originalmente desenvolvido por
-
-	Bill Kendrick
-
-
--Programadores
-
-	Tobias (tobgle) Glaesser
-
-	Ricardo (blacksheep) Cruz
- 
-	Ingo (grumbel) Ruhnke
- 
-	Matthias (MatzeB) Braun
-
-
--Programadores que colaboraram
-
-	Ryan (sik0fewl) Flegel
- 
-	Duong-Khang (neoneurone) NGUYEN
-
-
--Gráficos
-
-	Ingo (grumbel) Ruhnke
- 
-	Christopher A. (paroneayea) Webber
-
-	Benjamin P. (litespeed) Jung
-
-
--Design dos Níveis
-
-	Marek (Wansti) Moeckel
- 
-	Ingo (grumbel) Ruhnke
-
-
--História
-
-	Christopher A. (paroneayea) Webber
-
-
--Música
-
-	Marek (Wansti) Moeckel
-
-	Mystical
-
-	Mortimer Twang
-
-
--Sons
-
-	Efeitos sonoros livres de custo
-	de CDROMs e sites FTP
-
-
--Agradecimentos a
-
-	Larry Ewing
- Criador do Tux, o pinguim do Linux
-
-	SDL e OpenGL
- Por ter possibilitado esta excelente
- experiência de jogo em Linux
-
-
--Contactos
-
-	Visita a nossa página em
-*http://super-tux.sf.net
-
-	Ou visita-nos directamente no IRC:
-*#supertux em irc.freenode.net
-
-	Comentários, ideias e sugestões
-	devem ir para a nossa lista de correio
-*sup...@li...
-
-
-
-
-
-
-
-	Obrigado por teres
-	jogado ao
-
--SuperTux
-
-
-
-	Ver-nos-emos em breve na Milestone2!")
-  )
+	See you soon in Milestone2!"))
+)

[Super-tux-commit] supertux/src/badguy flyingsnowball.cpp,NONE,1.1 flyingsnowball.h,NONE,1.1

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

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

Added Files:
	flyingsnowball.cpp flyingsnowball.h 
Log Message:
forgot to add new files

--- NEW FILE: flyingsnowball.cpp ---
#include <config.h>
#include <stdio.h>

#include "flyingsnowball.h"

static const float FLYTIME = 1.0;
static const float FLYSPEED = 100.0;

FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader)
{
  reader.get("x", start_position.x);
  reader.get("y", start_position.y);
  bbox.set_size(31.8, 31.8);
  sprite = sprite_manager->create("flyingsnowball");
  physic.enable_gravity(false);
}

FlyingSnowBall::FlyingSnowBall(float pos_x, float pos_y)
{
  start_position.x = pos_x;
  start_position.y = pos_y;
  bbox.set_size(31.8, 31.8);
  sprite = sprite_manager->create("flyingsnowball");
  physic.enable_gravity(false);
}

void
FlyingSnowBall::write(lisp::Writer& writer)
{
  writer.start_list("flyingsnowball");

  writer.write_float("x", start_position.x);
  writer.write_float("y", start_position.y);

  writer.end_list("flyingsnowball");
}

void 
FlyingSnowBall::activate()
{
  sprite->set_action(dir == LEFT ? "left" : "right");
  mode = FLY_UP;
  physic.set_velocity_y(FLYSPEED);
  timer.start(FLYTIME/2);
}

bool
FlyingSnowBall::collision_squished(Player& player)
{
  sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
  kill_squished(player);
  return true;
}

HitResponse
FlyingSnowBall::collision_solid(GameObject& , const CollisionHit& hit)
{
  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
    physic.set_velocity_y(0);
  }

  return CONTINUE;
}

void
FlyingSnowBall::active_action(float elapsed_time) 
{
  if(timer.check()) {
    if(mode == FLY_UP) {
      mode = FLY_DOWN;
      physic.set_velocity_y(-FLYSPEED);
    } else if(mode == FLY_DOWN) {
      mode = FLY_UP;
      physic.set_velocity_y(FLYSPEED);
    }
    timer.start(FLYTIME);
  }
  movement=physic.get_movement(elapsed_time);
  dir= Sector::current()->player->get_pos().x>get_pos().x?RIGHT:LEFT;
  sprite->set_action(dir == LEFT ? "left" : "right");
}


--- NEW FILE: flyingsnowball.h ---
#ifndef __FLYINGSNOWBALL_H__
#define __FLYINGSNOWBALL_H__

#include "badguy.h"

class FlyingSnowBall : public BadGuy
{
public:
  FlyingSnowBall(const lisp::Lisp& reader);
  FlyingSnowBall(float pos_x, float pos_y);

  void activate();
  void write(lisp::Writer& writer);
  void active_action(float elapsed_time);
  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
protected:
  enum FlyingSnowballMode {
    FLY_UP,
    FLY_DOWN
  };
  FlyingSnowballMode mode;
  bool collision_squished(Player& player);
private:
  Timer2 timer;
};

#endif

[Super-tux-commit] supertux/src collision_grid_iterator.h,NONE,1.1

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

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

Added Files:
	collision_grid_iterator.h 
Log Message:
forgot to add new files

--- NEW FILE: collision_grid_iterator.h ---
#ifndef __COLLISION_GRID_ITERATOR_H__
#define __COLLISION_GRID_ITERATOR_H__

#include "math/rectangle.h"

using namespace SuperTux;

class CollisionGrid;

class CollisionGridIterator
{
public:
  CollisionGridIterator(CollisionGrid& newgrid, const Rectangle& bbox)
    : grid(newgrid)
  {
    start_x = int(bbox.p1.x / grid.cell_width);
    if(start_x < 0)
      start_x = 0;
    x = start_x;
        
    y = int(bbox.p1.y / grid.cell_height);
    if(y < 0)
      y = 0;
    
    end_x = int(bbox.p2.x / grid.cell_width) + 1;
    if(end_x > (int) grid.cells_x)
      end_x = grid.cells_x;
    
    end_y = int(bbox.p2.y / grid.cell_height) + 1;
    if(end_y > (int) grid.cells_y)
      end_y = grid.cells_y;

    if(start_x >= end_x) {
      printf("bad region.\n");
      y = 0;
      end_y = 0;
      return;
    }

    timestamp = grid.iterator_timestamp++;
    entry = 0;
  }

  MovingObject* next()
  {
    CollisionGrid::ObjectWrapper* wrapper = next_wrapper();
    if(wrapper == 0)
      return 0;
        
    return wrapper->object;
  }

private:
  friend class CollisionGrid;

  CollisionGrid::ObjectWrapper* next_wrapper() 
  {
    CollisionGrid::ObjectWrapper* wrapper;
    
    do {
      while(entry == 0) {
        if(y >= end_y)
          return 0;
        
        entry = grid.grid[y*grid.cells_x + x];
        x++;
        if(x >= end_x) {
          x = start_x;
          y++;
        }
      }
      
      wrapper = entry->object_wrapper;
      entry = entry->next;
    } while(wrapper->timestamp == timestamp);
    
    wrapper->timestamp = timestamp;
    
    return wrapper;
  }
    
  CollisionGrid& grid;
  CollisionGrid::GridEntry* entry;
  int x, y;
  int start_x, end_x, end_y;
  int timestamp;
};

#endif

[Super-tux-commit] supertux/lib/video font.cpp,1.17,1.18

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

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

Modified Files:
	font.cpp 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: font.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/video/font.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- font.cpp	2 Dec 2004 00:25:27 -0000	1.17
+++ font.cpp	5 Dec 2004 16:57:12 -0000	1.18
@@ -260,6 +260,7 @@
   int done = 0;
   float scroll = 0;
   float speed = scroll_speed / 50;
+  float left_border = 50;
 
   DrawingContext context;
   SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
@@ -316,18 +317,32 @@
         }
 
         Font* font = 0;
+        bool center = true;
         switch(names[i][0])
         {
           case ' ': font = small_font; break;
           case '\t': font = normal_font; break;
           case '-': font = heading_font; break;
           case '*': font = reference_font; break;
-          default: font = reference_font; break;
+          case '#': font = normal_font; center = false; break;
+          default: 
+            break;
         }
-
-        context.draw_text(font,
-            names[i].substr(1, names[i].size()-1),
-            Vector(screen->w/2, screen->h + y - scroll), CENTER_ALLIGN, LAYER_FOREGROUND1);
+        
+        if(font) {
+          if(center) {
+            context.draw_text(font,
+                              names[i].substr(1, names[i].size()-1),
+                              Vector(screen->w/2, screen->h + y - scroll),
+                              CENTER_ALLIGN, LAYER_FOREGROUND1);
+          } else {
+            context.draw_text(font,
+                              names[i].substr(1, names[i].size()-1),
+                              Vector(left_border, screen->h + y - scroll),
+                              LEFT_ALLIGN, LAYER_FOREGROUND1);
+          }
+        }                   
+          
         y += font->get_height() + ITEMS_SPACE;
       }
 

[Super-tux-commit] supertux/data/levels/bonus1 extro.txt,NONE,1.1 worldmap.stwm,1.2,1.3

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

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

Modified Files:
	worldmap.stwm 
Added Files:
	extro.txt 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: worldmap.stwm
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/worldmap.stwm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- worldmap.stwm	2 Dec 2004 01:41:55 -0000	1.2
+++ worldmap.stwm	5 Dec 2004 16:57:11 -0000	1.3
@@ -71,7 +71,7 @@
            (x 30)
 	        (y 39))
 	 (level (name "/bonus-level4.stl")
-			  (extro-filelevel "extro-bonus.txt")
+			  (extro-filelevel "extro.txt")
            (x 32)
 	        (y 46))
 	 (level (name "bonus-level5.stl")

--- NEW FILE: extro.txt ---
(supertux-text
  (background "actis.jpg")
  (text (_ "-Congratulations!

#You have successfully finished
#Bonus Island I

	featuring levels contributed by
	Jason W. Thompson
	Torfi Gunnarsson
	Abednego
	Matr1x

	
#If you didn't clear all levels yet,
#find your way back home and take 
#another path. There is still more
#challenge waiting for you!

#And there is a secret level to be
#found as well...
	
#A big "Thank you" goes out to
#everyone who contributed to this
#release. We hope you enjoyed it!))
)

[Super-tux-commit] supertux/data/levels/world1 extro.txt,NONE,1.1 intro.txt,NONE,1.1 de.po,1.1,1.2 worldmap.stwm,1.1,1.2

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

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

Modified Files:
	de.po worldmap.stwm 
Added Files:
	extro.txt intro.txt 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: de.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/de.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de.po	2 Dec 2004 01:41:55 -0000	1.1
+++ de.po	5 Dec 2004 16:57:12 -0000	1.2
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: world 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 02:10+0100\n"
+"POT-Creation-Date: 2004-12-05 17:38+0100\n"
 "PO-Revision-Date: 2004-12-02 02:25+0100\n"
 "Last-Translator:  <ma...@br...>\n"
 "Language-Team: German <de...@li...>\n"
@@ -17,6 +17,57 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/levels/world1/intro.txt:5
+msgid ""
+"-Penny gets captured!\n"
+"\n"
+"#Tux and Penny were out having a nice\n"
+"#picnic on the ice fields of Antarctica.\n"
+"#Suddenly, a creature jumped from\n"
+"#behind an ice bush, there was a flash,\n"
+"#and Tux fell asleep!\n"
+"\n"
+"#When Tux wakes up, he finds that Penny\n"
+"#is missing. Where she lay before now\n"
+"#lies a letter. \"Tux, my arch enemy!\"\n"
+"#says the letter. \"I have captured\n"
+"#your beautiful Penny and have taken her\n"
+"#to my fortress. The path to my fortress\n"
+"#is littered with my minions. Give up on\n"
+"#the thought of trying to reclaim her,\n"
+"#you haven't a chance! -Nolok\"\n"
+"\n"
+"#Tux looks and see Nolok's fortress in\n"
+"#the distance. Determined to save his\n"
+"#beloved Penny, he begins his journey."
+msgstr ""
+"-Penny ist verschwunden!\n"
+"\n"
+"#Tux und Penny sassen gemütlich beim Picknick\n"
+"#in den eisigen Ebenen der Antarktis.\n"
+"#Plötzlich sprang eine dunkle Kreatur hinter\n"
+"#einem Felsen hervor. Tux sah einen grellen\n"
+"#Blitz, dann wurde er ohnmächtig.\n"
+"\n"
+"#Als er aufwachte bemerkte er, dass Penny\n"
+"#verschwunden war. Wo sie eben noch gesessen\n"
+"#hatte lag jetzt ein Zettel:\n"
+"\n"
+"#\"Tux, mein Erzfeind!\n"
+"#Ich habe deine Freundinn Penny entführt und\n"
+"#halte sie in meiner Festung gefangen. Den Weg\n"
+"#dorthin bewachen meine finsteren Kreaturen!\n"
+"#Versuche gar nicht erst sie zu retten, du\n"
+"#hast keine Chance! -Nolok\"\n"
+"\n"
+"#Tux blickte auf und sah Noloks Festung in\n"
+"#der Ferne. Fest entschlossen seine gelibte\n"
+"#Penny zu retten machte er sich auf den Weg.\n"
+
+#: data/levels/world1/worldmap.stwm:4
+msgid "Icyisland"
+msgstr ""
+
 #: data/levels/world1/level1.stl:5
 msgid "Welcome to Antarctica"
 msgstr "Willkommen in Antarktika"
@@ -24,3 +75,78 @@
 #: data/levels/world1/level2.stl:5
 msgid "The Journey Begins"
 msgstr "Die Reise Beginnt"
+
+#: data/levels/world1/level3.stl:5
+msgid "Via Nostalgica"
+msgstr ""
+
+#: data/levels/world1/extro.txt:7
+#, fuzzy
+msgid ""
+"-Entering Nolok's Throne Room!\n"
+"\n"
+"#Tux ran into Nolok's throne room,\n"
+"#frantically searching for his beloved.\n"
+"#Alas, he found neither Penny nor Nolok\n"
+"#there, but instead, another note.\n"
+"\n"
+"#\"Well done, Tux, well done. If you are\n"
+"#reading this, you have removed my\n"
+"#control over this icy fortress. But as\n"
+"#you can see, your beloved Penny is not\n"
+"#here. What you did not realize is that\n"
+"#this is just one of my many fortresses,\n"
+"#spread far across the lands!\n"
+"\n"
+"#\"Tux, your ambition is most honorable,\n"
+"#but futile nonetheless. With every\n"
+"#fortress you conquer of mine, I will\n"
+"#escape to another, and take Penny with\n"
+"#me. Do not be silly... it is best that\n"
+"#you give up now.\"\n"
+"\n"
+"#Tux was sadly leaving the room, when he\n"
+"#felt something beneath his foot... an\n"
+"#envelope, addressed to him! Inside was\n"
+"#a roughly sketched map with fortresses\n"
+"#drawn in various lands. On the corner\n"
+"#of the map was Penny's signature, a\n"
+"#drawing of the ice flower.\n"
+"\n"
+"#Tux ran out of the fortress, map in\n"
+"#hand. No, he decided, he would not give\n"
+"#up. Penny was counting on him."
+msgstr ""
+"-In Noloks Thronsaal\n"
+"#Tux betrat Noloks Thronsaal und\n"
+"#suchte verzweifelt nach seiner Geliebten,\n"
+"#leider konnte er weder Penny noch Nolok\n"
+"#dort entdecken, stattdessen fand er eine\n"
+"#weitere Nachricht.\n"
+"\n"
+"#\"Gut gemaacht mein leiber Tux, sehr gut.\n"
+"#Wenn du dies hier liest, hast du diese\n"
+"#eisige Festung von mir befreit. Aber wie\n"
+"#du siehst ist deine geliebte Penny nicht\n"
+"#hier. Hast du nicht gemerkt, dass dies\n"
+"#nur eine meiner vielen Festungen ist,\n"
+"#die über die ganze Welt verteilt sind!\n"
+"\n"
+"#\"Tux, dein Bestreben ist ehrenwert, und\n"
+"#dennoch vergeblich. Mit jeder meiner\n"
+"#Festungen die du eroberst, werde ich zu\n"
+"#einer weiteren fliehen. Sei nicht dumm,\n"
+"#es wäre das beste jetzt aufzugeben.\n"
+"\n"
+"#Tux verliess traurig den Sall, als etwas\n"
+"#unter seinem Fuss raschelte...\n"
+"#Ein Briefumschlag mit seinem Namen!\n"
+"#In dem Umschlag war eine grobe Karte,\n"
+"#die Festungen in verschiedenen Ländern\n"
+"#zeigte. Auf der Rückseite der Karte war\n"
+"#Pennys Zeichen, das Bild einer Eisblume.\n"
+"\n"
+"#Tux nahm die Karte in die Hand und rannte\n"
+"#aus der Festung. Nein, er würde nicht\n"
+"#einfach aufgeben. Penny verliess sich auf\n"
+"#ihn.\n"

Index: worldmap.stwm
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/worldmap.stwm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- worldmap.stwm	2 Dec 2004 00:25:26 -0000	1.1
+++ worldmap.stwm	5 Dec 2004 16:57:12 -0000	1.2
@@ -1,10 +1,11 @@
 ;; Generated with Flexlay Editor
 (supertux-worldmap
   (properties 
-    (name  "Icyisland")
+    (name (_ "Icyisland"))
     (name-pt_PT  "Ilha Gelada")
     (name-de "Eisige Insel")
     (name-es "Isla de hielo")
+    (intro-filename "intro.txt")
     (music "salcon.mod")
     (start_pos_x 4)
     (start_pos_y 5))

--- NEW FILE: intro.txt ---
; Introduction text
(supertux-text
  (background "arctis.jpg")

  (text (_ "-Penny gets captured!

#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 Penny
#is missing. Where she lay before now
#lies a letter. \"Tux, my arch enemy!\"
#says the letter. \"I have captured
#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,
#you haven't a chance! -Nolok\"

#Tux looks and see Nolok's fortress in
#the distance. Determined to save his
#beloved Penny, he begins his journey."))
)


--- NEW FILE: extro.txt ---
; Ending text
(supertux-text
  (background "extro.jpg")
  (music "theme.mod")
  (show-after "CREDITS")

  (text (_ "-Entering Nolok's Throne Room!

#Tux ran into Nolok's throne room,
#frantically searching for his beloved.
#Alas, he found neither Penny nor Nolok
#there, but instead, another note.

#\"Well done, Tux, well done. If you are
#reading this, you have removed my
#control over this icy fortress. But as
#you can see, your beloved Penny is not
#here. What you did not realize is that
#this is just one of my many fortresses,
#spread far across the lands!

#\"Tux, your ambition is most honorable,
#but futile nonetheless. With every
#fortress you conquer of mine, I will
#escape to another, and take Penny with
#me. Do not be silly... it is best that
#you give up now.\"

#Tux was sadly leaving the room, when he
#felt something beneath his foot... an
#envelope, addressed to him! Inside was
#a roughly sketched map with fortresses
#drawn in various lands. On the corner
#of the map was Penny's signature, a
#drawing of the ice flower.

#Tux ran out of the fortress, map in
#hand. No, he decided, he would not give
#up. Penny was counting on him."))
)

[Super-tux-commit] supertux/data Jamfile,1.4,1.5 credits.txt,1.1,1.2 extro-bonus.txt,1.2,NONE extro.txt,1.6,NONE intro.txt,1.8,NONE

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

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

Modified Files:
	Jamfile credits.txt 
Removed Files:
	extro-bonus.txt extro.txt intro.txt 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: Jamfile
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/Jamfile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Jamfile	2 Dec 2004 01:41:54 -0000	1.4
+++ Jamfile	5 Dec 2004 16:57:09 -0000	1.5
@@ -35,9 +35,9 @@
 ;
 
 for p in $(LEVELPATHS) {
-  InstallData [ Wildcard $(p) : info *.stl *.stwm ] : $(p) ;
+  InstallData [ Wildcard $(p) : info *.stl *.stwm *.txt ] : $(p) ;
 
-  local translatable_lisp = [ Wildcard $(p) : info *.stl *.stwm ] ;
+  local translatable_lisp = [ Wildcard $(p) : info *.stl *.stwm *.txt ] ;
   SEARCH on $(translatable_lisp) = $(SEARCH_SOURCE) ;
   MakePot $(SUBDIR)/$(p)/messages.pot : $(translatable_lisp) ;
   XGETTEXT_FLAGS on $(SUBDIR)/$(p)/messages.pot += --language=Lisp ;

--- extro-bonus.txt DELETED ---

Index: credits.txt
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/credits.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- credits.txt	21 Nov 2004 00:49:30 -0000	1.1
+++ credits.txt	5 Dec 2004 16:57:09 -0000	1.2
@@ -3,7 +3,7 @@
   (background "oiltux.jpg")
 
   (text "-- SuperTux -
-	 Milestone 1
+	Milestone 1
 
 
 -Maintainer
@@ -213,4 +213,4 @@
 
 
 	Ver-nos-emos em breve na Milestone2!")
-  )
\ No newline at end of file
+  )

--- intro.txt DELETED ---

--- extro.txt DELETED ---

[Super-tux-commit] supertux/src collision_grid.cpp,1.1,1.2 collision_grid.h,1.2,1.3 gameloop.cpp,1.210,1.211 sector.cpp,1.58,1.59 sector.h,1.29,1.30 worldmap.cpp,1.138,1.139 worldmap.h,1.53,1.54

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

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

Modified Files:
	collision_grid.cpp collision_grid.h gameloop.cpp sector.cpp 
	sector.h worldmap.cpp worldmap.h 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: sector.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- sector.h	29 Nov 2004 16:03:32 -0000	1.29
+++ sector.h	5 Dec 2004 16:57:14 -0000	1.30
@@ -139,6 +139,8 @@
   typedef std::vector<GameObject*> GameObjects;
   GameObjects gameobjects;
 
+  Rectangle get_active_region();
+
 private:
   void fix_old_tiles();
   

Index: collision_grid.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision_grid.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- collision_grid.h	1 Dec 2004 15:58:38 -0000	1.2
+++ collision_grid.h	5 Dec 2004 16:57:13 -0000	1.3
@@ -25,6 +25,8 @@
   void check_collisions();
 
 private:
+  friend class CollisionGridIterator;
+  
   struct ObjectWrapper
   {
     MovingObject* object;
@@ -58,6 +60,7 @@
   float height;
   float cell_width;
   float cell_height;
+  int iterator_timestamp;
 };
 
 extern CollisionGrid* bla;

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- worldmap.cpp	2 Dec 2004 01:41:57 -0000	1.138
+++ worldmap.cpp	5 Dec 2004 16:57:14 -0000	1.139
@@ -49,6 +49,8 @@
 
 Menu* worldmap_menu  = 0;
 
+static const float TUXSPEED = 200;
+
 namespace WorldMapNS {
 
 Direction reverse_dir(Direction direction)
@@ -220,8 +222,8 @@
     }
   else
     {
-      // Let tux walk a few pixels (20 pixel/sec)
-      offset += 20.0f * delta;
+      // Let tux walk
+      offset += TUXSPEED * delta;
 
       if (offset > 32)
         { // We reached the next tile, so we check what to do now
@@ -349,6 +351,7 @@
 
   name = "<no title>";
   music = "salcon.mod";
+  intro_displayed = false;
 
   total_stats.reset();
 }
@@ -393,6 +396,7 @@
         const lisp::Lisp* props = iter.lisp();
         props->get("name", name);
         props->get("music", music);
+        props->get("intro-filename", intro_filename);
         props->get("start_pos_x", start_x);
         props->get("start_pos_y", start_y);
       } else if(iter.item() == "special-tiles") {
@@ -827,14 +831,13 @@
         }
       /* The porpose of the next checking is that if the player lost
          the level (in case there is one), don't show anything */
-      if(level_finished)
-        {
-        if (!level->extro_filename.empty())
-          {
+      if(level_finished) {
+        if (!level->extro_filename.empty()) {
           // Display a text file
-          display_text_file(level->extro_filename, SCROLL_SPEED_MESSAGE,
-              white_big_text , white_text, white_small_text, blue_text );
-          }
+          std::string filename = levels_path + level->extro_filename;
+          display_text_file(filename, SCROLL_SPEED_MESSAGE,
+                            white_big_text , white_text, white_small_text, blue_text );
+        }
 
         if (!level->next_worldmap.empty())
           {
@@ -1035,50 +1038,47 @@
   song = SoundManager::get()->load_music(datadir +  "/music/" + music);
   SoundManager::get()->play_music(song);
 
-  FrameRate frame_rate(10);
-  frame_rate.set_frame_limit(false);
-
-  frame_rate.start();
+  if(!intro_displayed && intro_filename != "") {
+    std::string filename = levels_path + intro_filename;
+    display_text_file(filename, SCROLL_SPEED_MESSAGE,
+                      white_big_text, white_text, white_small_text, blue_text);
+    intro_displayed = true;
+  }
 
+  Uint32 lastticks = SDL_GetTicks();
   DrawingContext context;
-  while(!quit)
-    {
-      float delta = frame_rate.get();
-
-      delta *= 1.3f;
-
-      if (delta > 10.0f)
-        delta = .3f;
-	
-      frame_rate.update();
-
-      Vector tux_pos = tux->get_pos();
-      if (1)
-        {
-          offset.x = -tux_pos.x + screen->w/2;
-          offset.y = -tux_pos.y + screen->h/2;
-
-          if (offset.x > 0) offset.x = 0;
-          if (offset.y > 0) offset.y = 0;
+  while(!quit) {
+    Uint32 ticks = SDL_GetTicks();
+    float elapsed_time = float(ticks - lastticks) / 1000;
+    global_time += elapsed_time;
+    lastticks = ticks;
+    
+    // 40 fps minimum
+    if(elapsed_time > .025)
+      elapsed_time = .025;
+    
+    Vector tux_pos = tux->get_pos();
+    
+    offset.x = -tux_pos.x + screen->w/2;
+    offset.y = -tux_pos.y + screen->h/2;
 
-          if (offset.x < screen->w - width*32) offset.x = screen->w - width*32;
-          if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
-        } 
+    if (offset.x > 0) offset.x = 0;
+    if (offset.y > 0) offset.y = 0;
 
-      draw(context, offset);
-      get_input();
-      update(delta);
+    if (offset.x < screen->w - width*32) offset.x = screen->w - width*32;
+    if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
+    
+    draw(context, offset);
+    get_input();
+    update(elapsed_time);
       
-      if(Menu::current())
-        {
-          Menu::current()->draw(context);
-          mouse_cursor->draw(context);
-        }
-
-      context.do_drawing();
-
-      SDL_Delay(20);
+    if(Menu::current()) {
+      Menu::current()->draw(context);
+      mouse_cursor->draw(context);
     }
+
+    context.do_drawing();
+  }
 }
 
 void
@@ -1110,6 +1110,7 @@
   writer.write_string("title",
       std::string(name + " - " + nb_solved_levels_str+"/"+total_levels_str));
   writer.write_string("map", map_filename);
+  writer.write_bool("intro-displayed", intro_displayed);
   writer.write_int("lives", player_status.lives);
   writer.write_int("distros", player_status.lives);
   writer.write_int("max-score-multiplier", player_status.max_score_multiplier);
@@ -1163,6 +1164,7 @@
     savegame->get("map", map_filename);
     load_map(); 
 
+    savegame->get("intro-displayed", intro_displayed);
     savegame->get("lives", player_status.lives);
     savegame->get("distros", player_status.distros);
     savegame->get("max-score-multiplier", player_status.max_score_multiplier);
@@ -1232,8 +1234,3 @@
 }
 
 } // namespace WorldMapNS
-
-/* Local Variables: */
-/* mode:c++ */
-/* End: */
-

Index: collision_grid.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/collision_grid.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- collision_grid.cpp	29 Nov 2004 16:03:30 -0000	1.1
+++ collision_grid.cpp	5 Dec 2004 16:57:13 -0000	1.2
@@ -4,11 +4,13 @@
 #include "collision_grid.h"
 #include "special/collision.h"
 #include "sector.h"
+#include "collision_grid_iterator.h"
 
 static const float DELTA = .001;
 
 CollisionGrid::CollisionGrid(float newwidth, float newheight)
-  : width(newwidth), height(newheight), cell_width(128), cell_height(128)
+  : width(newwidth), height(newheight), cell_width(128), cell_height(128),
+    iterator_timestamp(0)
 {
   cells_x = size_t(width / cell_width) + 1;
   cells_y = size_t(height / cell_height) + 1;
@@ -116,8 +118,8 @@
 void
 CollisionGrid::check_collisions()
 {
-  for(Objects::iterator i = objects.begin(); i != objects.end(); ++i) {
-    ObjectWrapper* wrapper = *i;
+  CollisionGridIterator iter(*this, Sector::current()->get_active_region());
+  while(ObjectWrapper* wrapper = iter.next_wrapper()) {
     MovingObject* object = wrapper->object;
     if(!object->is_valid())
       continue;
@@ -140,8 +142,7 @@
 void
 CollisionGrid::collide_object(ObjectWrapper* wrapper)
 {
-  static int timestamp = 0;
-  timestamp++;
+  iterator_timestamp++;
 
   const Rectangle& bbox = wrapper->object->bbox;
   for(float y = bbox.p1.y; y < bbox.p2.y; y += cell_height) {
@@ -158,13 +159,13 @@
           entry = entry->next) {
         ObjectWrapper* wrapper2 = entry->object_wrapper;
         // only check each object once (even if it is in multiple cells)
-        if(wrapper2->timestamp == timestamp)
+        if(wrapper2->timestamp == iterator_timestamp)
           continue;
         // don't collide with objects we already collided with
         if(wrapper2->id <= wrapper->id)
           continue;
 
-        wrapper->timestamp = timestamp;
+        wrapper->timestamp = iterator_timestamp;
         collide_object_object(wrapper, wrapper2);
       }
     }

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- gameloop.cpp	2 Dec 2004 00:25:27 -0000	1.210
+++ gameloop.cpp	5 Dec 2004 16:57:13 -0000	1.211
@@ -964,12 +964,6 @@
       stream << slot;
       std::string slotfile = st_save_dir + "/slot" + stream.str() + ".stsg";
 
-      if (access(slotfile.c_str(), F_OK) != 0)
-        {
-          shrink_fade(Vector(screen->w/2,screen->h/2), 600);
-          draw_intro();
-        }
-
       fadeout(256);
       DrawingContext context;
       context.draw_text(white_text, "Loading...",

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- worldmap.h	2 Dec 2004 00:25:27 -0000	1.53
+++ worldmap.h	5 Dec 2004 16:57:14 -0000	1.54
@@ -199,6 +199,9 @@
 
   Vector offset;
   std::string savegame_file;
+  
+  std::string intro_filename;
+  bool intro_displayed;
 
   void get_level_title(Level& level);
 

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sector.cpp	1 Dec 2004 23:26:30 -0000	1.58
+++ sector.cpp	5 Dec 2004 16:57:13 -0000	1.59
@@ -43,6 +43,7 @@
 #include "resources.h"
 #include "statistics.h"
 #include "collision_grid.h"
+#include "collision_grid_iterator.h"
 #include "special/collision.h"
 #include "math/rectangle.h"
 #include "math/aatriangle.h"
@@ -55,6 +56,7 @@
 #include "badguy/snowball.h"
 #include "badguy/bouncing_snowball.h"
 #include "badguy/flame.h"
+#include "badguy/flyingsnowball.h"
 #include "badguy/mriceblock.h"
 #include "badguy/mrbomb.h"
 #include "badguy/dispenser.h"
@@ -133,6 +135,8 @@
     return new BouncingSnowball(reader);
   } else if(name == "flame") {
     return new Flame(reader);
+  } else if(name == "flyingsnowball") {
+    return new FlyingSnowBall(reader);
   } else if(name == "mriceblock") {
     return new MrIceBlock(reader);
   } else if(name == "mrbomb") {
@@ -466,11 +470,28 @@
   return best_reset_point;
 }
 
+Rectangle
+Sector::get_active_region()
+{
+  return Rectangle(
+    camera->get_translation() - Vector(1600, 1200),
+    camera->get_translation() + Vector(1600, 1200));
+}
+
 void
 Sector::action(float elapsed_time)
 {
   player->check_bounds(camera);
-                                                                                
+
+#if 0
+  CollisionGridIterator iter(*grid, get_active_region());
+  while(MovingObject* object = iter.next()) {
+    if(!object->is_valid())
+      continue;
+
+    object->action(elapsed_time);
+  }
+#else
   /* update objects */
   for(GameObjects::iterator i = gameobjects.begin();
           i != gameobjects.end(); ++i) {
@@ -480,7 +501,8 @@
     
     object->action(elapsed_time);
   }
-                                                                                
+#endif
+  
   /* Handle all possible collisions. */
   collision_handler();                                                                              
   update_game_objects();
@@ -555,7 +577,16 @@
 {
   context.push_transform();
   context.set_translation(camera->get_translation());
-  
+
+#if 0
+  CollisionGridIterator iter(*grid, get_active_region());
+  while(MovingObject* object = iter.next()) {
+    if(!object->is_valid())
+      continue;
+
+    object->draw(context);
+  }
+#else
   for(GameObjects::iterator i = gameobjects.begin();
       i != gameobjects.end(); ++i) {
     GameObject* object = *i; 
@@ -564,6 +595,7 @@
     
     object->draw(context);
   }
+#endif
 
   context.pop_transform();
 }

[Super-tux-commit] supertux/src/badguy badguy.cpp,1.8,1.9 jumpy.cpp,1.6,1.7 jumpy.h,1.3,1.4

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

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

Modified Files:
	badguy.cpp jumpy.cpp jumpy.h 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: jumpy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jumpy.cpp	2 Dec 2004 00:25:27 -0000	1.6
+++ jumpy.cpp	5 Dec 2004 16:57:14 -0000	1.7
@@ -47,3 +47,14 @@
 
   return CONTINUE;
 }
+
+void
+Jumpy::active_action(float elapsed_time)
+{
+  BadGuy::active_action(elapsed_time);
+  
+  dir = Sector::current()->player->get_pos().x > get_pos().x
+    ? RIGHT : LEFT;
+    //FIXME: add middle and up here
+  sprite->set_action(dir == LEFT ? "left-down" : "right-down");
+}

Index: jumpy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/jumpy.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jumpy.h	29 Nov 2004 00:12:24 -0000	1.3
+++ jumpy.h	5 Dec 2004 16:57:14 -0000	1.4
@@ -12,6 +12,7 @@
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
 
   void write(lisp::Writer& writer);
+  void active_action(float);
 
 private:
   HitResponse hit(const CollisionHit& hit);

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy/badguy.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- badguy.cpp	29 Nov 2004 00:12:24 -0000	1.8
+++ badguy.cpp	5 Dec 2004 16:57:14 -0000	1.9
@@ -155,6 +155,7 @@
 {
   SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(),
       player.get_pos());
+  physic.enable_gravity(true);
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
   set_state(STATE_SQUISHED);

[Super-tux-commit] htdocs news.xml,1.12,1.13

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

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

Modified Files:
	news.xml 
Log Message:
- added fansite news item

Index: news.xml
===================================================================
RCS file: /cvsroot/super-tux/htdocs/news.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- news.xml	26 Oct 2004 05:44:31 -0000	1.12
+++ news.xml	2 Dec 2004 19:44:51 -0000	1.13
@@ -2,6 +2,11 @@
 <page title="SuperTux">
   <section title="News">
     <news>
+      <item date="2. December 2004">
+        It looks like we have our first fansite. You can find it at
+        <a href="http://cd.bromley.ac.uk/supertux/">SuperTux: The Fan Site</a>.
+        It includes game information, tips, cheats and more.
+      </item>
       <item date="25. October 2004">
         Better late than never. We now have a Mandrake RPM, Mac OS X binary and
         a BeOS package in our <a href="download.html">download section</a>.

[Super-tux-commit] supertux/data/locale de.po,1.1,1.2

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

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

Modified Files:
	de.po 
Log Message:
small translation update

Index: de.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/locale/de.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de.po	23 Nov 2004 22:21:28 -0000	1.1
+++ de.po	2 Dec 2004 01:56:26 -0000	1.2
@@ -419,9 +419,8 @@
 msgstr ""
 
 #: src/misc.cpp:162
-#, fuzzy
 msgid "Save Game"
-msgstr "Spiel Beginnen"
+msgstr "Spiel Speichern"
 
 #: src/misc.cpp:172 src/misc.cpp:179
 msgid "Pause"
@@ -432,14 +431,12 @@
 msgstr ""
 
 #: src/misc.cpp:177
-#, fuzzy
 msgid "Abort Level"
-msgstr "Zusatzlevel"
+msgstr "Level Abbrechen"
 
 #: src/misc.cpp:184
-#, fuzzy
 msgid "Quit Game"
-msgstr "Spiel Beginnen"
+msgstr "Spiel Beenden"
 
 #: src/misc.cpp:186
 msgid "Enter your name:"

[Super-tux-commit] supertux Jamfile,1.6,1.7

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

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

Modified Files:
	Jamfile 
Log Message:
Made lispfiles translatable. This time the translations are stored externally
in .po files in the same directory as the lisp files. So you can have
translation files for complete level subsets now.

Because Ricardo added a hacked solution before and because people already used
that, someone has to go over all the maps now, extract the translations and put
them into separate files, I'm too lazy to do that now, I just translated some
files for testing.
Translation-Patches are always welcome ;-)


Index: Jamfile
===================================================================
RCS file: /cvsroot/super-tux/supertux/Jamfile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Jamfile	27 Nov 2004 14:48:10 -0000	1.6
+++ Jamfile	2 Dec 2004 01:41:54 -0000	1.7
@@ -1,5 +1,24 @@
 SubDir TOP ;
 
+if $(XGETTEXT) != ""
+{
+    actions XGetText
+    {
+        $(XGETTEXT) $(XGETTEXT_FLAGS) --keyword='_:1' -o $(<) $(>)
+    }
+    rule MakePot
+    {
+      if $(>) {
+        XGetText $(<) : $(>) ;
+        Depends $(<) : $(>) ;
+        Depends all : $(<) ;
+      }
+    }
+} else {
+    rule MakePot
+    { }
+}
+
 # Decend into subdirs
 SubInclude TOP lib ;
 SubInclude TOP src ;
@@ -10,15 +29,5 @@
 # add some additional files to package
 Package INSTALL NEWS README COPYING AUTHORS ChangeLog ;
 
-if $(XGETTEXT) != ""
-{
-
-    actions MakePot
-    {
-        $(XGETTEXT) --keyword='_:1' --c++ -o $(<) $(>)
-    }
-    MakePot supertux.pot : $(TRANSLATABLE_SOURCES) ;
-    Depends supertux.pot : $(TRANSLATABLE_SOURCES) ;
-    MakeLocate supertux.pot : data/locale ;
-    Depends all : supertux.pot ;
-}
+MakePot data/locale/supertux.pot : $(TRANSLATABLE_SOURCES) ;
+XGETTEXT_FLAGS on data/locale/supertux.pot += --language=C++ ;

[Super-tux-commit] supertux/data/levels/misc menu.stl,1.10,1.11

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

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

Modified Files:
	menu.stl 
Log Message:
Made lispfiles translatable. This time the translations are stored externally
in .po files in the same directory as the lisp files. So you can have
translation files for complete level subsets now.

Because Ricardo added a hacked solution before and because people already used
that, someone has to go over all the maps now, extract the translations and put
them into separate files, I'm too lazy to do that now, I just translated some
files for testing.
Translation-Patches are always welcome ;-)


Index: menu.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/misc/menu.stl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- menu.stl	9 Sep 2004 10:13:52 -0000	1.10
+++ menu.stl	2 Dec 2004 01:41:55 -0000	1.11
@@ -1,7 +1,7 @@
 ;SuperTux-Level
 (supertux-level
   (version 1)
-  (name "Hello World")
+  (name (_ "Menu Level"))
   (author "unknown author")
   (music "theme.mod")
   (background "arctis.jpg")

[Super-tux-commit] supertux/data/levels/test sectors.stl,1.2,1.3

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

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

Modified Files:
	sectors.stl 
Log Message:
Made lispfiles translatable. This time the translations are stored externally
in .po files in the same directory as the lisp files. So you can have
translation files for complete level subsets now.

Because Ricardo added a hacked solution before and because people already used
that, someone has to go over all the maps now, extract the translations and put
them into separate files, I'm too lazy to do that now, I just translated some
files for testing.
Translation-Patches are always welcome ;-)


Index: sectors.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/test/sectors.stl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sectors.stl	28 Nov 2004 14:56:47 -0000	1.2
+++ sectors.stl	2 Dec 2004 01:41:55 -0000	1.3
@@ -1,6 +1,6 @@
 (supertux-level
   (version 2)
-  (name "Sector Test")
+  (name (_ "Sector Test"))
   (author "Matthias Braun")
   (time 500)
   (sector

[Super-tux-commit] supertux/data/levels/contribs level1.stl,1.1,1.2

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

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

Modified Files:
	level1.stl 
Log Message:
Made lispfiles translatable. This time the translations are stored externally
in .po files in the same directory as the lisp files. So you can have
translation files for complete level subsets now.

Because Ricardo added a hacked solution before and because people already used
that, someone has to go over all the maps now, extract the translations and put
them into separate files, I'm too lazy to do that now, I just translated some
files for testing.
Translation-Patches are always welcome ;-)


Index: level1.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/contribs/level1.stl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- level1.stl	17 Sep 2004 15:53:08 -0000	1.1
+++ level1.stl	2 Dec 2004 01:41:55 -0000	1.2
@@ -1,7 +1,7 @@
 ;SuperTux-Level
 (supertux-level
   (version 1)
-  (name "The long cave")
+  (name (_ "The long cave"))
   (author "Torfi Gunnarsson")
   (music "cave.mod")
   (background "cave2.jpg")

[Super-tux-commit] supertux/data/levels/bonus1 de.po,NONE,1.1 wansti-level1.stl,1.5,1.6 worldmap.stwm,1.1,1.2

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

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

Modified Files:
	wansti-level1.stl worldmap.stwm 
Added Files:
	de.po 
Log Message:
Made lispfiles translatable. This time the translations are stored externally
in .po files in the same directory as the lisp files. So you can have
translation files for complete level subsets now.

Because Ricardo added a hacked solution before and because people already used
that, someone has to go over all the maps now, extract the translations and put
them into separate files, I'm too lazy to do that now, I just translated some
files for testing.
Translation-Patches are always welcome ;-)


Index: worldmap.stwm
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/worldmap.stwm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- worldmap.stwm	2 Dec 2004 00:25:26 -0000	1.1
+++ worldmap.stwm	2 Dec 2004 01:41:55 -0000	1.2
@@ -1,7 +1,7 @@
 ;; Generated with Flexlay Editor
 (supertux-worldmap
   (properties 
-    (name  "Bonus Island I")
+    (name  (_ "Bonus Island I"))
     (start_pos_x 35)
     (start_pos_y 2))
   (tilemap 
@@ -128,13 +128,13 @@
     (level (name "wansti-level5.stl")
            (x 50)
            (y 22))
-			  
-			(special-tile (map-message "You found a secret place!")
+    (special-tile (map-message (_ "You found a secret place!"))
            (x 33) 
            (y 39) (passive-message #t)
            (apply-to-direction "west-north-south"))
 			  
-			(special-tile (map-message "Hint: Use igloos to get back here.")
+			(special-tile (map-message 
+                                       (_ "Hint: Use igloos to get back here."))
            (x 35)
            (y 5) (passive-message #t)
            (apply-to-direction "north"))
@@ -142,61 +142,61 @@
 			(special-tile 
 	        (x 33)
 			  (y 8)
-			  (map-message "Warp to Matr1x' Sector")
+			  (map-message (_ "Warp to Matr1x' Sector"))
 			  (teleport-to-x 20)
 			  (teleport-to-y 14))
 			(special-tile 
 	        (x 31)
 			  (y 8)
-			  (map-message "Warp to Thompson's Domain")
+			  (map-message (_ "Warp to Thompson's Domain"))
 			  (teleport-to-x 34)
 			  (teleport-to-y 18))
 			(special-tile 
 	        (x 35)
 			  (y 8)
-			  (map-message "Warp to the SuperTux Team Island")
+			  (map-message (_ "Warp to the SuperTux Team Island"))
 			  (teleport-to-x 51)
 			  (teleport-to-y 10))
 			(special-tile 
 	        (x 37)
 			  (y 8)
-			  (map-message "Warp to Abednego's Area")
+			  (map-message (_ "Warp to Abednego's Area"))
 			  (teleport-to-x 15)
 			  (teleport-to-y 31))
 		   (special-tile 
 	        (x 39)
 			  (y 8)
-			  (map-message "Warp to Torfi's Territory")
+			  (map-message (_ "Warp to Torfi's Territory"))
 			  (teleport-to-x 56)
 			  (teleport-to-y 33))
     	   (special-tile 
 	        (x 19)
 			  (y 24)
-			  (map-message "Leave Matrix' Sector")
+			  (map-message (_ "Leave Matrix' Sector"))
 			  (teleport-to-x 32)
 			  (teleport-to-y 37))
      	   (special-tile 
 	        (x 35)
 			  (y 26)
-			  (map-message "Leave Thompson's Domain")
+			  (map-message (_ "Leave Thompson's Domain"))
 			  (teleport-to-x 35)
 			  (teleport-to-y 2))
     	   (special-tile 
 	        (x 54)
 			  (y 25)
-			  (map-message "Leave SuperTux Team Island")
+			  (map-message (_ "Leave SuperTux Team Island"))
 			  (teleport-to-x 35)
 			  (teleport-to-y 2))
     	   (special-tile 
 	        (x 18)
 			  (y 43)
-			  (map-message "Leave Abednego's Area")
+			  (map-message (_ "Leave Abednego's Area"))
 			  (teleport-to-x 35)
 			  (teleport-to-y 2))
     	   (special-tile 
 	        (x 60)
 			  (y 43)
-			  (map-message "Leave Torfi's Territory")
+			  (map-message (_ "Leave Torfi's Territory"))
 			  (teleport-to-x 35)
 			  (teleport-to-y 2))
     	   
@@ -204,7 +204,7 @@
 			(special-tile 
 	        (x 27)
 			  (y 39)
-			  (map-message "Warp home")
+			  (map-message (_ "Warp home"))
 			  (teleport-to-x 35)
 			  (teleport-to-y 2))
 			  

Index: wansti-level1.stl
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level1.stl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wansti-level1.stl	23 Nov 2004 13:41:14 -0000	1.5
+++ wansti-level1.stl	2 Dec 2004 01:41:54 -0000	1.6
@@ -2,7 +2,7 @@
 (supertux-level
   (version 1)
   (author "SuperTux Team")
-  (name "Semi-Frozen")
+  (name (_ "Semi-Frozen"))
   (width  500)
   (height 15)
   (start_pos_x    100)

--- NEW FILE: de.po ---
# German translations for bonus package
# German messages for bonus.
# Copyright (C) 2004 THE bonus'S COPYRIGHT HOLDER
# This file is distributed under the same license as the bonus package.
#  <ma...@br...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: bonus 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-12-02 02:33+0100\n"
"PO-Revision-Date: 2004-12-02 02:34+0100\n"
"Last-Translator:  <ma...@br...>\n"
"Language-Team: German <de...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: data/levels/bonus1/wansti-level1.stl:5
msgid "Semi-Frozen"
msgstr "Halb-Gefroren"

#: data/levels/bonus1/worldmap.stwm:4
msgid "Bonus Island I"
msgstr "Bonusinsel I"

#: data/levels/bonus1/worldmap.stwm:131
msgid "You found a secret place!"
msgstr "Du hast ein Versteck gefunden!"

#: data/levels/bonus1/worldmap.stwm:137
msgid "Hint: Use igloos to get back here."
msgstr "Tip: Benutze die Igloos um hierher zurück zu kommen."

#: data/levels/bonus1/worldmap.stwm:145
msgid "Warp to Matr1x' Sector"
msgstr "Zu Matr1x' Sektor beamen"

#: data/levels/bonus1/worldmap.stwm:151
msgid "Warp to Thompson's Domain"
msgstr "Zu Thompsons Bereich beamen"

#: data/levels/bonus1/worldmap.stwm:157
msgid "Warp to the SuperTux Team Island"
msgstr "Zur SuperTux Team Insel beamen"

#: data/levels/bonus1/worldmap.stwm:163
msgid "Warp to Abednego's Area"
msgstr "Zu Abednegos Zone beamen"

#: data/levels/bonus1/worldmap.stwm:169
msgid "Warp to Torfi's Territory"
msgstr "Zu Torfis Territorium beamen"

#: data/levels/bonus1/worldmap.stwm:175
msgid "Leave Matrix' Sector"
msgstr "Matrix Sektor verlassen"

#: data/levels/bonus1/worldmap.stwm:181
msgid "Leave Thompson's Domain"
msgstr "Thompsons Bereich verlassen"

#: data/levels/bonus1/worldmap.stwm:187
msgid "Leave SuperTux Team Island"
msgstr "SuperTux Team Insel verlassen"

#: data/levels/bonus1/worldmap.stwm:193
msgid "Leave Abednego's Area"
msgstr "Abednegos Zone verlassen"

#: data/levels/bonus1/worldmap.stwm:199
msgid "Leave Torfi's Territory"
msgstr "Torfis Territorium verlassen"

#: data/levels/bonus1/worldmap.stwm:207
msgid "Warp home"
msgstr "Nach Hause beamen"

[Super-tux-commit] supertux/data Jamfile,1.3,1.4

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

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

Modified Files:
	Jamfile 
Log Message:
Made lispfiles translatable. This time the translations are stored externally
in .po files in the same directory as the lisp files. So you can have
translation files for complete level subsets now.

Because Ricardo added a hacked solution before and because people already used
that, someone has to go over all the maps now, extract the translations and put
them into separate files, I'm too lazy to do that now, I just translated some
files for testing.
Translation-Patches are always welcome ;-)


Index: Jamfile
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/Jamfile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Jamfile	23 Nov 2004 22:21:24 -0000	1.3
+++ Jamfile	2 Dec 2004 01:41:54 -0000	1.4
@@ -32,11 +32,15 @@
   levels/test
   levels/world1
   levels/world2
-  levels/worldmap
 ;
 
 for p in $(LEVELPATHS) {
   InstallData [ Wildcard $(p) : info *.stl *.stwm ] : $(p) ;
+
+  local translatable_lisp = [ Wildcard $(p) : info *.stl *.stwm ] ;
+  SEARCH on $(translatable_lisp) = $(SEARCH_SOURCE) ;
+  MakePot $(SUBDIR)/$(p)/messages.pot : $(translatable_lisp) ;
+  XGETTEXT_FLAGS on $(SUBDIR)/$(p)/messages.pot += --language=Lisp ;
 }
 InstallData [ Wildcard *.txt ] ;
 InstallData [ Wildcard music : *.mod *.ogg ] : music ;