super-tux-commit Mailing List for Super Tux (Page 56)
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-06-08 17:44:38
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9830/data/music Added Files: leveldone.mod Removed Files: tux-leveldone.mod Log Message: Fixed crashes at tiles that are not defined in supertux.stgt - throwing a warning instead Removed all undefined tiles from the world1 levels Renamed "Level Done" music --- tux-leveldone.mod DELETED --- --- NEW FILE: leveldone.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <ri...@ae...> - 2004-06-08 16:23:44
|
Actually, there is no need to remove or change the slot files. It will use= =20 the IcyIsland by default. =2D Ricardo Em Ter=E7a, 8 de Junho de 2004 16:03, o Ricardo Cruz escreveu: > Update of /cvsroot/super-tux/supertux/data/levels/default > In directory > sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19997/data/levels/worldmap > > Added Files: > icyisland.stwm > Removed Files: > worldmap.stwm > Log Message: > Changed map location. > Remove yours slot files from $HOME/save/ or add this to them: > (map "icyisland.stwm") > in the main group (where is the version, title, lives...). > > --- worldmap.stwm DELETED --- > > --- NEW FILE: icyisland.stwm --- > ;; Generated with Flexlay Editor > (supertux-worldmap > (name "Icyisland") > (properties > (name "Icyisland") > (music "SALCON.MOD")) > (tilemap > (width 40) > (height 30) > (data > 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 = 9=20 > 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 12 9 9 9 9 9 = 9=20 > 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 12 11 16 16 16 16 12 9 9 9 = 9 > 11 16 16 12 9 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 > 16 16 22 19 17 15 24 25 25 26 23 16 12 9 9 14 18 18 13 9 9 9 9 9 9= =20 > 9 9 9 9 9 9 9 9 9 9 9 9 11 22 58 19 19 20 18 13 15 31 32 32 34 > 26 19 23 16 12 9 9 9 9 9 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9= 9 > 9 15 19 59 19 20 13 9 9 15 31 35 29 29 28 19 19 60 23 16 12 9 9 9 = 11 > 22 19 24 25 26 23 12 11 16 16 12 9 9 9 9 9 15 19 47 19 17 11 16 16 22 > 30 28 19 48 40 40 39 19 20 18 13 9 9 11 22 19 19 30 36 34 26 23 22 19 19 > 23 12 9 9 9 9 15 19 47 19 23 22 19 19 19 19 24 26 47 24 26 47 19 23 16 > 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9 9 9 9 15 19 37 39 > 19 48 40 40 40 39 30 28 47 30 28 37 40 40 40 40 40 40 40 42 19 19 47 30 29 > 29 29 29 29 36 27 17 9 9 9 9 15 19 19 47 19 47 24 25 26 37 40 40 42 24 > 25 25 26 20 18 18 18 21 24 25 25 26 37 40 40 40 40 40 39 31 27 23 12 9 9 = 9 > 14 18 21 47 19 47 30 29 28 19 24 25 25 33 35 29 28 17 9 9 9 15 30 29 = 36 > 27 19 19 19 19 19 60 47 31 34 26 17 9 9 9 9 9 15 37 40 42 19 19 24 25 > 33 35 29 29 28 20 18 13 9 9 9 14 18 21 31 27 48 40 40 40 40 40 42 30 36 > 27 17 9 9 9 9 9 15 19 19 24 25 25 33 32 35 28 20 18 18 13 9 9 9 9 = 9 > 9 9 15 31 27 47 24 25 25 25 26 19 19 30 28 17 9 9 9 9 9 14 21 19 31 > 32 32 32 35 28 20 13 9 9 11 16 12 9 9 9 9 9 15 30 28 47 30 36 32 35 > 28 20 21 19 20 13 9 9 9 11 12 9 14 21 30 29 29 29 28 20 13 9 11 16 22 > 20 13 9 9 9 9 9 14 21 19 37 39 31 32 27 20 13 14 21 17 9 9 9 9 14 > 13 11 12 14 18 18 18 18 18 13 9 9 14 18 18 13 9 9 9 9 9 9 9 14 21 > 19 47 30 36 27 17 9 9 14 13 9 9 9 9 9 9 14 13 9 9 9 9 11 16 16 > 16 12 9 9 11 16 12 9 9 9 9 9 9 9 14 21 47 19 31 27 17 9 9 9 9= =20 > 9 9 9 9 9 9 9 11 16 16 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12= 9 > 9 9 9 9 15 47 19 30 28 17 9 9 9 9 9 9 9 9 9 11 16 22 49 50 51 > 24 26 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 > 9 9 9 9 9 9 9 9 9 15 24 26 52 53 54 30 28 19 30 29 29 28 19 30 29 > 29 36 34 25 26 24 26 48 40 40 42 17 9 9 9 9 9 9 9 9 9 9 9 9 15 > 31 27 55 56 57 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 30 28 47 20 18 > 18 13 9 9 9 9 9 9 9 9 9 9 9 9 15 31 34 25 26 19 47 19 47 24 26 > 47 19 47 24 26 47 19 24 26 48 40 40 42 23 12 9 9 9 9 11 12 9 9 9 9= =20 > 9 9 9 9 15 30 29 29 28 19 37 40 42 31 27 47 19 47 30 28 47 19 30 28 47 > 19 19 24 26 17 9 9 9 9 14 13 9 9 9 9 9 9 9 9 14 18 18 18 18 21 > 24 26 19 30 28 47 60 47 19 48 42 24 26 48 42 24 25 33 27 17 9 9 9 9 9= =20 > 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 28 24 25 26 37 40 42 19 47 > 19 30 28 47 19 30 29 36 27 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 > 12 9 9 9 14 18 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 > 9 9 11 16 16 12 9 9 9 9 9 9 9 9 14 13 9 9 9 9 9 14 21 31 32 > 32 34 25 25 25 25 26 19 19 20 13 14 18 18 13 9 9 14 21 60 23 12 9 9 9= =20 > 9 9 9 9 9 9 9 9 9 9 9 9 15 30 29 29 29 29 29 29 29 28 19 20 13 > 11 12 9 9 9 9 9 9 14 18 18 13 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 13 9 14 13 9 9 9 9 9 9 9 9 = 9=20 > 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 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 "world1/level1.stl") > (x 4) > (y 6)) > (level (name "world1/level2.stl") > (x 4) > (y 8)) > (level (name "world1/level3.stl") > (x 5) > (y 11)) > (level (name "world1/level4.stl") > (x 7) > (y 11)) > (level (name "world1/level5.stl") > (x 7) > (y 8)) > (level (name "world1/level6.stl") > (x 11) > (y 9)) > (level (name "world1/level7.stl") > (x 14) > (y 9)) > (level (name "world1/level8.stl") > (x 17) > (y 6)) > (level (name "world1/level9.stl") > (x 14) > (y 6)) > (level (name "world1/level10.stl") > (x 21) > (y 8)) > (level (name "world1/level11.stl") > (x 26) > (y 7)) > (level (name "world1/level12.stl") > (x 28) > (y 9)) > (level (name "world1/level13.stl") > (x 31) > (y 9)) > (level (name "world1/level14.stl") > (x 34) > (y 11)) > (level (name "world1/level15.stl") > (x 29) > (y 11)) > (level (name "world1/level16.stl") > (x 28) > (y 13)) > (level (name "world1/level17.stl") > (x 29) > (y 16)) > (level (name "world1/level18.stl") > (x 27) > (y 19)) > (level (name "world1/level19.stl") > (x 23) > (y 22)) > (level (name "world1/level20.stl") > (x 20) > (y 25)) > (level (name "world1/level21.stl") > (x 18) > (y 23)) > (level (name "world1/level22.stl") > (x 19) > (y 20)) > (level (name "world1/level23.stl") > (x 14) > (y 24)) > (level (name "world1/level24.stl") > (x 14) > (y 20)) > (level (name "world1/level25.stl") > (x 10) > (y 22)) > (level (name "world1/level26.stl") > (x 7) > (y 20) > (extro-filename "extro.txt")) > ) > > > ) > > > > > ------------------------------------------------------- > This SF.Net email is sponsored by: GNOME Foundation > Hackers Unite! GUADEC: The world's #1 Open Source Desktop Event. > GNOME Users and Developers European Conference, 28-30th June in Norway > http://2004/guadec.org > _______________________________________________ > Super-tux-commit mailing list > Sup...@li... > https://lists.sourceforge.net/lists/listinfo/super-tux-commit =2D-=20 It is idle to attempt to talk a young woman out of her passion: love does not lie in the ear. -- Walpole |
|
From: Ricardo C. <rm...@us...> - 2004-06-08 15:03:12
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19997/data/levels/worldmap Added Files: icyisland.stwm Removed Files: worldmap.stwm Log Message: Changed map location. Remove yours slot files from $HOME/save/ or add this to them: (map "icyisland.stwm") in the main group (where is the version, title, lives...). --- worldmap.stwm DELETED --- --- NEW FILE: icyisland.stwm --- ;; Generated with Flexlay Editor (supertux-worldmap (name "Icyisland") (properties (name "Icyisland") (music "SALCON.MOD")) (tilemap (width 40) (height 30) (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 9 9 9 9 9 9 9 9 9 9 9 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 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 12 11 16 16 16 16 12 9 9 9 9 11 16 16 12 9 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9 9 14 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 22 58 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9 9 9 9 9 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9 9 9 15 19 59 19 20 13 9 9 15 31 35 29 29 28 19 19 60 23 16 12 9 9 9 11 22 19 24 25 26 23 12 11 16 16 12 9 9 9 9 9 15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 39 19 20 18 13 9 9 11 22 19 19 30 36 34 26 23 22 19 19 23 12 9 9 9 9 15 19 47 19 23 22 19 19 19 19 24 26 47 24 26 47 19 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9 9 9 9 15 19 37 39 19 48 40 40 40 39 30 28 47 30 28 37 40 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9 9 9 9 15 19 19 47 19 47 24 25 26 37 40 40 42 24 25 25 26 20 18 18 18 21 24 25 25 26 37 40 40 40 40 40 39 31 27 23 12 9 9 9 14 18 21 47 19 47 30 29 28 19 24 25 25 33 35 29 28 17 9 9 9 15 30 29 36 27 19 19 19 19 19 60 47 31 34 26 17 9 9 9 9 9 15 37 40 42 19 19 24 25 33 35 29 29 28 20 18 13 9 9 9 14 18 21 31 27 48 40 40 40 40 40 42 30 36 27 17 9 9 9 9 9 15 19 19 24 25 25 33 32 35 28 20 18 18 13 9 9 9 9 9 9 9 15 31 27 47 24 25 25 25 26 19 19 30 28 17 9 9 9 9 9 14 21 19 31 32 32 32 35 28 20 13 9 9 11 16 12 9 9 9 9 9 15 30 28 47 30 36 32 35 28 20 21 19 20 13 9 9 9 11 12 9 14 21 30 29 29 29 28 20 13 9 11 16 22 20 13 9 9 9 9 9 14 21 19 37 39 31 32 27 20 13 14 21 17 9 9 9 9 14 13 11 12 14 18 18 18 18 18 13 9 9 14 18 18 13 9 9 9 9 9 9 9 14 21 19 47 30 36 27 17 9 9 14 13 9 9 9 9 9 9 14 13 9 9 9 9 11 16 16 16 12 9 9 11 16 12 9 9 9 9 9 9 9 14 21 47 19 31 27 17 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12 9 9 9 9 9 15 47 19 30 28 17 9 9 9 9 9 9 9 9 9 11 16 22 49 50 51 24 26 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 9 9 9 9 9 9 9 9 9 15 24 26 52 53 54 30 28 19 30 29 29 28 19 30 29 29 36 34 25 26 24 26 48 40 40 42 17 9 9 9 9 9 9 9 9 9 9 9 9 15 31 27 55 56 57 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 30 28 47 20 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 15 31 34 25 26 19 47 19 47 24 26 47 19 47 24 26 47 19 24 26 48 40 40 42 23 12 9 9 9 9 11 12 9 9 9 9 9 9 9 9 15 30 29 29 28 19 37 40 42 31 27 47 19 47 30 28 47 19 30 28 47 19 19 24 26 17 9 9 9 9 14 13 9 9 9 9 9 9 9 9 14 18 18 18 18 21 24 26 19 30 28 47 60 47 19 48 42 24 26 48 42 24 25 33 27 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 28 24 25 26 37 40 42 19 47 19 30 28 47 19 30 29 36 27 17 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 12 9 9 9 14 18 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 9 9 11 16 16 12 9 9 9 9 9 9 9 9 14 13 9 9 9 9 9 14 21 31 32 32 34 25 25 25 25 26 19 19 20 13 14 18 18 13 9 9 14 21 60 23 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 29 29 29 29 29 29 29 28 19 20 13 11 12 9 9 9 9 9 9 14 18 18 13 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 13 9 14 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 )) (levels (level (name "world1/level1.stl") (x 4) (y 6)) (level (name "world1/level2.stl") (x 4) (y 8)) (level (name "world1/level3.stl") (x 5) (y 11)) (level (name "world1/level4.stl") (x 7) (y 11)) (level (name "world1/level5.stl") (x 7) (y 8)) (level (name "world1/level6.stl") (x 11) (y 9)) (level (name "world1/level7.stl") (x 14) (y 9)) (level (name "world1/level8.stl") (x 17) (y 6)) (level (name "world1/level9.stl") (x 14) (y 6)) (level (name "world1/level10.stl") (x 21) (y 8)) (level (name "world1/level11.stl") (x 26) (y 7)) (level (name "world1/level12.stl") (x 28) (y 9)) (level (name "world1/level13.stl") (x 31) (y 9)) (level (name "world1/level14.stl") (x 34) (y 11)) (level (name "world1/level15.stl") (x 29) (y 11)) (level (name "world1/level16.stl") (x 28) (y 13)) (level (name "world1/level17.stl") (x 29) (y 16)) (level (name "world1/level18.stl") (x 27) (y 19)) (level (name "world1/level19.stl") (x 23) (y 22)) (level (name "world1/level20.stl") (x 20) (y 25)) (level (name "world1/level21.stl") (x 18) (y 23)) (level (name "world1/level22.stl") (x 19) (y 20)) (level (name "world1/level23.stl") (x 14) (y 24)) (level (name "world1/level24.stl") (x 14) (y 20)) (level (name "world1/level25.stl") (x 10) (y 22)) (level (name "world1/level26.stl") (x 7) (y 20) (extro-filename "extro.txt")) ) ) |
|
From: Ricardo C. <rm...@us...> - 2004-06-08 15:00:01
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19292/src Modified Files: worldmap.cpp worldmap.h Log Message: Save worldmap filename to slot. This is a first step to make worldmap more flexible in loading more maps. Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- worldmap.cpp 3 Jun 2004 22:09:31 -0000 1.84 +++ worldmap.cpp 8 Jun 2004 14:59:49 -0000 1.85 @@ -362,8 +362,6 @@ name = "<no file>"; music = "SALCON.MOD"; - - load_map(); } WorldMap::~WorldMap() @@ -379,12 +377,12 @@ 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(datadir + "/levels/worldmap/" + map_filename); if (!root_obj) - st_abort("Couldn't load file", filename); - + 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); @@ -905,7 +903,7 @@ song = sound_manager->load_music(datadir + "/music/" + music); sound_manager->play_music(song); - + unsigned int last_update_time; unsigned int update_time; @@ -968,7 +966,8 @@ out << "(supertux-savegame\n" << " (version 1)\n" - << " (title \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n" + << " (title \"" << name << " - " << nb_solved_levels << "/" << levels.size() << "\")\n" + << " (map \"" << map_filename << "\")\n" << " (lives " << player_status.lives << ")\n" << " (score " << player_status.score << ")\n" << " (distros " << player_status.distros << ")\n" @@ -995,25 +994,37 @@ { std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; + map_filename = "icyisland.stwm"; if (access(filename.c_str(), F_OK) != 0) + { + load_map(); return; + } lisp_object_t* savegame = lisp_read_from_file(filename); if (!savegame) { std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl; + load_map(); return; } lisp_object_t* cur = savegame; if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) + { + load_map(); return; + } cur = lisp_cdr(cur); LispReader reader(cur); + /* Get the Map filename and then load it before setting level settings */ + reader.read_string("map", map_filename); + load_map(); + reader.read_int("lives", player_status.lives); reader.read_int("score", player_status.score); reader.read_int("distros", player_status.distros); Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- worldmap.h 30 May 2004 01:08:49 -0000 1.31 +++ worldmap.h 8 Jun 2004 14:59:50 -0000 1.32 @@ -148,6 +148,8 @@ }; private: + std::string map_filename; + typedef std::vector<Level> Levels; Levels levels; |
|
From: Marek M. <wa...@us...> - 2004-06-08 13:23:26
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28542/src Modified Files: scene.cpp special.cpp Log Message: Ice bullets now bump off walls Fixed typo in scene.cpp Index: scene.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- scene.cpp 21 May 2004 00:22:57 -0000 1.29 +++ scene.cpp 8 Jun 2004 13:23:17 -0000 1.30 @@ -50,7 +50,7 @@ case PlayerStatus::GROWUP_BONUS: return "growup"; case PlayerStatus::FLOWER_BONUS: - return "icflower"; + return "iceflower"; default: return "none"; } Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- special.cpp 4 Jun 2004 14:14:59 -0000 1.55 +++ special.cpp 8 Jun 2004 13:23:17 -0000 1.56 @@ -51,6 +51,9 @@ life_count = 3; base.width = 4; base.height = 4; + + if (kind == ICE_BULLET) + life_count = 6; //ice-bullets get "extra lives" for bumping off walls if (dir == RIGHT) { @@ -102,12 +105,20 @@ base.x > scroll_x + screen->w || base.y < scroll_y || base.y > scroll_y + screen->h || - issolid(base.x + 4, base.y + 2) || - issolid(base.x, base.y + 2) || life_count <= 0) { remove_me(); } + if (issolid(base.x + 4, base.y + 2) || + issolid(base.x, base.y + 2)) + { + if (kind == FIRE_BULLET) + remove_me(); + else if (kind == ICE_BULLET) + { + physic.set_velocity_x(physic.get_velocity_x() * -1); + } + } } void |
|
From: Marek M. <wa...@us...> - 2004-06-08 13:23:26
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28542/data/levels/test Modified Files: level10.stl Log Message: Ice bullets now bump off walls Fixed typo in scene.cpp Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level10.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level10.stl 8 Jun 2004 12:09:06 -0000 1.10 +++ level10.stl 8 Jun 2004 13:23:16 -0000 1.11 @@ -26,7 +26,7 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 140 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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: Marek M. <wa...@us...> - 2004-06-08 12:09:18
|
Update of /cvsroot/super-tux/supertux/data/images/background In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12837/data/images/background Added Files: ocean.jpg ocean640.jpg Removed Files: ocean.png ocean640.png Log Message: converted ocean background to jpg updated one more level explicitly added background image "arctis.jpg" to test levels to prevent the game from crashing when choosing test collection from the menu - didn't work :-( --- NEW FILE: ocean.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ocean640.jpg --- (This appears to be a binary file; contents omitted.) --- ocean.png DELETED --- --- ocean640.png DELETED --- |
|
From: Marek M. <wa...@us...> - 2004-06-08 11:10:56
|
Update of /cvsroot/super-tux/supertux/data/images/background In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29970/data/images/background Modified Files: ocean.png Added Files: ocean640.png Log Message: Resized ocean background to 800x600 Index: ocean.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/background/ocean.png,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 Binary files /tmp/cvsHZQnpP and /tmp/cvsUpDMtd differ --- NEW FILE: ocean640.png --- (This appears to be a binary file; contents omitted.) |
|
From: Marek M. <wa...@us...> - 2004-06-08 07:12:51
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18654/src Modified Files: player.cpp player.h Log Message: Stomp sprite stays in place now (i.e. doesn't follow Tux around anymore) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- player.cpp 7 Jun 2004 19:52:38 -0000 1.139 +++ player.cpp 8 Jun 2004 07:12:37 -0000 1.140 @@ -116,7 +116,8 @@ jumping = false; can_jump = true; butt_jump = false; - + + stomp_pos = Vector(0,0); frame_main = 0; frame_ = 0; @@ -508,7 +509,13 @@ // Do butt jump if (butt_jump && on_ground() && size == BIG) { + + if (duck) + stomp_pos = Vector(base.x - 32, base.y); + else + stomp_pos = Vector(base.x - 32, base.y + 32); stomp_timer.start(STOMP_TIME); + butt_jump = false; // Break bricks beneath Tux @@ -769,10 +776,7 @@ // Draw stomp clouds when doing a butt jump if (stomp_timer.check()) - if (duck) - sprite->stomp->draw(context, Vector(base.x - 32, base.y), LAYER_OBJECTS + 1); - else - sprite->stomp->draw(context, Vector(base.x - 32, base.y + 32), LAYER_OBJECTS + 1); + sprite->stomp->draw(context, stomp_pos, LAYER_OBJECTS + 1); // Draw blinking star overlay if (invincible_timer.started() && Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- player.h 7 Jun 2004 19:52:46 -0000 1.69 +++ player.h 8 Jun 2004 07:12:37 -0000 1.70 @@ -153,6 +153,8 @@ Timer growing_timer; Timer stomp_timer; Physic physic; + + Vector stomp_pos; public: Player(); |
|
From: Dr. K. <no...@e-...> - 2004-06-08 06:44:53
|
No text version was provided |
|
From: Ricardo C. <rm...@us...> - 2004-06-07 22:43:33
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1792/po Modified Files: de.po es.po pt.po supertux.pot Log Message: Gettext wasn't working for the bottom copyright text. We need Latin letters for the small white font! Index: pt.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/pt.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pt.po 7 Jun 2004 19:21:18 -0000 1.6 +++ pt.po 7 Jun 2004 22:43:23 -0000 1.7 @@ -1,4 +1,5 @@ # translation of pt.po to +# translation of pt.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR SuperTux Development Team. # Ricardo Cruz <ri...@ae...>, 2004. @@ -6,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" -"POT-Creation-Date: 2004-06-03 22:58+0100\n" -"PO-Revision-Date: 2004-06-03 23:09+0100\n" +"Report-Msgid-Bugs-To: sup...@li...\n" +"POT-Creation-Date: 2004-06-07 23:38+0100\n" +"PO-Revision-Date: 2004-06-07 23:39+0100\n" "Last-Translator: Ricardo Cruz <ri...@ae...>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "X-Generator: KBabel 1.3\n" #: src/gameloop.cpp:163 @@ -44,31 +45,31 @@ msgid "COINS" msgstr "MOEDAS" -#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 #: src/worldmap.cpp:876 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:767 +#: src/gameloop.cpp:768 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:770 src/worldmap.cpp:727 +#: src/gameloop.cpp:771 src/worldmap.cpp:727 #, c-format msgid "SCORE: %d" msgstr "PONTOS: %d" -#: src/gameloop.cpp:773 src/worldmap.cpp:731 +#: src/gameloop.cpp:774 src/worldmap.cpp:731 #, c-format msgid "COINS: %d" msgstr "MOEDAS: %d" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:803 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Jogo gravado" -#: src/gameloop.cpp:805 +#: src/gameloop.cpp:806 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Livre" @@ -344,20 +345,14 @@ "debug-mode] | [--usage | --help | --version] [--leveleditor] " "NOME_DO_FICHEIRO\n" -#: src/title.cpp:276 -msgid " SuperTux " -msgstr " SuperTux " - -#: src/title.cpp:276 +#: src/title.cpp:277 msgid "" -"\n" "Copyright (c) 2003 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions; see the file " "COPYING\n" "for details.\n" msgstr "" -"\n" "Copyright (c) 2003 Equipa do SuperTux\n" "Este jogo vem sem ABSOLUTAMENTE NENHUMA GARANTIA. Isto é software livre, e\n" "és encorajado a o redistribuir, mas sob certas condições; ler o ficheiro " @@ -372,3 +367,4 @@ #: src/worldmap.cpp:724 msgid "GAMEOVER" msgstr "FIM DO JOGO" + Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- es.po 7 Jun 2004 19:21:18 -0000 1.3 +++ es.po 7 Jun 2004 22:43:23 -0000 1.4 @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: es\n" -"POT-Creation-Date: 2004-06-03 22:58+0100\n" +"Report-Msgid-Bugs-To: sup...@li...\n" +"POT-Creation-Date: 2004-06-07 23:38+0100\n" "PO-Revision-Date: 2004-06-03 22:29+0200\n" "Last-Translator: Javier Beaumont <de...@zi...>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "X-Generator: KBabel 1.3.1\n" #: src/gameloop.cpp:163 @@ -45,31 +45,31 @@ msgid "COINS" msgstr "MONEDAS" -#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 #: src/worldmap.cpp:876 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:767 +#: src/gameloop.cpp:768 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:770 src/worldmap.cpp:727 +#: src/gameloop.cpp:771 src/worldmap.cpp:727 #, c-format msgid "SCORE: %d" msgstr "PUNTOS: %d" -#: src/gameloop.cpp:773 src/worldmap.cpp:731 +#: src/gameloop.cpp:774 src/worldmap.cpp:731 #, c-format msgid "COINS: %d" msgstr "MONEDAS: %d" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:803 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Juego grabado" -#: src/gameloop.cpp:805 +#: src/gameloop.cpp:806 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Libre" @@ -310,13 +310,9 @@ "debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n" msgstr "" -#: src/title.cpp:276 -msgid " SuperTux " -msgstr " SuperTux " - -#: src/title.cpp:276 +#: src/title.cpp:277 +#, fuzzy msgid "" -"\n" "Copyright (c) 2003 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions; see the file " @@ -340,5 +336,8 @@ msgid "GAMEOVER" msgstr "FIN DEL JUEGO" +#~ msgid " SuperTux " +#~ msgstr " SuperTux " + #~ msgid "Key Setup" #~ msgstr "Configurar teclas" Index: supertux.pot =================================================================== RCS file: /cvsroot/super-tux/supertux/po/supertux.pot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- supertux.pot 3 Jun 2004 22:10:32 -0000 1.3 +++ supertux.pot 7 Jun 2004 22:43:23 -0000 1.4 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-03 22:58+0100\n" +"POT-Creation-Date: 2004-06-07 23:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -44,31 +44,31 @@ msgid "COINS" msgstr "" -#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 #: src/worldmap.cpp:876 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:767 +#: src/gameloop.cpp:768 msgid "Result:" msgstr "" -#: src/gameloop.cpp:770 src/worldmap.cpp:727 +#: src/gameloop.cpp:771 src/worldmap.cpp:727 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:773 src/worldmap.cpp:731 +#: src/gameloop.cpp:774 src/worldmap.cpp:731 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:803 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:805 +#: src/gameloop.cpp:806 #, c-format msgid "Slot %d - Free" msgstr "" @@ -308,13 +308,8 @@ "debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n" msgstr "" -#: src/title.cpp:276 -msgid " SuperTux " -msgstr "" - -#: src/title.cpp:276 +#: src/title.cpp:277 msgid "" -"\n" "Copyright (c) 2003 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions; see the file " Index: de.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/de.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- de.po 7 Jun 2004 19:21:06 -0000 1.4 +++ de.po 7 Jun 2004 22:43:23 -0000 1.5 @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" -"POT-Creation-Date: 2004-06-03 22:58+0100\n" +"Report-Msgid-Bugs-To: sup...@li...\n" +"POT-Creation-Date: 2004-06-07 23:38+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: <ma...@br...>\n" "Language-Team: German <de...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/gameloop.cpp:163 @@ -45,31 +45,31 @@ msgid "COINS" msgstr "" -#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 #: src/worldmap.cpp:876 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:767 +#: src/gameloop.cpp:768 msgid "Result:" msgstr "" -#: src/gameloop.cpp:770 src/worldmap.cpp:727 +#: src/gameloop.cpp:771 src/worldmap.cpp:727 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:773 src/worldmap.cpp:731 +#: src/gameloop.cpp:774 src/worldmap.cpp:731 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:802 +#: src/gameloop.cpp:803 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:805 +#: src/gameloop.cpp:806 #, c-format msgid "Slot %d - Free" msgstr "" @@ -312,13 +312,8 @@ "debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n" msgstr "" -#: src/title.cpp:276 -msgid " SuperTux " -msgstr "" - -#: src/title.cpp:276 +#: src/title.cpp:277 msgid "" -"\n" "Copyright (c) 2003 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions; see the file " |
|
From: Ricardo C. <rm...@us...> - 2004-06-07 22:43:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1792/src Modified Files: title.cpp Log Message: Gettext wasn't working for the bottom copyright text. We need Latin letters for the small white font! Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- title.cpp 3 Jun 2004 17:41:22 -0000 1.95 +++ title.cpp 7 Jun 2004 22:43:24 -0000 1.96 @@ -272,12 +272,12 @@ context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30), LAYER_FOREGROUND1+1); + context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1); context.draw_text(white_small_text, - _(" SuperTux " VERSION "\n" - "Copyright (c) 2003 SuperTux Devel Team\n" + _("Copyright (c) 2003 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions; see the file COPYING\n" - "for details.\n"), Vector(0, screen->h - 70), LAYER_FOREGROUND1); + "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LAYER_FOREGROUND1); /* Don't draw menu, if quit is true */ Menu* menu = Menu::current(); |
|
From: Ryan F. <sik...@us...> - 2004-06-07 22:06:23
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27590 Modified Files: leveleditor.cpp Log Message: - fixed type warning on OS X Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -u -d -r1.135 -r1.136 --- leveleditor.cpp 7 Jun 2004 21:46:26 -0000 1.135 +++ leveleditor.cpp 7 Jun 2004 22:06:14 -0000 1.136 @@ -1782,7 +1782,7 @@ for(unsigned int t = 0; t < sizeof(text[i])/sizeof(char *); t++) context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->get_height())), LAYER_GUI); - sprintf(str,"Press any key to continue - Page %d/%d?", i, sizeof(text)); + sprintf(str,"Press any key to continue - Page %d/%d?", i, static_cast<int>(sizeof(text))); context.draw_text(gold_text, str, Vector(0, 0), LAYER_GUI); context.do_drawing(); |
|
From: Ryan F. <sik...@us...> - 2004-06-07 21:46:54
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23794 Modified Files: leveleditor.cpp Log Message: - fixed type warning on OS X Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- leveleditor.cpp 3 Jun 2004 16:30:35 -0000 1.134 +++ leveleditor.cpp 7 Jun 2004 21:46:26 -0000 1.135 @@ -553,9 +553,9 @@ /* if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,le_level->get_sector("main")->particlesystem.c_str())) != -1) level_settings_menu->get_item_by_id(MNID_PARTICLE).list->active_item = i;*/ - sprintf(str,"%d",le_level->get_sector("main")->solids->get_width()); + sprintf(str,"%d",static_cast<int>(le_level->get_sector("main")->solids->get_width())); level_settings_menu->get_item_by_id(MNID_LENGTH).change_input(str); - sprintf(str,"%d",le_level->get_sector("main")->solids->get_height()); + sprintf(str,"%d", static_cast<int>(le_level->get_sector("main")->solids->get_height())); level_settings_menu->get_item_by_id(MNID_HEIGHT).change_input(str); sprintf(str,"%d",le_level->time_left); level_settings_menu->get_item_by_id(MNID_TIME).change_input(str); |
|
From: Ryan F. <sik...@us...> - 2004-06-07 20:54:05
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13289 Modified Files: TODO Log Message: - updated TODO Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- TODO 3 Jun 2004 23:26:41 -0000 1.62 +++ TODO 7 Jun 2004 20:53:35 -0000 1.63 @@ -42,6 +42,13 @@ ? Should disable Tux's movement temporarily (1 second?) [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] Dead Tux/badguys should be drawn on top of the foreground layer +[H] Graphics + - New forest tileset + - Badguy sprites + - Tux's buttjump animation [M] Save score on per-level basis to make high-score [M] Save time on per-level basis to make low-time-score |
|
From: Marek M. <wa...@us...> - 2004-06-07 19:54:28
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30028/src Modified Files: player.cpp player.h resources.cpp Log Message: Dust clouds are now drawn around Tux' feet whenever he does a butt stomp. Someone please improve the sprite! :-) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -r1.138 -r1.139 --- player.cpp 7 Jun 2004 15:32:58 -0000 1.138 +++ player.cpp 7 Jun 2004 19:52:38 -0000 1.139 @@ -39,6 +39,7 @@ #define TILES_FOR_BUTTJUMP 3 // animation times (in ms): #define SHOOTING_TIME 320 +#define STOMP_TIME 250 // others stuff: #define AUTOSCROLL_DEAD_INTERVAL 300 @@ -507,6 +508,7 @@ // Do butt jump if (butt_jump && on_ground() && size == BIG) { + stomp_timer.start(STOMP_TIME); butt_jump = false; // Break bricks beneath Tux @@ -764,6 +766,13 @@ else sprite->grab_left->draw(context, pos, LAYER_OBJECTS + 1); } + + // Draw stomp clouds when doing a butt jump + if (stomp_timer.check()) + if (duck) + sprite->stomp->draw(context, Vector(base.x - 32, base.y), LAYER_OBJECTS + 1); + else + sprite->stomp->draw(context, Vector(base.x - 32, base.y + 32), LAYER_OBJECTS + 1); // Draw blinking star overlay if (invincible_timer.started() && Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- player.h 4 Jun 2004 14:03:06 -0000 1.68 +++ player.h 7 Jun 2004 19:52:46 -0000 1.69 @@ -107,6 +107,7 @@ Sprite* grab_right; Sprite* duck_right; Sprite* duck_left; + Sprite* stomp; }; extern PlayerSprite smalltux; @@ -150,6 +151,7 @@ Timer shooting_timer; // used to show the arm when Tux is shooting Timer dying_timer; Timer growing_timer; + Timer stomp_timer; Physic physic; public: Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- resources.cpp 4 Jun 2004 14:03:06 -0000 1.37 +++ resources.cpp 7 Jun 2004 19:52:46 -0000 1.38 @@ -78,6 +78,7 @@ smalltux.skid_right = sprite_manager->load("smalltux-skid-right"); smalltux.grab_left = sprite_manager->load("smalltux-grab-left"); smalltux.grab_right = sprite_manager->load("smalltux-grab-right"); + smalltux.stomp = sprite_manager->load("stomp"); largetux.stand_left = sprite_manager->load("largetux-stand-left"); largetux.stand_right = sprite_manager->load("largetux-stand-right"); @@ -93,6 +94,7 @@ largetux.grab_right = sprite_manager->load("largetux-grab-right"); largetux.duck_left = sprite_manager->load("largetux-duck-left"); largetux.duck_right = sprite_manager->load("largetux-duck-right"); + largetux.stomp = sprite_manager->load("stomp"); firetux.stand_left = sprite_manager->load("firetux-stand-left"); firetux.stand_right = sprite_manager->load("firetux-stand-right"); @@ -108,6 +110,7 @@ firetux.grab_right = sprite_manager->load("firetux-grab-right"); firetux.duck_left = sprite_manager->load("firetux-duck-left"); firetux.duck_right = sprite_manager->load("firetux-duck-right"); + firetux.stomp = sprite_manager->load("stomp"); icetux.stand_left = sprite_manager->load("icetux-stand-left"); icetux.stand_right = sprite_manager->load("icetux-stand-right"); @@ -123,6 +126,7 @@ icetux.grab_right = sprite_manager->load("icetux-grab-right"); icetux.duck_left = sprite_manager->load("icetux-duck-left"); icetux.duck_right = sprite_manager->load("icetux-duck-right"); + icetux.stomp = sprite_manager->load("stomp"); /* Water: */ |
|
From: Marek M. <wa...@us...> - 2004-06-07 19:54:09
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30028/data Modified Files: supertux.strf Log Message: Dust clouds are now drawn around Tux' feet whenever he does a butt stomp. Someone please improve the sprite! :-) Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- supertux.strf 31 May 2004 14:10:27 -0000 1.40 +++ supertux.strf 7 Jun 2004 19:52:17 -0000 1.41 @@ -684,10 +684,17 @@ ; Door (sprite (name "door") - (y-hotspot 0) + (x-hotspot 0) (y-hotspot 0) (images "shared/door.png") ) + + ; Stomp + (sprite (name "stomp") + (x-hotspot 0) + (y-hotspot 0) + (images "shared/stomp.png") + ) ) ;; EOF ;; |
|
From: Marek M. <wa...@us...> - 2004-06-07 19:52:50
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30028/data/images/shared Added Files: stomp.png Log Message: Dust clouds are now drawn around Tux' feet whenever he does a butt stomp. Someone please improve the sprite! :-) --- NEW FILE: stomp.png --- (This appears to be a binary file; contents omitted.) |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-07 19:23:02
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22768/src Modified Files: Makefile.am Log Message: added missing 'exceptions.h' and 'gettext.h' to Makefile.am Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- Makefile.am 7 Jun 2004 12:52:57 -0000 1.34 +++ Makefile.am 7 Jun 2004 19:21:18 -0000 1.35 @@ -32,8 +32,10 @@ intro.cpp \ intro.h \ defines.h \ +exceptions.h \ gameloop.cpp \ gameloop.h \ +gettext.h \ globals.cpp \ globals.h \ high_scores.cpp \ @@ -89,7 +91,6 @@ gameobjs.cpp \ game_object.cpp \ game_object.h \ -drawable.h \ background.h \ background.cpp \ tilemap.h \ |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-07 19:21:57
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22768/po Modified Files: de.po es.po pt.po Log Message: added missing 'exceptions.h' and 'gettext.h' to Makefile.am Index: pt.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/pt.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pt.po 3 Jun 2004 22:10:32 -0000 1.5 +++ pt.po 7 Jun 2004 19:21:18 -0000 1.6 @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-03 22:58+0100\n" "PO-Revision-Date: 2004-06-03 23:09+0100\n" "Last-Translator: Ricardo Cruz <ri...@ae...>\n" @@ -14,6 +13,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: sup...@li...\n" "X-Generator: KBabel 1.3\n" #: src/gameloop.cpp:163 @@ -306,7 +306,8 @@ msgstr "" "Opções Gráficas:\n" " --fullscreen Ocupar todo o ecrã.\n" -" --opengl Caso tenha sido compilado com suporte para OpenGL, isto irá fazer\n" +" --opengl Caso tenha sido compilado com suporte para OpenGL, " +"isto irá fazer\n" " com que o SuperTux o use.\n" " --sdl Usar o SDL como renderer gráfico (software)\n" "\n" @@ -319,12 +320,17 @@ " -j, --joystick NUM Usar o joystick NUM (omissão: 0)\n" " --joymap XAXIS:YAXIS:A:B:START\n" " Define como os botões e eixos devem ser mapeados\n" -" --leveleditor Abre o editor de nÃveis num dado ficheiro (e apenas quando um é fornecido.)\n" -" -d, --datadir DIR Carregar os dados do jogo do DIR (omissão: automático)\n" -" --debug-mode Activa o modo de depuração, que é útil para programadores.\n" -" --help Mostra um texto de ajuda com os sumários da linha de comando\n" +" --leveleditor Abre o editor de nÃveis num dado ficheiro (e apenas " +"quando um é fornecido.)\n" +" -d, --datadir DIR Carregar os dados do jogo do DIR (omissão: " +"automático)\n" +" --debug-mode Activa o modo de depuração, que é útil para " +"programadores.\n" +" --help Mostra um texto de ajuda com os sumários da linha de " +"comando\n" " opções, licença e contolos do jogo.\n" -" --usage Mostra uma breve listagem das opções via a linha de comandos.\n" +" --usage Mostra uma breve listagem das opções via a linha de " +"comandos.\n" " --version Mostra a versão do SuperTux que está a correr.\n" "\n" @@ -335,7 +341,8 @@ "debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n" msgstr "" "Uso: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" -"debug-mode] | [--usage | --help | --version] [--leveleditor] NOME_DO_FICHEIRO\n" +"debug-mode] | [--usage | --help | --version] [--leveleditor] " +"NOME_DO_FICHEIRO\n" #: src/title.cpp:276 msgid " SuperTux " @@ -365,4 +372,3 @@ #: src/worldmap.cpp:724 msgid "GAMEOVER" msgstr "FIM DO JOGO" - Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- es.po 3 Jun 2004 22:10:32 -0000 1.2 +++ es.po 7 Jun 2004 19:21:18 -0000 1.3 @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: es\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-03 22:58+0100\n" "PO-Revision-Date: 2004-06-03 22:29+0200\n" "Last-Translator: Javier Beaumont <de...@zi...>\n" @@ -15,6 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: sup...@li...\n" "X-Generator: KBabel 1.3.1\n" #: src/gameloop.cpp:163 Index: de.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/de.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- de.po 3 Jun 2004 22:10:32 -0000 1.3 +++ de.po 7 Jun 2004 19:21:06 -0000 1.4 @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" -"Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-03 22:58+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: <ma...@br...>\n" @@ -15,6 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: sup...@li...\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/gameloop.cpp:163 |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-07 19:21:45
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22768 Modified Files: autogen.sh Log Message: added missing 'exceptions.h' and 'gettext.h' to Makefile.am Index: autogen.sh =================================================================== RCS file: /cvsroot/super-tux/supertux/autogen.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- autogen.sh 7 Jun 2004 18:11:10 -0000 1.8 +++ autogen.sh 7 Jun 2004 19:21:03 -0000 1.9 @@ -1,9 +1,9 @@ #!/bin/sh # we need a minimum of automake 1.6 and automake 1.8 seems to be buggy -# this doesn't seem to work, commented out +# this doesn't seem to work well # see AUTOMAKE_OPTIONS in Makefile.am -# export WANT_AUTOMAKE=1.6 +export WANT_AUTOMAKE=1.6 aclocal -I m4 automake --copy --add-missing |
|
From: Duong-Khang N. <neo...@us...> - 2004-06-07 18:12:02
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8234 Modified Files: ChangeLog Makefile.am autogen.sh configure.ac Log Message: added AUTOMAKE_OPTIONS Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- configure.ac 2 Jun 2004 23:00:26 -0000 1.26 +++ configure.ac 7 Jun 2004 18:11:11 -0000 1.27 @@ -14,7 +14,7 @@ AC_INIT(SuperTux, 0.1.1) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(dist-bzip2) +AM_INIT_AUTOMAKE SDL_VERSION=1.2.4 Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 3 Jun 2004 11:27:19 -0000 1.6 +++ Makefile.am 7 Jun 2004 18:11:09 -0000 1.7 @@ -1,3 +1,4 @@ SUBDIRS = intl m4 src data po -EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs config.rpath config.rpath LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh +EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = 1.6 dist-bzip2 Index: autogen.sh =================================================================== RCS file: /cvsroot/super-tux/supertux/autogen.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- autogen.sh 3 Jun 2004 11:27:19 -0000 1.7 +++ autogen.sh 7 Jun 2004 18:11:10 -0000 1.8 @@ -1,7 +1,9 @@ #!/bin/sh # we need a minimum of automake 1.6 and automake 1.8 seems to be buggy -export WANT_AUTOMAKE=1.6 +# this doesn't seem to work, commented out +# see AUTOMAKE_OPTIONS in Makefile.am +# export WANT_AUTOMAKE=1.6 aclocal -I m4 automake --copy --add-missing Index: ChangeLog =================================================================== RCS file: /cvsroot/super-tux/supertux/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChangeLog 3 Jun 2004 11:27:19 -0000 1.7 +++ ChangeLog 7 Jun 2004 18:11:02 -0000 1.8 @@ -1,3 +1,8 @@ +2004-06-07 neoneurone <neo...@us...> + + * Makefile.am, configure.ac, autogen.sh: minor changes + for using automake version 1.6 + 2004-06-02 gettextize <bug...@gn...> * Makefile.am (SUBDIRS): Add intl, |
|
From: Marek M. <wa...@us...> - 2004-06-07 15:33:08
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6146/src Modified Files: player.cpp Log Message: Tweaked the buttstomp range - now it kills only enemies that are close to Tux on the same height level. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 --- player.cpp 7 Jun 2004 15:13:52 -0000 1.137 +++ player.cpp 7 Jun 2004 15:32:58 -0000 1.138 @@ -528,8 +528,9 @@ BadGuy* badguy = dynamic_cast<BadGuy*> (*i); if(badguy) { - if (fabsf(base.x - badguy->base.x) < 300 && - fabsf(base.y - badguy->base.y) < 300 && + + if (fabsf(base.x - badguy->base.x) < 150 && + fabsf(base.y - badguy->base.y) < 60 && (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) || issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height))) badguy->kill_me(25); |
|
From: Marek M. <wa...@us...> - 2004-06-07 15:14:03
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2205/src Modified Files: player.cpp Log Message: Just a small fix to prevent Tux from butt-jumping when ducked. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 --- player.cpp 4 Jun 2004 14:03:06 -0000 1.136 +++ player.cpp 7 Jun 2004 15:13:52 -0000 1.137 @@ -496,7 +496,7 @@ /* In case the player has pressed Down while in a certain range of air, enable butt jump action */ - if (input.down == DOWN && !butt_jump) + if (input.down == DOWN && !butt_jump && !duck) if(tiles_on_air(TILES_FOR_BUTTJUMP) && jumping) butt_jump = true; |
|
From: Matze B. <mat...@us...> - 2004-06-07 12:53:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3372 Modified Files: Makefile.am Log Message: this hopefully fixes macosx problems Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Makefile.am 2 Jun 2004 23:00:26 -0000 1.33 +++ Makefile.am 7 Jun 2004 12:52:57 -0000 1.34 @@ -2,6 +2,7 @@ bin_PROGRAMS = supertux supertux_CXXFLAGS = -DLOCALEDIR=\"$(localedir)\" +supertux_LDADD = @LIBINTL@ supertux_SOURCES = \ screen/drawing_context.h \ |
248 messages has been excluded from this view by a project administrator.
