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

[Super-tux-commit] supertux/src button.h,1.25,1.26 camera.h,1.6,1.7 leveleditor.cpp,1.132,1.133 leveleditor.h,1.12,1.13 title.cpp,1.93,1.94

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

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

Modified Files:
	button.h camera.h leveleditor.cpp leveleditor.h title.cpp 
Log Message:
Changed level editor to a class.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- title.cpp	2 Jun 2004 23:33:35 -0000	1.93
+++ title.cpp	3 Jun 2004 11:26:12 -0000	1.94
@@ -69,6 +69,8 @@
 static std::vector<LevelSubset*> contrib_subsets;
 static LevelSubset* current_contrib_subset = 0;
 
+static LevelEditor* leveleditor;
+
 void free_contrib_menu()
 {
   for(std::vector<LevelSubset*>::iterator i = contrib_subsets.begin();
@@ -297,7 +299,9 @@
                   generate_contrib_menu();
                   break;
                 case MNID_LEVELEDITOR:
-                  leveleditor();
+                  leveleditor = new LevelEditor();
+                  leveleditor->run();
+                  delete leveleditor;
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:

Index: camera.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/camera.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- camera.h	31 May 2004 02:40:29 -0000	1.6
+++ camera.h	3 Jun 2004 11:26:12 -0000	1.7
@@ -52,6 +52,12 @@
     (void) context;
   }
 
+  void set_scrolling(int scroll_x, int scroll_y)
+  {
+    translation.x = scroll_x;
+    translation.y = scroll_y;
+  }
+
   enum CameraMode
   {
     NORMAL, AUTOSCROLL, MANUAL

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- button.h	2 Jun 2004 23:33:34 -0000	1.25
+++ button.h	3 Jun 2004 11:26:12 -0000	1.26
@@ -23,6 +23,7 @@
 
 #include <vector>
 #include "screen/texture.h"
+#include "timer.h"
 
 enum ButtonState {
   BUTTON_NONE = -1,

Index: leveleditor.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- leveleditor.h	2 Jun 2004 23:33:35 -0000	1.12
+++ leveleditor.h	3 Jun 2004 11:26:12 -0000	1.13
@@ -23,6 +23,73 @@
 #ifndef SUPERTUX_LEVELEDITOR_H
 #define SUPERTUX_LEVELEDITOR_H
 
+#include "screen/drawing_context.h"
+#include "game_object.h"
+#include "screen/texture.h"
+#include "level.h"
+#include "button.h"
+#include "menu.h"
+
+class LevelEditor
+{
+public:
+  LevelEditor();
+  ~LevelEditor();
+
+  int run(char* filename = NULL);
+
+private:
+
+// Functions
+void newlevel(void);
+void selectlevel(void);
+void savelevel();
+void editlevel(void);
+void testlevel(void);
+void checkevents(void);
+void unload_level();
+
+/* own declerations */
+/* crutial ones (main loop) */
+void init_menus();
+int load_level_subset(char *filename);
+void drawlevel(DrawingContext& context);
+void drawinterface(DrawingContext& context);
+void change(float x, float y, int tm, unsigned int c);
+void showhelp();
+void set_defaults(void);
+void activate_bad_guys(void);
+void goto_level(int levelnb);
+void highlight_selection();
+
+void drawminimap();
+
+void apply_level_settings_menu();
+void update_subset_settings_menu();
+void save_subset_settings_menu();
+void update_level_settings_menu();
+void change_object_properties(GameObject *pobj);
+
+// structs
+struct TileOrObject
+{
+  TileOrObject() : tile(0), obj(NULL) { is_tile = true; };
+
+  void Tile(unsigned int set_to) { tile = set_to; is_tile = true; }
+  void Object(GameObject* pobj) { obj = pobj; is_tile = false; }
+  //Returns true for a tile
+  bool IsTile() { return is_tile; };
+  //Returns true for a GameObject
+  bool IsObject() { return !is_tile; };
+
+
+  void Init() { tile = 0; obj = NULL; is_tile = true; };
+
+  bool is_tile; //true for tile (false for object)
+  unsigned int tile;
+  GameObject* obj;
+};
+
 struct square
 {
   int x1, y1, x2, y2;
@@ -31,13 +98,64 @@
 /* selection modes */
 enum SelectionMode { CURSOR, SQUARE, NONE };
 
-int leveleditor(char* filename = NULL);
-void newlevel(void);
-void selectlevel(void);
-void le_savelevel();
-void editlevel(void);
-void testlevel(void);
-int le_init(void);
-void le_checkevents(void);
+// variables
+/* leveleditor internals */
+string_list_type level_subsets;
+bool le_level_changed;  /* if changes, ask for saving, when quiting*/
+bool show_minimap;
+bool show_selections;
+bool le_help_shown;
+int pos_x, pos_y, cursor_x, cursor_y;
+int le_levelnb;
+Level* le_level;
+LevelSubset* le_level_subset;
+int le_show_grid;
+int le_frame;
+Surface* le_selection;
+int done;
+TileOrObject le_current;
+bool le_mouse_pressed[2];
+bool le_mouse_clicked[2];
+Button* le_save_level_bt;
+Button* le_exit_bt;
+Button* le_test_level_bt;
+Button* le_next_level_bt;
+Button* le_previous_level_bt;
+Button* le_move_right_bt;
+Button* le_move_left_bt;
+Button* le_move_up_bt;
+Button* le_move_down_bt;
+Button* le_rubber_bt;
+Button* le_select_mode_one_bt;
+Button* le_select_mode_two_bt;
+Button* le_settings_bt;
+Button* le_tilegroup_bt;
+Button* le_objects_bt;
+Button* le_object_select_bt;
+Button* le_object_properties_bt;
+ButtonPanel* le_tilemap_panel;
+int active_tm;
+Menu* leveleditor_menu;
+Menu* subset_load_menu;
+Menu* subset_new_menu;
+Menu* subset_settings_menu;
+Menu* level_settings_menu;
+Menu* select_tilegroup_menu;
+Menu* select_objects_menu;
+Timer select_tilegroup_menu_effect;
+Timer select_objects_menu_effect;
+Timer display_level_info;
+typedef std::map<std::string, ButtonPanel*> ButtonPanelMap;
+ButtonPanelMap tilegroups_map;
+ButtonPanelMap objects_map;
+std::string cur_tilegroup;
+std::string cur_objects;
+MouseCursor* mouse_select_object;
+MovingObject* selected_game_object;
+
+square selection;
+SelectionMode le_selection_mode;
+SDL_Event event;
+};
 
 #endif /*SUPERTUX_LEVELEDITOR_H*/

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- leveleditor.cpp	3 Jun 2004 11:19:24 -0000	1.132
+++ leveleditor.cpp	3 Jun 2004 11:26:12 -0000	1.133
@@ -29,24 +29,23 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <algorithm>
+
 #include "leveleditor.h"
 
 #include "screen/screen.h"
 #include "defines.h"
 #include "globals.h"
 #include "setup.h"
-#include "menu.h"
-#include "level.h"
 #include "sector.h"
 #include "tilemap.h"
 #include "gameloop.h"
 #include "badguy.h"
 #include "player.h"
 #include "scene.h"
-#include "button.h"
 #include "tile.h"
 #include "resources.h"
 #include "background.h"
+#include "camera.h"
 
 /* definitions to aid development */
 
@@ -70,104 +69,123 @@
 
 enum { TM_IA, TM_BG, TM_FG };
 
-/* own declerations */
-/* crutial ones (main loop) */
-int le_init();
-void le_quit();
-int le_load_level_subset(char *filename);
-void le_drawlevel(DrawingContext& context);
-void le_drawinterface(DrawingContext& context);
-void le_checkevents();
-void le_change(float x, float y, int tm, unsigned int c);
-void le_testlevel();
-void le_showhelp();
-void le_set_defaults(void);
-void le_activate_bad_guys(void);
-void le_goto_level(int levelnb);
-void le_highlight_selection();
+LevelEditor::LevelEditor()
+{
+  level_subsets = dsubdirs("/levels", "level1.stl");
+  le_level_subset = new LevelSubset;
 
-void apply_level_settings_menu();
-void update_subset_settings_menu();
-void save_subset_settings_menu();
+  le_level = NULL;
+  le_levelnb = 1;
+  selected_game_object = NULL;
 
-struct TileOrObject
-{
-  TileOrObject() : tile(0), obj(NULL) { is_tile = true; };
+  active_tm = TM_IA;
+  le_show_grid = true;
+  show_selections = true;
 
-  void Tile(unsigned int set_to) { tile = set_to; is_tile = true; }
-  void Object(GameObject* pobj) { obj = pobj; is_tile = false; }
-  //Returns true for a tile
-  bool IsTile() { return is_tile; };
-  //Returns true for a GameObject
-  bool IsObject() { return !is_tile; };
+  done = 0;
+  le_frame = 0;	/* support for frames in some tiles, like waves and bad guys */
+  le_level_changed = false;
+  le_help_shown = false;
 
+  le_mouse_pressed[LEFT] = false;
+  le_mouse_pressed[RIGHT] = false;
 
-  void Init() { tile = 0; obj = NULL; is_tile = true; };
+  le_mouse_clicked[LEFT] = false;
+  le_mouse_clicked[RIGHT] = false;
 
-  bool is_tile; //true for tile (false for object)
-  unsigned int tile;
-  GameObject* obj;
-};
+  le_selection = new Surface(datadir + "/images/leveleditor/select.png", USE_ALPHA);
 
-/* leveleditor internals */
-static string_list_type level_subsets;
-static bool le_level_changed;  /* if changes, ask for saving, when quiting*/
-static bool show_minimap;
-static bool show_selections;
-static bool le_help_shown;
-static int pos_x, pos_y, cursor_x, cursor_y;
-static int le_levelnb;
-static Level* le_level;
-static LevelSubset* le_level_subset;
-static int le_show_grid;
-static int le_frame;
-static Surface* le_selection;
-static int done;
-static TileOrObject le_current;
-static bool le_mouse_pressed[2];
-static bool le_mouse_clicked[2];
-static Button* le_save_level_bt;
-static Button* le_exit_bt;
-static Button* le_test_level_bt;
-static Button* le_next_level_bt;
-static Button* le_previous_level_bt;
-static Button* le_move_right_bt;
-static Button* le_move_left_bt;
-static Button* le_move_up_bt;
-static Button* le_move_down_bt;
-static Button* le_rubber_bt;
-static Button* le_select_mode_one_bt;
-static Button* le_select_mode_two_bt;
-static Button* le_settings_bt;
-static Button* le_tilegroup_bt;
-static Button* le_objects_bt;
-static Button* le_object_select_bt;
-static Button* le_object_properties_bt;
-static ButtonPanel* le_tilemap_panel;
-static int active_tm;
-static Menu* leveleditor_menu;
-static Menu* subset_load_menu;
-static Menu* subset_new_menu;
-static Menu* subset_settings_menu;
-static Menu* level_settings_menu;
-static Menu* select_tilegroup_menu;
-static Menu* select_objects_menu;
-static Timer select_tilegroup_menu_effect;
-static Timer select_objects_menu_effect;
-static Timer display_level_info;
-typedef std::map<std::string, ButtonPanel*> ButtonPanelMap;
-static ButtonPanelMap tilegroups_map;
-static ButtonPanelMap objects_map;
-static std::string cur_tilegroup;
-static std::string cur_objects;
-static MouseCursor* mouse_select_object;
-static MovingObject* selected_game_object;
+  select_tilegroup_menu_effect.init(false);
+  select_objects_menu_effect.init(false);
+  display_level_info.init(false);
 
-static square selection;
-static SelectionMode le_selection_mode;
-static SDL_Event event;
+  /* Load buttons */
+  le_save_level_bt = new Button("/images/icons/save.png","Save level", SDLK_F6,screen->w-64,32);
+  le_exit_bt = new Button("/images/icons/exit.png","Exit", SDLK_F10,screen->w-32,32);
+  le_next_level_bt = new Button("/images/icons/next.png","Next level", SDLK_PAGEUP,screen->w-64,0);
+  le_previous_level_bt = new Button("/images/icons/previous.png","Previous level",SDLK_PAGEDOWN,screen->w-32,0);
+  le_rubber_bt = new Button("/images/icons/rubber.png","Rubber",SDLK_DELETE,screen->w-32,48);
+  le_select_mode_one_bt = new Button ("/images/icons/select-mode1.png","Select single tile",SDLK_F3,screen->w-64,48);
+  le_select_mode_two_bt = new Button("/images/icons/select-mode2.png","Select multiple tiles",SDLK_F3,screen->w-64,48);
+  le_test_level_bt = new Button("/images/icons/test-level.png","Test level",SDLK_F4,screen->w-64,screen->h - 64);
+  le_settings_bt = new Button("/images/icons/settings.png","Level settings",SDLK_F5,screen->w-32,screen->h - 64);
+  le_move_left_bt = new Button("/images/icons/left.png","Move left",SDLK_LEFT,screen->w-80-16,0);
+  le_move_right_bt = new Button("/images/icons/right.png","Move right",SDLK_RIGHT,screen->w-80,0);
+  le_move_up_bt = new Button("/images/icons/up.png","Move up",SDLK_UP,screen->w-80,16);
+  le_move_down_bt = new Button("/images/icons/down.png","Move down",SDLK_DOWN,screen->w-80,32);
+  le_tilegroup_bt = new Button("/images/icons/tilegroup.png","Select Tilegroup", SDLK_F7,screen->w-64,64);
+  le_objects_bt = new Button("/images/icons/objects.png","Select Objects", SDLK_F8,screen->w-64,80);
+  le_object_select_bt = new Button("/images/icons/select-one.png","Select an Object", SDLK_s, screen->w - 64, screen->h-98);
+  le_object_properties_bt = new Button("/images/icons/properties.png","Edit object properties", SDLK_p, screen->w - 32, screen->h-98);
+  le_object_properties_bt->set_active(false);
 
-int leveleditor(char* filename)
+  mouse_select_object = new MouseCursor(datadir + "/images/status/select-cursor.png",1);
+  mouse_select_object->set_mid(16,16);
+
+  le_tilemap_panel = new ButtonPanel(screen->w-64,screen->h-32,32,32);
+  le_tilemap_panel->set_button_size(32,10);
+  le_tilemap_panel->additem(new Button("/images/icons/bkgrd.png","Background",SDLK_b,0,0),TM_BG);
+  le_tilemap_panel->additem(new Button("/images/icons/intact.png","Interactive",SDLK_i,0,0), TM_IA);
+  le_tilemap_panel->additem(new Button("/images/icons/frgrd.png","Foreground",SDLK_f,0,0),TM_FG);
+  le_tilemap_panel->highlight_last(true);
+  le_tilemap_panel->set_last_clicked(TM_IA);
+
+  le_current.Init();
+
+  init_menus();
+
+  SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+}
+
+LevelEditor::~LevelEditor()
+{
+  SDL_EnableKeyRepeat(0, 0);    // disables key repeating
+
+  unload_level();
+  delete le_selection;
+  delete leveleditor_menu;
+  delete subset_load_menu;
+  delete subset_new_menu;
+  delete subset_settings_menu;
+  delete level_settings_menu;
+  delete select_tilegroup_menu;
+  delete select_objects_menu;
+  delete le_save_level_bt;
+  delete le_exit_bt;
+  delete le_test_level_bt;
+  delete le_next_level_bt;
+  delete le_previous_level_bt;
+  delete le_move_right_bt;
+  delete le_move_left_bt;
+  delete le_move_up_bt;
+  delete le_move_down_bt;
+  delete le_rubber_bt;
+  delete le_select_mode_one_bt;
+  delete le_select_mode_two_bt;
+  delete le_settings_bt;
+  delete le_tilegroup_bt;
+  delete le_objects_bt;
+  delete le_tilemap_panel;
+  delete le_object_select_bt;
+  delete le_object_properties_bt;
+  delete mouse_select_object;
+
+  delete le_level_subset;
+  le_level_subset = 0;
+
+  for(ButtonPanelMap::iterator i = tilegroups_map.begin();
+      i != tilegroups_map.end(); ++i)
+  {
+    delete i->second;
+  }
+  for(ButtonPanelMap::iterator i = objects_map.begin();
+      i != objects_map.end(); ++i)
+  {
+    delete i->second;
+  }
+}
+
+int LevelEditor::run(char* filename)
 {
   int last_time, now_time, i;
   DrawingContext context;
@@ -175,16 +193,13 @@
   le_level = NULL;
   le_levelnb = 1;
 
-  if(le_init() != 0)
-    return 1;
-
   sound_manager->halt_music();
 
   while (SDL_PollEvent(&event))
   {}
 
   if(filename != NULL)
-    if(le_load_level_subset(filename))
+    if(load_level_subset(filename))
       return 1;
 
   while(true)
@@ -192,7 +207,7 @@
     last_time = SDL_GetTicks();
     le_frame++;
 
-    le_checkevents();
+    checkevents();
 
     if(Menu::current() == select_tilegroup_menu)
     {
@@ -219,13 +234,13 @@
       /* making events results to be in order */
 
       /* draw the level */
-      le_drawlevel(context);
+      drawlevel(context);
     }
     else
       fillrect(0, 0, screen->w, screen->h, 0, 0, 0);
 
     /* draw editor interface */
-    le_drawinterface(context);
+    drawinterface(context);
 
     Menu* menu = Menu::current();
     if(menu)
@@ -305,7 +320,7 @@
         default:
           if(i >= 1)
           {
-            if(le_load_level_subset(level_subsets.item[i-1]))
+            if(load_level_subset(level_subsets.item[i-1]))
               return 1;
           }
           break;
@@ -325,7 +340,7 @@
             LevelSubset::create(subset_new_menu->get_item_by_id(MNID_SUBSETNAME).input);
             le_level_subset->load(subset_new_menu->get_item_by_id(MNID_SUBSETNAME).input);
             leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO;
-            le_goto_level(1);
+            goto_level(1);
             subset_new_menu->get_item_by_id(MNID_SUBSETNAME).change_input("");
 
             Menu::set_current(subset_settings_menu);
@@ -354,7 +369,6 @@
 
     if(done)
     {
-      le_quit();
       return 0;
     }
 
@@ -371,12 +385,12 @@
   return done;
 }
 
-int le_load_level_subset(char *filename)
+int LevelEditor::load_level_subset(char *filename)
 {
   le_level_subset->load(filename);
   leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO;
   le_levelnb = 1;
-  le_goto_level(le_levelnb);
+  goto_level(le_levelnb);
 
   //GameSession* session = new GameSession(datadir + "/levels/" + le_level_subset->name + "/level1.stl", 0, ST_GL_DEMO_GAME);
 
@@ -385,7 +399,7 @@
   return 0;
 }
 
-void le_init_menus()
+void LevelEditor::init_menus()
 {
   int i;
 
@@ -512,78 +526,7 @@
 
 }
 
-int le_init()
-{
-  level_subsets = dsubdirs("/levels", "level1.stl");
-  le_level_subset = new LevelSubset;
-
-  le_level = NULL;
-  le_levelnb = 1;
-  selected_game_object = NULL;
-
-  active_tm = TM_IA;
-  le_show_grid = true;
-  show_selections = true;
-
-  done = 0;
-  le_frame = 0;	/* support for frames in some tiles, like waves and bad guys */
-  le_level_changed = false;
-  le_help_shown = false;
-
-  le_mouse_pressed[LEFT] = false;
-  le_mouse_pressed[RIGHT] = false;
-
-  le_mouse_clicked[LEFT] = false;
-  le_mouse_clicked[RIGHT] = false;
-
-  le_selection = new Surface(datadir + "/images/leveleditor/select.png", USE_ALPHA);
-
-  select_tilegroup_menu_effect.init(false);
-  select_objects_menu_effect.init(false);
-  display_level_info.init(false);
-
-  /* Load buttons */
-  le_save_level_bt = new Button("/images/icons/save.png","Save level", SDLK_F6,screen->w-64,32);
-  le_exit_bt = new Button("/images/icons/exit.png","Exit", SDLK_F10,screen->w-32,32);
-  le_next_level_bt = new Button("/images/icons/next.png","Next level", SDLK_PAGEUP,screen->w-64,0);
-  le_previous_level_bt = new Button("/images/icons/previous.png","Previous level",SDLK_PAGEDOWN,screen->w-32,0);
-  le_rubber_bt = new Button("/images/icons/rubber.png","Rubber",SDLK_DELETE,screen->w-32,48);
-  le_select_mode_one_bt = new Button ("/images/icons/select-mode1.png","Select single tile",SDLK_F3,screen->w-64,48);
-  le_select_mode_two_bt = new Button("/images/icons/select-mode2.png","Select multiple tiles",SDLK_F3,screen->w-64,48);
-  le_test_level_bt = new Button("/images/icons/test-level.png","Test level",SDLK_F4,screen->w-64,screen->h - 64);
-  le_settings_bt = new Button("/images/icons/settings.png","Level settings",SDLK_F5,screen->w-32,screen->h - 64);
-  le_move_left_bt = new Button("/images/icons/left.png","Move left",SDLK_LEFT,screen->w-80-16,0);
-  le_move_right_bt = new Button("/images/icons/right.png","Move right",SDLK_RIGHT,screen->w-80,0);
-  le_move_up_bt = new Button("/images/icons/up.png","Move up",SDLK_UP,screen->w-80,16);
-  le_move_down_bt = new Button("/images/icons/down.png","Move down",SDLK_DOWN,screen->w-80,32);
-  le_tilegroup_bt = new Button("/images/icons/tilegroup.png","Select Tilegroup", SDLK_F7,screen->w-64,64);
-  le_objects_bt = new Button("/images/icons/objects.png","Select Objects", SDLK_F8,screen->w-64,80);
-  le_object_select_bt = new Button("/images/icons/select-one.png","Select an Object", SDLK_s, screen->w - 64, screen->h-98);
-  le_object_properties_bt = new Button("/images/icons/properties.png","Edit object properties", SDLK_p, screen->w - 32, screen->h-98);
-  le_object_properties_bt->set_active(false);
-
-  mouse_select_object = new MouseCursor(datadir + "/images/status/select-cursor.png",1);
-  mouse_select_object->set_mid(16,16);
-
-  le_tilemap_panel = new ButtonPanel(screen->w-64,screen->h-32,32,32);
-  le_tilemap_panel->set_button_size(32,10);
-  le_tilemap_panel->additem(new Button("/images/icons/bkgrd.png","Background",SDLK_b,0,0),TM_BG);
-  le_tilemap_panel->additem(new Button("/images/icons/intact.png","Interactive",SDLK_i,0,0), TM_IA);
-  le_tilemap_panel->additem(new Button("/images/icons/frgrd.png","Foreground",SDLK_f,0,0),TM_FG);
-  le_tilemap_panel->highlight_last(true);
-  le_tilemap_panel->set_last_clicked(TM_IA);
-
-  le_current.Init();
-
-  le_init_menus();
-
-  SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
-
-
-  return 0;
-}
-
-void update_level_settings_menu()
+void LevelEditor::update_level_settings_menu()
 {
   char str[80];
   int i;
@@ -629,13 +572,13 @@
   level_settings_menu->get_item_by_id(MNID_BottomBlue).change_input(str);
 }
 
-void update_subset_settings_menu()
+void LevelEditor::update_subset_settings_menu()
 {
   subset_settings_menu->item[2].change_input(le_level_subset->title.c_str());
   subset_settings_menu->item[3].change_input(le_level_subset->description.c_str());
 }
 
-void apply_level_settings_menu()
+void LevelEditor::apply_level_settings_menu()
 {
   int i;
   i = false;
@@ -676,7 +619,7 @@
       atoi(level_settings_menu->get_item_by_id(MNID_BottomBlue).input)));
 }
 
-void save_subset_settings_menu()
+void LevelEditor::save_subset_settings_menu()
 {
   le_level_subset->title = subset_settings_menu->item[2].input;
   le_level_subset->description = subset_settings_menu->item[3].input;
@@ -684,7 +627,7 @@
   le_level_changed = false;
 }
 
-void le_unload_level()
+void LevelEditor::unload_level()
 {
   if(le_level_changed)
   {
@@ -704,64 +647,16 @@
   le_level_changed = false;
 }
 
-void le_goto_level(int levelnb)
+void LevelEditor::goto_level(int levelnb)
 {
-  le_unload_level();
+  unload_level();
   le_level = new Level();
   le_level->load(le_level_subset->get_level_filename(levelnb));
   display_level_info.start(2500);
   le_levelnb = levelnb;
 }
 
-void le_quit(void)
-{
-  SDL_EnableKeyRepeat(0, 0);    // disables key repeating
-
-  le_unload_level();
-  delete le_selection;
-  delete leveleditor_menu;
-  delete subset_load_menu;
-  delete subset_new_menu;
-  delete subset_settings_menu;
-  delete level_settings_menu;
-  delete select_tilegroup_menu;
-  delete select_objects_menu;
-  delete le_save_level_bt;
-  delete le_exit_bt;
-  delete le_test_level_bt;
-  delete le_next_level_bt;
-  delete le_previous_level_bt;
-  delete le_move_right_bt;
-  delete le_move_left_bt;
-  delete le_move_up_bt;
-  delete le_move_down_bt;
-  delete le_rubber_bt;
-  delete le_select_mode_one_bt;
-  delete le_select_mode_two_bt;
-  delete le_settings_bt;
-  delete le_tilegroup_bt;
-  delete le_objects_bt;
-  delete le_tilemap_panel;
-  delete le_object_select_bt;
-  delete le_object_properties_bt;
-  delete mouse_select_object;
-
-  delete le_level_subset;
-  le_level_subset = 0;
-
-  for(ButtonPanelMap::iterator i = tilegroups_map.begin();
-      i != tilegroups_map.end(); ++i)
-  {
-    delete i->second;
-  }
-  for(ButtonPanelMap::iterator i = objects_map.begin();
-      i != objects_map.end(); ++i)
-  {
-    delete i->second;
-  }
-}
-
-void le_drawminimap()
+void LevelEditor::drawminimap()
 {
 #if 0
 //  if(le_level == NULL)
@@ -818,7 +713,7 @@
 #endif
 }
 
-void le_drawinterface(DrawingContext &context)
+void LevelEditor::drawinterface(DrawingContext &context)
 {
   int x,y;
   char str[80];
@@ -836,7 +731,7 @@
   }
 
   if(show_minimap) // use_gl because the minimap isn't shown correctly in software mode. Any idea? FIXME Possible reasons: SDL_SoftStretch is a hack itsself || an alpha blitting issue SDL can't handle in software mode
-    le_drawminimap();
+    drawminimap();
 
   if(show_selections && MouseCursor::current() != mouse_select_object)
   {
@@ -848,7 +743,7 @@
     else if(le_selection_mode == SQUARE)
     {
       int w, h;
-      le_highlight_selection();
+      highlight_selection();
       /* draw current selection */
       w = selection.x2 - selection.x1;
       h = selection.y2 - selection.y1;
@@ -940,7 +835,7 @@
 
 }
 
-void le_drawlevel(DrawingContext& context)
+void LevelEditor::drawlevel(DrawingContext& context)
 {
 //  unsigned int y,x;
 //  Uint8 a;
@@ -1029,7 +924,7 @@
   largetux.walk_right->draw(context, Vector(100 - pos_x, 240 - pos_y), LAYER_OBJECTS-1);
 }
 
-void le_change_object_properties(GameObject *pobj)
+void LevelEditor::change_object_properties(GameObject *pobj)
 {
   DrawingContext context;
     
@@ -1104,7 +999,7 @@
 }
 
 
-void le_checkevents()
+void LevelEditor::checkevents()
 {
   SDLKey key;
   SDLMod keymod;
@@ -1143,7 +1038,7 @@
             break;
           case SDLK_F1:
             if(le_level != NULL)
-              le_showhelp();
+              showhelp();
             break;
           case SDLK_HOME:
             cursor_x = 0;
@@ -1241,7 +1136,7 @@
           /* Check for button events */
           le_test_level_bt->event(event);
           if(le_test_level_bt->get_state() == BUTTON_CLICKED)
-            le_testlevel();
+            testlevel();
           le_save_level_bt->event(event);
           if(le_save_level_bt->get_state() == BUTTON_CLICKED)
             le_level->save(le_level_subset->name.c_str());
@@ -1255,7 +1150,7 @@
           {
             if(le_levelnb < le_level_subset->levels)
             {
-              le_goto_level(le_levelnb+1);
+              goto_level(le_levelnb+1);
             }
             else
             {
@@ -1267,7 +1162,7 @@
               {
                 new_lev.save(le_level_subset->name.c_str());
                 le_level_subset->levels = le_levelnb;
-                le_goto_level(le_levelnb);
+                goto_level(le_levelnb);
               }
              if(surf != NULL)
               delete surf;
@@ -1277,7 +1172,7 @@
           if(le_previous_level_bt->get_state() == BUTTON_CLICKED)
           {
             if(le_levelnb > 1)
-              le_goto_level(le_levelnb -1);
+              goto_level(le_levelnb -1);
           }
           le_rubber_bt->event(event);
           if(le_rubber_bt->get_state() == BUTTON_CLICKED)
@@ -1294,7 +1189,7 @@
             le_object_properties_bt->event(event);
             if(le_object_properties_bt->get_state() == BUTTON_CLICKED)
             {
-              le_change_object_properties(selected_game_object);
+              change_object_properties(selected_game_object);
             }
           }
 
@@ -1466,7 +1361,7 @@
           if(MouseCursor::current() != mouse_select_object)
           {
             if(le_current.IsTile())
-              le_change(cursor_x, cursor_y, active_tm, le_current.tile);
+              change(cursor_x, cursor_y, active_tm, le_current.tile);
           }
         }
         else if(le_mouse_clicked[LEFT])
@@ -1634,10 +1529,12 @@
       pos_y = (le_level->get_sector("main")->solids->get_height() * 32) - screen->h;
     if(pos_y < 0)
       pos_y = 0;
+
+    le_level->get_sector("main")->camera->set_scrolling(pos_x, pos_y);
   }
 }
 
-void le_highlight_selection()
+void LevelEditor::highlight_selection()
 {
   int x1, x2, y1, y2;
 
@@ -1670,7 +1567,7 @@
   fillrect(x1*32-pos_x, y1*32-pos_y,32* (x2 - x1 + 1),32 * (y2 - y1 + 1),173,234,177,103);
 }
 
-void le_change(float x, float y, int tm, unsigned int c)
+void LevelEditor::change(float x, float y, int tm, unsigned int c)
 {
   if(le_level != NULL)
   {
@@ -1682,7 +1579,7 @@
     switch(le_selection_mode)
     {
     case CURSOR:
-      le_change(x,y,tm,c);
+      change(x,y,tm,c);
 
       base_type cursor_base;
       cursor_base.x = x;
@@ -1761,7 +1658,7 @@
       for(xx = x1; xx <= x2; xx++)
         for(yy = y1; yy <= y2; yy++)
         {
-          le_change(xx*32, yy*32, tm, c);
+          change(xx*32, yy*32, tm, c);
 
         }
       break;
@@ -1771,7 +1668,7 @@
   }
 }
 
-void le_testlevel()
+void LevelEditor::testlevel()
 {
   //Make sure a time value is set when testing the level
   if(le_level->time_left == 0)
@@ -1788,7 +1685,7 @@
   Menu::set_current(NULL);
 }
 
-void le_showhelp()
+void LevelEditor::showhelp()
 {
   DrawingContext context;
 
@@ -1876,7 +1773,7 @@
   for(int i = 0; i < 3; i++)
     {
     context.draw_gradient(Color(0,0,0), Color(255,255,255), LAYER_BACKGROUND0);
-    le_drawinterface(context);
+    drawinterface(context);
 
     context.draw_text_center(blue_text, "- Help -", Vector(0, 30), LAYER_GUI);
 

[Super-tux-commit] supertux/m4 Makefile.in,1.1,NONE

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

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

Removed Files:
	Makefile.in 
Log Message:
there should only be Makefile.am in cvs, never a Makefile.in

--- Makefile.in DELETED ---

[Super-tux-commit] supertux/po LINGUAS,1.2,1.3 pt.po,1.1,NONE

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

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

Modified Files:
	LINGUAS 
Removed Files:
	pt.po 
Log Message:
pt.po is broken, please fix this first before readding it:

make[2]: Entering directory `/home/matze/projects/supertux/po'
make[2]: `de.gmo' is up to date.
rm -f pt.gmo && /usr/bin/msgfmt -c --statistics -o pt.gmo pt.po
/usr/bin/msgfmt: pt.po: warning: Charset "CHARSET" is not a portable encoding name.
                                 Message conversion to user's charset might not work.
/usr/bin/msgfmt: pt.po: some header fields still have the initial default value
/usr/bin/msgfmt: pt.po: warning: PO file header fuzzy
                        warning: older versions of msgfmt will give an error on this
/usr/bin/msgfmt: found 1 fatal error
make[2]: *** [pt.gmo] Error 1



--- pt.po DELETED ---

Index: LINGUAS
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/LINGUAS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LINGUAS	2 Jun 2004 23:44:23 -0000	1.2
+++ LINGUAS	3 Jun 2004 11:21:50 -0000	1.3
@@ -1,3 +1,2 @@
 # Set of available languages.
 de
-pt

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

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

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

Modified Files:
	leveleditor.cpp 
Log Message:
fixed warnings in leveleditor

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- leveleditor.cpp	3 Jun 2004 10:41:07 -0000	1.131
+++ leveleditor.cpp	3 Jun 2004 11:19:24 -0000	1.132
@@ -613,7 +613,7 @@
   level_settings_menu->get_item_by_id(MNID_TIME).change_input(str);
   sprintf(str,"%2.0f",le_level->get_sector("main")->gravity);
   level_settings_menu->get_item_by_id(MNID_GRAVITY).change_input(str);
-  sprintf(str,"%d",le_level->get_sector("main")->background->get_speed());
+  sprintf(str,"%2.2f", le_level->get_sector("main")->background->get_speed());
   level_settings_menu->get_item_by_id(MNID_BGSPEED).change_input(str);
   sprintf(str,"%d",le_level->get_sector("main")->background->get_gradient_top().red);
   level_settings_menu->get_item_by_id(MNID_TopRed).change_input(str);
@@ -689,7 +689,8 @@
   if(le_level_changed)
   {
     char str[1024];
-    sprintf(str,"Save changes to level %d of %s?",le_level,le_level_subset->name.c_str());
+    // TODO get level number
+    sprintf(str,"Save changes to level %d of %s?", 0/*le_level*/,le_level_subset->name.c_str());
     Surface* surf = new Surface(le_level->get_sector("main")->background->get_image(), false);
     if(confirm_dialog(surf, str))
     {

[Super-tux-commit] supertux/m4 Makefile.am,NONE,1.1

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

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

Added Files:
	Makefile.am 
Log Message:
forgot to add Makefile.am

--- NEW FILE: Makefile.am ---
EXTRA_DIST = $(wildcard *.m4)

[Super-tux-commit] supertux/src button.cpp,1.34,1.35 leveleditor.cpp,1.130,1.131

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

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

Modified Files:
	button.cpp leveleditor.cpp 
Log Message:
Made these two compilable. Were accessing text's w and h variables.

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- button.cpp	2 Jun 2004 23:33:34 -0000	1.34
+++ button.cpp	3 Jun 2004 10:41:06 -0000	1.35
@@ -119,13 +119,13 @@
     char str[80];
     int i = -32;
 
-    if(0 > rect.x - (int)strlen(info.c_str()) * white_small_text->w)
-      i = rect.w + strlen(info.c_str()) * white_small_text->w;
+    if(0 > rect.x - white_small_text->get_text_width(info))
+      i = rect.w + (int)white_small_text->get_text_width(info);
 
     if(!info.empty())
-      context.draw_text(white_small_text, info.c_str(), Vector(i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y), LAYER_GUI);
+      context.draw_text(white_small_text, info, Vector(i + rect.x - white_small_text->get_text_width(info), rect.y), LAYER_GUI);
     sprintf(str,"(%s)", SDL_GetKeyName(shortcut));
-    context.draw_text(white_small_text, str, Vector(i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2), LAYER_GUI);
+    context.draw_text(white_small_text, str, Vector(i + rect.x -  white_small_text->get_text_width(str), rect.y + white_small_text->get_height()+2), LAYER_GUI);
   }
   if(state == BUTTON_PRESSED || state == BUTTON_DEACTIVE)
     fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- leveleditor.cpp	2 Jun 2004 23:33:35 -0000	1.130
+++ leveleditor.cpp	3 Jun 2004 10:41:07 -0000	1.131
@@ -1880,7 +1880,7 @@
     context.draw_text_center(blue_text, "- Help -", Vector(0, 30), LAYER_GUI);
 
     for(unsigned int t = 0; t < sizeof(text[i])/sizeof(char *); t++)
-      context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->h)), LAYER_GUI);
+      context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->get_height())), LAYER_GUI);
 
     sprintf(str,"Press any key to continue - Page %d/%d?", i, sizeof(text));
     context.draw_text(gold_text, str, Vector(0, 0), LAYER_GUI);

[Super-tux-commit] supertux/m4 Makefile.in,NONE,1.1

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

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

Added Files:
	Makefile.in 
Log Message:
- added empty m4/Makefile.in so we can at least compile :)

