super-tux-commit Mailing List for Super Tux (Page 50)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Marek M. <wa...@us...> - 2004-07-09 18:53:22
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12259/data/levels/worldmap Modified Files: icyisland.stwm Log Message: added new music, a second forest tune sounds very similar to the first one, because i used the same instruments. the tune might need some more work, so i guess i'll change that some time happy listening :) Index: icyisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/icyisland.stwm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- icyisland.stwm 7 Jul 2004 23:45:47 -0000 1.2 +++ icyisland.stwm 9 Jul 2004 18:53:11 -0000 1.3 @@ -3,6 +3,7 @@ (properties (name "Icyisland") (name-pt_PT "Ilha Gelada") + (name-de "Eisinsel") (music "SALCON.MOD")) (tilemap (width 40) |
|
From: Marek M. <wa...@us...> - 2004-07-09 18:53:20
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12259/data/music Added Files: forest2-fast.mod forest2.mod Log Message: added new music, a second forest tune sounds very similar to the first one, because i used the same instruments. the tune might need some more work, so i guess i'll change that some time happy listening :) --- NEW FILE: forest2-fast.mod --- (This appears to be a binary file; contents omitted.) --- NEW FILE: forest2.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 18:18:54
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3614/data/levels/worldmap Modified Files: bonusisland1.stwm Log Message: Added title. Index: bonusisland1.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/bonusisland1.stwm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bonusisland1.stwm 6 Jul 2004 22:42:29 -0000 1.1 +++ bonusisland1.stwm 9 Jul 2004 18:18:45 -0000 1.2 @@ -1,5 +1,7 @@ ;; Generated with Flexlay Editor (supertux-worldmap + (properties + (name "Bonus Island")) (tilemap (width 70) (height 40) |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 18:18:21
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3426/src Modified Files: title.cpp worldmap.h Log Message: Shows map's title, not filename, in menu. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- title.cpp 9 Jul 2004 14:43:44 -0000 1.102 +++ title.cpp 9 Jul 2004 18:18:11 -0000 1.103 @@ -257,7 +257,11 @@ contrib_worldmap_menu->additem(MN_LABEL, _("Contrib Worlds"), 0,0); contrib_worldmap_menu->additem(MN_HL, "", 0,0); for(int i = 0; i < worldmap_list.num_items; i++) - contrib_worldmap_menu->additem(MN_ACTION, worldmap_list.item[i],0,0,i); + { + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(worldmap_list.item[i]); + contrib_worldmap_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0,i); + } contrib_worldmap_menu->additem(MN_HL,"",0,0); contrib_worldmap_menu->additem(MN_BACK,"Back",0,0); Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- worldmap.h 9 Jul 2004 14:43:44 -0000 1.34 +++ worldmap.h 9 Jul 2004 18:18:11 -0000 1.35 @@ -199,6 +199,9 @@ /* Load map directly from file */ void loadmap(const std::string& filename); + const std::string& get_world_title() const + { return name; } + private: void on_escape_press(); }; |
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892/src Modified Files: globals.cpp globals.h menu.cpp menu.h setup.cpp supertux.cpp title.cpp worldmap.cpp worldmap.h Log Message: Added worldmap choosing from command-line and menu. Contributed maps must be in data/levels/worldmap, included the ones run from the command-line. It is possible to feed maps with absolute path, but it is just a hack that converts them to relative paths to the worldmap folder. I did this, in order to make it possible for someone to add a mime-type for Konqueror as 'supertux --worldmap' and press a .stwt file from worldmap dir. About the Contrib Worlds menu, we might consider just making one Contrib menu, and make levels from different folders to create dynamically a map. Till that day, let's keep this menu. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- menu.cpp 2 Jul 2004 15:14:48 -0000 1.83 +++ menu.cpp 9 Jul 2004 14:43:44 -0000 1.84 @@ -59,6 +59,7 @@ Menu* highscore_menu = 0; Menu* load_game_menu = 0; Menu* save_game_menu = 0; +Menu* contrib_worldmap_menu = 0; Menu* contrib_menu = 0; Menu* contrib_subset_menu = 0; Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- setup.cpp 7 Jul 2004 17:56:47 -0000 1.106 +++ setup.cpp 9 Jul 2004 14:43:44 -0000 1.107 @@ -383,12 +383,14 @@ game_menu = new Menu(); highscore_menu = new Menu(); contrib_menu = new Menu(); + contrib_worldmap_menu = new Menu(); contrib_subset_menu = new Menu(); 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, _("Contrib Worlds"),0,contrib_worldmap_menu, MNID_WORLDMAP_CONTRIB); + main_menu->additem(MN_GOTO, _("Contrib Levels"),0,contrib_menu, MNID_LEVELS_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); @@ -641,6 +643,7 @@ delete options_keys_menu; delete options_joystick_menu; delete highscore_menu; + delete contrib_worldmap_menu; delete contrib_menu; delete contrib_subset_menu; delete worldmap_menu; @@ -988,6 +991,10 @@ { launch_leveleditor_mode = true; } + else if (strcmp(argv[i], "--worldmap") == 0) + { + launch_worldmap_mode = true; + } else if (strcmp(argv[i], "--datadir") == 0 || strcmp(argv[i], "-d") == 0 ) { @@ -1065,7 +1072,8 @@ " -j, --joystick NUM Use joystick NUM (default: 0)\n" " --joymap XAXIS:YAXIS:A:B:START\n" " Define how joystick buttons and axis should be mapped\n" - " --leveleditor Opens the leveleditor in a file. (Only works when a file is provided.)\n" + " --leveleditor Opens the leveleditor in a file.\n" + " --worldmap Opens the specified worldmap file.\n" " -d, --datadir DIR Load Game data from DIR (default: automatic)\n" " --debug Enables the debug mode, which is useful for developers.\n" " --help Display a help message summarizing command-line\n" @@ -1106,7 +1114,7 @@ /* Display the usage message: */ - fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug] | [--usage | --help | --version] [--leveleditor] FILENAME\n"), + fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug] | [--usage | --help | --version] [--leveleditor] [--worldmap] FILENAME\n"), prog); Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- menu.h 14 Jun 2004 22:45:23 -0000 1.67 +++ menu.h 9 Jul 2004 14:43:44 -0000 1.68 @@ -33,7 +33,8 @@ enum MainMenuIDs { MNID_STARTGAME, - MNID_CONTRIB, + MNID_WORLDMAP_CONTRIB, + MNID_LEVELS_CONTRIB, MNID_OPTIONMENU, MNID_LEVELEDITOR, MNID_CREDITS, @@ -235,6 +236,7 @@ extern Surface* arrow_left; extern Surface* arrow_right; +extern Menu* contrib_worldmap_menu; extern Menu* contrib_menu; extern Menu* contrib_subset_menu; extern Menu* main_menu; Index: globals.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/globals.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- globals.cpp 28 Jun 2004 17:12:34 -0000 1.22 +++ globals.cpp 9 Jul 2004 14:43:44 -0000 1.23 @@ -58,6 +58,7 @@ int joystick_num = 0; char* level_startup_file = 0; bool launch_leveleditor_mode = false; +bool launch_worldmap_mode = false; /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */ char *st_dir, *st_save_dir; Index: globals.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/globals.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- globals.h 28 Jun 2004 17:12:34 -0000 1.34 +++ globals.h 9 Jul 2004 14:43:44 -0000 1.35 @@ -69,6 +69,7 @@ extern int joystick_num; extern char* level_startup_file; extern bool launch_leveleditor_mode; +extern bool launch_worldmap_mode; /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */ extern char* st_dir; Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- title.cpp 9 Jul 2004 11:07:41 -0000 1.101 +++ title.cpp 9 Jul 2004 14:43:44 -0000 1.102 @@ -45,6 +45,7 @@ #include "level.h" #include "level_subset.h" #include "gameloop.h" +#include "worldmap.h" #include "leveleditor.h" #include "scene.h" #include "player.h" @@ -53,6 +54,7 @@ #include "sector.h" #include "tilemap.h" #include "resources.h" +#include "type.h" #include "gettext.h" static Surface* bkg_title; @@ -71,6 +73,8 @@ static std::vector<LevelSubset*> contrib_subsets; static LevelSubset* current_contrib_subset = 0; +static string_list_type worldmap_list; + static LevelEditor* leveleditor; void free_contrib_menu() @@ -85,6 +89,7 @@ void generate_contrib_menu() { + /** Generating contrib levels list by making use of Level Subset */ string_list_type level_subsets = dsubdirs("/levels", "info"); free_contrib_menu(); @@ -107,7 +112,7 @@ string_list_free(&level_subsets); } -void check_contrib_menu() +void check_levels_contrib_menu() { static int current_subset = -1; @@ -172,6 +177,19 @@ } } +void check_contrib_worldmap_menu() +{ + int index = contrib_worldmap_menu->check(); + if (index != -1) + { + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(worldmap_list.item[index]); + worldmap.display(); + + Menu::set_current(main_menu); + } +} + void draw_demo(double frame_ratio) { Sector* world = titlesession->get_current_sector(); @@ -233,6 +251,19 @@ logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA); img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA); + /* Generating contrib maps by only using a string_list */ + worldmap_list = dfiles("levels/worldmap", NULL, NULL); + + contrib_worldmap_menu->additem(MN_LABEL, _("Contrib Worlds"), 0,0); + contrib_worldmap_menu->additem(MN_HL, "", 0,0); + for(int i = 0; i < worldmap_list.num_items; i++) + contrib_worldmap_menu->additem(MN_ACTION, worldmap_list.item[i],0,0,i); + contrib_worldmap_menu->additem(MN_HL,"",0,0); + contrib_worldmap_menu->additem(MN_BACK,"Back",0,0); + + titlesession->get_current_sector()->activate(); + titlesession->set_current(); + /* --- Main title loop: --- */ frame = 0; @@ -295,7 +326,9 @@ // Start Game, ie. goto the slots menu update_load_save_game_menu(load_game_menu); break; - case MNID_CONTRIB: + case MNID_WORLDMAP_CONTRIB: + break; + case MNID_LEVELS_CONTRIB: // Contrib Menu puts("Entering contrib menu"); generate_contrib_menu(); @@ -350,12 +383,16 @@ } else if(menu == contrib_menu) { - check_contrib_menu(); + check_levels_contrib_menu(); } else if (menu == contrib_subset_menu) { check_contrib_subset_menu(); } + else if(menu == contrib_worldmap_menu) + { + check_contrib_worldmap_menu(); + } } mouse_cursor->draw(context); Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- worldmap.cpp 9 Jul 2004 10:38:58 -0000 1.90 +++ worldmap.cpp 9 Jul 2004 14:43:44 -0000 1.91 @@ -378,12 +378,12 @@ void WorldMap::load_map() { + std::cout << "Loading map: " << datadir + "/levels/worldmap/" + map_filename << std::endl; + lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename); if (!root_obj) st_abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename); - std::cout << "Loading map: " << datadir + "/levels/worldmap/" + map_filename << std::endl; - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0) { lisp_object_t* cur = lisp_cdr(root_obj); @@ -960,6 +960,9 @@ void WorldMap::savegame(const std::string& filename) { + if(filename != "") + return; + std::cout << "savegame: " << filename << std::endl; std::ofstream out(filename.c_str()); @@ -1087,6 +1090,14 @@ lisp_free(savegame); } +void +WorldMap::loadmap(const std::string& filename) +{ + savegame_file = ""; + map_filename = filename; + load_map(); +} + } // namespace WorldMapNS /* Local Variables: */ Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- worldmap.h 7 Jul 2004 17:56:01 -0000 1.33 +++ worldmap.h 9 Jul 2004 14:43:44 -0000 1.34 @@ -192,8 +192,13 @@ if possible, write the new position to \a new_pos */ bool path_ok(Direction direction, Vector pos, Vector* new_pos); + /* Save map to slot */ void savegame(const std::string& filename); + /* Load map from slot */ void loadgame(const std::string& filename); + /* Load map directly from file */ + void loadmap(const std::string& filename); + private: void on_escape_press(); }; Index: supertux.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- supertux.cpp 28 Jun 2004 11:30:27 -0000 1.24 +++ supertux.cpp 9 Jul 2004 14:43:44 -0000 1.25 @@ -67,6 +67,18 @@ else leveleditor.run(); } + else if (launch_worldmap_mode && level_startup_file) + { + // hack to make it possible for someone to give an absolute path + std::string str(level_startup_file); + unsigned int i = str.find_last_of("/", str.size()); + if(i != std::string::npos) + str.erase(0, i+1); + + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(str); + worldmap.display(); + } else if (level_startup_file) { GameSession session(level_startup_file, ST_GL_LOAD_LEVEL_FILE); |
|
From: Marek M. <wa...@us...> - 2004-07-09 12:04:52
|
Update of /cvsroot/super-tux/supertux/data/levels/bonus1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15214/data/levels/bonus1 Modified Files: wansti-level3.stl Log Message: Fixed an "invalid tile" bug in one of the bonus levels Index: wansti-level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level3.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wansti-level3.stl 8 Jul 2004 08:34:53 -0000 1.2 +++ wansti-level3.stl 9 Jul 2004 12:04:41 -0000 1.3 @@ -56,7 +56,7 @@ ) (foreground-tm - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 85 86 87 88 85 86 87 88 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 89 90 91 92 89 90 91 92 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 89 90 91 92 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 11:07:50
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5597/src Modified Files: title.cpp Log Message: Ooops, looks like I removed a line. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- title.cpp 9 Jul 2004 10:38:58 -0000 1.100 +++ title.cpp 9 Jul 2004 11:07:41 -0000 1.101 @@ -337,6 +337,7 @@ update_load_save_game_menu(load_game_menu); Menu::set_current(main_menu); + update_time = st_get_ticks(); } else if (process_load_game_menu()) { |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 10:58:50
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3848 Modified Files: LEVELDESIGN Log Message: Updated LEVELDESIGN to reflect the new level format. Index: LEVELDESIGN =================================================================== RCS file: /cvsroot/super-tux/supertux/LEVELDESIGN,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- LEVELDESIGN 10 May 2004 23:20:40 -0000 1.9 +++ LEVELDESIGN 9 Jul 2004 10:58:41 -0000 1.10 @@ -9,68 +9,143 @@ = LEVEL FORMAT = -The level format used to be pretty easy to understand, but it -is now more complex. Anyway, should be pretty useful to know -a bit of it, when you want to do stuff just as to just change -the author's name or something small. +Since the level editor does not support anything, you might have +to edit a couple of things directly from the level file, so it +might be a better idea to read this. -It uses the Lisp syntax and is pretty intuitive. Here have a -look at a quotation: -(Comments can be made using ';') +Level format should be pretty straight forward. The syntax is the +Scheme one. But even if you have no idea about it, no worry, +it is pretty intuitive. + +Attention: this describes the new level format. But current levels +still use the old one, since the engine still supports it and also +level editors still use it. + +To explain a bit of the level format, there is nothing better than +really looking at it. So here goes a quote of it. The comments +prefix-ed by a ';', describe what everything is about. ; This is a comment! +; Level made using SuperTux's built-in Level Editor (supertux-level -; some level info: version, author and the level's name - (version 1) +; version higher than 1 means that it follows the new level format (CVS) + (version 2) +; Level's title and author name + (name "The Castle of Nolok") (author "Ingo Ruhnke") - (name "Night Chill") -; number of tiles used (currently the height has to be 15) - (width 515) - (height 15) -; Tux's start position - (start_pos_x 100) - (start_pos_y 170) -; Background image; if none is specified, the color below will be used - (background "") -; Music file - (music "Mortimers_chipdisko.mod") -; Colors, as you can see you can have different colors in the top -; and in the bottom, thus creating a gradient - (bkgd_red_top 0) - (bkgd_green_top 0) - (bkgd_blue_top 0) - (bkgd_red_bottom 120) - (bkgd_green_bottom 120) - (bkgd_blue_bottom 0) -; Time (it is not in seconds!) - (time 300) -; Gravity to be used (you should let it stay in 10 for ordinary levels) - (gravity 10) -; The particle system draws images that simulate weather effects -; As of the writing of this text, both "snow" and "clouds" are supported - (particle_system "snow") -; Theme is the tileset that is used - (theme "antarctica") - (interactive-tm - ; here goes a lot of numbers that are the tiles places +; Time the player has to finish the level (it is not in seconds!) + (time 300) +; Each level has one or more sectors. Sectors can be seen as levels inside this +; level. Their use is for swapping. + (sector +; Naming sectors is usefull to for swapping +; "main" sectors are the ones that the player will start in + (name "main") +; Level's gravity (better let it 10) + (gravity 10) +; We can have one or more playerspawn that can be used by doors. +; "main" is the default one for this sector. + (playerspawn + (name "main") + (x 100) + (y 170) ) -; Reset points; there can be more than one -; Reset points are positions where the player passes through and -; if he dies, he will be back to there. They are invisible - (reset-points - (point (x 6988) (y 222)) - ) -; Objects include enemies, may include more stuff in the future -; just as moving plataforms... - (objects - (mriceblock (x 13919) (y 384)) - (mriceblock (x 14258) (y 366)) - (mriceblock (x 12996) (y 248)) - (mriceblock (x 13058) (y 250)) - (mriceblock (x 12933) (y 245)) +; Level's music file from data/music + (music "fortress.mod") +; This level will use a vertical background +; You can also set a background image by using: +; (background "arctis.jpg") + (background + (top_red 0) + (top_green 0) + (top_blue 0) + (bottom_red 150) + (bottom_green 0) + (bottom_blue 0) + ) +; Now let's go for tilemaps. Tilemaps are the tiles field. We can have more +; than one. Each one has the following properites: +; layer - can be foreground (drawn above player), interactive (interacts with player, +; (solid #t) has to be set, as well), background (drawn below the player). +; speed - this can be used for parallax effects. Better use a level editor (though +; there is not yet one that supports it) to edit this. + (tilemap + (layer "interactive") + (solid #t) + (speed 1) +; width and height of the tilemap. Has to be specified. + (width 525) + (height 15) +; Here goes the tilemap : + (tiles 64 64 69 68 68 ... + .... + ....) + ) +; Another tilemap, this is the background one + (tilemap + (layer "background") + (solid #f) + (speed 1) + (width 525) + (height 15) + (tiles 0 0 ... + ... ) + ) +; Yet another one. Normally there are only three. + (tilemap + (layer "foreground") + (solid #f) + (speed 1) + (width 525) + (height 15) + (tiles 0 0 0 0 ... + ...) + ) +; Let's setup a few bad guys. + (jumpy + (x 1277) + (y 388) +; stay-on-platform is a flag to tell them not to fall from +; their platforms. + (stay-on-platform #f) + ) + (mriceblock + (x 4345) + (y 380) + (stay-on-platform #f) + ) + (stalactite + (x 790) + (y 96) + (stay-on-platform #f) + ) +; At last, but not least, the camera: +; (Order doesn't matter for Lisp, so camera could be on top or the middle) + (camera +; This is the ordinary mode, but we can also have an auto one. +; "auto" can be used to create a path to the camera. +; Here is an example of an auto camera: +; (camera +; (mode "autoscroll") +; (path +; (point (x 0) (y 0) (speed 0.5)) +; (point (x 500) (y 0) (speed 2)) +; (point (x 1200) (y 0) (speed 1)) +; (point (x 3000) (y 0) (speed 1)) +; (point (x 1500) (y 0) (speed 1.4)) +; (point (x 99999) (y 0)) +; ) +; ) + (mode "normal") +; backscrolling is only set for normal. It says if player can back +; scroll or not (just go to the front). + (backscrolling #t) + ) +; We could also setup other objects, like trampolins, doors (to swap), +; and moving platform. Please check another level (ie. in test/) that +; uses them to learn more about them. ) - ) - +) = LEVEL EDITORS = |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 10:40:29
|
Update of /cvsroot/super-tux/supertux/data/images/background In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1439/data/images/background Modified Files: extro.jpg Added Files: extro640.jpg Log Message: Resized extro.jpg to 800x600, otherwise end screen has problems. Kept the other as extro640.jpg. Index: extro.jpg =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/background/extro.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsgMl32L and /tmp/cvs89f3s7 differ --- NEW FILE: extro640.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 10:39:07
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1197/src Modified Files: title.cpp worldmap.cpp Log Message: Fixed aborting behavior. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- title.cpp 23 Jun 2004 10:17:25 -0000 1.99 +++ title.cpp 9 Jul 2004 10:38:58 -0000 1.100 @@ -305,6 +305,7 @@ leveleditor->run(); delete leveleditor; Menu::set_current(main_menu); + update_time = st_get_ticks(); break; case MNID_CREDITS: display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS); @@ -336,7 +337,6 @@ update_load_save_game_menu(load_game_menu); Menu::set_current(main_menu); - update_time = st_get_ticks(); } else if (process_load_game_menu()) { Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- worldmap.cpp 8 Jul 2004 10:11:08 -0000 1.89 +++ worldmap.cpp 9 Jul 2004 10:38:58 -0000 1.90 @@ -707,8 +707,11 @@ break; case GameSession::ES_LEVEL_ABORT: /* In case the player's abort the level, keep it using the old - status */ - player_status = old_player_status; + status. But the minimum lives and no bonus. */ + player_status.score = old_player_status.score; + player_status.distros = old_player_status.distros; + player_status.lives = std::min(old_player_status.lives, player_status.lives); + player_status.bonus = player_status.NO_BONUS; break; case GameSession::ES_GAME_OVER: { |
|
From: Ricardo C. <rm...@us...> - 2004-07-08 15:05:10
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5808 Modified Files: TRANSLATORS Log Message: Added a couple of lines to TRANSLATORS. Index: TRANSLATORS =================================================================== RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- TRANSLATORS 7 Jun 2004 12:06:57 -0000 1.3 +++ TRANSLATORS 8 Jul 2004 15:05:01 -0000 1.4 @@ -17,9 +17,10 @@ should use the personal one. And if it is possible to ommit it in your language, it might be a good idea. -* Names like SuperTux, Tux, Penny and other game elements should not be translated. If you +* Names like SuperTux, Tux, Penny or Nolok should not be translated. If you really think one of these to be a too strange word for your people, first inform us at our mailing list. + Minor characters like Mr. Ice Block can (and should) be translated. A couple of notes: * If somewhere in the game, after translating a string, it doesn't look well (bad @@ -50,6 +51,16 @@ and run 'make update-po'. Then a binary file will be created. In order to make SuperTux using it, you will have to install it ('make install'). + To translate data files, you'll have to use a text editor, since we don't follow any + convention. To translate a level's tile, to French, for instance, just do this: + (name "Hello World!") + (name-fr "Bonjour Monde!") + Other data files, like texts in data/, can be translated the same way: + (text "Hello World! + Bye World!") + (text-fr "Bonjour Monde! + Au revoir Monde!") + == DEVELOPERS == |
|
From: Ricardo C. <rm...@us...> - 2004-07-08 11:41:11
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31877/data/levels/test Modified Files: info Log Message: Tranlated test subset. Index: info =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- info 12 Apr 2004 22:53:15 -0000 1.1 +++ info 8 Jul 2004 11:41:03 -0000 1.2 @@ -1,4 +1,8 @@ ;SuperTux-Level-Subset (supertux-level-subset (title "Test collection") - (description "A few levels for test proposes")) \ No newline at end of file + (description "A few levels for test proposes") + + (title-pt_PT "Colecção de Teste") + (description-pt_PT "Uma série de níveis destinados a teste") + ) \ No newline at end of file |
|
From: Ricardo C. <rm...@us...> - 2004-07-08 11:40:48
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31815/src Modified Files: level_subset.cpp Log Message: Let title and description of subsets to be translatable. By the way, is description field really needed? Why not just get rid of it? Index: level_subset.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level_subset.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- level_subset.cpp 16 Jun 2004 00:40:42 -0000 1.2 +++ level_subset.cpp 8 Jul 2004 11:40:40 -0000 1.3 @@ -61,8 +61,8 @@ { LispReader reader(lisp_cdr(root_obj)); - reader.read_string("title", title); - reader.read_string("description", description); + reader.read_string("title", title, true); + reader.read_string("description", description, true); reader.read_string_vector("levels", levels); } else |
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20209/data/levels/world1 Modified Files: level10.stl level11.stl level12.stl level13.stl level14.stl level15.stl level16.stl level17.stl level18.stl level19.stl level1.stl level20.stl level21.stl level22.stl level23.stl level24.stl level25.stl level26.stl level2.stl level3.stl level4.stl level5.stl level6.stl level7.stl level8.stl level9.stl Log Message: Changed Marek's translations de_DE to de. German is country independent, right? Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level1.stl 8 Jul 2004 08:34:53 -0000 1.17 +++ level1.stl 8 Jul 2004 10:31:24 -0000 1.18 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "Welcome to Antarctica") (name-pt_PT "Bem-vindo à Antártida") - (name-de_DE "Willkommen in Antarctica") + (name-de "Willkommen in Antarctica") (width 310) (height 19) (start_pos_x 100) Index: level21.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level21.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level21.stl 8 Jul 2004 08:34:57 -0000 1.12 +++ level21.stl 8 Jul 2004 10:31:24 -0000 1.13 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "A Path in the Clouds") (name-pt_PT "Um Caminho pelas Nuvens") - (name-de_DE "Ein Pfad in den Wolken") + (name-de "Ein Pfad in den Wolken") (width 525) (height 15) (start_pos_x 100) Index: level16.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level16.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level16.stl 8 Jul 2004 08:34:55 -0000 1.13 +++ level16.stl 8 Jul 2004 10:31:21 -0000 1.14 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Living in a Fridge") (name-pt_PT "Vivendo numa Frigideira") - (name-de_DE "Leben im Kühlschrank") + (name-de "Leben im Kühlschrank") (width 510) (height 19) (start_pos_x 100) Index: level17.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level17.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level17.stl 8 Jul 2004 08:34:55 -0000 1.13 +++ level17.stl 8 Jul 2004 10:31:21 -0000 1.14 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "'...or is it just me?'") (name-pt_PT "'... ou é apenas de mim?'") - (name-de_DE "'...oder bin ich das?'") + (name-de "'...oder bin ich das?'") (width 515) (height 19) (start_pos_x 100) Index: level23.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level23.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level23.stl 8 Jul 2004 08:34:57 -0000 1.11 +++ level23.stl 8 Jul 2004 10:31:24 -0000 1.12 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "The Escape") (name-pt_PT "A Fuga") - (name-de_DE "Die Flucht") + (name-de "Die Flucht") (width 515) (height 15) (start_pos_x 100) Index: level6.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level6.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level6.stl 8 Jul 2004 08:34:59 -0000 1.14 +++ level6.stl 8 Jul 2004 10:31:27 -0000 1.15 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "The Frosted Fields") (name-pt_PT "Os Campos Congelados") - (name-de_DE "Vereiste Felder") + (name-de "Vereiste Felder") (width 510) (height 19) (start_pos_x 100) Index: level8.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level8.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level8.stl 8 Jul 2004 08:35:14 -0000 1.16 +++ level8.stl 8 Jul 2004 10:31:27 -0000 1.17 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Stone Cold") (name-pt_PT "Pedra Gelada") - (name-de_DE "Kalt wie Stein") + (name-de "Kalt wie Stein") (width 520) (height 19) (start_pos_x 100) Index: level14.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level14.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level14.stl 8 Jul 2004 08:34:55 -0000 1.17 +++ level14.stl 8 Jul 2004 10:31:18 -0000 1.18 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "Entrance to the Cave") (name-pt_PT "Entrada para a Gruta") - (name-de_DE "Eingang der Höhle") + (name-de "Eingang der Höhle") (width 510) (height 19) (start_pos_x 100) Index: level19.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level19.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level19.stl 8 Jul 2004 08:34:56 -0000 1.14 +++ level19.stl 8 Jul 2004 10:31:23 -0000 1.15 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Miyamoto Monument") (name-pt_PT "O Monumento Miyamoto") - (name-de_DE "Das Miyamoto Monument") + (name-de "Das Miyamoto Monument") (width 505) (height 15) (start_pos_x 100) Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level2.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level2.stl 8 Jul 2004 08:34:56 -0000 1.15 +++ level2.stl 8 Jul 2004 10:31:26 -0000 1.16 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "The Journey Begins") (name-pt_PT "A Aventura Começa") - (name-de_DE "Das Abenteuer beginnt") + (name-de "Das Abenteuer beginnt") (width 300) (height 19) (start_pos_x 100) Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level10.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level10.stl 8 Jul 2004 08:34:53 -0000 1.18 +++ level10.stl 8 Jul 2004 10:31:17 -0000 1.19 @@ -3,7 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "23rd Airborne") - (name-de_DE "23 Mann Luftverteidigung") + (name-de "23 Mann Luftverteidigung") (width 515) (height 19) (start_pos_x 100) Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level12.stl 8 Jul 2004 08:34:54 -0000 1.14 +++ level12.stl 8 Jul 2004 10:31:17 -0000 1.15 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Into the Stars") (name-pt_PT "Até às Estrelas") - (name-de_DE "Griff nach den Sternen") + (name-de "Griff nach den Sternen") (width 520) (height 19) (start_pos_x 100) Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level5.stl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- level5.stl 8 Jul 2004 08:34:58 -0000 1.20 +++ level5.stl 8 Jul 2004 10:31:27 -0000 1.21 @@ -4,7 +4,7 @@ (author "Philippe Saint-Pierre") (name "The Somewhat Smaller Bath") (name-pt_PT "Um Banho Um Pouco Mais Pequeno") - (name-de_DE "Das etwas kleinere Bad") + (name-de "Das etwas kleinere Bad") (width 355) (height 19) (start_pos_x 100) Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level4.stl 8 Jul 2004 08:34:58 -0000 1.19 +++ level4.stl 8 Jul 2004 10:31:27 -0000 1.20 @@ -4,7 +4,7 @@ (author "Tobias Glaesser") (name "Tobgle Road") (name-pt_PT "A Estrada Tobgle") - (name-de_DE "Tobgle Passage") + (name-de "Tobgle Passage") (width 270) (height 19) (start_pos_x 100) Index: level15.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level15.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level15.stl 8 Jul 2004 08:34:55 -0000 1.13 +++ level15.stl 8 Jul 2004 10:31:21 -0000 1.14 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Under the Ice") (name-pt_PT "Debaixo do Gelo") - (name-de_DE "Unter dem Eis") + (name-de "Unter dem Eis") (width 510) (height 19) (start_pos_x 100) Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level7.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level7.stl 8 Jul 2004 08:35:13 -0000 1.19 +++ level7.stl 8 Jul 2004 10:31:27 -0000 1.20 @@ -4,7 +4,7 @@ (author "Voluptuous Pachyderm") (name "Oh no! More Snowballs!") (name-pt_PT "Oh não! Mais Bolas de Neve!") - (name-de_DE "Oh nein! Noch mehr Schneebälle!") + (name-de "Oh nein! Noch mehr Schneebälle!") (width 525) (height 19) (start_pos_x 100) Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level26.stl 8 Jul 2004 08:34:58 -0000 1.11 +++ level26.stl 8 Jul 2004 10:31:24 -0000 1.12 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "The Castle of Nolok") (name-pt_PT "O Castelo do Nolok") - (name-de_DE "Noloks Festung") + (name-de "Noloks Festung") (width 525) (height 15) (start_pos_x 100) Index: level24.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level24.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level24.stl 8 Jul 2004 08:34:57 -0000 1.11 +++ level24.stl 8 Jul 2004 10:31:24 -0000 1.12 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "The Shattered Bridge") (name-pt_PT "A Ponte Quebradiça") - (name-de_DE "Die eingestürzte Brücke") + (name-de "Die eingestürzte Brücke") (width 525) (height 15) (start_pos_x 100) Index: level18.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level18.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level18.stl 8 Jul 2004 08:34:55 -0000 1.14 +++ level18.stl 8 Jul 2004 10:31:22 -0000 1.15 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Ice in the Hole") (name-pt_PT "Gelo no Buraco") - (name-de_DE "Eisiges Loch") + (name-de "Eisiges Loch") (width 500) (height 19) (start_pos_x 100) Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level13.stl 8 Jul 2004 08:34:54 -0000 1.15 +++ level13.stl 8 Jul 2004 10:31:18 -0000 1.16 @@ -4,7 +4,7 @@ (author "Ricardo Cruz") (name "Above the Arctic Skies") (name-pt_PT "Acima dos Céus do Ártico") - (name-de_DE "Über den arktischen Wolken") + (name-de "Über den arktischen Wolken") (width 290) (height 19) (start_pos_x 100) Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level11.stl 8 Jul 2004 08:34:54 -0000 1.17 +++ level11.stl 8 Jul 2004 10:31:17 -0000 1.18 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Night Chill") (name-pt_PT "Noite Fria") - (name-de_DE "Eine kalte Nacht") + (name-de "Eine kalte Nacht") (width 515) (height 19) (start_pos_x 100) Index: level25.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level25.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level25.stl 8 Jul 2004 08:34:58 -0000 1.6 +++ level25.stl 8 Jul 2004 10:31:24 -0000 1.7 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "Arctic Ruins") (name-pt_PT "Ruínas da Antártida") - (name-de_DE "Arktische Ruinen") + (name-de "Arktische Ruinen") (width 500) (height 15) (start_pos_x 100) Index: level9.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level9.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level9.stl 8 Jul 2004 08:35:14 -0000 1.15 +++ level9.stl 8 Jul 2004 10:31:27 -0000 1.16 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "Grumbel's Sense of Snow") (name-pt_PT "Sensação de Neve do Grumbel") - (name-de_DE "Grumbels Gespür für Schnee") + (name-de "Grumbels Gespür für Schnee") (width 525) (height 19) (start_pos_x 100) Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level3.stl 8 Jul 2004 08:34:58 -0000 1.15 +++ level3.stl 8 Jul 2004 10:31:26 -0000 1.16 @@ -4,7 +4,7 @@ (author "Bill Kendrick") (name "Via Nostalgica") (name-pt_PT "Via Nostálgica") - (name-de_DE "Via Nostalgica") + (name-de "Via Nostalgica") (width 390) (height 19) (start_pos_x 100) Index: level22.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level22.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level22.stl 8 Jul 2004 08:34:57 -0000 1.11 +++ level22.stl 8 Jul 2004 10:31:24 -0000 1.12 @@ -4,7 +4,7 @@ (author "Marek Moeckel") (name "No more Mr Ice Guy") (name-pt_PT "Mais nenhum Sr. Gelo") - (name-de_DE "Nie mehr Mr. Ice Guy") + (name-de "Nie mehr Mr. Ice Guy") (width 260) (height 15) (start_pos_x 100) Index: level20.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level20.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level20.stl 8 Jul 2004 08:34:57 -0000 1.11 +++ level20.stl 8 Jul 2004 10:31:24 -0000 1.12 @@ -4,7 +4,7 @@ (author "Ingo Ruhnke") (name "End of the Tunnel") (name-pt_PT "Fim do Túnel") - (name-de_DE "Ende des Tunnels") + (name-de "Ende des Tunnels") (width 510) (height 15) (start_pos_x 100) |
|
From: Ricardo C. <rm...@us...> - 2004-07-08 10:12:12
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17685/data Modified Files: CREDITS Log Message: Just down-cased a word. Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- CREDITS 7 Jul 2004 22:47:52 -0000 1.24 +++ CREDITS 8 Jul 2004 10:11:59 -0000 1.25 @@ -110,7 +110,7 @@ Milestone 1 --Responsável pela manutenção +-Responsável pela Manutenção Tobias (tobgle) Glaesser |
|
From: Ricardo C. <rm...@us...> - 2004-07-08 10:11:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17490/src Modified Files: level.cpp lispreader.cpp lispreader.h worldmap.cpp Log Message: I18N: - Also check without country code. ie. Germany is the same for German and Austria. - Only check for translation when the code asks for. (translatable flag) Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- level.cpp 7 Jul 2004 17:56:01 -0000 1.97 +++ level.cpp 8 Jul 2004 10:11:08 -0000 1.98 @@ -89,7 +89,7 @@ void Level::load_old_format(LispReader& reader) { - reader.read_string("name", name); + reader.read_string("name", name, true); reader.read_string("author", author); reader.read_int("time", time_left); Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- worldmap.cpp 7 Jul 2004 17:56:01 -0000 1.88 +++ worldmap.cpp 8 Jul 2004 10:11:08 -0000 1.89 @@ -402,7 +402,7 @@ else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0) { LispReader reader(lisp_cdr(element)); - reader.read_string("name", name); + reader.read_string("name", name, true); reader.read_string("music", music); } else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0) @@ -425,7 +425,7 @@ level.west = true; reader.read_string("extro-filename", level.extro_filename); - reader.read_string("name", level.name); + reader.read_string("name", level.name, true); reader.read_int("x", level.x); reader.read_int("y", level.y); level.vertical_flip = false; @@ -475,7 +475,7 @@ if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { LispReader reader(lisp_cdr(root_obj)); - reader.read_string("name", level.title); + reader.read_string("name", level.title, true); } lisp_free(root_obj); @@ -1067,7 +1067,7 @@ bool solved = false; LispReader level_reader(data); - level_reader.read_string("name", name); + level_reader.read_string("name", name, true); level_reader.read_bool("solved", solved); for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- lispreader.cpp 7 Jul 2004 22:47:06 -0000 1.28 +++ lispreader.cpp 8 Jul 2004 10:11:08 -0000 1.29 @@ -1206,13 +1206,37 @@ } bool -LispReader::read_string (const char* name, std::string& str) +LispReader::read_string (const char* name, std::string& str, bool translatable) { - char str_[1024]; - sprintf(str_, "%s-%s", name, getenv("LANG")); - lisp_object_t* obj = search_for (str_); + lisp_object_t* obj; + if(translatable) + { + /* Internationalization support: check for the suffix: str + "-" + $LANG variable. + If not found, use the regular string. + So, translating a string in a Lisp file would result in something like: + (text "Hello World!") + (text-fr "Bonjour Monde!") + being fr the value of LANG (echo $LANG) for the language we want to translate to */ - if(!obj) + char str_[1024]; // check, for instance, for (title-fr_FR "Bonjour") + sprintf(str_, "%s-%s", name, getenv("LANG")); + + obj = search_for (str_); + + if(!obj) // check, for instance, for (title-fr "Bonjour") + { + char lang[3]; + strncpy(lang, getenv("LANG"), 2); + lang[2] = '\0'; + sprintf(str_, "%s-%s", name, lang); + + obj = search_for (str_); + } + + if(!obj) // check, for instance, for (title "Hello") + obj = search_for (name); + } + else obj = search_for (name); if (!obj) Index: lispreader.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- lispreader.h 15 Jun 2004 12:18:59 -0000 1.14 +++ lispreader.h 8 Jul 2004 10:11:08 -0000 1.15 @@ -187,7 +187,7 @@ bool read_int_vector(const char* name, std::vector<unsigned int>& vec); bool read_char_vector(const char* name, std::vector<char>& vec); bool read_string_vector(const char* name, std::vector<std::string>& vec); - bool read_string(const char* name, std::string& str); + bool read_string(const char* name, std::string& str, bool translatable = false); bool read_int(const char* name, int& i); bool read_float(const char* name, float& f); bool read_bool(const char* name, bool& b); |
|
From: Ricardo C. <rm...@us...> - 2004-07-08 10:11:32
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17490/src/screen Modified Files: font.cpp Log Message: I18N: - Also check without country code. ie. Germany is the same for German and Austria. - Only check for translation when the code asks for. (translatable flag) Index: font.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- font.cpp 7 Jul 2004 22:47:06 -0000 1.7 +++ font.cpp 8 Jul 2004 10:11:07 -0000 1.8 @@ -151,7 +151,7 @@ } - reader->read_string("text", text); + reader->read_string("text", text, true); delete reader; names.clear(); |
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1048/data/levels/world1 Modified Files: level1.stl level10.stl level11.stl level12.stl level13.stl level14.stl level15.stl level16.stl level17.stl level18.stl level19.stl level2.stl level20.stl level21.stl level22.stl level23.stl level24.stl level25.stl level26.stl level3.stl level4.stl level5.stl level6.stl level7.stl level8.stl level9.stl Log Message: Translated level titles to German Some more work on the bonus castle Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level1.stl 7 Jul 2004 22:48:48 -0000 1.16 +++ level1.stl 8 Jul 2004 08:34:53 -0000 1.17 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "Welcome to Antarctica") (name-pt_PT "Bem-vindo à Antártida") + (name-de_DE "Willkommen in Antarctica") (width 310) (height 19) (start_pos_x 100) Index: level21.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level21.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level21.stl 7 Jul 2004 23:44:52 -0000 1.11 +++ level21.stl 8 Jul 2004 08:34:57 -0000 1.12 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "A Path in the Clouds") (name-pt_PT "Um Caminho pelas Nuvens") + (name-de_DE "Ein Pfad in den Wolken") (width 525) (height 15) (start_pos_x 100) Index: level16.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level16.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level16.stl 7 Jul 2004 23:44:51 -0000 1.12 +++ level16.stl 8 Jul 2004 08:34:55 -0000 1.13 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Living in a Fridge") (name-pt_PT "Vivendo numa Frigideira") + (name-de_DE "Leben im Kühlschrank") (width 510) (height 19) (start_pos_x 100) Index: level17.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level17.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level17.stl 7 Jul 2004 23:44:51 -0000 1.12 +++ level17.stl 8 Jul 2004 08:34:55 -0000 1.13 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "'...or is it just me?'") (name-pt_PT "'... ou é apenas de mim?'") + (name-de_DE "'...oder bin ich das?'") (width 515) (height 19) (start_pos_x 100) Index: level6.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level6.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level6.stl 7 Jul 2004 23:44:53 -0000 1.13 +++ level6.stl 8 Jul 2004 08:34:59 -0000 1.14 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "The Frosted Fields") (name-pt_PT "Os Campos Congelados") + (name-de_DE "Vereiste Felder") (width 510) (height 19) (start_pos_x 100) Index: level8.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level8.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level8.stl 7 Jul 2004 23:44:54 -0000 1.15 +++ level8.stl 8 Jul 2004 08:35:14 -0000 1.16 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Stone Cold") (name-pt_PT "Pedra Gelada") + (name-de_DE "Kalt wie Stein") (width 520) (height 19) (start_pos_x 100) Index: level14.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level14.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level14.stl 7 Jul 2004 23:44:51 -0000 1.16 +++ level14.stl 8 Jul 2004 08:34:55 -0000 1.17 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "Entrance to the Cave") (name-pt_PT "Entrada para a Gruta") + (name-de_DE "Eingang der Höhle") (width 510) (height 19) (start_pos_x 100) Index: level19.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level19.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level19.stl 7 Jul 2004 23:44:52 -0000 1.13 +++ level19.stl 8 Jul 2004 08:34:56 -0000 1.14 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Miyamoto Monument") (name-pt_PT "O Monumento Miyamoto") + (name-de_DE "Das Miyamoto Monument") (width 505) (height 15) (start_pos_x 100) Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level2.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level2.stl 7 Jul 2004 22:48:48 -0000 1.14 +++ level2.stl 8 Jul 2004 08:34:56 -0000 1.15 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "The Journey Begins") (name-pt_PT "A Aventura Começa") + (name-de_DE "Das Abenteuer beginnt") (width 300) (height 19) (start_pos_x 100) Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level10.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level10.stl 31 May 2004 02:40:19 -0000 1.17 +++ level10.stl 8 Jul 2004 08:34:53 -0000 1.18 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "23rd Airborne") + (name-de_DE "23 Mann Luftverteidigung") (width 515) (height 19) (start_pos_x 100) Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level12.stl 7 Jul 2004 23:44:51 -0000 1.13 +++ level12.stl 8 Jul 2004 08:34:54 -0000 1.14 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Into the Stars") (name-pt_PT "Até às Estrelas") + (name-de_DE "Griff nach den Sternen") (width 520) (height 19) (start_pos_x 100) Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level5.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level5.stl 7 Jul 2004 23:44:53 -0000 1.19 +++ level5.stl 8 Jul 2004 08:34:58 -0000 1.20 @@ -4,6 +4,7 @@ (author "Philippe Saint-Pierre") (name "The Somewhat Smaller Bath") (name-pt_PT "Um Banho Um Pouco Mais Pequeno") + (name-de_DE "Das etwas kleinere Bad") (width 355) (height 19) (start_pos_x 100) Index: level23.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level23.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level23.stl 7 Jul 2004 23:44:53 -0000 1.10 +++ level23.stl 8 Jul 2004 08:34:57 -0000 1.11 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "The Escape") (name-pt_PT "A Fuga") + (name-de_DE "Die Flucht") (width 515) (height 15) (start_pos_x 100) Index: level15.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level15.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level15.stl 7 Jul 2004 23:44:51 -0000 1.12 +++ level15.stl 8 Jul 2004 08:34:55 -0000 1.13 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Under the Ice") (name-pt_PT "Debaixo do Gelo") + (name-de_DE "Unter dem Eis") (width 510) (height 19) (start_pos_x 100) Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level7.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level7.stl 7 Jul 2004 23:44:54 -0000 1.18 +++ level7.stl 8 Jul 2004 08:35:13 -0000 1.19 @@ -4,6 +4,7 @@ (author "Voluptuous Pachyderm") (name "Oh no! More Snowballs!") (name-pt_PT "Oh não! Mais Bolas de Neve!") + (name-de_DE "Oh nein! Noch mehr Schneebälle!") (width 525) (height 19) (start_pos_x 100) Index: level25.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level25.stl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- level25.stl 7 Jul 2004 23:44:53 -0000 1.5 +++ level25.stl 8 Jul 2004 08:34:58 -0000 1.6 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "Arctic Ruins") (name-pt_PT "Ruínas da Antártida") + (name-de_DE "Arktische Ruinen") (width 500) (height 15) (start_pos_x 100) Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level26.stl 7 Jul 2004 23:44:53 -0000 1.10 +++ level26.stl 8 Jul 2004 08:34:58 -0000 1.11 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "The Castle of Nolok") (name-pt_PT "O Castelo do Nolok") + (name-de_DE "Noloks Festung") (width 525) (height 15) (start_pos_x 100) Index: level24.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level24.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level24.stl 7 Jul 2004 23:44:53 -0000 1.10 +++ level24.stl 8 Jul 2004 08:34:57 -0000 1.11 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "The Shattered Bridge") (name-pt_PT "A Ponte Quebradiça") + (name-de_DE "Die eingestürzte Brücke") (width 525) (height 15) (start_pos_x 100) Index: level18.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level18.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level18.stl 7 Jul 2004 23:44:51 -0000 1.13 +++ level18.stl 8 Jul 2004 08:34:55 -0000 1.14 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Ice in the Hole") (name-pt_PT "Gelo no Buraco") + (name-de_DE "Eisiges Loch") (width 500) (height 19) (start_pos_x 100) Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level13.stl 7 Jul 2004 23:44:51 -0000 1.14 +++ level13.stl 8 Jul 2004 08:34:54 -0000 1.15 @@ -4,6 +4,7 @@ (author "Ricardo Cruz") (name "Above the Arctic Skies") (name-pt_PT "Acima dos Céus do Ártico") + (name-de_DE "Über den arktischen Wolken") (width 290) (height 19) (start_pos_x 100) Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level11.stl 7 Jul 2004 23:44:50 -0000 1.16 +++ level11.stl 8 Jul 2004 08:34:54 -0000 1.17 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Night Chill") (name-pt_PT "Noite Fria") + (name-de_DE "Eine kalte Nacht") (width 515) (height 19) (start_pos_x 100) Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level4.stl 7 Jul 2004 23:44:53 -0000 1.18 +++ level4.stl 8 Jul 2004 08:34:58 -0000 1.19 @@ -4,6 +4,7 @@ (author "Tobias Glaesser") (name "Tobgle Road") (name-pt_PT "A Estrada Tobgle") + (name-de_DE "Tobgle Passage") (width 270) (height 19) (start_pos_x 100) Index: level9.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level9.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level9.stl 7 Jul 2004 23:44:54 -0000 1.14 +++ level9.stl 8 Jul 2004 08:35:14 -0000 1.15 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "Grumbel's Sense of Snow") (name-pt_PT "Sensação de Neve do Grumbel") + (name-de_DE "Grumbels Gespür für Schnee") (width 525) (height 19) (start_pos_x 100) Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level3.stl 7 Jul 2004 22:48:48 -0000 1.14 +++ level3.stl 8 Jul 2004 08:34:58 -0000 1.15 @@ -4,6 +4,7 @@ (author "Bill Kendrick") (name "Via Nostalgica") (name-pt_PT "Via Nostálgica") + (name-de_DE "Via Nostalgica") (width 390) (height 19) (start_pos_x 100) Index: level22.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level22.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level22.stl 7 Jul 2004 23:44:53 -0000 1.10 +++ level22.stl 8 Jul 2004 08:34:57 -0000 1.11 @@ -4,6 +4,7 @@ (author "Marek Moeckel") (name "No more Mr Ice Guy") (name-pt_PT "Mais nenhum Sr. Gelo") + (name-de_DE "Nie mehr Mr. Ice Guy") (width 260) (height 15) (start_pos_x 100) Index: level20.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level20.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level20.stl 7 Jul 2004 23:44:52 -0000 1.10 +++ level20.stl 8 Jul 2004 08:34:57 -0000 1.11 @@ -4,6 +4,7 @@ (author "Ingo Ruhnke") (name "End of the Tunnel") (name-pt_PT "Fim do Túnel") + (name-de_DE "Ende des Tunnels") (width 510) (height 15) (start_pos_x 100) |
|
From: Ricardo C. <rm...@us...> - 2004-07-07 23:45:56
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15214/data/levels/worldmap Modified Files: icyisland.stwm Log Message: Translated Icyland world name to Portuguese (European). Index: icyisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/icyisland.stwm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- icyisland.stwm 8 Jun 2004 19:52:57 -0000 1.1 +++ icyisland.stwm 7 Jul 2004 23:45:47 -0000 1.2 @@ -1,8 +1,8 @@ ;; Generated with Flexlay Editor (supertux-worldmap - (name "Icyisland") (properties (name "Icyisland") + (name-pt_PT "Ilha Gelada") (music "SALCON.MOD")) (tilemap (width 40) |
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14439/data/levels/world1 Modified Files: level11.stl level12.stl level13.stl level14.stl level15.stl level16.stl level17.stl level18.stl level19.stl level20.stl level21.stl level22.stl level23.stl level24.stl level25.stl level26.stl level4.stl level5.stl level6.stl level7.stl level8.stl level9.stl Log Message: Translated level's titles to Portuguese (European). Index: level21.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level21.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level21.stl 8 Jun 2004 17:44:12 -0000 1.10 +++ level21.stl 7 Jul 2004 23:44:52 -0000 1.11 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "A Path in the Clouds") + (name-pt_PT "Um Caminho pelas Nuvens") (width 525) (height 15) (start_pos_x 100) Index: level16.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level16.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level16.stl 8 Jun 2004 17:44:12 -0000 1.11 +++ level16.stl 7 Jul 2004 23:44:51 -0000 1.12 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Living in a Fridge") + (name-pt_PT "Vivendo numa Frigideira") (width 510) (height 19) (start_pos_x 100) Index: level17.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level17.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level17.stl 8 Jun 2004 09:38:41 -0000 1.11 +++ level17.stl 7 Jul 2004 23:44:51 -0000 1.12 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "'...or is it just me?'") + (name-pt_PT "'... ou é apenas de mim?'") (width 515) (height 19) (start_pos_x 100) Index: level6.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level6.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level6.stl 15 May 2004 16:07:19 -0000 1.12 +++ level6.stl 7 Jul 2004 23:44:53 -0000 1.13 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "The Frosted Fields") + (name-pt_PT "Os Campos Congelados") (width 510) (height 19) (start_pos_x 100) Index: level8.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level8.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level8.stl 15 May 2004 16:07:20 -0000 1.14 +++ level8.stl 7 Jul 2004 23:44:54 -0000 1.15 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Stone Cold") + (name-pt_PT "Pedra Gelada") (width 520) (height 19) (start_pos_x 100) Index: level14.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level14.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level14.stl 8 Jun 2004 17:44:11 -0000 1.15 +++ level14.stl 7 Jul 2004 23:44:51 -0000 1.16 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "Entrance to the Cave") + (name-pt_PT "Entrada para a Gruta") (width 510) (height 19) (start_pos_x 100) Index: level19.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level19.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level19.stl 8 Jun 2004 17:44:12 -0000 1.12 +++ level19.stl 7 Jul 2004 23:44:52 -0000 1.13 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Miyamoto Monument") + (name-pt_PT "O Monumento Miyamoto") (width 505) (height 15) (start_pos_x 100) Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level12.stl 8 Jun 2004 17:44:10 -0000 1.12 +++ level12.stl 7 Jul 2004 23:44:51 -0000 1.13 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Into the Stars") + (name-pt_PT "Até às Estrelas") (width 520) (height 19) (start_pos_x 100) Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level5.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level5.stl 8 Jun 2004 17:44:27 -0000 1.18 +++ level5.stl 7 Jul 2004 23:44:53 -0000 1.19 @@ -3,6 +3,7 @@ (version 1) (author "Philippe Saint-Pierre") (name "The Somewhat Smaller Bath") + (name-pt_PT "Um Banho Um Pouco Mais Pequeno") (width 355) (height 19) (start_pos_x 100) Index: level23.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level23.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level23.stl 15 May 2004 10:09:58 -0000 1.9 +++ level23.stl 7 Jul 2004 23:44:53 -0000 1.10 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "The Escape") + (name-pt_PT "A Fuga") (width 515) (height 15) (start_pos_x 100) Index: level15.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level15.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level15.stl 8 Jun 2004 09:38:41 -0000 1.11 +++ level15.stl 7 Jul 2004 23:44:51 -0000 1.12 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Under the Ice") + (name-pt_PT "Debaixo do Gelo") (width 510) (height 19) (start_pos_x 100) Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level7.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level7.stl 8 Jun 2004 17:44:27 -0000 1.17 +++ level7.stl 7 Jul 2004 23:44:54 -0000 1.18 @@ -3,6 +3,7 @@ (version 1) (author "Voluptuous Pachyderm") (name "Oh no! More Snowballs!") + (name-pt_PT "Oh não! Mais Bolas de Neve!") (width 525) (height 19) (start_pos_x 100) Index: level25.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level25.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level25.stl 8 Jun 2004 12:09:08 -0000 1.4 +++ level25.stl 7 Jul 2004 23:44:53 -0000 1.5 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "Arctic Ruins") + (name-pt_PT "Ruínas da Antártida") (width 500) (height 15) (start_pos_x 100) Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level26.stl 29 Apr 2004 13:07:19 -0000 1.9 +++ level26.stl 7 Jul 2004 23:44:53 -0000 1.10 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "The Castle of Nolok") + (name-pt_PT "O Castelo do Nolok") (width 525) (height 15) (start_pos_x 100) Index: level24.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level24.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level24.stl 8 Jun 2004 17:44:27 -0000 1.9 +++ level24.stl 7 Jul 2004 23:44:53 -0000 1.10 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "The Shattered Bridge") + (name-pt_PT "A Ponte Quebradiça") (width 525) (height 15) (start_pos_x 100) Index: level18.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level18.stl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- level18.stl 8 Jun 2004 12:09:07 -0000 1.12 +++ level18.stl 7 Jul 2004 23:44:51 -0000 1.13 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Ice in the Hole") + (name-pt_PT "Gelo no Buraco") (width 500) (height 19) (start_pos_x 100) Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level13.stl 8 Jun 2004 17:44:11 -0000 1.13 +++ level13.stl 7 Jul 2004 23:44:51 -0000 1.14 @@ -3,6 +3,7 @@ (version 1) (author "Ricardo Cruz") (name "Above the Arctic Skies") + (name-pt_PT "Acima dos Céus do Ártico") (width 290) (height 19) (start_pos_x 100) Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level11.stl 12 Jun 2004 21:13:34 -0000 1.15 +++ level11.stl 7 Jul 2004 23:44:50 -0000 1.16 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Night Chill") + (name-pt_PT "Noite Fria") (width 515) (height 19) (start_pos_x 100) Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level4.stl 7 Jul 2004 22:48:48 -0000 1.17 +++ level4.stl 7 Jul 2004 23:44:53 -0000 1.18 @@ -3,7 +3,7 @@ (version 1) (author "Tobias Glaesser") (name "Tobgle Road") - (name-pt_PT "A Estrada do Tobgle") + (name-pt_PT "A Estrada Tobgle") (width 270) (height 19) (start_pos_x 100) Index: level9.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level9.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level9.stl 8 Jun 2004 17:44:27 -0000 1.13 +++ level9.stl 7 Jul 2004 23:44:54 -0000 1.14 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "Grumbel's Sense of Snow") + (name-pt_PT "Sensação de Neve do Grumbel") (width 525) (height 19) (start_pos_x 100) Index: level22.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level22.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level22.stl 15 May 2004 10:09:58 -0000 1.9 +++ level22.stl 7 Jul 2004 23:44:53 -0000 1.10 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "No more Mr Ice Guy") + (name-pt_PT "Mais nenhum Sr. Gelo") (width 260) (height 15) (start_pos_x 100) Index: level20.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level20.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level20.stl 8 Jun 2004 17:44:12 -0000 1.9 +++ level20.stl 7 Jul 2004 23:44:52 -0000 1.10 @@ -3,6 +3,7 @@ (version 1) (author "Ingo Ruhnke") (name "End of the Tunnel") + (name-pt_PT "Fim do Túnel") (width 510) (height 15) (start_pos_x 100) |
|
From: Ricardo C. <rm...@us...> - 2004-07-07 22:48:59
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30460/data/levels/world1 Modified Files: level1.stl level2.stl level3.stl level4.stl Log Message: Just translated level's title of the first 4 levels. Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level1.stl 15 May 2004 11:31:47 -0000 1.15 +++ level1.stl 7 Jul 2004 22:48:48 -0000 1.16 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "Welcome to Antarctica") + (name-pt_PT "Bem-vindo à Antártida") (width 310) (height 19) (start_pos_x 100) Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level4.stl 8 Jun 2004 09:38:41 -0000 1.16 +++ level4.stl 7 Jul 2004 22:48:48 -0000 1.17 @@ -3,6 +3,7 @@ (version 1) (author "Tobias Glaesser") (name "Tobgle Road") + (name-pt_PT "A Estrada do Tobgle") (width 270) (height 19) (start_pos_x 100) Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level3.stl 15 May 2004 11:31:47 -0000 1.13 +++ level3.stl 7 Jul 2004 22:48:48 -0000 1.14 @@ -3,6 +3,7 @@ (version 1) (author "Bill Kendrick") (name "Via Nostalgica") + (name-pt_PT "Via Nostálgica") (width 390) (height 19) (start_pos_x 100) Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level2.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level2.stl 15 May 2004 11:31:47 -0000 1.13 +++ level2.stl 7 Jul 2004 22:48:48 -0000 1.14 @@ -3,6 +3,7 @@ (version 1) (author "Marek Moeckel") (name "The Journey Begins") + (name-pt_PT "A Aventura Começa") (width 300) (height 19) (start_pos_x 100) |
|
From: Ricardo C. <rm...@us...> - 2004-07-07 22:48:02
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30318/data Modified Files: CREDITS extro.txt intro.txt Log Message: Formatted files in the right order. Included European Portuguese translation. Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- CREDITS 30 May 2004 01:08:32 -0000 1.23 +++ CREDITS 7 Jul 2004 22:47:52 -0000 1.24 @@ -1,4 +1,6 @@ --- SuperTux - +; Credits text +(supertux-text + (text "-- SuperTux - Milestone 1 @@ -101,4 +103,111 @@ - See you soon in Milestone2! + 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!") + ) \ No newline at end of file Index: intro.txt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/intro.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- intro.txt 29 Apr 2004 00:53:58 -0000 1.3 +++ intro.txt 7 Jul 2004 22:47:52 -0000 1.4 @@ -1,4 +1,6 @@ --Penny gets captured! +; Introduction text +(supertux-text + (text "-Penny gets captured! Tux and Penny were out having a nice picnic on the ice fields of Antarctica. @@ -8,14 +10,38 @@ 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 + 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" + 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. + beloved Penny, he begins his journey.") + +; Portuguese (European) by Ricardo Cruz + (text-pt_PT "-A Penny foi capturada! + + O Tux e a Penny foram fazer um piquenique + nos campos de gelo da Antártida. + De repente, uma criatura surge de + trás de um arbusto gelado, dá-se um clarão, + e o Tux perde os sentidos! + + Ao acordar, o Tux verifica que a sua + Penny desapareceu. No seu lugar + está uma carta. \"Tux, meu arqui-inimigo!\" + diz a carta. \"Eu capturei a tua + preciosa Penny e levei-a para + a minha fortaleza. O caminho para esta + está atolhado com os meus guerreiros. Desiste + sequer de pensares em resgatá-la, + porque não tens hipótese! -Nolok\" + + O Tux olha e vê a fortaleza de Nolok + ao longe. Determinado em salvar a sua + amada Penny, ele inicia a sua viagem.") + ) Index: extro.txt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/extro.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- extro.txt 27 Apr 2004 19:16:01 -0000 1.2 +++ extro.txt 7 Jul 2004 22:47:52 -0000 1.3 @@ -1,11 +1,13 @@ --Entering Nolok's Throne Room! +; Ending text +(supertux-text + (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 + \"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 @@ -13,12 +15,12 @@ this is just one of my many fortresses, spread far across the lands! - "Tux, your ambition is most honorable, + \"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." + you give up now.\" Tux was sadly leaving the room, when he felt something beneath his foot... an @@ -30,4 +32,40 @@ Tux ran out of the fortress, map in hand. No, he decided, he would not give - up. Penny was counting on him. + up. Penny was counting on him.") + +; Portuguese (European) by Ricardo Cruz + (text-pt_PT "-Entrando na Sala do Trono de Nolok! + + O Tux entra a correr na sala do trono de Nolok, + procurando freneticamente a sua amada. + Todavia, nem Penny, nem Nolok lá + estavam; em vez deles, outra carta. + + \"Muito bem, Tux, muito bem. Se estiveres a + ler isto é porque acabaste de remover + todo o meu poder sobre esta região gelada. Mas + como vês, a tua bela Penny não está + aqui. O que não te apercebeste é que + esta é apenas uma das várias fortalezas + que tenho espalhadas pelo reino! + + \"Tux, a tua intenção é honrosa... + mas fútil. Por cada fortaleza + que me conquistes, Escaparei + para outra, e levarei a Penny comigo. + Não sejas tonto... o melhor é mesmo + desistires agora.\" + + Tux abandona a sala tristemente, quando + sente algo debaixo do seu pé... um + envelope, endereçado a ele! Dentro estava + um esboço de um mapa com várias fortalezas + localizadas em vários pontos. No canto + do mapa estava a assinatura da Penny, o + desenho de uma flor de gelo. + + O Tux corre para fora da fortaleza, com o + mapa na mão. Não, ele decide, não vou + desistir. A Penny está a contar com ele.") + ) |
|
From: Ricardo C. <rm...@us...> - 2004-07-07 22:47:16
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29974/src/screen Modified Files: font.cpp font.h Log Message: Fixed the translating of the shown text files. Index: font.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- font.cpp 7 Jul 2004 19:19:18 -0000 1.6 +++ font.cpp 7 Jul 2004 22:47:06 -0000 1.7 @@ -141,33 +141,39 @@ { std::string text; std::vector<std::string> names; - - lisp_object_t* root_obj = lisp_read_from_file(datadir + file); - lisp_object_t* cur = lisp_car(root_obj); - if (lisp_symbol_p(cur) && strcmp(lisp_symbol(cur), "text") == 0) - { - LispReader reader(lisp_cdr(root_obj)); - reader.read_string("text", text); - } - else + LispReader* reader = LispReader::load(datadir + "/" + file, "supertux-text"); + + if(!reader) { - std::cerr << "Error: Could not open text. Ignoring...\n"; - return; + std::cerr << "Error: Could not open text. Ignoring...\n"; + return; } - unsigned int l, i; - l = 0; + + reader->read_string("text", text); + delete reader; + + names.clear(); + unsigned int i, l; + i = 0; while(true) { - i = l; l = text.find("\n", i); - if(l != std::string::npos) + + if(l == std::string::npos) + { + char temp[1024]; + temp[text.copy(temp, text.size() - i, i)] = '\0'; + names.push_back(temp); break; + } - char* temp = 0; - text.copy(temp, l, i); + char temp[1024]; + temp[text.copy(temp, l-i, i)] = '\0'; names.push_back(temp); + + i = l+1; } int done = 0; Index: font.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- font.h 29 Jun 2004 13:00:40 -0000 1.5 +++ font.h 7 Jul 2004 22:47:06 -0000 1.6 @@ -26,6 +26,8 @@ #include "surface.h" #include "vector.h" +/** Reads a text file (using LispReader, so it as to be in its formatting) + and displays it in a StarTrek fashion */ void display_text_file(const std::string& file, const std::string& surface, float scroll_speed); void display_text_file(const std::string& file, Surface* surface, float scroll_speed); |
|
From: Ricardo C. <rm...@us...> - 2004-07-07 22:47:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29974/src Modified Files: lispreader.cpp Log Message: Fixed the translating of the shown text files. Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- lispreader.cpp 7 Jul 2004 19:19:19 -0000 1.27 +++ lispreader.cpp 7 Jul 2004 22:47:06 -0000 1.28 @@ -44,7 +44,7 @@ #define TOKEN_FALSE 10 -#define MAX_TOKEN_LENGTH 1024 +#define MAX_TOKEN_LENGTH 4096 static char token_string[MAX_TOKEN_LENGTH + 1] = ""; static int token_length = 0; @@ -1208,7 +1208,7 @@ bool LispReader::read_string (const char* name, std::string& str) { - char str_[1204]; + char str_[1024]; sprintf(str_, "%s-%s", name, getenv("LANG")); lisp_object_t* obj = search_for (str_); |
|
From: Ricardo C. <rm...@us...> - 2004-07-07 19:19:29
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6618/src/screen Modified Files: font.cpp Log Message: Added support for data files internationalization by a simple 3 lines code in lispreader's read_string(). To translate a level's title to European Portuguese, I would look at: (title "Hello World!") and add: (title-pt_PT "Olá Mundo!") Also, made display_text_file() using lispreader (to make it i18n too). Unfortunately, there is a crash of lisp_reader in my system (not related), so I wasn't able to give it a try. data/*.txt files also need updating to work. Else, it should just skip it, without crashing. Index: font.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- font.cpp 29 Jun 2004 13:00:40 -0000 1.5 +++ font.cpp 7 Jul 2004 19:19:18 -0000 1.6 @@ -26,6 +26,7 @@ #include "screen.h" #include "font.h" #include "drawing_context.h" +#include "../lispreader.h" Font::Font(const std::string& file, FontType ntype, int nw, int nh, int nshadowsize) @@ -138,36 +139,40 @@ void display_text_file(const std::string& file, Surface* surface, float scroll_speed) { - int done; - float scroll; - float speed; - FILE* fi; - char temp[1024]; + std::string text; std::vector<std::string> names; - char filename[1024]; - sprintf(filename,"%s/%s", datadir.c_str(), file.c_str()); - if((fi = fopen(filename,"r")) != NULL) + lisp_object_t* root_obj = lisp_read_from_file(datadir + file); + lisp_object_t* cur = lisp_car(root_obj); + + if (lisp_symbol_p(cur) && strcmp(lisp_symbol(cur), "text") == 0) { - while(fgets(temp, sizeof(temp), fi) != NULL) - { - temp[strlen(temp)-1]='\0'; - names.push_back(temp); - } - fclose(fi); + LispReader reader(lisp_cdr(root_obj)); + reader.read_string("text", text); } else { - names.push_back("File was not found!"); - names.push_back(filename); - names.push_back("Shame on the guy, who"); - names.push_back("forgot to include it"); - names.push_back("in your SuperTux distribution."); + std::cerr << "Error: Could not open text. Ignoring...\n"; + return; } - scroll = 0; - speed = scroll_speed / 50; - done = 0; + unsigned int l, i; + l = 0; + while(true) + { + i = l; + l = text.find("\n", i); + if(l != std::string::npos) + break; + + char* temp = 0; + text.copy(temp, l, i); + names.push_back(temp); + } + + int done = 0; + float scroll = 0; + float speed = scroll_speed / 50; DrawingContext context; SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); |
248 messages has been excluded from this view by a project administrator.
