super-tux-commit Mailing List for Super Tux (Page 49)
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: Ricardo C. <rm...@us...> - 2004-07-16 19:14:24
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14666 Modified Files: TRANSLATORS Log Message: Removed note for the using of UTF-8. Lisp parser has problems with it. Index: TRANSLATORS =================================================================== RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TRANSLATORS 15 Jul 2004 19:50:54 -0000 1.6 +++ TRANSLATORS 16 Jul 2004 19:14:14 -0000 1.7 @@ -63,9 +63,6 @@ (text-fr "Bonjour Monde! Au revoir Monde!") - Note: When translating data files do not forget to set the charset to UTF-8!! - For instance, in KWrite, go to Edit and under Codification select UTF-8. - == DEVELOPERS == |
|
From: Sean M <no...@e-...> - 2004-07-16 03:27:03
|
Hello, Have you noticed your computer running slower than ever? The reason for that may have to do with online advertisers adding SpyWare or AdWare to your computer without your knowledge. "Spyware" is a common term for files that are installed on your system without your knowledge that allow companies to monitor your Internet activity. "AdWare" is software that will show you popup ads over and over. What they don't tell you, however, is how these files can be extremely dangerous to your PC and could cause major problems with your PC. We are offering every computer owner, including yourself, the opportunity to scan your computer to see how many "SpyWare" infections your PC has free of charge. To scan your computer for free, click here: http://whitebroadcasting.com/dbm83/l.php?959&31664656&riceez420/trekblue8 Our goal is to put an end to shady online advertising so that Internet users can enjoy the World Wide Web without having their privacy intruded upon. We urge you to run the free scan! Click Here To Begin Scan: http://whitebroadcasting.com/dbm83/l.php?959&31664656&riceez420/trekblue8 PLACE URL HERE Thank you for your time, and we hope that we have been of some help. -------------------------------------------- We hope you enjoyed receiving this email, but if you no longer wish to receive our emails please respond here: http://whitebroadcasting.com/dbm83/un.php?738&31664656 To Remove by Mail e-ticket-marketing.com PO Box 9 Irvine Ca 92650 tcjxfry |
|
From: Ricardo C. <rm...@us...> - 2004-07-15 19:58:10
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12246/data/levels/worldmap Modified Files: icyisland.stwm Log Message: Ooops, looks like i removed a level entry... Index: icyisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/icyisland.stwm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- icyisland.stwm 15 Jul 2004 19:47:33 -0000 1.6 +++ icyisland.stwm 15 Jul 2004 19:57:53 -0000 1.7 @@ -46,7 +46,7 @@ (levels - (level (name "") + (level (name "world1/level1.stl") (x 4) (y 6)) (level (name "world1/level2.stl") |
|
From: Ricardo C. <rm...@us...> - 2004-07-15 19:51:09
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11140 Modified Files: TRANSLATORS Log Message: Made a note for translators to use charset UTF-8. Index: TRANSLATORS =================================================================== RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TRANSLATORS 13 Jul 2004 10:59:16 -0000 1.5 +++ TRANSLATORS 15 Jul 2004 19:50:54 -0000 1.6 @@ -63,6 +63,9 @@ (text-fr "Bonjour Monde! Au revoir Monde!") + Note: When translating data files do not forget to set the charset to UTF-8!! + For instance, in KWrite, go to Edit and under Codification select UTF-8. + == DEVELOPERS == |
|
From: Ricardo C. <rm...@us...> - 2004-07-15 19:47:42
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10157/data/levels/worldmap Modified Files: icyisland.stwm Log Message: Spanish translation by DemoNight! Index: icyisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/icyisland.stwm,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- icyisland.stwm 10 Jul 2004 11:09:43 -0000 1.5 +++ icyisland.stwm 15 Jul 2004 19:47:33 -0000 1.6 @@ -4,6 +4,7 @@ (name "Icyisland") (name-pt_PT "Ilha Gelada") (name-de "Eisige Insel") + (name-es "Isla de hielo") (music "SALCON.MOD") (start_pos_x 4) (start_pos_y 5)) @@ -45,7 +46,7 @@ (levels - (level (name "world1/level1.stl") + (level (name "") (x 4) (y 6)) (level (name "world1/level2.stl") |
|
From: Ryan F. <sik...@us...> - 2004-07-14 21:06:31
|
Update of /cvsroot/super-tux/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6440 Modified Files: news.xml download.xml Log Message: - added news about FC2 RPM and new OS X binary Index: news.xml =================================================================== RCS file: /cvsroot/super-tux/htdocs/news.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- news.xml 29 Jun 2004 19:08:09 -0000 1.5 +++ news.xml 14 Jul 2004 21:06:21 -0000 1.6 @@ -2,6 +2,12 @@ <page title="SuperTux"> <section title="News"> <news> + <item date="14. July 2004"> + A new SuperTux 0.1.1 Mac OS X binary is available that fixes a start-up crash in OS X 10.2. + We also now have a SuperTux 0.1.1 Fedora Core 2 RPM available. + As always, you can get them from our + <a href="download.html">download section</a>. + </item> <item date="29. June 2004"> SuperTux 0.1.1 now has SuSE RPMs available. You can get them from our <a href="download.html">download section</a>. Index: download.xml =================================================================== RCS file: /cvsroot/super-tux/htdocs/download.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- download.xml 29 Jun 2004 19:08:09 -0000 1.12 +++ download.xml 14 Jul 2004 21:06:21 -0000 1.13 @@ -5,10 +5,11 @@ <ul> <li>Source: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1.tar.bz2?download">supertux-0.1.1.tar.bz2</a></li> <li>Windows Binary: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1-setup.exe?download">supertux-0.1.1-setup.exe</a></li> - <li>Mac OS X 10.3.x disk image: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1-macosx.dmg?download">supertux-0.1.1-macosx.dmg</a></li> + <li>Mac OS X: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1-macosx.dmg?download">supertux-0.1.1-macosx.dmg</a></li> <li>Autopackage: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1.package?download">supertux-0.1.1.package</a></li> <li>SuSE RPM (with OpenGL): <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1-1.GL.SuSE.i586.rpm?download">supertux-0.1.1-1.GL.SuSE.i586.rpm</a></li> <li>SuSE RPM (without OpenGL): <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1-11.nonGL.SuSE.i586.rpm?download">supertux-0.1.1-11.nonGL.SuSE.i586.rpm</a></li> + <li>Fedora Core 2 RPM: <a href="http://prdownloads.sourceforge.net/super-tux/supertux-0.1.1-FC2.i386.rpm?download">supertux-0.1.1-FC2.i386.rpm</a></li> </ul> </subsection> |
|
From: Ricardo C. <rm...@us...> - 2004-07-14 09:46:28
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25917/src Modified Files: menu.cpp menu.h setup.cpp title.cpp Log Message: Merged the two worldmap and level subset contrib menu. In the future, it would be a good idea to make level subset dealing with both levels and worldmaps. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- menu.cpp 9 Jul 2004 14:43:44 -0000 1.84 +++ menu.cpp 14 Jul 2004 09:46:19 -0000 1.85 @@ -59,7 +59,6 @@ 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: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- title.cpp 13 Jul 2004 19:11:04 -0000 1.106 +++ title.cpp 14 Jul 2004 09:46:19 -0000 1.107 @@ -102,10 +102,17 @@ LevelSubset* subset = new LevelSubset(); subset->load(level_subsets.item[i]); contrib_menu->additem(MN_GOTO, subset->title.c_str(), i, - contrib_subset_menu, i+1); + contrib_subset_menu, i); contrib_subsets.push_back(subset); } + for(int i = 0; i < worldmap_list.num_items; i++) + { + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(worldmap_list.item[i]); + contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.num_items); + } + contrib_menu->additem(MN_HL,"",0,0); contrib_menu->additem(MN_BACK,_("Back"),0,0); @@ -117,43 +124,46 @@ static int current_subset = -1; int index = contrib_menu->check(); - if (index != -1) + if (index == -1) + return; + + if (index < (int)contrib_subsets.size()) { - index -= 1; - if (index >= 0 && index <= int(contrib_subsets.size())) - { - if (current_subset != index) - { - current_subset = index; - // FIXME: This shouln't be busy looping - LevelSubset& subset = * (contrib_subsets[index]); + if (current_subset != index) + { + current_subset = index; + // FIXME: This shouln't be busy looping + LevelSubset& subset = * (contrib_subsets[index]); - current_contrib_subset = ⊂ + current_contrib_subset = ⊂ - contrib_subset_menu->clear(); + contrib_subset_menu->clear(); - contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0); - contrib_subset_menu->additem(MN_HL,"",0,0); - - for (int i = 0; i < subset.get_num_levels(); ++i) - { - Level* level = new Level; - level->load(subset.get_level_filename(i)); - contrib_subset_menu->additem(MN_ACTION, level->get_name(), 0, 0, i); - delete level; - } + contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0); + contrib_subset_menu->additem(MN_HL,"",0,0); - contrib_subset_menu->additem(MN_HL,"",0,0); - contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0); - - titlesession->get_current_sector()->activate(); - titlesession->set_current(); - } - } - else + for (int i = 0; i < subset.get_num_levels(); ++i) { - // Back button + Level* level = new Level; + level->load(subset.get_level_filename(i)); + contrib_subset_menu->additem(MN_ACTION, level->get_name(), 0, 0, i); + delete level; } + + contrib_subset_menu->additem(MN_HL,"",0,0); + contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0); + + titlesession->get_current_sector()->activate(); + titlesession->set_current(); + } + } + else if(index < worldmap_list.num_items + (int)contrib_subsets.size()) + { + WorldMapNS::WorldMap worldmap; + worldmap.loadmap(worldmap_list.item[index - contrib_subsets.size()]); + worldmap.display(); + + Menu::set_current(main_menu); } } @@ -177,19 +187,6 @@ } } -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(); @@ -252,18 +249,7 @@ img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true); /* 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++) - { - 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); + worldmap_list = dfiles("levels/worldmap", NULL, "icyisland.stwm"); titlesession->get_current_sector()->activate(); titlesession->set_current(); @@ -330,8 +316,6 @@ // Start Game, ie. goto the slots menu update_load_save_game_menu(load_game_menu); break; - case MNID_WORLDMAP_CONTRIB: - break; case MNID_LEVELS_CONTRIB: // Contrib Menu puts("Entering contrib menu"); @@ -393,10 +377,6 @@ { check_contrib_subset_menu(); } - else if(menu == contrib_worldmap_menu) - { - check_contrib_worldmap_menu(); - } } mouse_cursor->draw(context); @@ -414,6 +394,7 @@ /* Free surfaces: */ free_contrib_menu(); + string_list_free(&worldmap_list); delete titlesession; delete bkg_title; delete logo; Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- setup.cpp 10 Jul 2004 14:22:59 -0000 1.108 +++ setup.cpp 14 Jul 2004 09:46:19 -0000 1.109 @@ -383,13 +383,11 @@ 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 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); @@ -643,7 +641,6 @@ 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; Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- menu.h 9 Jul 2004 14:43:44 -0000 1.68 +++ menu.h 14 Jul 2004 09:46:19 -0000 1.69 @@ -33,7 +33,6 @@ enum MainMenuIDs { MNID_STARTGAME, - MNID_WORLDMAP_CONTRIB, MNID_LEVELS_CONTRIB, MNID_OPTIONMENU, MNID_LEVELEDITOR, @@ -236,7 +235,6 @@ 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; |
|
From: Tobias G. <to...@us...> - 2004-07-13 19:11:26
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16997/src Modified Files: collision.cpp tile.cpp title.cpp Log Message: Fixed gcc3.4.x compilation. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- title.cpp 10 Jul 2004 14:22:59 -0000 1.105 +++ title.cpp 13 Jul 2004 19:11:04 -0000 1.106 @@ -25,6 +25,7 @@ #include <string.h> #include <errno.h> #include <unistd.h> +#include <cmath> #include <SDL.h> #include <SDL_image.h> @@ -49,7 +50,6 @@ #include "leveleditor.h" #include "scene.h" #include "player.h" -#include "math.h" #include "tile.h" #include "sector.h" #include "tilemap.h" Index: collision.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- collision.cpp 22 Jun 2004 12:34:13 -0000 1.28 +++ collision.cpp 13 Jul 2004 19:11:04 -0000 1.29 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. +#include <cmath> #include "defines.h" #include "collision.h" #include "bitmask.h" Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- tile.cpp 10 Jul 2004 14:22:59 -0000 1.33 +++ tile.cpp 13 Jul 2004 19:11:04 -0000 1.34 @@ -18,6 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. +#include <cmath> #include <cassert> #include <iostream> |
|
From: Ricardo C. <rm...@us...> - 2004-07-13 10:59:25
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13822 Modified Files: TRANSLATORS Log Message: Added poEdit to po editors. Thanks to Karl Ove Hufthammer. Index: TRANSLATORS =================================================================== RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TRANSLATORS 8 Jul 2004 15:05:01 -0000 1.4 +++ TRANSLATORS 13 Jul 2004 10:59:16 -0000 1.5 @@ -37,6 +37,8 @@ KBabel - a long dated KDE program that has been maturing over the years, and it's really handy by now. + poEdit - a multi-platform po editor (runs under Windows and Unix). + URL: http://poedit.sourceforge.net/ (X)Emacs - a commonly used program for translating with the respective plugin. QTranslator - made by Qt, has the advantage of running in several platforms. PO files are written in ASCII and are pretty intuitive, so they can be used by any text |
|
From: Marek M. <wa...@us...> - 2004-07-13 07:47:39
|
Update of /cvsroot/super-tux/supertux/data/levels/bonus1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16192/data/levels/bonus1 Modified Files: abednego-level1.stl abednego-level2.stl abednego-level3.stl Log Message: Fixed some design bugs in some of the contributed bonus levels Index: abednego-level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/abednego-level2.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- abednego-level2.stl 6 Jul 2004 20:01:05 -0000 1.1 +++ abednego-level2.stl 13 Jul 2004 07:47:30 -0000 1.2 @@ -4,7 +4,7 @@ (name "Dungeons but no Dragons") (author "Abednego") (music "Mortimers_chipdisko.mod") - (background "arctis.png") + (background "arctis2.jpg") (particle_system "") (bkgd_speed 50) (bkgd_red_top 0) Index: abednego-level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/abednego-level1.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- abednego-level1.stl 6 Jul 2004 20:01:04 -0000 1.1 +++ abednego-level1.stl 13 Jul 2004 07:47:29 -0000 1.2 @@ -4,7 +4,7 @@ (name "Flight Test") (author "Abednego") (music "Mortimers_chipdisko.mod") - (background "arctis.png") + (background "arctis2.jpg") (particle_system "") (bkgd_speed 50) (bkgd_red_top 0) Index: abednego-level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/abednego-level3.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- abednego-level3.stl 6 Jul 2004 20:01:05 -0000 1.1 +++ abednego-level3.stl 13 Jul 2004 07:47:30 -0000 1.2 @@ -4,7 +4,7 @@ (name "Lies!") (author "Abednego") (music "Mortimers_chipdisko.mod") - (background "arctis.png") + (background "arctis2.jpg") (particle_system "") (bkgd_speed 50) (bkgd_red_top 0) |
|
From: Ricardo C. <rm...@us...> - 2004-07-12 22:04:38
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27526/src Modified Files: lispreader.cpp Log Message: Ooops, forgot to change something after testing. Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- lispreader.cpp 12 Jul 2004 22:03:18 -0000 1.31 +++ lispreader.cpp 12 Jul 2004 22:04:26 -0000 1.32 @@ -1218,7 +1218,7 @@ (text-fr "Bonjour Monde!") being fr the value of LANG (echo $LANG) for the language we want to translate to */ - char* lang = getenv("tt"); + char* lang = getenv("LANG"); char str_[1024]; // check, for instance, for (title-fr_FR "Bonjour") sprintf(str_, "%s-%s", name, lang); |
|
From: Ricardo C. <rm...@us...> - 2004-07-12 22:03:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27245/src Modified Files: lispreader.cpp Log Message: Damn strlen() crashes when NULL is passed. Fixed. Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- lispreader.cpp 9 Jul 2004 22:16:49 -0000 1.30 +++ lispreader.cpp 12 Jul 2004 22:03:18 -0000 1.31 @@ -1218,7 +1218,7 @@ (text-fr "Bonjour Monde!") being fr the value of LANG (echo $LANG) for the language we want to translate to */ - char* lang = getenv("LANG"); + char* lang = getenv("tt"); char str_[1024]; // check, for instance, for (title-fr_FR "Bonjour") sprintf(str_, "%s-%s", name, lang); @@ -1227,7 +1227,7 @@ if(!obj) // check, for instance, for (title-fr "Bonjour") { - if(strlen(lang) >= 2) + if(lang != NULL && strlen(lang) >= 2) { char lang_[3]; strncpy(lang_, lang, 2); |
|
From: Marek M. <wa...@us...> - 2004-07-10 21:53:17
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6209/src Modified Files: Tag: supertux_0_1_1_branch player.cpp setup.cpp worldmap.cpp worldmap.h Log Message: fixed autoscrolling problems added new world map properties (start_pos_x) and (start_pos_y), changed worldmap.stwm accordingly added bonus island levels and world map loading of world maps other than "worldmap.stwm" now possible (currently, the bonus island is loaded by default) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.88 retrieving revision 1.88.2.1 diff -u -d -r1.88 -r1.88.2.1 --- player.cpp 10 May 2004 19:06:02 -0000 1.88 +++ player.cpp 10 Jul 2004 21:53:08 -0000 1.88.2.1 @@ -761,7 +761,7 @@ if(hor_autoscroll) { if(base.x == scroll_x) - if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32))) + if((issolid(base.x+32, base.y) || (size != SMALL && !duck && issolid(base.x+32, base.y+32))) && (dying == DYING_NOT)) kill(KILL); if(base.x + base.width > scroll_x + screen->w) Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.68.2.2 retrieving revision 1.68.2.3 diff -u -d -r1.68.2.2 -r1.68.2.3 --- worldmap.cpp 16 May 2004 17:30:12 -0000 1.68.2.2 +++ worldmap.cpp 10 Jul 2004 21:53:08 -0000 1.68.2.3 @@ -172,8 +172,8 @@ offset = 0; moving = false; - tile_pos.x = 4; - tile_pos.y = 5; + tile_pos.x = worldmap->get_start_x(); + tile_pos.y = worldmap->get_start_y(); direction = D_NONE; input_direction = D_NONE; } @@ -344,22 +344,25 @@ WorldMap::WorldMap() { tile_manager = new TileManager(); - tux = new Tux(this); width = 20; height = 15; + + start_x = 4; + start_y = 5; level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); - + + map_file = datadir + "/levels/default/worldmap.stwm"; + input_direction = D_NONE; enter_level = false; name = "<no file>"; music = "SALCON.MOD"; - load_map(); } WorldMap::~WorldMap() @@ -373,13 +376,18 @@ } void +WorldMap::set_map_file(std::string mapfile) +{ + map_file = datadir + "/levels/default/" + mapfile; +} + +void WorldMap::load_map() { - std::string filename = datadir + "/levels/default/worldmap.stwm"; - lisp_object_t* root_obj = lisp_read_from_file(filename); + lisp_object_t* root_obj = lisp_read_from_file(map_file); if (!root_obj) - st_abort("Couldn't load file", filename); + st_abort("Couldn't load file", map_file); if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0) { @@ -401,6 +409,8 @@ LispReader reader(lisp_cdr(element)); reader.read_string("name", &name); reader.read_string("music", &music); + reader.read_int("start_pos_x", &start_x); + reader.read_int("start_pos_y", &start_y); } else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0) { @@ -443,7 +453,8 @@ } } - lisp_free(root_obj); + lisp_free(root_obj); + tux = new Tux(this); } void WorldMap::get_level_title(Levels::pointer level) Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -d -r1.28.2.1 -r1.28.2.2 --- worldmap.h 15 May 2004 22:22:54 -0000 1.28.2.1 +++ worldmap.h 10 Jul 2004 21:53:08 -0000 1.28.2.2 @@ -141,6 +141,9 @@ std::vector<int> tilemap; int width; int height; + + int start_x; + int start_y; TileManager* tile_manager; @@ -175,6 +178,7 @@ Point offset; std::string savegame_file; + std::string map_file; void get_level_title(Levels::pointer level); @@ -183,6 +187,8 @@ WorldMap(); ~WorldMap(); + void set_map_file(std::string mapfile); + /** Busy loop */ void display(); @@ -206,6 +212,13 @@ void savegame(const std::string& filename); void loadgame(const std::string& filename); + + const int& get_start_x() const + { return start_x; } + + const int& get_start_y() const + { return start_y; } + private: void on_escape_press(); }; Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.79 retrieving revision 1.79.2.1 diff -u -d -r1.79 -r1.79.2.1 --- setup.cpp 10 May 2004 16:09:49 -0000 1.79 +++ setup.cpp 10 Jul 2004 21:53:08 -0000 1.79.2.1 @@ -507,6 +507,10 @@ fadeout(); WorldMapNS::WorldMap worldmap; + + //TODO: Define the circumstances under which BonusIsland is chosen + worldmap.set_map_file("bonusisland.stwm"); + worldmap.load_map(); // Load the game or at least set the savegame_file variable worldmap.loadgame(slotfile); |
|
From: Marek M. <wa...@us...> - 2004-07-10 21:53:16
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6209/data/levels/default Modified Files: Tag: supertux_0_1_1_branch worldmap.stwm Added Files: Tag: supertux_0_1_1_branch bonusisland.stwm Log Message: fixed autoscrolling problems added new world map properties (start_pos_x) and (start_pos_y), changed worldmap.stwm accordingly added bonus island levels and world map loading of world maps other than "worldmap.stwm" now possible (currently, the bonus island is loaded by default) Index: worldmap.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/Attic/worldmap.stwm,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -d -r1.15 -r1.15.2.1 --- worldmap.stwm 27 Apr 2004 15:07:20 -0000 1.15 +++ worldmap.stwm 10 Jul 2004 21:53:08 -0000 1.15.2.1 @@ -1,5 +1,10 @@ ;; Generated with Flexlay Editor (supertux-worldmap + (properties + (name "Icyisland") + (music "SALCON.MOD") + (start_pos_x 4) + (start_pos_y 5)) (tilemap (width 40) (height 30) @@ -116,7 +121,7 @@ (level (name "world1/level26.stl") (x 7) (y 20) - (extro-filename "extro.txt")) + (extro-filename "extro.txt")) ) --- NEW FILE: bonusisland.stwm --- ;; Generated with Flexlay Editor (supertux-worldmap (properties (name "Bonus Island") (start_pos_x 35) (start_pos_y 2)) (tilemap (width 70) (height 40) (data 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 16 16 16 16 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 24 25 26 58 24 26 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 29 28 59 31 27 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 22 19 19 23 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 24 26 47 30 28 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 20 21 20 13 9 9 9 9 9 9 11 16 16 16 16 16 16 16 16 16 16 16 16 22 19 30 28 47 19 19 19 23 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 17 14 13 9 9 9 9 9 9 9 15 48 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 45 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 39 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 13 9 9 9 9 9 9 9 9 9 15 47 20 18 18 21 19 19 19 19 19 19 19 19 19 19 60 47 60 19 19 19 20 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 21 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 16 16 22 47 17 9 9 15 19 48 40 40 40 40 40 40 40 40 40 45 40 40 40 39 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 48 40 40 40 40 40 42 17 9 9 15 19 47 20 18 21 19 20 18 21 19 19 47 20 18 21 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 16 16 16 22 47 20 18 18 18 18 18 13 9 9 15 48 42 17 9 14 18 13 9 14 21 19 47 17 9 15 47 17 9 9 11 16 16 16 16 16 16 16 16 12 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 48 40 40 40 40 40 40 42 17 9 9 9 9 9 9 9 9 15 47 20 13 9 9 9 9 11 16 22 19 47 17 9 15 47 17 11 16 22 48 40 40 40 40 39 19 19 17 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 20 18 18 18 18 18 18 13 9 9 9 9 11 16 12 9 15 47 17 9 9 11 12 9 14 21 19 19 47 23 16 22 47 23 22 60 19 47 19 19 19 19 47 19 19 17 9 9 9 9 11 22 47 23 12 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 14 18 13 9 15 47 17 9 9 15 23 12 9 14 21 19 37 40 40 39 37 40 40 40 40 42 19 48 40 40 42 19 20 13 9 9 9 9 15 60 47 60 17 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 15 19 17 9 9 14 18 18 18 21 47 20 18 21 60 19 19 19 47 19 19 20 18 13 9 9 9 9 9 14 21 47 20 13 9 9 9 9 9 9 9 9 9 9 9 9 11 22 47 23 12 11 16 16 16 16 12 9 9 9 9 9 9 9 9 15 47 17 9 9 14 18 13 9 9 9 9 9 9 15 47 17 9 14 18 21 19 19 47 19 19 23 12 9 9 9 9 9 11 16 22 47 23 16 12 9 9 9 9 9 9 9 9 9 9 9 15 19 47 19 23 22 48 40 40 39 17 9 9 9 9 9 11 16 16 22 47 23 16 16 16 16 12 9 9 9 9 9 9 15 47 17 9 9 9 14 21 19 47 19 19 19 23 12 9 9 9 9 15 19 19 47 19 19 17 9 9 9 9 9 9 9 9 9 9 9 15 19 47 19 19 19 47 19 19 47 17 9 9 9 9 9 15 19 19 19 47 19 19 48 40 39 17 9 9 9 9 9 9 15 47 17 9 9 9 9 15 19 37 40 40 39 19 17 9 9 9 9 14 21 19 37 40 39 23 16 12 9 9 9 9 9 9 9 9 9 14 21 47 19 19 48 42 19 19 47 23 12 9 9 9 9 14 18 21 19 47 19 19 47 19 47 17 9 9 9 9 11 16 22 47 23 16 12 9 9 15 19 19 19 19 47 19 17 9 9 9 9 9 15 19 19 19 47 19 20 13 9 9 9 9 9 9 9 9 9 9 15 37 40 40 42 24 25 26 47 19 17 9 11 12 9 9 9 14 21 37 40 40 42 19 47 17 9 9 9 9 15 19 19 47 19 19 23 12 9 14 18 18 18 21 47 20 13 9 11 16 16 16 22 19 19 19 47 19 23 12 9 9 9 9 9 9 9 9 9 9 15 19 19 19 19 31 32 27 47 19 17 9 14 13 9 9 11 16 22 19 60 19 19 19 47 17 9 9 9 9 14 21 19 37 40 40 39 17 9 9 9 9 9 15 47 17 9 9 15 48 40 40 40 40 39 19 37 40 39 23 12 9 9 9 9 9 9 9 9 9 15 19 60 19 19 30 29 28 47 20 13 9 9 9 9 11 22 19 19 19 19 19 19 19 47 17 9 9 9 9 9 14 21 19 19 19 47 17 9 9 9 9 11 22 47 17 9 9 15 47 19 19 19 19 47 19 19 19 47 19 17 9 9 9 9 9 9 9 9 9 14 21 48 40 40 40 40 40 42 17 9 9 9 9 9 15 48 40 40 40 40 40 40 40 42 17 9 9 9 9 9 9 15 19 19 19 47 17 9 9 9 9 15 19 47 17 9 9 15 47 19 19 19 19 37 40 40 40 42 19 17 9 9 9 9 9 9 9 9 11 16 22 47 19 19 19 19 19 19 17 9 9 9 9 9 15 47 19 19 19 19 20 21 19 20 13 9 9 9 9 9 9 15 19 48 40 42 23 12 9 9 9 15 19 47 17 9 9 15 37 40 39 19 19 19 19 19 19 19 19 17 9 9 9 9 9 9 9 9 15 19 19 37 40 40 40 40 40 39 17 9 9 9 9 9 15 37 40 39 19 20 13 14 18 13 9 9 9 9 9 9 9 14 21 47 19 19 19 17 9 9 11 22 19 47 17 9 9 15 19 19 37 40 40 40 40 40 39 19 20 13 9 9 9 9 9 9 9 9 14 21 19 19 19 19 19 19 19 47 23 12 9 9 9 9 14 18 21 47 20 13 9 9 9 9 9 9 9 9 9 9 9 9 15 47 20 18 18 13 9 9 14 21 19 47 17 9 9 14 21 19 19 19 20 18 18 21 47 20 13 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 21 47 20 13 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 14 21 47 17 9 9 9 14 18 18 18 13 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 23 16 16 16 16 16 16 16 22 47 23 16 16 16 16 16 16 16 16 16 16 16 16 16 22 47 23 16 16 16 16 16 16 16 22 47 23 16 16 16 16 16 16 16 16 16 16 22 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 37 40 40 40 40 40 40 40 40 40 44 40 40 40 40 40 40 40 40 40 40 40 43 40 40 40 44 40 40 40 40 40 40 40 40 40 44 40 40 40 40 40 40 40 40 40 40 40 40 42 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 21 47 20 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 22 47 23 16 16 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 19 19 37 40 39 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 19 49 50 51 47 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 60 19 52 53 54 47 60 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 19 55 56 57 42 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 19 19 19 19 19 19 19 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 )) (levels (level (name "bonus1/abednego-level1.stl") (x 7) (y 18)) (level (name "bonus1/abednego-level2.stl") (x 11) (y 15)) (level (name "bonus1/abednego-level3.stl") (x 9) (y 21)) (level (name "bonus1/abednego-level4.stl") (x 12) (y 23)) (level (name "bonus1/matr1x-level1.stl") (x 24) (y 17)) (level (name "bonus1/matr1x-level2.stl") (x 29) (y 19)) (level (name "bonus1/matr1x-level3.stl") (x 25) (y 21)) (level (name "bonus1/thompson-level1.stl") (x 38) (y 18)) (level (name "bonus1/thompson-level2.stl") (x 40) (y 22)) (level (name "bonus1/torfi-level1.stl") (x 42) (y 12)) (level (name "bonus1/torfi-level2.stl") (x 47) (y 10)) (level (name "bonus1/torfi-level3.stl") (x 46) (y 15)) (level (name "bonus1/wansti-level1.stl") (x 59) (y 15)) (level (name "bonus1/wansti-level2.stl") (x 60) (y 21)) (level (name "bonus1/wansti-level3.stl") (x 57) (y 23)) (level (name "bonus1/castle.stl") (x 35) (y 36)) ) ) |
|
From: Ricardo C. <rm...@us...> - 2004-07-10 21:01:18
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30728 Modified Files: TODO Log Message: Added place idea to TODO. Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- TODO 9 Jul 2004 23:26:48 -0000 1.72 +++ TODO 10 Jul 2004 21:01:09 -0000 1.73 @@ -30,6 +30,9 @@ [H] Worldmap should have a flag to allow to go to another map after finishing a level from that one. + It might be cool to have a (place group in the worldmap file that would allow + such stuff as: levels, messages, wrapping and worldmap changing (or even + combinations). [H] Change resolution to 800x600 - Levels need to be updated to resolution - half of the levels have been already updated |
|
From: Ricardo C. <rm...@us...> - 2004-07-10 14:23:08
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31744/src Modified Files: background.cpp button.cpp high_scores.cpp leveleditor.cpp mousecursor.cpp particlesystem.cpp resources.cpp setup.cpp sprite.cpp tile.cpp title.cpp worldmap.cpp Log Message: Replaced USE_ALPHA/IGNORE_ALPHA by booleans. Should have been done long ago. Index: particlesystem.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- particlesystem.cpp 9 Jun 2004 05:23:19 -0000 1.11 +++ particlesystem.cpp 10 Jul 2004 14:22:59 -0000 1.12 @@ -71,9 +71,9 @@ SnowParticleSystem::SnowParticleSystem() { - snowimages[0] = new Surface(datadir+"/images/shared/snow0.png", USE_ALPHA); - snowimages[1] = new Surface(datadir+"/images/shared/snow1.png", USE_ALPHA); - snowimages[2] = new Surface(datadir+"/images/shared/snow2.png", USE_ALPHA); + snowimages[0] = new Surface(datadir+"/images/shared/snow0.png", true); + snowimages[1] = new Surface(datadir+"/images/shared/snow1.png", true); + snowimages[2] = new Surface(datadir+"/images/shared/snow2.png", true); virtual_width = screen->w * 2; @@ -128,7 +128,7 @@ CloudParticleSystem::CloudParticleSystem() { - cloudimage = new Surface(datadir + "/images/shared/cloud.png", USE_ALPHA); + cloudimage = new Surface(datadir + "/images/shared/cloud.png", true); virtual_width = 2000.0; Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- worldmap.cpp 10 Jul 2004 14:07:04 -0000 1.94 +++ worldmap.cpp 10 Jul 2004 14:22:59 -0000 1.95 @@ -130,7 +130,7 @@ tile->sprite = new Surface( datadir + "/images/worldmap/" + filename, - USE_ALPHA); + true); if (id >= int(tiles.size())) tiles.resize(id+1); @@ -171,9 +171,9 @@ Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA); - firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", USE_ALPHA); - smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", USE_ALPHA); + largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", true); + firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", true); + smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", true); offset = 0; moving = false; @@ -357,9 +357,9 @@ start_x = 4; start_y = 5; - level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); - leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); - leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); + level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", true); + leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", true); + leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", true); input_direction = D_NONE; enter_level = false; Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sprite.cpp 9 Jun 2004 05:23:20 -0000 1.16 +++ sprite.cpp 10 Jul 2004 14:22:59 -0000 1.17 @@ -44,7 +44,7 @@ for(std::vector<std::string>::size_type i = 0; i < images.size(); ++i) { surfaces.push_back( - new Surface(datadir + "/images/" + images[i], USE_ALPHA)); + new Surface(datadir + "/images/" + images[i], true)); } frame_delay = 1000.0f/fps; Index: button.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- button.cpp 9 Jun 2004 05:23:19 -0000 1.36 +++ button.cpp 10 Jul 2004 14:22:59 -0000 1.37 @@ -88,11 +88,11 @@ if(mw != -1 || mh != -1) { - icon.push_back(new Surface(filename,USE_ALPHA)); + icon.push_back(new Surface(filename,true)); icon.back()->resize(mw,mh); } else - icon.push_back(new Surface(filename,USE_ALPHA)); + icon.push_back(new Surface(filename,true)); } Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- setup.cpp 9 Jul 2004 14:43:44 -0000 1.107 +++ setup.cpp 10 Jul 2004 14:22:59 -0000 1.108 @@ -602,11 +602,11 @@ Font::NUM, 32,32); /* Load GUI/menu images: */ - checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA); - checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", USE_ALPHA); - back = new Surface(datadir + "/images/status/back.png", USE_ALPHA); - arrow_left = new Surface(datadir + "/images/icons/left.png", USE_ALPHA); - arrow_right = new Surface(datadir + "/images/icons/right.png", USE_ALPHA); + checkbox = new Surface(datadir + "/images/status/checkbox.png", true); + checkbox_checked = new Surface(datadir + "/images/status/checkbox-checked.png", true); + back = new Surface(datadir + "/images/status/back.png", true); + arrow_left = new Surface(datadir + "/images/icons/left.png", true); + arrow_right = new Surface(datadir + "/images/icons/right.png", true); /* Load the mouse-cursor */ mouse_cursor = new MouseCursor( datadir + "/images/status/mousecursor.png",1); Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.140 retrieving revision 1.141 diff -u -d -r1.140 -r1.141 --- leveleditor.cpp 16 Jun 2004 00:40:42 -0000 1.140 +++ leveleditor.cpp 10 Jul 2004 14:22:59 -0000 1.141 @@ -97,7 +97,7 @@ le_mouse_clicked[LEFT] = false; le_mouse_clicked[RIGHT] = false; - le_selection = new Surface(datadir + "/images/leveleditor/select.png", USE_ALPHA); + le_selection = new Surface(datadir + "/images/leveleditor/select.png", true); select_tilegroup_menu_effect.init(false); select_objects_menu_effect.init(false); Index: mousecursor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/mousecursor.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- mousecursor.cpp 29 Jun 2004 17:47:36 -0000 1.12 +++ mousecursor.cpp 10 Jul 2004 14:22:59 -0000 1.13 @@ -24,7 +24,7 @@ MouseCursor::MouseCursor(std::string cursor_file, int frames) : mid_x(0), mid_y(0) { - cursor = new Surface(cursor_file, USE_ALPHA); + cursor = new Surface(cursor_file, true); cur_state = MC_NORMAL; cur_frame = 0; Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- title.cpp 10 Jul 2004 14:07:03 -0000 1.104 +++ title.cpp 10 Jul 2004 14:22:59 -0000 1.105 @@ -247,9 +247,9 @@ titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME); /* Load images: */ - bkg_title = new Surface(datadir + "/images/background/arctis.jpg", IGNORE_ALPHA); - logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA); - img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA); + bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false); + logo = new Surface(datadir + "/images/title/logo.png", true); + img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true); /* Generating contrib maps by only using a string_list */ worldmap_list = dfiles("levels/worldmap", NULL, NULL); Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- background.cpp 13 Jun 2004 21:48:16 -0000 1.10 +++ background.cpp 10 Jul 2004 14:22:59 -0000 1.11 @@ -86,7 +86,7 @@ this->speed = speed; delete image; - image = new Surface(datadir + "/images/background/" + name, IGNORE_ALPHA); + image = new Surface(datadir + "/images/background/" + name, false); } void Index: high_scores.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- high_scores.cpp 14 Jun 2004 22:45:23 -0000 1.21 +++ high_scores.cpp 10 Jul 2004 14:22:59 -0000 1.22 @@ -86,7 +86,7 @@ SDL_Event event; DrawingContext context; - bkgd = new Surface(datadir + "/images/highscore/highscore.png", IGNORE_ALPHA); + bkgd = new Surface(datadir + "/images/highscore/highscore.png", false); hs_score = score; Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- tile.cpp 22 Jun 2004 12:34:14 -0000 1.32 +++ tile.cpp 10 Jul 2004 14:22:59 -0000 1.33 @@ -39,7 +39,7 @@ if (lisp_string_p(cur)) { return new Surface(datadir + "/images/tilesets/" + lisp_string(cur), - USE_ALPHA); + true); } else if (lisp_cons_p(cur) && lisp_symbol_p(lisp_car(cur))) { @@ -55,7 +55,7 @@ lisp_integer(lisp_list_nth(data, 2)), lisp_integer(lisp_list_nth(data, 3)), lisp_integer(lisp_list_nth(data, 4)), - USE_ALPHA); + true); } else { Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- resources.cpp 20 Jun 2004 14:50:21 -0000 1.40 +++ resources.cpp 10 Jul 2004 14:22:59 -0000 1.41 @@ -131,59 +131,59 @@ /* Water: */ - img_water = new Surface(datadir + "/images/shared/water.png", IGNORE_ALPHA); + img_water = new Surface(datadir + "/images/shared/water.png", false); img_waves[0] = new Surface(datadir + "/images/shared/waves-0.png", - USE_ALPHA); + true); img_waves[1] = new Surface(datadir + "/images/shared/waves-1.png", - USE_ALPHA); + true); img_waves[2] = new Surface(datadir + "/images/shared/waves-2.png", - USE_ALPHA); + true); /* Pole: */ - img_pole = new Surface(datadir + "/images/shared/pole.png", USE_ALPHA); + img_pole = new Surface(datadir + "/images/shared/pole.png", true); img_poletop = new Surface(datadir + "/images/shared/poletop.png", - USE_ALPHA); + true); /* Flag: */ img_flag[0] = new Surface(datadir + "/images/shared/flag-0.png", - USE_ALPHA); + true); img_flag[1] = new Surface(datadir + "/images/shared/flag-1.png", - USE_ALPHA); + true); /* Cloud: */ img_cloud[0][0] = new Surface(datadir + "/images/shared/cloud-00.png", - USE_ALPHA); + true); img_cloud[0][1] = new Surface(datadir + "/images/shared/cloud-01.png", - USE_ALPHA); + true); img_cloud[0][2] = new Surface(datadir + "/images/shared/cloud-02.png", - USE_ALPHA); + true); img_cloud[0][3] = new Surface(datadir + "/images/shared/cloud-03.png", - USE_ALPHA); + true); img_cloud[1][0] = new Surface(datadir + "/images/shared/cloud-10.png", - USE_ALPHA); + true); img_cloud[1][1] = new Surface(datadir + "/images/shared/cloud-11.png", - USE_ALPHA); + true); img_cloud[1][2] = new Surface(datadir + "/images/shared/cloud-12.png", - USE_ALPHA); + true); img_cloud[1][3] = new Surface(datadir + "/images/shared/cloud-13.png", - USE_ALPHA); + true); /* Bad guys: */ @@ -205,22 +205,22 @@ /* Distros: */ img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png", - USE_ALPHA); + true); img_distro[1] = new Surface(datadir + "/images/tilesets/coin2.png", - USE_ALPHA); + true); img_distro[2] = new Surface(datadir + "/images/tilesets/coin3.png", - USE_ALPHA); + true); img_distro[3] = new Surface(datadir + "/images/tilesets/coin2.png", - USE_ALPHA); + true); /* Tux life: */ tux_life = new Surface(datadir + "/images/shared/tux-life.png", - USE_ALPHA); + true); /* Sound effects: */ |
|
From: Ricardo C. <rm...@us...> - 2004-07-10 14:23:08
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31744/src/screen Modified Files: font.cpp screen.h surface.cpp surface.h Log Message: Replaced USE_ALPHA/IGNORE_ALPHA by booleans. Should have been done long ago. Index: font.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- font.cpp 10 Jul 2004 14:07:03 -0000 1.9 +++ font.cpp 10 Jul 2004 14:22:58 -0000 1.10 @@ -33,7 +33,7 @@ : chars(0), shadow_chars(0), type(ntype), w(nw), h(nh), shadowsize(nshadowsize) { - chars = new Surface(file, USE_ALPHA); + chars = new Surface(file, true); switch(type) { case TEXT: @@ -58,7 +58,7 @@ } SDL_UnlockSurface(conv); SDL_SetAlpha(conv, SDL_SRCALPHA, 128); - shadow_chars = new Surface(conv, USE_ALPHA); + shadow_chars = new Surface(conv, true); SDL_FreeSurface(conv); } } @@ -172,7 +172,7 @@ } // load background image - Surface* background = new Surface(datadir + "/images/background/" + background_file, IGNORE_ALPHA); + Surface* background = new Surface(datadir + "/images/background/" + background_file, false); int done = 0; float scroll = 0; Index: screen.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/screen.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- screen.h 25 Jun 2004 11:54:37 -0000 1.7 +++ screen.h 10 Jul 2004 14:22:58 -0000 1.8 @@ -53,11 +53,6 @@ class Vector; -#define NO_UPDATE false -#define UPDATE true -#define USE_ALPHA 0 -#define IGNORE_ALPHA 1 - void putpixel(SDL_Surface *surface, int x, int y, Uint32 pixel); void drawpixel(int x, int y, Uint32 pixel); void fillrect(float x, float y, float w, float h, int r, int g, int b, int a = 255); Index: surface.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/surface.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- surface.h 14 Jun 2004 22:56:17 -0000 1.2 +++ surface.h 10 Jul 2004 14:22:58 -0000 1.3 @@ -33,7 +33,7 @@ #include "screen.h" #include "vector.h" -SDL_Surface* sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, int use_alpha); +SDL_Surface* sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha); SDL_Surface* sdl_surface_from_nothing(); class SurfaceImpl; @@ -59,7 +59,7 @@ ConstructorType type; SDL_Surface* surface; std::string file; - int use_alpha; + bool use_alpha; int x; int y; int w; @@ -67,9 +67,9 @@ Color top_gradient; Color bottom_gradient; - SurfaceData(SDL_Surface* surf, int use_alpha_); - SurfaceData(const std::string& file_, int use_alpha_); - SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_); + SurfaceData(SDL_Surface* surf, bool use_alpha_); + SurfaceData(const std::string& file_, bool use_alpha_); + SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_); SurfaceData(Color top_gradient_, Color bottom_gradient_, int w_, int h_); ~SurfaceData(); @@ -94,9 +94,9 @@ static void reload_all(); static void debug_check(); - Surface(SDL_Surface* surf, int use_alpha); - Surface(const std::string& file, int use_alpha); - Surface(const std::string& file, int x, int y, int w, int h, int use_alpha); + Surface(SDL_Surface* surf, bool use_alpha); + Surface(const std::string& file, bool use_alpha); + Surface(const std::string& file, int x, int y, int w, int h, bool use_alpha); Surface(Color top_gradient, Color bottom_gradient, int w_, int h_); ~Surface(); @@ -135,9 +135,9 @@ class SurfaceSDL : public SurfaceImpl { public: - SurfaceSDL(SDL_Surface* surf, int use_alpha); - SurfaceSDL(const std::string& file, int use_alpha); - SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha); + SurfaceSDL(SDL_Surface* surf, bool use_alpha); + SurfaceSDL(const std::string& file, bool use_alpha); + SurfaceSDL(const std::string& file, int x, int y, int w, int h, bool use_alpha); SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h); virtual ~SurfaceSDL(); @@ -155,9 +155,9 @@ GLuint gl_texture; public: - SurfaceOpenGL(SDL_Surface* surf, int use_alpha); - SurfaceOpenGL(const std::string& file, int use_alpha); - SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha); + SurfaceOpenGL(SDL_Surface* surf, bool use_alpha); + SurfaceOpenGL(const std::string& file, bool use_alpha); + SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, bool use_alpha); SurfaceOpenGL(Color top_gradient, Color bottom_gradient, int w, int h); virtual ~SurfaceOpenGL(); Index: surface.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/surface.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- surface.cpp 14 Jun 2004 22:56:17 -0000 1.2 +++ surface.cpp 10 Jul 2004 14:22:58 -0000 1.3 @@ -31,7 +31,7 @@ Surface::Surfaces Surface::surfaces; -SurfaceData::SurfaceData(SDL_Surface* temp, int use_alpha_) +SurfaceData::SurfaceData(SDL_Surface* temp, bool use_alpha_) : type(SURFACE), surface(0), use_alpha(use_alpha_) { // Copy the given surface and make sure that it is not stored in @@ -49,11 +49,11 @@ SDL_BlitSurface(temp, NULL, surface, NULL); } -SurfaceData::SurfaceData(const std::string& file_, int use_alpha_) +SurfaceData::SurfaceData(const std::string& file_, bool use_alpha_) : type(LOAD), surface(0), file(file_), use_alpha(use_alpha_) {} -SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_) +SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_) : type(LOAD_PART), surface(0), file(file_), use_alpha(use_alpha_), x(x_), y(y_), w(w_), h(h_) {} @@ -134,7 +134,7 @@ } #endif -Surface::Surface(SDL_Surface* surf, int use_alpha) +Surface::Surface(SDL_Surface* surf, bool use_alpha) : data(surf, use_alpha), w(0), h(0) { impl = data.create(); @@ -146,7 +146,7 @@ surfaces.push_back(this); } -Surface::Surface(const std::string& file, int use_alpha) +Surface::Surface(const std::string& file, bool use_alpha) : data(file, use_alpha), w(0), h(0) { impl = data.create(); @@ -158,7 +158,7 @@ surfaces.push_back(this); } -Surface::Surface(const std::string& file, int x, int y, int w, int h, int use_alpha) +Surface::Surface(const std::string& file, int x, int y, int w, int h, bool use_alpha) : data(file, x, y, w, h, use_alpha), w(0), h(0) { impl = data.create(); @@ -248,7 +248,7 @@ } SDL_Surface* -sdl_surface_part_from_file(const std::string& file, int x, int y, int w, int h, int use_alpha) +sdl_surface_part_from_file(const std::string& file, int x, int y, int w, int h, bool use_alpha) { SDL_Rect src; SDL_Surface * sdl_surface; @@ -283,7 +283,7 @@ SDL_SetAlpha(temp,0,0); SDL_BlitSurface(temp, &src, conv, NULL); - if(use_alpha == IGNORE_ALPHA && !use_gl) + if(use_alpha == false && !use_gl) sdl_surface = SDL_DisplayFormat(conv); else sdl_surface = SDL_DisplayFormatAlpha(conv); @@ -291,7 +291,7 @@ if (sdl_surface == NULL) st_abort("Can't covert to display format", file); - if (use_alpha == IGNORE_ALPHA && !use_gl) + if (use_alpha == false && !use_gl) SDL_SetAlpha(sdl_surface, 0, 0); SDL_FreeSurface(temp); @@ -301,7 +301,7 @@ } SDL_Surface* -sdl_surface_from_file(const std::string& file, int use_alpha) +sdl_surface_from_file(const std::string& file, bool use_alpha) { SDL_Surface* sdl_surface; SDL_Surface* temp; @@ -311,7 +311,7 @@ if (temp == NULL) st_abort("Can't load", file); - if(use_alpha == IGNORE_ALPHA && !use_gl) + if(use_alpha == false && !use_gl) sdl_surface = SDL_DisplayFormat(temp); else sdl_surface = SDL_DisplayFormatAlpha(temp); @@ -319,7 +319,7 @@ if (sdl_surface == NULL) st_abort("Can't covert to display format", file); - if (use_alpha == IGNORE_ALPHA && !use_gl) + if (use_alpha == false && !use_gl) SDL_SetAlpha(sdl_surface, 0, 0); SDL_FreeSurface(temp); @@ -328,7 +328,7 @@ } SDL_Surface* -sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, int use_alpha) +sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha) { SDL_Surface* sdl_surface; Uint32 saved_flags; @@ -343,7 +343,7 @@ SDL_SetAlpha(sdl_surf, 0, 0); } - if(use_alpha == IGNORE_ALPHA && !use_gl) + if(use_alpha == false && !use_gl) sdl_surface = SDL_DisplayFormat(sdl_surf); else sdl_surface = SDL_DisplayFormatAlpha(sdl_surf); @@ -358,7 +358,7 @@ if (sdl_surface == NULL) st_abort("Can't covert to display format", "SURFACE"); - if (use_alpha == IGNORE_ALPHA && !use_gl) + if (use_alpha == false && !use_gl) SDL_SetAlpha(sdl_surface, 0, 0); return sdl_surface; @@ -434,7 +434,7 @@ } #ifndef NOOPENGL -SurfaceOpenGL::SurfaceOpenGL(SDL_Surface* surf, int use_alpha) +SurfaceOpenGL::SurfaceOpenGL(SDL_Surface* surf, bool use_alpha) { sdl_surface = sdl_surface_from_sdl_surface(surf, use_alpha); create_gl(sdl_surface,&gl_texture); @@ -443,7 +443,7 @@ h = sdl_surface->h; } -SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int use_alpha) +SurfaceOpenGL::SurfaceOpenGL(const std::string& file, bool use_alpha) { sdl_surface = sdl_surface_from_file(file, use_alpha); create_gl(sdl_surface,&gl_texture); @@ -452,7 +452,7 @@ h = sdl_surface->h; } -SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_) +SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_) { sdl_surface = sdl_surface_part_from_file(file_,x_,y_,w_,h_,use_alpha_); @@ -700,21 +700,21 @@ #endif -SurfaceSDL::SurfaceSDL(SDL_Surface* surf, int use_alpha) +SurfaceSDL::SurfaceSDL(SDL_Surface* surf, bool use_alpha) { sdl_surface = sdl_surface_from_sdl_surface(surf, use_alpha); w = sdl_surface->w; h = sdl_surface->h; } -SurfaceSDL::SurfaceSDL(const std::string& file, int use_alpha) +SurfaceSDL::SurfaceSDL(const std::string& file, bool use_alpha) { sdl_surface = sdl_surface_from_file(file, use_alpha); w = sdl_surface->w; h = sdl_surface->h; } -SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha) +SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int w, int h, bool use_alpha) { sdl_surface = sdl_surface_part_from_file(file, x, y, w, h, use_alpha); w = sdl_surface->w; |
|
From: Ricardo C. <rm...@us...> - 2004-07-10 14:07:42
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28802/data Modified Files: CREDITS extro.txt intro.txt Log Message: Added background image. Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- CREDITS 8 Jul 2004 10:11:59 -0000 1.25 +++ CREDITS 10 Jul 2004 14:07:33 -0000 1.26 @@ -1,5 +1,7 @@ ; Credits text (supertux-text + (background "oiltux.jpg") + (text "-- SuperTux - Milestone 1 Index: intro.txt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/intro.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- intro.txt 7 Jul 2004 22:47:52 -0000 1.4 +++ intro.txt 10 Jul 2004 14:07:33 -0000 1.5 @@ -1,5 +1,7 @@ ; Introduction text (supertux-text + (background "arctis.jpg") + (text "-Penny gets captured! Tux and Penny were out having a nice Index: extro.txt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/extro.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- extro.txt 7 Jul 2004 22:47:52 -0000 1.3 +++ extro.txt 10 Jul 2004 14:07:33 -0000 1.4 @@ -1,5 +1,7 @@ ; Ending text (supertux-text + (background "extro.jpg") + (text "-Entering Nolok's Throne Room! Tux ran into Nolok's throne room, |
|
From: Ricardo C. <rm...@us...> - 2004-07-10 14:07:14
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28696/src Modified Files: intro.cpp title.cpp worldmap.cpp Log Message: display_text_file() now reads the background image from the file. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- title.cpp 9 Jul 2004 18:18:11 -0000 1.103 +++ title.cpp 10 Jul 2004 14:07:03 -0000 1.104 @@ -345,7 +345,7 @@ update_time = st_get_ticks(); break; case MNID_CREDITS: - display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS); + display_text_file("CREDITS", SCROLL_SPEED_CREDITS); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- worldmap.cpp 10 Jul 2004 10:59:00 -0000 1.93 +++ worldmap.cpp 10 Jul 2004 14:07:04 -0000 1.94 @@ -381,8 +381,6 @@ 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); @@ -702,10 +700,8 @@ sound_manager->load_music(datadir + "/music/theme.mod"); sound_manager->play_music(theme); // Display final credits and go back to the main menu - display_text_file(level->extro_filename, - "/images/background/extro.jpg", SCROLL_SPEED_MESSAGE); - display_text_file("CREDITS", - "/images/background/oiltux.jpg", SCROLL_SPEED_CREDITS); + display_text_file(level->extro_filename, SCROLL_SPEED_MESSAGE); + display_text_file("CREDITS", SCROLL_SPEED_CREDITS); quit = true; } } Index: intro.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- intro.cpp 9 Jun 2004 05:23:19 -0000 1.26 +++ intro.cpp 10 Jul 2004 14:07:03 -0000 1.27 @@ -25,6 +25,6 @@ void draw_intro() { - display_text_file("intro.txt", "/images/background/arctis.jpg", SCROLL_SPEED_MESSAGE); + display_text_file("intro.txt", SCROLL_SPEED_MESSAGE); } |
|
From: Ricardo C. <rm...@us...> - 2004-07-10 14:07:11
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28696/src/screen Modified Files: font.cpp font.h Log Message: display_text_file() now reads the background image from the file. Index: font.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- font.cpp 8 Jul 2004 10:11:07 -0000 1.8 +++ font.cpp 10 Jul 2004 14:07:03 -0000 1.9 @@ -130,14 +130,7 @@ #define SCROLL 60 #define ITEMS_SPACE 4 -void display_text_file(const std::string& file, const std::string& surface, float scroll_speed) -{ - Surface* sur = new Surface(datadir + surface, IGNORE_ALPHA); - display_text_file(file, sur, scroll_speed); - delete sur; -} - -void display_text_file(const std::string& file, Surface* surface, float scroll_speed) +void display_text_file(const std::string& file, float scroll_speed) { std::string text; std::vector<std::string> names; @@ -150,10 +143,12 @@ return; } - reader->read_string("text", text, true); + std::string background_file; + reader->read_string("background", background_file, true); delete reader; + // Split text string lines into a vector names.clear(); unsigned int i, l; i = 0; @@ -176,6 +171,9 @@ i = l+1; } + // load background image + Surface* background = new Surface(datadir + "/images/background/" + background_file, IGNORE_ALPHA); + int done = 0; float scroll = 0; float speed = scroll_speed / 50; @@ -225,7 +223,7 @@ speed = -MAX_VEL; /* draw the credits */ - context.draw_surface(surface, Vector(0,0), 0); + context.draw_surface(background, Vector(0,0), 0); float y = 0; for(size_t i = 0; i < names.size(); i++) { @@ -265,6 +263,6 @@ } SDL_EnableKeyRepeat(0, 0); // disables key repeating - Menu::set_current(main_menu); + delete background; } Index: font.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/font.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- font.h 7 Jul 2004 22:47:06 -0000 1.6 +++ font.h 10 Jul 2004 14:07:03 -0000 1.7 @@ -28,8 +28,7 @@ /** 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); +void display_text_file(const std::string& file, float scroll_speed); /* Text type */ class Font |
|
From: Marek M. <wa...@us...> - 2004-07-10 11:09:51
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1283/data/levels/worldmap Modified Files: bonusisland1.stwm icyisland.stwm Log Message: Fixed some bugs I just created in the worldmaps :) Index: bonusisland1.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/bonusisland1.stwm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bonusisland1.stwm 10 Jul 2004 10:59:00 -0000 1.3 +++ bonusisland1.stwm 10 Jul 2004 11:09:43 -0000 1.4 @@ -18,20 +18,20 @@ 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 16 16 22 47 17 9 9 15 19 48 40 40 40 40 40 40 40 40 40 45 40 40 40 39 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 48 40 40 40 40 40 42 17 9 9 15 19 47 20 18 21 19 20 18 21 19 19 47 20 18 21 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 16 16 16 22 47 20 18 18 18 18 18 13 9 9 15 48 42 17 9 14 18 13 9 14 21 19 47 17 9 15 47 17 9 9 11 16 16 16 16 16 16 16 16 12 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 - 9 9 9 9 9 15 48 40 40 40 40 40 40 42 17 9 9 9 9 9 9 9 9 15 47 20 13 9 9 9 9 11 16 22 19 47 17 9 15 47 17 11 16 22 48 40 40 6 40 39 19 19 17 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 15 48 40 40 40 40 40 40 42 17 9 9 9 9 9 9 9 9 15 47 20 13 9 9 9 9 11 16 22 19 47 17 9 15 47 17 11 16 22 48 40 40 40 40 39 19 19 17 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 20 18 18 18 18 18 18 13 9 9 9 9 11 16 12 9 15 47 17 9 9 11 12 9 14 21 19 19 47 23 16 22 47 23 22 60 19 47 19 19 19 19 47 19 19 17 9 9 9 9 11 22 47 23 12 9 9 9 9 9 9 9 9 - 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 14 18 13 9 15 47 17 9 9 15 23 12 9 14 21 19 37 40 40 39 37 40 40 6 40 42 19 48 40 40 42 19 20 13 9 9 9 9 15 60 47 60 17 9 9 9 9 9 9 9 9 + 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 14 18 13 9 15 47 17 9 9 15 23 12 9 14 21 19 37 40 40 39 37 40 40 40 40 42 19 48 40 40 42 19 20 13 9 9 9 9 15 60 47 60 17 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 15 19 17 9 9 14 18 18 18 21 47 20 18 21 60 19 19 19 47 19 19 20 18 13 9 9 9 9 9 14 21 47 20 13 9 9 9 9 9 9 9 9 9 9 9 9 11 22 47 23 12 11 16 16 16 16 12 9 9 9 9 9 9 9 9 15 47 17 9 9 14 18 13 9 9 9 9 9 9 15 47 17 9 14 18 21 19 19 47 19 19 23 12 9 9 9 9 9 11 16 22 47 23 16 12 9 9 9 9 9 9 9 - 9 9 9 9 15 19 47 19 23 22 48 6 40 39 17 9 9 9 9 9 11 16 16 22 47 23 16 16 16 16 12 9 9 9 9 9 9 15 47 17 9 9 9 14 21 19 7 19 19 19 23 12 9 9 9 9 15 19 19 7 19 19 17 9 9 9 9 9 9 9 + 9 9 9 9 15 19 47 19 23 22 48 40 40 39 17 9 9 9 9 9 11 16 16 22 47 23 16 16 16 16 12 9 9 9 9 9 9 15 47 17 9 9 9 14 21 19 47 19 19 19 23 12 9 9 9 9 15 19 19 47 19 19 17 9 9 9 9 9 9 9 9 9 9 9 15 19 47 19 19 19 47 19 19 47 17 9 9 9 9 9 15 19 19 19 47 19 19 48 40 39 17 9 9 9 9 9 9 15 47 17 9 9 9 9 15 19 37 40 40 39 19 17 9 9 9 9 14 21 19 37 40 39 23 16 12 9 9 9 9 9 - 9 9 9 9 14 21 47 19 19 48 42 19 19 47 23 12 9 9 9 9 14 18 21 19 7 19 19 47 19 47 17 9 9 9 9 11 16 22 47 23 16 12 9 9 15 19 19 19 19 47 19 17 9 9 9 9 9 15 19 19 19 47 19 20 13 9 9 9 9 9 - 9 9 9 9 9 15 37 6 40 42 24 25 26 47 19 17 9 11 12 9 9 9 14 21 37 40 40 42 19 47 17 9 9 9 9 15 19 19 7 19 19 23 12 9 14 18 18 18 21 47 20 13 9 11 16 16 16 22 19 19 19 47 19 23 12 9 9 9 9 9 - 9 9 9 9 9 15 19 19 19 19 31 32 27 47 19 17 9 14 13 9 9 11 16 22 19 60 19 19 19 7 17 9 9 9 9 14 21 19 37 40 40 39 17 9 9 9 9 9 15 47 17 9 9 15 48 40 40 40 40 39 19 37 40 39 23 12 9 9 9 9 + 9 9 9 9 14 21 47 19 19 48 42 19 19 47 23 12 9 9 9 9 14 18 21 19 47 19 19 47 19 47 17 9 9 9 9 11 16 22 47 23 16 12 9 9 15 19 19 19 19 47 19 17 9 9 9 9 9 15 19 19 19 47 19 20 13 9 9 9 9 9 + 9 9 9 9 9 15 37 40 40 42 24 25 26 47 19 17 9 11 12 9 9 9 14 21 37 40 40 42 19 47 17 9 9 9 9 15 19 19 47 19 19 23 12 9 14 18 18 18 21 47 20 13 9 11 16 16 16 22 19 19 19 47 19 23 12 9 9 9 9 9 + 9 9 9 9 9 15 19 19 19 19 31 32 27 47 19 17 9 14 13 9 9 11 16 22 19 60 19 19 19 47 17 9 9 9 9 14 21 19 37 40 40 39 17 9 9 9 9 9 15 47 17 9 9 15 48 40 40 40 40 39 19 37 40 39 23 12 9 9 9 9 9 9 9 9 9 15 19 60 19 19 30 29 28 47 20 13 9 9 9 9 11 22 19 19 19 19 19 19 19 47 17 9 9 9 9 9 14 21 19 19 19 47 17 9 9 9 9 11 22 47 17 9 9 15 47 19 19 19 19 47 19 19 19 47 19 17 9 9 9 9 - 9 9 9 9 9 14 21 48 40 6 40 40 40 42 17 9 9 9 9 9 15 48 40 40 40 6 40 40 40 42 17 9 9 9 9 9 9 15 19 19 19 47 17 9 9 9 9 15 19 47 17 9 9 15 47 19 19 19 19 37 6 40 40 42 19 17 9 9 9 9 - 9 9 9 9 11 16 22 47 19 19 19 19 19 19 17 9 9 9 9 9 15 47 19 19 19 19 20 21 19 20 13 9 9 9 9 9 9 15 19 48 6 42 23 12 9 9 9 15 19 47 17 9 9 15 37 40 39 19 19 19 19 19 19 19 19 17 9 9 9 9 - 9 9 9 9 15 19 19 37 40 40 40 40 6 39 17 9 9 9 9 9 15 37 40 39 19 20 13 14 18 13 9 9 9 9 9 9 9 14 21 47 19 19 19 17 9 9 11 22 19 47 17 9 9 15 19 19 37 6 40 40 40 40 39 19 20 13 9 9 9 9 + 9 9 9 9 9 14 21 48 40 40 40 40 40 42 17 9 9 9 9 9 15 48 40 40 40 40 40 40 40 42 17 9 9 9 9 9 9 15 19 19 19 47 17 9 9 9 9 15 19 47 17 9 9 15 47 19 19 19 19 37 40 40 40 42 19 17 9 9 9 9 + 9 9 9 9 11 16 22 47 19 19 19 19 19 19 17 9 9 9 9 9 15 47 19 19 19 19 20 21 19 20 13 9 9 9 9 9 9 15 19 48 40 42 23 12 9 9 9 15 19 47 17 9 9 15 37 40 39 19 19 19 19 19 19 19 19 17 9 9 9 9 + 9 9 9 9 15 19 19 37 40 40 40 40 40 39 17 9 9 9 9 9 15 37 40 39 19 20 13 14 18 13 9 9 9 9 9 9 9 14 21 47 19 19 19 17 9 9 11 22 19 47 17 9 9 15 19 19 37 40 40 40 40 40 39 19 20 13 9 9 9 9 9 9 9 9 14 21 19 19 19 19 19 19 19 47 23 12 9 9 9 9 14 18 21 47 20 13 9 9 9 9 9 9 9 9 9 9 9 9 15 47 20 18 18 13 9 9 14 21 19 47 17 9 9 14 21 19 19 19 20 18 18 21 47 20 13 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 21 47 20 13 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 14 21 47 17 9 9 9 14 18 18 18 13 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 9 9 9 9 15 47 17 9 9 9 9 9 9 @@ -99,8 +99,6 @@ (level (name "bonus1/castle.stl") (x 35) (y 36)) - - (extro-filename "extro.txt")) ) ) Index: icyisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/icyisland.stwm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- icyisland.stwm 10 Jul 2004 10:59:00 -0000 1.4 +++ icyisland.stwm 10 Jul 2004 11:09:43 -0000 1.5 @@ -123,7 +123,7 @@ (level (name "world1/level26.stl") (x 7) (y 20) - (extro-filename "extro.txt")) + (extro-filename "extro.txt")) ) |
|
From: Marek M. <wa...@us...> - 2004-07-10 10:59:10
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31846/src Modified Files: worldmap.cpp worldmap.h Log Message: Made Tux' starting position on the world map settable in the stwm file (In Worldmap class, Tux is initialized at the end of load_worldmap, I hope this doesn't cause trouble elsewhere) Updated levels and worldmap accordingly Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- worldmap.cpp 9 Jul 2004 22:16:50 -0000 1.92 +++ worldmap.cpp 10 Jul 2004 10:59:00 -0000 1.93 @@ -177,8 +177,8 @@ offset = 0; moving = false; - tile_pos.x = 4; - tile_pos.y = 5; + tile_pos.x = worldmap->get_start_x(); + tile_pos.y = worldmap->get_start_y(); direction = D_NONE; input_direction = D_NONE; } @@ -349,11 +349,14 @@ WorldMap::WorldMap() { tile_manager = new TileManager(); - tux = new Tux(this); - + //tux = new Tux(this); + width = 20; height = 15; - + + start_x = 4; + start_y = 5; + level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); @@ -404,6 +407,8 @@ LispReader reader(lisp_cdr(element)); reader.read_string("name", name, true); reader.read_string("music", music); + reader.read_int("start_pos_x", start_x); + reader.read_int("start_pos_y", start_y); } else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0) { @@ -447,6 +452,7 @@ } lisp_free(root_obj); + tux = new Tux(this); } void WorldMap::get_level_title(Level& level) Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- worldmap.h 9 Jul 2004 18:18:11 -0000 1.35 +++ worldmap.h 10 Jul 2004 10:59:00 -0000 1.36 @@ -124,6 +124,9 @@ std::vector<int> tilemap; int width; int height; + + int start_x; + int start_y; TileManager* tile_manager; @@ -201,6 +204,12 @@ const std::string& get_world_title() const { return name; } + + const int& get_start_x() const + { return start_x; } + + const int& get_start_y() const + { return start_y; } private: void on_escape_press(); |
|
From: Marek M. <wa...@us...> - 2004-07-10 10:59:09
|
Update of /cvsroot/super-tux/supertux/data/levels/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31846/data/levels/worldmap Modified Files: bonusisland1.stwm icyisland.stwm Log Message: Made Tux' starting position on the world map settable in the stwm file (In Worldmap class, Tux is initialized at the end of load_worldmap, I hope this doesn't cause trouble elsewhere) Updated levels and worldmap accordingly Index: bonusisland1.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/bonusisland1.stwm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bonusisland1.stwm 9 Jul 2004 18:18:45 -0000 1.2 +++ bonusisland1.stwm 10 Jul 2004 10:59:00 -0000 1.3 @@ -1,7 +1,9 @@ ;; Generated with Flexlay Editor (supertux-worldmap (properties - (name "Bonus Island")) + (name "Bonus Island") + (start_pos_x 35) + (start_pos_y 2)) (tilemap (width 70) (height 40) @@ -47,5 +49,58 @@ 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 )) + + (levels + (level (name "bonus1/abednego-level1.stl") + (x 7) + (y 18)) + (level (name "bonus1/abednego-level2.stl") + (x 11) + (y 15)) + (level (name "bonus1/abednego-level3.stl") + (x 9) + (y 21)) + (level (name "bonus1/abednego-level4.stl") + (x 12) + (y 23)) + (level (name "bonus1/matr1x-level1.stl") + (x 24) + (y 17)) + (level (name "bonus1/matr1x-level2.stl") + (x 29) + (y 19)) + (level (name "bonus1/matr1x-level3.stl") + (x 25) + (y 21)) + (level (name "bonus1/thompson-level1.stl") + (x 38) + (y 18)) + (level (name "bonus1/thompson-level2.stl") + (x 40) + (y 22)) + (level (name "bonus1/torfi-level1.stl") + (x 42) + (y 12)) + (level (name "bonus1/torfi-level2.stl") + (x 47) + (y 10)) + (level (name "bonus1/torfi-level3.stl") + (x 46) + (y 15)) + (level (name "bonus1/wansti-level1.stl") + (x 59) + (y 15)) + (level (name "bonus1/wansti-level2.stl") + (x 60) + (y 21)) + (level (name "bonus1/wansti-level3.stl") + (x 57) + (y 23)) + (level (name "bonus1/castle.stl") + (x 35) + (y 36)) + + (extro-filename "extro.txt")) + ) ) Index: icyisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/worldmap/icyisland.stwm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- icyisland.stwm 9 Jul 2004 18:53:11 -0000 1.3 +++ icyisland.stwm 10 Jul 2004 10:59:00 -0000 1.4 @@ -3,8 +3,10 @@ (properties (name "Icyisland") (name-pt_PT "Ilha Gelada") - (name-de "Eisinsel") - (music "SALCON.MOD")) + (name-de "Eisige Insel") + (music "SALCON.MOD") + (start_pos_x 4) + (start_pos_y 5)) (tilemap (width 40) (height 30) |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 23:26:57
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4476 Modified Files: TODO Log Message: Updated and commented the TODO. Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- TODO 12 Jun 2004 21:13:34 -0000 1.71 +++ TODO 9 Jul 2004 23:26:48 -0000 1.72 @@ -19,9 +19,17 @@ [?] Default keyboard setup should change. Up will be needed for other features like going through doors and looking up, etc. + Ricardo: IMO, there should be the following keys for the following actions: + Up arrow - Look up + Down arrow - Look down / duck + Left arrow - Left move + Right arrow - Right move + Ctrl - Run / Power + Alt - Jump + Not sure if Open doors action would be attributed to Up or Ctrl... -[H] Worldmap needs to allow multiple maps - - or just one big map with multiple worlds? +[H] Worldmap should have a flag to allow to go to another map after finishing + a level from that one. [H] Change resolution to 800x600 - Levels need to be updated to resolution - half of the levels have been already updated @@ -31,7 +39,7 @@ - Should kill enemies with a certain range - Done--now needs to be tweaked - Animation (need images) - - Should be a powerup item + - Should be a powerup item (still to be discussed) - Should break bricks if Tux is on top of bricks, otherwise it should kill enemies within a close range. - After enemy-kill is used, powerup should be removed from Tux @@ -39,8 +47,6 @@ - we should decide on specifics [H] Tux should fall while walking in tiles that have a space between. - Possible solution: reduce Tux's width when checking collision with tiles -[H] stdint.h isn't a part of FreeBSD. We should probably use SDL integer - types instead. [H] Graphics - New forest tileset - Badguy sprites @@ -49,21 +55,23 @@ - Useful for vertical scrolling when we only want a sky background on the top of the level - Support for this is already available using a paralax tilemap layer +[H] Background code have the following bugs: + - Gradient in software rendering doesn't currently work (at least here). + - Images tiling code sucks resulting in glitches and unecessary drawings. [M] There are some weird graphical glitches when Tux bumps more than one block at the same time [M] Save score on per-level basis to make high-score [M] Save time on per-level basis to make low-time-score [M] Add bonus score for extra time left when finishing a level -[M] When aborting a level, lives and score should remain the same as they - were before. Solution: make more dependency between the game engine and - worldmap or just backup those variables before starting a level. - fixed? [M] when bumping a special with 2 blocks at once, it won't change direction [M] tux get killed if he kicks a iceblock while at the same time bouncing on [M] You shouldn't be able to stand on invisible blocks, before you bumped them the roof +[M] Implement Unisolid type for tiles (where collisions from below are ignored). [L] Allow any object to be inside of a [?] box, ie. trampoline or badguy + - Not sure if this would be gameplay wise. [L] in the "Welcome to Antarctica" level, the blocks next to the first growup look like there are 2 blocks above each other when bumping against them as small tux... @@ -72,12 +80,8 @@ instead of fall, pause mode doesn't seem to have this problem, only menu) [L] catch exceptions thrown by lispreader -[L] fadein/out for intro/extro would be nice [L] we only have a global counter for multiple coin blocks. This should be handled - per block. -[L] Show level number on top of the screen when playing the level -[L] Fix the door animation -[L] Prevent Tux from being able to jump over ending sequence triggers + per block. - Why is this a bad thing? It avoids unnecessary cpu and memory use. Beyond Milestone2 ----------------- |
|
From: Ricardo C. <rm...@us...> - 2004-07-09 22:16:59
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24260/src Modified Files: lispreader.cpp worldmap.cpp Log Message: Fixed crash when LANG system's variable is not defined. Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- worldmap.cpp 9 Jul 2004 14:43:44 -0000 1.91 +++ worldmap.cpp 9 Jul 2004 22:16:50 -0000 1.92 @@ -361,7 +361,7 @@ input_direction = D_NONE; enter_level = false; - name = "<no file>"; + name = "<no title>"; music = "SALCON.MOD"; } Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- lispreader.cpp 8 Jul 2004 10:11:08 -0000 1.29 +++ lispreader.cpp 9 Jul 2004 22:16:49 -0000 1.30 @@ -1218,19 +1218,26 @@ (text-fr "Bonjour Monde!") being fr the value of LANG (echo $LANG) for the language we want to translate to */ + char* lang = getenv("LANG"); + char str_[1024]; // check, for instance, for (title-fr_FR "Bonjour") - sprintf(str_, "%s-%s", name, getenv("LANG")); + sprintf(str_, "%s-%s", name, 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); + if(strlen(lang) >= 2) + { + char lang_[3]; + strncpy(lang_, lang, 2); + lang_[2] = '\0'; + sprintf(str_, "%s-%s", name, lang_); - obj = search_for (str_); + obj = search_for (str_); + } + else + obj = 0; } if(!obj) // check, for instance, for (title "Hello") |
248 messages has been excluded from this view by a project administrator.