--- NEW FILE: Makefile.in ---

[Super-tux-commit] supertux/po pt.po,NONE,1.1 LINGUAS,1.1,1.2

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

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

Modified Files:
	LINGUAS 
Added Files:
	pt.po 
Log Message:
Is it enough to edit LINGUAS to add a new translation?

--- NEW FILE: pt.po ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR SuperTux Development Team
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: sup...@li...\n"
"POT-Creation-Date: 2004-06-03 00:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/setup.cpp:388
msgid "Start Game"
msgstr "Começar Jogo"

#: src/setup.cpp:389
msgid "Contrib Levels"
msgstr "Contribuições"

#: src/setup.cpp:390
msgid "Options"
msgstr "Opções"

#: src/setup.cpp:391
msgid "Level Editor"
msgstr "Editor de Níveis"

#: src/setup.cpp:392
msgid "Credits"
msgstr "Méritos"

#: src/setup.cpp:393
msgid "Quit"
msgstr "Sair"

Index: LINGUAS
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/LINGUAS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LINGUAS	2 Jun 2004 23:00:37 -0000	1.1
+++ LINGUAS	2 Jun 2004 23:44:23 -0000	1.2
@@ -1,2 +1,3 @@
 # Set of available languages.
 de
+pt

[Super-tux-commit] supertux/src background.h,1.6,1.7 button.cpp,1.33,1.34 button.h,1.24,1.25 level.cpp,1.89,1.90 leveleditor.cpp,1.129,1.130 leveleditor.h,1.11,1.12 menu.cpp,1.76,1.77 sector.h,1.2,1.3 title.cpp,1.92,1.93

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

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

Modified Files:
	background.h button.cpp button.h level.cpp leveleditor.cpp 
	leveleditor.h menu.cpp sector.h title.cpp 
Log Message:
Managed to update the level editor to the new drawing context code and stuff.
But it has a lot of issues. Scrolling is not being respected, buttons are not working well, and lots of crashing.
Time to rescue the level editor! :)

Index: background.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/background.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- background.h	31 May 2004 02:40:29 -0000	1.6
+++ background.h	2 Jun 2004 23:33:34 -0000	1.7
@@ -40,6 +40,15 @@
 
   void set_gradient(Color top, Color bottom);
 
+  std::string get_image() const
+        { return imagefile; }
+  float get_speed() const
+        { return speed; }
+  Color get_gradient_top() const
+        { return gradient_top; }
+  Color get_gradient_bottom() const
+        { return gradient_bottom; }
+
   virtual void action(float elapsed_time);
 
   virtual void draw(DrawingContext& context);

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- leveleditor.cpp	31 May 2004 22:13:15 -0000	1.129
+++ leveleditor.cpp	2 Jun 2004 23:33:35 -0000	1.130
@@ -37,17 +37,17 @@
 #include "setup.h"
 #include "menu.h"
 #include "level.h"
+#include "sector.h"
+#include "tilemap.h"
 #include "gameloop.h"
 #include "badguy.h"
+#include "player.h"
 #include "scene.h"
 #include "button.h"
 #include "tile.h"
[...1015 lines suppressed...]
 
-  while(done_ == 0)
-  {
-    done_ = wait_for_event(event);
-    SDL_Delay(50);
-  }
+    while(done_ == 0)
+      {
+      done_ = wait_for_event(event);
+      SDL_Delay(50);
+      }
+    }
 
   show_selections = true;
   le_show_grid = tmp_show_grid;
   le_selection_mode = temp_le_selection_mode;
   le_help_shown = false;
 }
-
-#endif

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- menu.cpp	31 May 2004 23:47:05 -0000	1.76
+++ menu.cpp	2 Jun 2004 23:33:35 -0000	1.77
@@ -89,7 +89,10 @@
       dialog->event(event);
     }
 
-    context.draw_surface(background, Vector(0,0), LAYER_BACKGROUND0);
+    if(background == NULL)
+      context.draw_gradient(Color(200, 100, 200), Color(100, 200, 100), LAYER_BACKGROUND0);
+    else
+      context.draw_surface(background, Vector(0,0), LAYER_BACKGROUND0);
 
     dialog->draw(context);
     dialog->action();

Index: sector.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sector.h	31 May 2004 13:43:30 -0000	1.2
+++ sector.h	2 Jun 2004 23:33:35 -0000	1.3
@@ -119,11 +119,11 @@
   
   std::string name;
 
-  std::string song_title;
   MusicRef level_song;
   MusicRef level_song_fast;
 
 public:
+  std::string song_title;
   float gravity;
 
   // some special objects, where we need direct access

Index: button.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- button.h	30 May 2004 01:08:48 -0000	1.24
+++ button.h	2 Jun 2004 23:33:34 -0000	1.25
@@ -24,9 +24,6 @@
 #include <vector>
 #include "screen/texture.h"
 
-// TODO
-#if 0
-
 enum ButtonState {
   BUTTON_NONE = -1,
   BUTTON_CLICKED,
@@ -51,18 +48,18 @@
   
   ~Button();
   void event(SDL_Event& event);
-  void draw();
+  void draw(DrawingContext& context);
   int get_state();
   void set_active(bool active) { active ? state = BUTTON_NONE : state = BUTTON_DEACTIVE; };
   void add_icon(const std::string& imagefile, int mw, int mh);
   SDL_Rect get_pos() { return rect; }
   int get_tag(){return tag; }
-  void set_drawable(Drawable* newdrawable)
-  { drawable = newdrawable; }
+//  void set_drawable(Drawable* newdrawable)
+//  { drawable = newdrawable; }
 
 private:
   static Timer popup_timer;
-  Drawable* drawable;
+//  Drawable* drawable;
   std::vector<Surface*> icon;
   std::string info;
   SDLKey shortcut;
@@ -77,7 +74,7 @@
 public:
   ButtonPanel(int x, int y, int w, int h);
   ~ButtonPanel();
-  void draw();
+  void draw(DrawingContext& context);
   Button* event(SDL_Event &event);
   void additem(Button* pbutton, int tag);
   Button* button_panel_event(SDL_Event& event);
@@ -95,6 +92,5 @@
   std::vector<Button*> item;
   std::vector<Button*>::iterator last_clicked;
 };
-#endif
 
 #endif /*SUPERTUX_BUTTON_H*/

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- level.cpp	31 May 2004 22:13:15 -0000	1.89
+++ level.cpp	2 Jun 2004 23:33:34 -0000	1.90
@@ -274,6 +274,45 @@
   add_sector(sector);
 }
 
+void
+Level::save(const std::string& filename)
+{
+#if 0
+  LispReader* level = LispReader::load(filename, "supertux-level");
+
+  int version = 1;
+  level->read_int("version", version);
+  if(version == 1) {
+    load_old_format(*level);
+    return;
+  }
+
+  for(lisp_object_t* cur = level->get_lisp(); !lisp_nil_p(cur);
+      cur = lisp_cdr(cur)) {
+    std::string token = lisp_symbol(lisp_car(lisp_car(cur)));
+    lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur)));
+    LispReader reader(lisp_cdr(lisp_car(cur)));
+
+    if(token == "name") {
+      name = lisp_string(data);
+    } else if(token == "author") {
+      author = lisp_string(data);
+    } else if(token == "time") {
+      time_left = lisp_integer(data);
+    } else if(token == "sector") {
+      Sector* sector = new Sector;
+      sector->parse(reader);
+      add_sector(sector);
+    } else {
+      std::cerr << "Unknown token '" << token << "' in level file.\n";
+      continue;
+    }
+  }
+  
+  delete level;
+#endif
+}
+
 Level::~Level()
 {
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)

Index: button.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- button.cpp	30 May 2004 01:08:48 -0000	1.33
+++ button.cpp	2 Jun 2004 23:33:34 -0000	1.34
@@ -22,13 +22,11 @@
 #include <stdlib.h>
 #include "setup.h"
 #include "screen/screen.h"
+#include "screen/drawing_context.h"
 #include "globals.h"
 #include "button.h"
 #include "camera.h"
 
-// TODO
-#if 0
-
 Timer Button::popup_timer;
 
 Button::Button(Surface* button_image, const std::string& ninfo,
@@ -50,7 +48,6 @@
   tag = -1;
   state = BUTTON_NONE;
   show_info = false;
-  drawable = NULL;
 }
 
 Button::Button(const std::string& imagefilename, const std::string& ninfo,
@@ -71,7 +68,6 @@
   tag = -1;
   state = BUTTON_NONE;
   show_info = false;
-  drawable = NULL;
 }
 
 void Button::add_icon(const std::string& icon_file, int mw, int mh)
@@ -99,7 +95,7 @@
 
 }
 
-void Button::draw()
+void Button::draw(DrawingContext& context)
 {
   if(state == BUTTON_HOVER)
     if(!popup_timer.check())
@@ -109,14 +105,14 @@
   fillrect(rect.x+1,rect.y+1,rect.w-2,rect.h-2,175,175,175,200);
 
   for(std::vector<Surface*>::iterator it = icon.begin(); it != icon.end(); ++it)
-    (*it)->draw(rect.x,rect.y);
+    context.draw_surface(*it, Vector(rect.x,rect.y), LAYER_GUI);
 
-  if(drawable)
+/*  if(drawable)
   {
     Camera viewport;
     viewport.set_translation(Vector(rect.x, rect.y));
     drawable->draw(viewport, 0);
-  }
+  }*/
 
   if(show_info)
   {
@@ -127,9 +123,9 @@
       i = rect.w + strlen(info.c_str()) * white_small_text->w;
 
     if(!info.empty())
-      white_small_text->draw(info.c_str(), i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y, 1);
+      context.draw_text(white_small_text, info.c_str(), Vector(i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y), LAYER_GUI);
     sprintf(str,"(%s)", SDL_GetKeyName(shortcut));
-    white_small_text->draw(str, i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2, 1);
+    context.draw_text(white_small_text, str, Vector(i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2), LAYER_GUI);
   }
   if(state == BUTTON_PRESSED || state == BUTTON_DEACTIVE)
     fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);
@@ -272,7 +268,7 @@
   item.clear();
 }
 
-void ButtonPanel::draw()
+void ButtonPanel::draw(DrawingContext& context)
 {
 
   if(hidden == false)
@@ -280,7 +276,7 @@
     fillrect(rect.x,rect.y,rect.w,rect.h,100,100,100,200);
     for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it)
     {
-      (*it)->draw();
+      (*it)->draw(context);
       if(hlast && it == last_clicked)
       {
         fillrect((*it)->get_pos().x,(*it)->get_pos().y,(*it)->get_pos().w,(*it)->get_pos().h,100,100,100,128);
@@ -326,6 +322,3 @@
 {
   hlast = b;
 }
-#endif
-
-

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- title.cpp	31 May 2004 23:47:05 -0000	1.92
+++ title.cpp	2 Jun 2004 23:33:35 -0000	1.93
@@ -297,8 +297,7 @@
                   generate_contrib_menu();
                   break;
                 case MNID_LEVELEDITOR:
-                  // TODO
-                  //leveleditor();
+                  leveleditor();
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:

Index: leveleditor.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- leveleditor.h	30 May 2004 01:08:48 -0000	1.11
+++ leveleditor.h	2 Jun 2004 23:33:35 -0000	1.12
@@ -23,8 +23,6 @@
 #ifndef SUPERTUX_LEVELEDITOR_H
 #define SUPERTUX_LEVELEDITOR_H
 
-#if 0 // TODO
-
 struct square
 {
   int x1, y1, x2, y2;
@@ -42,6 +40,4 @@
 int le_init(void);
 void le_checkevents(void);
 
-#endif
-
 #endif /*SUPERTUX_LEVELEDITOR_H*/

[Super-tux-commit] supertux/src/screen drawing_context.h,1.3,1.4

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

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

Modified Files:
	drawing_context.h 
Log Message:
Managed to update the level editor to the new drawing context code and stuff.
But it has a lot of issues. Scrolling is not being respected, buttons are not working well, and lots of crashing.
Time to rescue the level editor! :)

Index: drawing_context.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- drawing_context.h	31 May 2004 13:43:31 -0000	1.3
+++ drawing_context.h	2 Jun 2004 23:33:34 -0000	1.4
@@ -38,7 +38,8 @@
   LAYER_OBJECTS = 100,
   LAYER_FOREGROUNDTILES = 200,
   LAYER_FOREGROUND0 = 300,
-  LAYER_FOREGROUND1 = 400
+  LAYER_FOREGROUND1 = 400,
+  LAYER_GUI         = 500
 };
 
 class Color

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

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

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

Added Files:
	gettext.h 
Log Message:
forgot a file

--- NEW FILE: gettext.h ---
/* Convenience header for conditional use of GNU <libintl.h>.
   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published
   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.

   You should have received a copy of the GNU Library General Public
   License along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
   USA.  */

#ifndef _LIBGETTEXT_H
#define _LIBGETTEXT_H 1

#ifdef HAVE_GETTEXT
#  define _(String) gettext(String)
#  define N_(String) gettext_noop(String)
#else
#  define _(String) String
#  define N_(String) String
#endif

/* NLS can be disabled through the configure --disable-nls option.  */
#if ENABLE_NLS

/* Get declarations of GNU message catalog functions.  */
# include <libintl.h>

#else

/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
   chokes if dcgettext is defined as a macro.  So include it now, to make
   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
   as well because people using "gettext.h" will not include <libintl.h>,
   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
   is OK.  */
#if defined(__sun)
# include <locale.h>
#endif

/* Disabled NLS.
   The casts to 'const char *' serve the purpose of producing warnings
   for invalid uses of the value returned from these functions.
   On pre-ANSI systems without 'const', the config.h file is supposed to
   contain "#define const".  */
# define gettext(Msgid) ((const char *) (Msgid))
# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
# define ngettext(Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define dngettext(Domainname, Msgid1, Msgid2, N) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
# define textdomain(Domainname) ((const char *) (Domainname))
# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))

#endif

/* A pseudo function call that serves as a marker for the automated
   extraction of messages, but does not call gettext().  The run-time
   translation is done at a different place in the code.
   The argument, String, should be a literal string.  Concatenated strings
   and other string expressions won't work.
   The macro's expansion is not parenthesized, so that it is suitable as
   initializer for static 'char[]' or 'const char[]' variables.  */
#define gettext_noop(String) String

#endif /* _LIBGETTEXT_H */

[Super-tux-commit] supertux TODO,1.60,1.61

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

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

Modified Files:
	TODO 
Log Message:
TODO update

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- TODO	1 Jun 2004 21:29:54 -0000	1.60
+++ TODO	2 Jun 2004 23:01:46 -0000	1.61
@@ -63,10 +63,6 @@
 [L] fadein/out for intro/extro would be nice
 [L] we only have a global counter for multiple coin blocks. This should be handled
     per block.
-[L] AX_CHECK_GL produces an error during configure, when something in
-    configure.ac changed and it was automatically regenerated by make (instead
-    of the user doing ./autogen.sh)
-
 
 Beyond Milestone2
 -----------------

[Super-tux-commit] supertux/src Makefile.am,1.32,1.33 setup.cpp,1.93,1.94 supertux.cpp,1.19,1.20

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

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

Modified Files:
	Makefile.am setup.cpp supertux.cpp 
Log Message:
added gettext support to autoconf&others and translated the main menu to german

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- setup.cpp	2 Jun 2004 20:54:46 -0000	1.93
+++ setup.cpp	2 Jun 2004 23:00:26 -0000	1.94
@@ -52,6 +52,7 @@
 #include "resources.h"
 #include "intro.h"
 #include "sound_manager.h"
+#include "gettext.h"
 
 #include "player.h"
 
@@ -384,12 +385,12 @@
   worldmap_menu  = new Menu();
 
   main_menu->set_pos(screen->w/2, 335);
-  main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME);
-  main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB);
-  main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU);
-  main_menu->additem(MN_ACTION,"Level Editor",0,0, MNID_LEVELEDITOR);
-  main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS);
-  main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU);
+  main_menu->additem(MN_GOTO, _("Start Game"),0,load_game_menu, MNID_STARTGAME);
+  main_menu->additem(MN_GOTO, _("Contrib Levels"),0,contrib_menu, MNID_CONTRIB);
+  main_menu->additem(MN_GOTO, _("Options"),0,options_menu, MNID_OPTIONMENU);
+  main_menu->additem(MN_ACTION, _("Level Editor"),0,0, MNID_LEVELEDITOR);
+  main_menu->additem(MN_ACTION, _("Credits"),0,0, MNID_CREDITS);
+  main_menu->additem(MN_ACTION, _("Quit"),0,0, MNID_QUITMAINMENU);
 
   options_menu->additem(MN_LABEL,"Options",0,0);
   options_menu->additem(MN_HL,"",0,0);

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- supertux.cpp	31 May 2004 02:40:30 -0000	1.19
+++ supertux.cpp	2 Jun 2004 23:00:26 -0000	1.20
@@ -37,12 +37,18 @@
 #include "resources.h"
 #include "screen/texture.h"
 #include "tile.h"
+#include "gettext.h"
 
 int main(int argc, char * argv[])
 {
 #ifndef DEBUG
   try {
 #endif
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+    bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+      
     st_directory_setup();
     parseargs(argc, argv);
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	31 May 2004 22:13:14 -0000	1.32
+++ Makefile.am	2 Jun 2004 23:00:26 -0000	1.33
@@ -1,4 +1,7 @@
+localedir = $(datadir)/locale
+
 bin_PROGRAMS = supertux
+supertux_CXXFLAGS = -DLOCALEDIR=\"$(localedir)\"
 
 supertux_SOURCES = \
 screen/drawing_context.h \

[Super-tux-commit] supertux configure.ac,1.25,1.26

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

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

Modified Files:
	configure.ac 
Log Message:
added gettext support to autoconf&others and translated the main menu to german

Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.ac	24 May 2004 16:14:42 -0000	1.25
+++ configure.ac	2 Jun 2004 23:00:26 -0000	1.26
@@ -10,7 +10,6 @@
 dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
-
 AC_PREREQ([2.54])
 AC_INIT(SuperTux, 0.1.1)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
@@ -63,6 +62,8 @@
     AC_MSG_RESULT([no])
 fi
 
+AM_GNU_GETTEXT
+
 dnl ===========================================================================
 dnl Check for SDL
 AM_PATH_SDL($SDL_VERSION,
@@ -99,7 +100,10 @@
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
 
-AC_OUTPUT(Makefile src/Makefile data/Makefile)
+AC_OUTPUT(Makefile m4/Makefile intl/Makefile
+          src/Makefile
+          data/Makefile
+          po/Makefile.in)
 
 echo ""
 echo "Features:"

[Super-tux-commit] supertux/mk/autoconf acx_pthread.m4,1.1,NONE ax_check_gl.m4,1.1,NONE sdl.m4,1.1,NONE

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

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

Removed Files:
	acx_pthread.m4 ax_check_gl.m4 sdl.m4 
Log Message:
added gettext support to autoconf&others and translated the main menu to german

--- acx_pthread.m4 DELETED ---

--- sdl.m4 DELETED ---

--- ax_check_gl.m4 DELETED ---

[Super-tux-commit] supertux/po ChangeLog,NONE,1.1 LINGUAS,NONE,1.1 Makefile.in.in,NONE,1.1 Makevars,NONE,1.1 POTFILES.in,NONE,1.1 Rules-quot,NONE,1.1 boldquot.sed,NONE,1.1 de.po,NONE,1.1 en@boldquot.header,NONE,1.1 en@quot.header,NONE,1.1 insert-header.sin,NONE,1.1 quot.sed,NONE,1.1 remove-potcdate.sin,NONE,1.1 supertux.pot,NONE,1.1

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

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

Added Files:
	ChangeLog LINGUAS Makefile.in.in Makevars POTFILES.in 
	Rules-quot boldquot.sed de.po en@boldquot.header 
	en@quot.header insert-header.sin quot.sed remove-potcdate.sin 
	supertux.pot 
Log Message:
added gettext support to autoconf&others and translated the main menu to german

--- NEW FILE: en@quot.header ---
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
# It also translates pairs of apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019)
# and pairs of quotation mark (0x22) to
# left double quotation mark (U+201C) and right double quotation mark (U+201D).
#
# When output to an UTF-8 terminal, the quotation characters appear perfectly.
# When output to an ISO-8859-1 terminal, the single quotation marks are
# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
# grave/acute accent (by libiconv), and the double quotation marks are
# transliterated to 0x22.
# When output to an ASCII terminal, the single quotation marks are
# transliterated to apostrophes, and the double quotation marks are
# transliterated to 0x22.
#

--- NEW FILE: de.po ---
# German translations for SuperTux package
# German messages for SuperTux.
# Copyright (C) 2004 SuperTux Development Team
# This file is distributed under the same license as the SuperTux package.
#  <ma...@br...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: SuperTux 0.1.1\n"
"Report-Msgid-Bugs-To: sup...@li...\n"
"POT-Creation-Date: 2004-06-03 00:22+0200\n"
"PO-Revision-Date: 2004-06-03 00:29+0200\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"

#: src/setup.cpp:388
msgid "Start Game"
msgstr "Spiel Beginnen"

#: src/setup.cpp:389
msgid "Contrib Levels"
msgstr "Zusatzlevel"

#: src/setup.cpp:390
msgid "Options"
msgstr "Einstellungen"

#: src/setup.cpp:391
msgid "Level Editor"
msgstr "Level Editor"

#: src/setup.cpp:392
msgid "Credits"
msgstr "Mitwirkende"

#: src/setup.cpp:393
msgid "Quit"
msgstr "Beenden"

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

--- NEW FILE: ChangeLog ---
2004-06-02  gettextize  <bug...@gn...>

	* Makefile.in.in: New file, from gettext-0.12.1.
	* boldquot.sed: New file, from gettext-0.12.1.
	* en@boldquot.header: New file, from gettext-0.12.1.
	* en@quot.header: New file, from gettext-0.12.1.
	* insert-header.sin: New file, from gettext-0.12.1.
	* quot.sed: New file, from gettext-0.12.1.
	* remove-potcdate.sin: New file, from gettext-0.12.1.
	* Rules-quot: New file, from gettext-0.12.1.


--- NEW FILE: Rules-quot ---
# Special Makefile rules for English message catalogs with quotation marks.

DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot

.SUFFIXES: .insert-header .po-update-en

en@quot.po-update: en@quot.po-update-en
en@boldquot.po-update: en@boldquot.po-update-en

.insert-header.po-update-en:
	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
	tmpdir=`pwd`; \
	echo "$$lang:"; \
	ll=`echo $$lang | sed -e 's/@.*//'`; \
	LC_ALL=C; export LC_ALL; \
	cd $(srcdir); \
	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
	    rm -f $$tmpdir/$$lang.new.po; \
	  else \
	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
	      :; \
	    else \
	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
	      exit 1; \
	    fi; \
	  fi; \
	else \
	  echo "creation of $$lang.po failed!" 1>&2; \
	  rm -f $$tmpdir/$$lang.new.po; \
	fi

en...@qu...sert-header: insert-header.sin
	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en...@qu...sert-header

en...@bo...sert-header: insert-header.sin
	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en...@bo...sert-header

mostlyclean: mostlyclean-quot
mostlyclean-quot:
	rm -f *.insert-header

--- NEW FILE: LINGUAS ---
# Set of available languages.
de

--- NEW FILE: POTFILES.in ---
src/menu.cpp
src/particlesystem.cpp
src/game_object.h
src/leveleditor.h
src/scene.cpp
src/bitmask.h
src/background.cpp
src/intro.cpp
src/serializable.h
src/door.cpp
src/tilemap.h
src/bitmask.cpp
src/sprite_manager.cpp
src/configfile.h
src/vector.cpp
src/worldmap.cpp
src/later/rectangle.h
src/later/moving_object.cpp
src/later/badguy.cpp
src/later/badguy.h
src/later/moving_object.h
src/game_object.cpp
src/interactive_object.cpp
src/particlesystem.h
src/high_scores.h
src/type.cpp
src/sound_manager.cpp
src/scene.h
src/sprite.cpp
src/polygon.cpp
src/rectangle.h
src/level.h
src/moving_object.cpp
src/timer.cpp
src/supertux.cpp
src/setup.h
src/collision.h
src/resources.h
src/physic.cpp
src/background.h
src/tilemap.cpp
src/gameobjs.cpp
src/vector.h
src/sprite.h
src/title.cpp
src/sector.cpp
src/sound.h
src/camera.h
src/timer.h
src/title.h
src/door.h
src/physic.h
src/button.cpp
src/lispwriter.cpp
src/gameloop.cpp
src/level.cpp
src/setup.cpp
src/sound.cpp
src/resources.cpp
src/sector.h
src/musicref.cpp
src/badguy.cpp
src/menu.h
src/gettext.h
src/mousecursor.h
src/special.cpp
src/high_scores.cpp
src/lispreader.cpp
src/screen/font.cpp
src/screen/screen.h
src/screen/drawing_context.h
src/screen/font.h
src/screen/texture.h
src/screen/texture.cpp
src/screen/screen.cpp
src/screen/drawing_context.cpp
src/polygon.h
src/tile.h
src/sprite_manager.h
src/mousecursor.cpp
src/type.h
src/defines.h
src/badguy.h
src/exceptions.h
src/player.h
src/special.h
src/sound_manager.h
src/gameloop.h
src/worldmap.h
src/globals.h
src/gameobjs.h
src/tile.cpp
src/configfile.cpp
src/camera.cpp
src/moving_object.h
src/button.h
src/musicref.h
src/interactive_object.h
src/leveleditor.cpp
src/intro.h
src/lispreader.h
src/lispwriter.h
src/globals.cpp
src/collision.cpp
src/player.cpp

--- NEW FILE: en@boldquot.header ---
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
# It also translates pairs of apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019)
# and pairs of quotation mark (0x22) to
# left double quotation mark (U+201C) and right double quotation mark (U+201D).
#
# When output to an UTF-8 terminal, the quotation characters appear perfectly.
# When output to an ISO-8859-1 terminal, the single quotation marks are
# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
# grave/acute accent (by libiconv), and the double quotation marks are
# transliterated to 0x22.
# When output to an ASCII terminal, the single quotation marks are
# transliterated to apostrophes, and the double quotation marks are
# transliterated to 0x22.
#
# This catalog furthermore displays the text between the quotation marks in
# bold face, assuming the VT100/XTerm escape sequences.
#

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

--- NEW FILE: Makefile.in.in ---
# Makefile for PO directory in any package using GNU gettext.
# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper <dr...@gn...>
#
# This file can be copied and used freely without restrictions.  It can
# be used in projects which are not available under the GNU General Public
# License but which still want to provide support for the GNU gettext
# functionality.
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.

PACKAGE = @PACKAGE@
VERSION = @VERSION@

SHELL = /bin/sh
@SET_MAKE@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@

prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po

INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)

GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
MSGMERGE_UPDATE = @MSGMERGE@ --update
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter

POFILES = @POFILES@
GMOFILES = @GMOFILES@
UPDATEPOFILES = @UPDATEPOFILES@
DUMMYPOFILES = @DUMMYPOFILES@
DISTFILES.common = Makefile.in.in remove-potcdate.sin \
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
$(POFILES) $(GMOFILES) \
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)

POTFILES = \

CATALOGS = @CATALOGS@

# Makevars gets inserted here. (Don't remove this line!)

.SUFFIXES:
.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update

.po.mo:
	@echo "$(MSGFMT) -c -o $@ $<"; \
	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@

.po.gmo:
	@lang=`echo $* | sed -e 's,.*/,,'`; \
	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo

.sin.sed:
	sed -e '/^#/d' $< > t-$@
	mv t-$@ $@


all: all-@USE_NLS@

all-yes: stamp-po
all-no:

# stamp-po is a timestamp denoting the last time at which the CATALOGS have
# been loosely updated. Its purpose is that when a developer or translator
# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
# invocations of "make" will do nothing. This timestamp would not be necessary
# if updating the $(CATALOGS) would always touch them; however, the rule for
# $(POFILES) has been designed to not touch files that don't need to be
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
	test -z "$(CATALOGS)" || $(MAKE) $(CATALOGS)
	@echo "touch stamp-po"
	@echo timestamp > stamp-poT
	@mv stamp-poT stamp-po

# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.

# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
	  --files-from=$(srcdir)/POTFILES.in \
	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
	test ! -f $(DOMAIN).po || { \
	  if test -f $(srcdir)/$(DOMAIN).pot; then \
	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
	    else \
	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
	    fi; \
	  else \
	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
	  fi; \
	}

# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
# every "make" invocation, only create it when it is missing.
# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
$(srcdir)/$(DOMAIN).pot:
	$(MAKE) $(DOMAIN).pot-update

# This target rebuilds a PO file if $(DOMAIN).pot has changed.
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(srcdir)/$(DOMAIN).pot
	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
	echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
	cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot


install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
	if test "$(PACKAGE)" = "gettext-tools"; then \
	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
	  for file in $(DISTFILES.common) Makevars.template; do \
	    $(INSTALL_DATA) $(srcdir)/$$file \
			    $(DESTDIR)$(gettextsrcdir)/$$file; \
	  done; \
	  for file in Makevars; do \
	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
	  done; \
	else \
	  : ; \
	fi
install-data-no: all
install-data-yes: all
	$(mkinstalldirs) $(DESTDIR)$(datadir)
	@catalogs='$(CATALOGS)'; \
	for cat in $$catalogs; do \
	  cat=`basename $$cat`; \
	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
	  dir=$(localedir)/$$lang/LC_MESSAGES; \
	  $(mkinstalldirs) $(DESTDIR)$$dir; \
	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
	    if test -n "$$lc"; then \
	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
	         for file in *; do \
	           if test -f $$file; then \
	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
	           fi; \
	         done); \
	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
	      else \
	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
	          :; \
	        else \
	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
	        fi; \
	      fi; \
	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
	    fi; \
	  done; \
	done

install-strip: install

installdirs: installdirs-exec installdirs-data
installdirs-exec:
installdirs-data: installdirs-data-@USE_NLS@
	if test "$(PACKAGE)" = "gettext-tools"; then \
	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
	else \
	  : ; \
	fi
installdirs-data-no:
installdirs-data-yes:
	$(mkinstalldirs) $(DESTDIR)$(datadir)
	@catalogs='$(CATALOGS)'; \
	for cat in $$catalogs; do \
	  cat=`basename $$cat`; \
	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
	  dir=$(localedir)/$$lang/LC_MESSAGES; \
	  $(mkinstalldirs) $(DESTDIR)$$dir; \
	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
	    if test -n "$$lc"; then \
	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
	         for file in *; do \
	           if test -f $$file; then \
	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
	           fi; \
	         done); \
	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
	      else \
	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
	          :; \
	        else \
	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
	        fi; \
	      fi; \
	    fi; \
	  done; \
	done

# Define this as empty until I found a useful application.
installcheck:

uninstall: uninstall-exec uninstall-data
uninstall-exec:
uninstall-data: uninstall-data-@USE_NLS@
	if test "$(PACKAGE)" = "gettext-tools"; then \
	  for file in $(DISTFILES.common) Makevars.template; do \
	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
	  done; \
	else \
	  : ; \
	fi
uninstall-data-no:
uninstall-data-yes:
	catalogs='$(CATALOGS)'; \
	for cat in $$catalogs; do \
	  cat=`basename $$cat`; \
	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
	  done; \
	done

check: all

info dvi ps pdf html tags TAGS ctags CTAGS ID:

mostlyclean:
	rm -f remove-potcdate.sed
	rm -f stamp-poT
	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
	rm -fr *.o

clean: mostlyclean

distclean: clean
	rm -f Makefile Makefile.in POTFILES *.mo

maintainer-clean: distclean
	@echo "This command is intended for maintainers to use;"
	@echo "it deletes files that may require special tools to rebuild."
	rm -f stamp-po $(GMOFILES)

distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir:
	$(MAKE) update-po
	@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
dist2: $(DISTFILES)
	dists="$(DISTFILES)"; \
	if test "$(PACKAGE)" = "gettext-tools"; then \
	  dists="$$dists Makevars.template"; \
	fi; \
	if test -f $(srcdir)/ChangeLog; then \
	  dists="$$dists ChangeLog"; \
	fi; \
	for i in 0 1 2 3 4 5 6 7 8 9; do \
	  if test -f $(srcdir)/ChangeLog.$$i; then \
	    dists="$$dists ChangeLog.$$i"; \
	  fi; \
	done; \
	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
	for file in $$dists; do \
	  if test -f $$file; then \
	    cp -p $$file $(distdir); \
	  else \
	    cp -p $(srcdir)/$$file $(distdir); \
	  fi; \
	done

update-po: Makefile
	$(MAKE) $(DOMAIN).pot-update
	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
	$(MAKE) update-gmo

# General rule for updating PO files.

.nop.po-update:
	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
	tmpdir=`pwd`; \
	echo "$$lang:"; \
	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
	cd $(srcdir); \
	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
	    rm -f $$tmpdir/$$lang.new.po; \
	  else \
	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
	      :; \
	    else \
	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
	      exit 1; \
	    fi; \
	  fi; \
	else \
	  echo "msgmerge for $$lang.po failed!" 1>&2; \
	  rm -f $$tmpdir/$$lang.new.po; \
	fi

$(DUMMYPOFILES):

update-gmo: Makefile $(GMOFILES)
	@:

Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
	cd $(top_builddir) \
	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
	       $(SHELL) ./config.status

force:

# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

--- NEW FILE: remove-potcdate.sin ---
# Sed script that remove the POT-Creation-Date line in the header entry
# from a POT file.
#
# The distinction between the first and the following occurrences of the
# pattern is achieved by looking at the hold space.
/^"POT-Creation-Date: .*"$/{
x
# Test if the hold space is empty.
s/P/P/
ta
# Yes it was empty. First occurrence. Remove the line.
g
d
bb
:a
# The hold space was nonempty. Following occurrences. Do nothing.
x
:b
}

--- NEW FILE: supertux.pot ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR SuperTux Development Team
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: sup...@li...\n"
"POT-Creation-Date: 2004-06-03 00:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: src/setup.cpp:388
msgid "Start Game"
msgstr ""

#: src/setup.cpp:389
msgid "Contrib Levels"
msgstr ""

#: src/setup.cpp:390
msgid "Options"
msgstr ""

#: src/setup.cpp:391
msgid "Level Editor"
msgstr ""

#: src/setup.cpp:392
msgid "Credits"
msgstr ""

#: src/setup.cpp:393
msgid "Quit"
msgstr ""

--- NEW FILE: Makevars ---
# Makefile variables for PO directory in any package using GNU gettext.

# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)

# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..

# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_

# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
# package.  (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.)  Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright.  The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = SuperTux Development Team

# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
# - Strings which are not entire sentences, see the maintainer guidelines
#   in the GNU gettext documentation, section 'Preparing Strings'.
# - Strings which use unclear terms or require additional context to be
#   understood.
# - Strings which make invalid assumptions about notation of date, time or
#   money.
# - Pluralisation problems.
# - Incorrect English spelling.
# - Incorrect formatting.
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS = sup...@li...

# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used.  It is usually empty.
EXTRA_LOCALE_CATEGORIES =

--- NEW FILE: insert-header.sin ---
# Sed script that inserts the file called HEADER before the header entry.
#
# At each occurrence of a line starting with "msgid ", we execute the following
# commands. At the first occurrence, insert the file. At the following
# occurrences, do nothing. The distinction between the first and the following
# occurrences is achieved by looking at the hold space.
/^msgid /{
x
# Test if the hold space is empty.
s/m/m/
ta
# Yes it was empty. First occurrence. Read the file.
r HEADER
# Output the file's contents by reading the next line. But don't lose the
# current line while doing this.
g
N
bb
:a
# The hold space was nonempty. Following occurrences. Do nothing.
x
:b
}

[Super-tux-commit] supertux/m4 - New directory

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

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

Log Message:
Directory /cvsroot/super-tux/supertux/m4 added to the repository

[Super-tux-commit] supertux/po - New directory

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

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

Log Message:
Directory /cvsroot/super-tux/supertux/po added to the repository

[Super-tux-commit] supertux/intl - New directory

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

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

Log Message:
Directory /cvsroot/super-tux/supertux/intl added to the repository

[Super-tux-commit] supertux/data/images/status letters-black.png,1.4,NONE letters-blue.png,1.4,NONE letters-gold.png,1.4,NONE letters-green.png,1.2,NONE letters-red.png,1.4,NONE letters-silver.png,1.1,NONE letters-white-big.png,1.6,NONE letters-white-small.png,1.4,NONE letters-white.png,1.3,NONE numbers.png,1.1.1.1,NONE

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

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

Removed Files:
	letters-black.png letters-blue.png letters-gold.png 
	letters-green.png letters-red.png letters-silver.png 
	letters-white-big.png letters-white-small.png 
	letters-white.png numbers.png 
Log Message:
new versions of all fonts

--- letters-gold.png DELETED ---

--- letters-white-small.png DELETED ---

--- letters-silver.png DELETED ---

--- letters-black.png DELETED ---

--- letters-white.png DELETED ---

--- letters-blue.png DELETED ---

--- letters-red.png DELETED ---

--- letters-green.png DELETED ---

--- letters-white-big.png DELETED ---

--- numbers.png DELETED ---

[Super-tux-commit] supertux/src/screen font.cpp,1.2,1.3

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

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

Modified Files:
	font.cpp 
Log Message:
new versions of all fonts

Index: font.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- font.cpp	2 Jun 2004 20:06:56 -0000	1.2
+++ font.cpp	2 Jun 2004 20:54:46 -0000	1.3
@@ -44,7 +44,6 @@
   last_char = first_char + (chars->h / h) * 16;
   if(last_char > 127) // we have left out some control chars at 128-159
     last_char += 32;
-  printf("Chars: %d-%d.\n", first_char, last_char);
    
   // Load shadow font.
   if(shadowsize > 0) {

[Super-tux-commit] supertux/src globals.h,1.31,1.32 setup.cpp,1.92,1.93

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

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

Modified Files:
	globals.h setup.cpp 
Log Message:
new versions of all fonts

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- setup.cpp	2 Jun 2004 20:06:56 -0000	1.92
+++ setup.cpp	2 Jun 2004 20:54:46 -0000	1.93
@@ -583,27 +583,16 @@
   SDL_EnableUNICODE(1);
 
   /* Load global images: */
-
-  black_text  = new Font(datadir + "/images/status/letters-black.png",
-      Font::TEXT, 16,18);
-  gold_text   = new Font(datadir + "/images/status/letters-gold.png",
-      Font::TEXT, 16,18);
-  silver_text = new Font(datadir + "/images/status/letters-silver.png",
-      Font::TEXT, 16,18);
-  blue_text   = new Font(datadir + "/images/status/letters-blue.png",
-      Font::TEXT, 16, 18, 3);
-  red_text    = new Font(datadir + "/images/status/letters-red.png",
-      Font::TEXT, 16,18);
-  green_text  = new Font(datadir + "/images/status/letters-green.png",
-      Font::TEXT, 16,18);
-  white_text  = new Font(datadir + "/images/fonts/letters-white.png",
+  gold_text = new Font(datadir + "/images/fonts/gold.png", Font::TEXT, 16,18);
+  blue_text = new Font(datadir + "/images/fonts/blue.png", Font::TEXT, 16,18,3);
+  white_text  = new Font(datadir + "/images/fonts/white.png",
       Font::TEXT, 16,18);
-  white_small_text = new Font(datadir +
-      "/images/status/letters-white-small.png", Font::TEXT, 8,9, 1);
-  white_big_text   = new Font(datadir + "/images/fonts/letters-white-big.png",
+  white_small_text = new Font(datadir + "/images/fonts/white-small.png",
+          Font::TEXT, 8,9, 1);
+  white_big_text   = new Font(datadir + "/images/fonts/white-big.png",
       Font::TEXT, 20,22, 3);
-  yellow_nums = new Font(datadir + "/images/status/numbers.png",
-      Font::TEXT, 32,32);
+  yellow_nums = new Font(datadir + "/images/fonts/numbers.png",
+      Font::NUM, 32,32);
 
   /* Load GUI/menu images: */
   checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA);
@@ -622,13 +611,9 @@
 {
 
   /* Free global images: */
-  delete black_text;
   delete gold_text;
-  delete silver_text;
   delete white_text;
   delete blue_text;
-  delete red_text;
-  delete green_text;
   delete white_small_text;
   delete white_big_text;
   delete yellow_nums;

Index: globals.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/globals.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- globals.h	30 May 2004 01:08:48 -0000	1.31
+++ globals.h	2 Jun 2004 20:54:46 -0000	1.32
@@ -46,16 +46,12 @@
 
 extern JoystickKeymap joystick_keymap;
 
-extern SDL_Surface * screen;
-extern Font* black_text;
+extern SDL_Surface* screen;
 extern Font* gold_text;
-extern Font* silver_text;
 extern Font* white_text;
 extern Font* white_small_text;
 extern Font* white_big_text;
 extern Font* blue_text;
-extern Font* red_text;
-extern Font* green_text;
 extern Font* yellow_nums;
 
 extern MouseCursor * mouse_cursor;

[Super-tux-commit] supertux/data Makefile.am,1.14,1.15

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

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

Modified Files:
	Makefile.am 
Log Message:
new versions of all fonts

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	20 May 2004 23:09:40 -0000	1.14
+++ Makefile.am	2 Jun 2004 20:54:46 -0000	1.15
@@ -14,6 +14,7 @@
   $(wildcard images/*.xpm) \
   $(wildcard images/background/*.png) \
   $(wildcard images/background/*.jpg) \
+  $(wildcard images/fonts/*.png) \
   $(wildcard images/highscore/*.png) \
   $(wildcard images/icons/*.png) \
   $(wildcard images/icons/*.xpm) \

[Super-tux-commit] supertux/data/images/fonts blue.png,NONE,1.1 gold.png,NONE,1.1 numbers.png,NONE,1.1 white-big.png,NONE,1.1 white-small.png,NONE,1.1 white.png,NONE,1.1 letters-white-big.png,1.1,NONE letters-white.png,1.1,NONE

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

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

Added Files:
	blue.png gold.png numbers.png white-big.png white-small.png 
	white.png 
Removed Files:
	letters-white-big.png letters-white.png 
Log Message:
new versions of all fonts

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

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

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

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

--- letters-white-big.png DELETED ---

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

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

--- letters-white.png DELETED ---

[Super-tux-commit] supertux/data/images/fonts letters-white-big.png,NONE,1.1 letters-white.png,NONE,1.1

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

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

Added Files:
	letters-white-big.png letters-white.png 
Log Message:
added new latin1 font of litespeed

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

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