super-tux-commit Mailing List for Super Tux (Page 41)
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-08-08 09:43:01
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17100/data/levels/world1 Modified Files: level12.stl level13.stl Log Message: fixed some visible blank tiles in the levels There are more invalid tile id's; does anyone know where they come from?? Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level12.stl 15 Jul 2004 19:47:32 -0000 1.16 +++ level12.stl 8 Aug 2004 09:42:50 -0000 1.17 @@ -40,7 +40,7 @@ 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 13 15 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 113 51 52 51 52 51 52 51 52 51 52 114 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 15 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 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 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 15 0 0 0 0 48 0 0 0 0 13 14 14 14 14 14 14 14 14 14 15 0 0 0 16 17 18 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 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 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 51 52 0 0 0 51 52 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 48 51 52 0 0 0 51 52 0 0 0 51 52 50 49 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 20 14 14 14 14 14 14 14 14 14 14 23 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 19 11 11 12 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 30 17 17 18 0 0 0 0 0 0 0 0 0 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 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 48 0 0 0 0 10 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 10 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 19 11 11 11 11 11 11 11 11 11 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 50 49 0 0 0 50 49 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 48 48 50 49 0 0 0 50 49 0 0 0 50 49 51 52 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 16 17 17 18 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 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 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 48 0 0 0 0 16 17 17 17 17 17 17 17 17 17 18 0 0 0 0 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 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 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 51 52 0 0 0 51 52 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 48 48 51 52 0 0 0 51 52 0 0 0 51 52 50 49 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 16 17 17 18 0 0 16 17 17 18 0 0 16 17 17 18 0 0 16 17 17 18 0 0 189 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 18 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 50 49 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 50 49 0 0 0 50 49 0 0 0 50 49 51 52 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 + 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 16 17 17 18 0 0 16 17 17 18 0 0 16 17 17 18 0 0 16 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 18 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 50 49 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 50 49 0 0 0 50 49 0 0 0 50 49 51 52 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 0 0 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 51 52 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 51 52 0 0 0 51 52 0 0 0 51 52 48 48 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ) Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level13.stl 15 Jul 2004 19:47:32 -0000 1.17 +++ level13.stl 8 Aug 2004 09:42:50 -0000 1.18 @@ -62,7 +62,7 @@ 0 0 0 25 0 8 8 109 110 111 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 122 123 0 124 125 0 122 123 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 0 0 124 125 0 124 125 0 0 122 123 0 124 125 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 122 123 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 122 123 0 0 0 24 0 0 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 109 110 111 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 122 123 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 122 123 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 197 197 197 197 197 197 197 197 197 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 124 125 0 124 125 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 124 125 195 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 124 125 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) |
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16615/data/images/tilesets Modified Files: Tag: supertux_0_1_1_branch supertux.stgt water.png waves-0.png waves-1.png waves-2.png Added Files: Tag: supertux_0_1_1_branch waterfall0-0-0.png waterfall0-0-1.png waterfall0-0-2.png waterfall0-1-0.png waterfall0-1-1.png waterfall0-1-2.png waterfall0-2-0.png waterfall0-2-1.png waterfall0-2-2.png waterfall1-0-0.png waterfall1-0-1.png waterfall1-0-2.png waterfall1-1-1.png waterfall1-1-2.png waterfall1-1-3.png waterfall1-1-4.png waterfall1-2-1.png waterfall1-2-2.png waterfall1-2-3.png waterfall1-2-4.png waterfall1-3-1.png waterfall1-3-2.png waterfall1-3-3.png waterfall1-3-4.png waterfall1-4-1.png waterfall1-4-2.png waterfall1-4-3.png waterfall1-4-4.png waterfall1-5-0.png waterfall1-5-1.png waterfall1-5-2.png waterfall2-1-1.png waterfall2-1-2.png waterfall2-1-3.png waterfall2-1-4.png waterfall2-2-1.png waterfall2-2-2.png waterfall2-2-3.png waterfall2-2-4.png waterfall2-3-1.png waterfall2-3-2.png waterfall2-3-3.png waterfall2-3-4.png waterfall2-4-1.png waterfall2-4-2.png waterfall2-4-3.png waterfall2-4-4.png waterfall3-1-1.png waterfall3-1-2.png waterfall3-1-3.png waterfall3-1-4.png waterfall3-2-1.png waterfall3-2-2.png waterfall3-2-3.png waterfall3-2-4.png waterfall3-3-1.png waterfall3-3-2.png waterfall3-3-3.png waterfall3-3-4.png waterfall3-4-1.png waterfall3-4-2.png waterfall3-4-3.png waterfall3-4-4.png waterfall4-1-1.png waterfall4-1-2.png waterfall4-1-3.png waterfall4-1-4.png waterfall4-2-1.png waterfall4-2-2.png waterfall4-2-3.png waterfall4-2-4.png waterfall4-3-1.png waterfall4-3-2.png waterfall4-3-3.png waterfall4-3-4.png waterfall4-4-1.png waterfall4-4-2.png waterfall4-4-3.png waterfall4-4-4.png waterfall5-1-1.png waterfall5-1-2.png waterfall5-1-3.png waterfall5-1-4.png waterfall5-2-1.png waterfall5-2-2.png waterfall5-2-3.png waterfall5-2-4.png waterfall5-3-1.png waterfall5-3-2.png waterfall5-3-3.png waterfall5-3-4.png waterfall5-4-1.png waterfall5-4-2.png waterfall5-4-3.png waterfall5-4-4.png Log Message: added unDEFER's water and waterfall tiles and used them in wansti-level1 --- NEW FILE: waterfall5-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-0.png --- (This appears to be a binary file; contents omitted.) Index: water.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/water.png,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 Binary files /tmp/cvsaRVFc9 and /tmp/cvssm4NMf differ --- NEW FILE: waterfall5-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-2-3.png --- (This appears to be a binary file; contents omitted.) Index: waves-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-2.png,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 Binary files /tmp/cvscyrNWd and /tmp/cvsvyJYzk differ --- NEW FILE: waterfall2-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-4.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -d -r1.28.2.1 -r1.28.2.2 --- supertux.stgt 1 Aug 2004 18:38:38 -0000 1.28.2.1 +++ supertux.stgt 8 Aug 2004 09:39:20 -0000 1.28.2.2 @@ -15,7 +15,8 @@ (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 136 137 138 139 81 173 174)) (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60)) (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) - (tile (id 0) + (tilegroup (name "WaterFall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199)) + (tile (id 0) (images "notile.png")) (tile (id 1) @@ -506,6 +507,112 @@ (water #t) (anim-speed 120)) - ) - + ;; WaterFall + (tile (id 175) + (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 176) + (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 177) + (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 178) + (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 179) + (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 180) + (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 181) + (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 182) + (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 183) + (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 184) + (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 185) + (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 186) + (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 187) + (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 188) + (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 189) + (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 190) + (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 191) + (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 192) + (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 193) + (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 194) + (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 195) + (images "waterfall1-0-0.png" "waterfall1-0-1.png" "waterfall1-0-2.png") + (water #t) + (anim-speed 50)) + (tile (id 196) + (images "waterfall1-5-0.png" "waterfall1-5-1.png" "waterfall1-5-2.png") + (water #t) + (anim-speed 50)) + (tile (id 197) + (images "waterfall0-0-0.png" "waterfall0-0-1.png" "waterfall0-0-2.png") + (water #t) + (anim-speed 50)) + (tile (id 198) + (images "waterfall0-1-0.png" "waterfall0-1-1.png" "waterfall0-1-2.png") + (water #t) + (anim-speed 50)) + (tile (id 199) + (images "waterfall0-2-0.png" "waterfall0-2-1.png" "waterfall0-2-2.png") + (water #t) + (anim-speed 50)) + + ) --- NEW FILE: waterfall3-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-1.png --- (This appears to be a binary file; contents omitted.) Index: waves-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-1.png,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 Binary files /tmp/cvssyTNAi and /tmp/cvsj7ZGlp differ --- NEW FILE: waterfall4-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-1.png --- (This appears to be a binary file; contents omitted.) Index: waves-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-0.png,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 Binary files /tmp/cvsPLa7Qp and /tmp/cvsz9jKGw differ --- NEW FILE: waterfall4-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-2-4.png --- (This appears to be a binary file; contents omitted.) |
|
From: Tobias G. <to...@us...> - 2004-08-07 11:34:50
|
Update of /cvsroot/super-tux/supertux/lib/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4103/lib/gui Modified Files: menu.cpp Log Message: Empty menus shouldn't lead to crashs anymore. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- menu.cpp 5 Aug 2004 14:09:12 -0000 1.10 +++ menu.cpp 7 Aug 2004 11:34:41 -0000 1.11 @@ -770,7 +770,7 @@ /* An International Character. */ } - if(item[active_item].kind == MN_CONTROLFIELD_KB) + if(item.size() > 0 && item[active_item].kind == MN_CONTROLFIELD_KB) { if(key == SDLK_ESCAPE) { @@ -798,7 +798,7 @@ menuaction = MENU_ACTION_RIGHT; break; case SDLK_SPACE: - if(item[active_item].kind == MN_TEXTFIELD) + if(item.size() > 0 && item[active_item].kind == MN_TEXTFIELD) { menuaction = MENU_ACTION_INPUT; mn_input_char = ' '; @@ -848,7 +848,7 @@ } break; case SDL_JOYBUTTONDOWN: - if (item[active_item].kind == MN_CONTROLFIELD_JS) + if (item.size() > 0 && item[active_item].kind == MN_CONTROLFIELD_JS) { // FIXME: This next line does nothing useable, right? // *item[active_item].int_p = key; |
|
From: Marek M. <wa...@us...> - 2004-08-06 21:29:19
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18110/data/levels/default Modified Files: Tag: supertux_0_1_1_branch bonusisland.stwm Log Message: put two new levels (and level-templates) on the map (plus, I changed level numbers again) The world map of Bonus Island, as it is with this commit, is CONSIDERED FINAL So, if there are no objections, this is what Bonus Island will look like in 0.1.2 Index: bonusisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/Attic/bonusisland.stwm,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -u -d -r1.1.2.15 -r1.1.2.16 --- bonusisland.stwm 3 Aug 2004 15:33:52 -0000 1.1.2.15 +++ bonusisland.stwm 6 Aug 2004 21:29:06 -0000 1.1.2.16 @@ -13,7 +13,7 @@ 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 11 16 16 16 16 16 16 22 19 19 23 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 22 19 19 19 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 15 48 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 66 40 46 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 - 15 47 20 18 18 18 21 19 20 18 18 18 18 18 18 18 18 18 21 19 19 19 19 19 19 19 19 19 19 19 19 19 19 19 19 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 + 15 47 20 18 18 18 21 19 20 18 18 18 18 18 18 18 18 18 21 19 19 19 19 19 19 19 19 19 19 19 19 19 19 19 60 47 60 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 15 47 17 9 9 9 14 18 13 9 9 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 15 47 17 9 9 9 9 9 9 9 9 9 11 16 16 16 16 16 22 47 20 18 18 21 19 48 40 40 40 40 40 40 40 40 40 45 40 40 40 39 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 15 47 17 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 @@ -87,28 +87,34 @@ (x 46) (y 15)) (level (name "bonus1/wansti-level1.stl") - (x 59) + (x 59) (y 15)) (level (name "bonus1/wansti-level2.stl") - (x 55) - (y 19)) + (x 61) + (y 17)) (level (name "bonus1/wansti-level3.stl") (x 60) (y 21)) + (level (name "bonus1/wansti-level4.stl") + (x 55) + (y 19)) (level (name "bonus1/wansti-level5.stl") - (x 57) + (x 58) (y 23)) (level (name "bonus1/bonus-level1.stl") (x 35) - (y 29)) + (y 5)) (level (name "bonus1/bonus-level2.stl") - (x 18) + (x 35) (y 29)) (level (name "bonus1/bonus-level3.stl") + (x 18) + (y 29)) + (level (name "bonus1/bonus-level4.stl") (extro-filename "extro-bonus.txt") (x 35) (y 36)) - (level (name "bonus1/bonus-level4.stl") + (level (name "bonus1/bonus-level5.stl") (x 49) (y 37)) |
|
From: Ricardo C. <rm...@us...> - 2004-08-06 17:38:10
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11401/src Modified Files: tile_manager.cpp Log Message: Replaced insert() by this cleaner way to add entries. Index: tile_manager.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile_manager.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- tile_manager.cpp 5 Aug 2004 19:29:02 -0000 1.5 +++ tile_manager.cpp 6 Aug 2004 17:37:56 -0000 1.6 @@ -80,7 +80,7 @@ continue; }*/ - tiles.insert(std::make_pair(tile_id, tile)); + tiles[tile_id] = tile; } else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) { |
|
From: Tobias G. <to...@us...> - 2004-08-06 12:11:04
|
Update of /cvsroot/super-tux/supertux/lib/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14546/lib/app Modified Files: setup.cpp Log Message: The right (source) data directory should now be found whether you use libtool to link your application against the SuperTux library or not. Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/setup.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- setup.cpp 6 Aug 2004 11:43:08 -0000 1.12 +++ setup.cpp 6 Aug 2004 12:10:54 -0000 1.13 @@ -297,16 +297,21 @@ } else { - std::string exedir = std::string(dirname(exe_file)) + "/"; - - datadir = exedir + "../../data"; // SuperTux run from source dir + std::string exedir = std::string(dirname(exe_file)) + "/"; + + datadir = exedir + "../data"; // SuperTux run from source dir if (access(datadir.c_str(), F_OK) != 0) { + datadir = exedir + "../../data"; //SuperTux run from source dir (with libtool script) + + if (access(datadir.c_str(), F_OK) != 0) + { datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH if (access(datadir.c_str(), F_OK) != 0) { // If all fails, fall back to compiled path datadir = DATA_PREFIX; } + } } } #else |
|
From: Tobias G. <to...@us...> - 2004-08-06 11:43:27
|
Update of /cvsroot/super-tux/supertux/lib/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10574/lib/app Modified Files: globals.cpp globals.h setup.cpp setup.h Log Message: Converted many char*s to std::strings. This is providing more safety from buffer overflows and anyway more straightforward string handling. Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/setup.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- setup.cpp 6 Aug 2004 01:36:47 -0000 1.11 +++ setup.cpp 6 Aug 2004 11:43:08 -0000 1.12 @@ -65,10 +65,10 @@ void usage(char * prog, int ret); /* Does the given file exist and is it accessible? */ -int FileSystem::faccessible(const char *filename) +int FileSystem::faccessible(const std::string& filename) { struct stat filestat; - if (stat(filename, &filestat) == -1) + if (stat(filename.c_str(), &filestat) == -1) { return false; } @@ -82,10 +82,10 @@ } /* Can we write to this location? */ -int FileSystem::fwriteable(const char *filename) +int FileSystem::fwriteable(const std::string& filename) { FILE* fi; - fi = fopen(filename, "wa"); + fi = fopen(filename.c_str(), "wa"); if (fi == NULL) { return false; @@ -94,14 +94,13 @@ } /* Makes sure a directory is created in either the SuperTux home directory or the SuperTux base directory.*/ -int FileSystem::fcreatedir(const char* relative_dir) +int FileSystem::fcreatedir(const std::string& relative_dir) { - char path[1024]; - snprintf(path, 1024, "%s/%s/", st_dir, relative_dir); - if(mkdir(path,0755) != 0) + std::string path = st_dir + "/" + relative_dir + "/"; + if(mkdir(path.c_str(),0755) != 0) { - snprintf(path, 1024, "%s/%s/", datadir.c_str(), relative_dir); - if(mkdir(path,0755) != 0) + path = datadir + "/" + relative_dir + "/"; + if(mkdir(path.c_str(),0755) != 0) { return false; } @@ -119,29 +118,28 @@ /* Get all names of sub-directories in a certain directory. */ /* Returns the number of sub-directories found. */ /* Note: The user has to free the allocated space. */ -std::set<std::string> FileSystem::dsubdirs(const char *rel_path,const char* expected_file) +std::set<std::string> FileSystem::dsubdirs(const std::string &rel_path,const std::string& expected_file) { DIR *dirStructP; struct dirent *direntp; std::set<std::string> sdirs; - char filename[1024]; - char path[1024]; + std::string filename; + std::string path = st_dir + "/" + rel_path; - sprintf(path,"%s/%s",st_dir,rel_path); - if((dirStructP = opendir(path)) != NULL) + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISDIR(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISDIR(buf.st_mode)) { - if(expected_file != NULL) + if(!expected_file.empty()) { - sprintf(filename,"%s/%s/%s",path,direntp->d_name,expected_file); + filename = path + "/" + direntp->d_name + "/" + expected_file; if(!faccessible(filename)) continue; } @@ -152,29 +150,29 @@ closedir(dirStructP); } - sprintf(path,"%s/%s",datadir.c_str(),rel_path); - if((dirStructP = opendir(path)) != NULL) + path = datadir + "/" + rel_path; + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISDIR(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISDIR(buf.st_mode)) { - if(expected_file != NULL) + if(!expected_file.empty()) { - sprintf(filename,"%s/%s/%s",path,direntp->d_name,expected_file); - if(!faccessible(filename)) + filename = path + "/" + direntp->d_name + "/" + expected_file; + if(!faccessible(filename.c_str())) { continue; } else { - sprintf(filename,"%s/%s/%s/%s",st_dir,rel_path,direntp->d_name,expected_file); - if(faccessible(filename)) + filename = st_dir + "/" + rel_path + "/" + direntp->d_name + "/" + expected_file; + if(faccessible(filename.c_str())) continue; } } @@ -188,32 +186,31 @@ return sdirs; } -std::set<std::string> FileSystem::dfiles(const char *rel_path, const char* glob, const char* exception_str) +std::set<std::string> FileSystem::dfiles(const std::string& rel_path, const std::string& glob, const std::string& exception_str) { DIR *dirStructP; struct dirent *direntp; std::set<std::string> sdirs; - char path[1024]; + std::string path = st_dir + "/" + rel_path; - sprintf(path,"%s/%s",st_dir,rel_path); - if((dirStructP = opendir(path)) != NULL) + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISREG(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode)) { - if(exception_str != NULL) + if(!exception_str.empty()) { - if(strstr(direntp->d_name,exception_str) != NULL) + if(strstr(direntp->d_name,exception_str.c_str()) != NULL) continue; } - if(glob != NULL) - if(strstr(direntp->d_name,glob) == NULL) + if(!glob.empty()) + if(strstr(direntp->d_name,glob.c_str()) == NULL) continue; sdirs.insert(direntp->d_name); @@ -222,25 +219,25 @@ closedir(dirStructP); } - sprintf(path,"%s/%s",datadir.c_str(),rel_path); - if((dirStructP = opendir(path)) != NULL) + path = datadir + "/" + rel_path; + if((dirStructP = opendir(path.c_str())) != NULL) { while((direntp = readdir(dirStructP)) != NULL) { - char absolute_filename[1024]; + std::string absolute_filename; struct stat buf; - sprintf(absolute_filename, "%s/%s", path, direntp->d_name); + absolute_filename = path + "/" + direntp->d_name; - if (stat(absolute_filename, &buf) == 0 && S_ISREG(buf.st_mode)) + if (stat(absolute_filename.c_str(), &buf) == 0 && S_ISREG(buf.st_mode)) { - if(exception_str != NULL) + if(!exception_str.empty()) { - if(strstr(direntp->d_name,exception_str) != NULL) + if(strstr(direntp->d_name,exception_str.c_str()) != NULL) continue; } - if(glob != NULL) - if(strstr(direntp->d_name,glob) == NULL) + if(!glob.empty()) + if(strstr(direntp->d_name,glob.c_str()) == NULL) continue; sdirs.insert(direntp->d_name); @@ -263,8 +260,7 @@ /* Set SuperTux configuration and save directories */ void Setup::directories(void) { - char *home; - char str[1024]; + std::string home; /* Get home directory (from $HOME variable)... if we can't determine it, use the current directory ("."): */ if (getenv("HOME") != NULL) @@ -272,30 +268,21 @@ else home = "."; - std::string st_dir_tmp = "/." + package_symbol_name; - st_dir = (char *) malloc(sizeof(char) * (strlen(home) + - strlen(st_dir_tmp.c_str()) + 1)); - strcpy(st_dir, home); - strcat(st_dir,st_dir_tmp.c_str()); + st_dir = home + "/." + package_symbol_name; /* Remove .supertux config-file from old SuperTux versions */ if(FileSystem::faccessible(st_dir)) { - remove - (st_dir); + remove(st_dir.c_str()); } - st_save_dir = (char *) malloc(sizeof(char) * (strlen(st_dir) + strlen("/save") + 1)); - - strcpy(st_save_dir,st_dir); - strcat(st_save_dir,"/save"); + st_save_dir = st_dir + "/save"; /* Create them. In the case they exist they won't destroy anything. */ - mkdir(st_dir, 0755); - mkdir(st_save_dir, 0755); + mkdir(st_dir.c_str(), 0755); + mkdir(st_save_dir.c_str(), 0755); - sprintf(str, "%s/levels", st_dir); - mkdir(str, 0755); + mkdir((st_dir + "/levels").c_str(), 0755); // User has not that a datadir, so we try some magic if (datadir.empty()) Index: globals.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/globals.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- globals.cpp 28 Jul 2004 21:47:43 -0000 1.7 +++ globals.cpp 6 Aug 2004 11:43:07 -0000 1.8 @@ -58,7 +58,7 @@ bool flip_levels_mode = false; /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */ -char *st_dir, *st_save_dir; +std::string st_dir, st_save_dir; SDL_Joystick * js; Index: setup.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/setup.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- setup.h 27 Jul 2004 19:31:37 -0000 1.7 +++ setup.h 6 Aug 2004 11:43:08 -0000 1.8 @@ -31,12 +31,12 @@ /// File system utility functions struct FileSystem { - static int faccessible(const char *filename); - static int fcreatedir(const char* relative_dir); - static int fwriteable(const char *filename); + static int faccessible(const std::string& filename); + static int fcreatedir(const std::string& relative_dir); + static int fwriteable(const std::string& filename); static std::set<std::string> read_directory(const std::string& pathname); - static std::set<std::string> dsubdirs(const char *rel_path, const char* expected_file); - static std::set<std::string> dfiles(const char *rel_path, const char* glob, const char* exception_str); + static std::set<std::string> dsubdirs(const std::string& rel_path, const std::string& expected_file); + static std::set<std::string> dfiles(const std::string& rel_path, const std::string& glob, const std::string& exception_str); }; /// All you need to get an application up and running Index: globals.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/globals.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- globals.h 28 Jul 2004 21:47:43 -0000 1.7 +++ globals.h 6 Aug 2004 11:43:08 -0000 1.8 @@ -72,8 +72,8 @@ extern bool flip_levels_mode; /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */ - extern char* st_dir; - extern char* st_save_dir; + extern std::string st_dir; + extern std::string st_save_dir; extern SDL_Joystick * js; |
|
From: Tobias G. <to...@us...> - 2004-08-06 11:43:27
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10574/src Modified Files: gameloop.cpp level_subset.cpp leveleditor.cpp title.cpp Log Message: Converted many char*s to std::strings. This is providing more safety from buffer overflows and anyway more straightforward string handling. Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- gameloop.cpp 28 Jul 2004 23:06:12 -0000 1.164 +++ gameloop.cpp 6 Aug 2004 11:43:09 -0000 1.165 @@ -20,6 +20,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <iostream> +#include <sstream> #include <cassert> #include <cstdio> #include <cstdlib> @@ -799,12 +800,14 @@ std::string slotinfo(int slot) { - char tmp[1024]; - char slotfile[1024]; + std::string tmp; + std::string slotfile; std::string title; - sprintf(slotfile,"%s/slot%d.stsg",st_save_dir,slot); + std::stringstream stream; + stream << slot; + slotfile = st_save_dir + "/slot" + stream.str() + ".stsg"; - lisp_object_t* savegame = lisp_read_from_file(slotfile); + lisp_object_t* savegame = lisp_read_from_file(slotfile.c_str()); if (savegame) { LispReader reader(lisp_cdr(savegame)); @@ -812,15 +815,15 @@ lisp_free(savegame); } - if (access(slotfile, F_OK) == 0) + if (access(slotfile.c_str(), F_OK) == 0) { if (!title.empty()) - snprintf(tmp,1024,"Slot %d - %s",slot, title.c_str()); + tmp = "Slot " + stream.str() + " - " + title; else - snprintf(tmp, 1024,_("Slot %d - Savegame"),slot); + tmp = "Slot " + stream.str() + " - Savegame"; } else - sprintf(tmp,_("Slot %d - Free"),slot); + tmp = std::string(_("Slot")) + " " + stream.str() + " - " + std::string(_("Free")); return tmp; } @@ -831,10 +834,11 @@ if(slot != -1 && load_game_menu->get_item_by_id(slot).kind == MN_ACTION) { - char slotfile[1024]; - snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot); + std::stringstream stream; + stream << slot; + std::string slotfile = st_save_dir + "/slot" + stream.str() + ".stsg"; - if (access(slotfile, F_OK) != 0) + if (access(slotfile.c_str(), F_OK) != 0) { draw_intro(); } Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- title.cpp 29 Jul 2004 11:05:28 -0000 1.115 +++ title.cpp 6 Aug 2004 11:43:10 -0000 1.116 @@ -20,6 +20,7 @@ // 02111-1307, USA. #include <iostream> +#include <sstream> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -279,7 +280,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 = FileSystem::dfiles("levels/worldmap", NULL, "icyisland.stwm"); + worldmap_list = FileSystem::dfiles("levels/worldmap", "", "icyisland.stwm"); titlesession->get_current_sector()->activate(); titlesession->set_current(); @@ -379,14 +380,15 @@ if(event.key.keysym.sym == SDLK_DELETE) { int slot = menu->get_active_item_id(); - char str[1024]; - sprintf(str,_("Are you sure you want to delete slot %d?"), slot); + std::stringstream stream; + stream << slot; + std::string str = _("Are you sure you want to delete slot") + stream.str() + "?"; - if(confirm_dialog(bkg_title, str)) + if(confirm_dialog(bkg_title, str.c_str())) { - sprintf(str,"%s/slot%d.stsg", st_save_dir, slot); - printf("Removing: %s\n",str); - remove(str); + str = st_save_dir + "/slot" + stream.str() + ".stsg"; + printf("Removing: %s\n",str.c_str()); + remove(str.c_str()); } update_load_save_game_menu(load_game_menu); Index: level_subset.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level_subset.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level_subset.cpp 28 Jul 2004 23:47:54 -0000 1.9 +++ level_subset.cpp 6 Aug 2004 11:43:09 -0000 1.10 @@ -82,16 +82,16 @@ // Check in which directory our subset is located (ie. ~/.supertux/ // or SUPERTUX_DATADIR) - char filename[1024]; - snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset); - if (access(filename, R_OK) == 0) + std::string filename; + filename = st_dir + "/levels/" + subset + "/"; + if (access(filename.c_str(), R_OK) == 0) { directory = filename; } else { - snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset); - if (access(filename, R_OK) == 0) + filename = datadir + "/levels/" + subset + "/"; + if (access(filename.c_str(), R_OK) == 0) directory = filename; else std::cout << "Error: LevelSubset: couldn't find subset: " << subset << std::endl; @@ -104,14 +104,14 @@ // directory to see what we can find std::set<std::string> files; - snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset); - if(access(filename, R_OK) == 0) + filename = st_dir + "/levels/" + subset + "/"; + if(access(filename.c_str(), R_OK) == 0) { files = FileSystem::read_directory(filename); } else { - snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset); + filename = datadir + "/levels/" + subset + "/"; files = FileSystem::read_directory(filename); } Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.147 retrieving revision 1.148 diff -u -d -r1.147 -r1.148 --- leveleditor.cpp 5 Aug 2004 18:58:08 -0000 1.147 +++ leveleditor.cpp 6 Aug 2004 11:43:09 -0000 1.148 @@ -544,8 +544,8 @@ level_settings_menu->get_item_by_id(MNID_NAME).change_input(le_level->name.c_str()); level_settings_menu->get_item_by_id(MNID_AUTHOR).change_input(le_level->author.c_str()); - level_settings_menu->get_item_by_id(MNID_SONG).list.first = FileSystem::dfiles("music/",NULL, "-fast"); - level_settings_menu->get_item_by_id(MNID_BGIMG).list.first = FileSystem::dfiles("images/background",NULL, NULL); + level_settings_menu->get_item_by_id(MNID_SONG).list.first = FileSystem::dfiles("music/","", "-fast"); + level_settings_menu->get_item_by_id(MNID_BGIMG).list.first = FileSystem::dfiles("images/background","", ""); level_settings_menu->get_item_by_id(MNID_BGIMG).list.first.insert(""); level_settings_menu->get_item_by_id(MNID_PARTICLE).list.first.insert(""); level_settings_menu->get_item_by_id(MNID_PARTICLE).list.first.insert("snow"); |
|
From: Tobias G. <to...@us...> - 2004-08-06 11:43:26
|
Update of /cvsroot/super-tux/supertux/lib/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10574/lib/utils Modified Files: configfile.cpp configfile.h Log Message: Converted many char*s to std::strings. This is providing more safety from buffer overflows and anyway more straightforward string handling. Index: configfile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/utils/configfile.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- configfile.h 25 Jul 2004 19:03:35 -0000 1.4 +++ configfile.h 6 Aug 2004 11:43:08 -0000 1.5 @@ -24,7 +24,7 @@ namespace SuperTux { -FILE * opendata(const char * filename, const char * mode); +FILE * opendata(const std::string& filename, const char * mode); class Config { public: Index: configfile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/utils/configfile.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- configfile.cpp 27 Jul 2004 19:31:38 -0000 1.6 +++ configfile.cpp 6 Aug 2004 11:43:08 -0000 1.7 @@ -49,32 +49,25 @@ SoundManager::get()->enable_music(true); } -FILE * SuperTux::opendata(const char * rel_filename, const char * mode) +FILE * SuperTux::opendata(const std::string& rel_filename, const char *mode) { - char * filename = NULL; + std::string filename; FILE * fi; - filename = (char *) malloc(sizeof(char) * (strlen(st_dir) + - strlen(rel_filename) + 1)); - - strcpy(filename, st_dir); - /* Open the high score file: */ - - strcat(filename, rel_filename); + filename = st_dir + rel_filename; /* Try opening the file: */ - fi = fopen(filename, mode); + fi = fopen(filename.c_str(), mode); if (fi == NULL) { - fprintf(stderr, "Warning: Unable to open the file \"%s\" ", filename); + fprintf(stderr, "Warning: Unable to open the file \"%s\" ", filename.c_str()); if (strcmp(mode, "r") == 0) fprintf(stderr, "for read!!!\n"); else if (strcmp(mode, "w") == 0) fprintf(stderr, "for write!!!\n"); } - free( filename ); return(fi); } |
|
From: Ryan F. <sik...@us...> - 2004-08-06 01:36:56
|
Update of /cvsroot/super-tux/supertux/lib/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31673/lib/app Modified Files: setup.cpp Log Message: - fixed search path for datadir Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/setup.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- setup.cpp 28 Jul 2004 21:47:43 -0000 1.10 +++ setup.cpp 6 Aug 2004 01:36:47 -0000 1.11 @@ -312,7 +312,7 @@ { std::string exedir = std::string(dirname(exe_file)) + "/"; - datadir = exedir + "../data"; // SuperTux run from source dir + datadir = exedir + "../../data"; // SuperTux run from source dir if (access(datadir.c_str(), F_OK) != 0) { datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH |
|
From: Tobias G. <to...@us...> - 2004-08-05 20:11:39
|
Update of /cvsroot/super-tux/supertux/lib/math In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13651/lib/math Modified Files: vector.h Log Message: Fixed #include introduced by the last commit. In the library all includes have to be in "#include ../libsubdir/foo.h" style, so that the relations between the includes work correctly inside your /usr/(local)/include/ directory as well. Index: vector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/math/vector.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vector.h 5 Aug 2004 10:08:43 -0000 1.4 +++ vector.h 5 Aug 2004 20:11:30 -0000 1.5 @@ -20,7 +20,7 @@ #ifndef SUPERTUX_VECTOR_H #define SUPERTUX_VECTOR_H -#include "special/base.h" +#include "../special/base.h" namespace SuperTux { |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 19:29:10
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5160/src Modified Files: tile_manager.cpp tile_manager.h Log Message: Removed commented code. Index: tile_manager.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile_manager.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- tile_manager.cpp 5 Aug 2004 18:58:08 -0000 1.4 +++ tile_manager.cpp 5 Aug 2004 19:29:02 -0000 1.5 @@ -74,19 +74,13 @@ Tile* tile = new Tile; int tile_id = tile->read(reader); - if(tile_id < 0) { +/* if(tile_id < 0) { std::cerr << "Warning: parse error when reading a tile (id < 0), skipping.\n"; continue; - } + }*/ tiles.insert(std::make_pair(tile_id, tile)); - -/* tile_id += tileset_id; - - if(tile_id >= int(tiles.size())) - tiles.resize(tile_id+1); - tiles[tile_id] = tile;*/ } else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) { @@ -169,19 +163,6 @@ return i->second; } return i->second; - -/* - if(id < tiles.size()) - { - return *tiles[id]; - } - else - { - // Never return 0, but return the 0th tile instead so that - // user code doesn't have to check for NULL pointers all over - // the place - return *tiles[0]; - }*/ } /* EOF */ Index: tile_manager.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile_manager.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tile_manager.h 5 Aug 2004 18:58:08 -0000 1.3 +++ tile_manager.h 5 Aug 2004 19:29:02 -0000 1.4 @@ -45,7 +45,6 @@ TileManager(); ~TileManager(); -// std::vector<Tile*> tiles; typedef std::map<int, Tile*> Tiles; Tiles tiles; |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 18:58:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/src Modified Files: leveleditor.cpp tile_manager.cpp tile_manager.h tilemap.cpp Log Message: Replaced the use of a vector for the tiles placement by a map one. This way, empty tiles are not created, and so, we can now have the organization I posted on the ml. Index: tile_manager.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile_manager.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- tile_manager.h 28 Jun 2004 11:30:27 -0000 1.2 +++ tile_manager.h 5 Aug 2004 18:58:08 -0000 1.3 @@ -24,6 +24,7 @@ #include <set> #include <vector> #include <string> +#include <map> class Tile; @@ -44,7 +45,10 @@ TileManager(); ~TileManager(); - std::vector<Tile*> tiles; +// std::vector<Tile*> tiles; + typedef std::map<int, Tile*> Tiles; + Tiles tiles; + static TileManager* instance_ ; static std::set<TileGroup>* tilegroups_; void load_tileset(std::string filename); @@ -65,20 +69,7 @@ unsigned int total_ids() { return tiles.size(); } - Tile& get(unsigned int id) { - - if(id < tiles.size()) - { - return *tiles[id]; - } - else - { - // Never return 0, but return the 0th tile instead so that - // user code doesn't have to check for NULL pointers all over - // the place - return *tiles[0]; - } - } + Tile* get(unsigned int id); }; #endif Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.146 retrieving revision 1.147 diff -u -d -r1.146 -r1.147 --- leveleditor.cpp 28 Jul 2004 23:06:12 -0000 1.146 +++ leveleditor.cpp 5 Aug 2004 18:58:08 -0000 1.147 @@ -496,7 +496,7 @@ for(std::vector<int>::const_iterator sit = (*it).tiles.begin(); sit != (*it).tiles.end(); ++sit, ++i) { - Tile& tile = TileManager::instance()->get(*sit); +/* Tile& tile = TileManager::instance()->get(*sit); Surface* image; if(tile.editor_images.size() > 0) image = tile.editor_images[0]; @@ -508,7 +508,7 @@ Button* button = new Button(image, it->name, SDLKey(SDLK_a + i), 0, 0, 32, 32); - tilegroups_map[it->name]->additem(button, *sit); + tilegroups_map[it->name]->additem(button, *sit);*/ } } select_tilegroup_menu->additem(MN_HL,"",0,0); Index: tilemap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tilemap.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- tilemap.cpp 20 Jul 2004 18:04:48 -0000 1.17 +++ tilemap.cpp 5 Aug 2004 18:58:08 -0000 1.18 @@ -263,9 +263,9 @@ TileMap::get_tile(int x, int y) const { if(x < 0 || x >= width || y < 0 || y >= height) - return &tilemanager->get(0); + return tilemanager->get(0); - return &tilemanager->get(tiles[y*width + x].id); + return tilemanager->get(tiles[y*width + x].id); } Tile* Index: tile_manager.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile_manager.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tile_manager.cpp 25 Jul 2004 19:03:36 -0000 1.3 +++ tile_manager.cpp 5 Aug 2004 18:58:08 -0000 1.4 @@ -38,9 +38,8 @@ TileManager::~TileManager() { - for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; - } + for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) + delete i->second; delete tilegroups_; } @@ -51,9 +50,8 @@ return; // free old tiles - for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { - delete *i; - } + for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i) + delete i->second; tiles.clear(); lisp_object_t* root_obj = lisp_read_from_file(filename); @@ -78,15 +76,17 @@ int tile_id = tile->read(reader); if(tile_id < 0) { std::cerr - << "Warning: parse error when reading a tile, skipping.\n"; + << "Warning: parse error when reading a tile (id < 0), skipping.\n"; continue; } - tile_id += tileset_id; + tiles.insert(std::make_pair(tile_id, tile)); + +/* tile_id += tileset_id; if(tile_id >= int(tiles.size())) tiles.resize(tile_id+1); - tiles[tile_id] = tile; + tiles[tile_id] = tile;*/ } else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0) { @@ -137,21 +137,51 @@ if(c == 0) return; - Tile& tile = get(c); + Tile* tile = get(c); - if(!tile.images.size()) + if(!tile->images.size()) return; - if(tile.images.size() > 1) + if(tile->images.size() > 1) { size_t frame - = ((global_frame_counter*25) / tile.anim_speed) % tile.images.size(); - context.draw_surface(tile.images[frame], pos, layer); + = ((global_frame_counter*25) / tile->anim_speed) % tile->images.size(); + context.draw_surface(tile->images[frame], pos, layer); } - else if (tile.images.size() == 1) + else if (tile->images.size() == 1) { - context.draw_surface(tile.images[0], pos, layer); + context.draw_surface(tile->images[0], pos, layer); } } +Tile* +TileManager::get(unsigned int id) +{ +Tiles::iterator i = tiles.find(id); + +if(i == tiles.end()) + { + std::cerr << "Warning: Asked for a non-existing tile id. Ignoring.\n"; + // Never return 0, but return the first tile instead so that + // user code doesn't have to check for NULL pointers all over + // the place + i = tiles.begin(); + return i->second; + } +return i->second; + +/* + if(id < tiles.size()) + { + return *tiles[id]; + } + else + { + // Never return 0, but return the 0th tile instead so that + // user code doesn't have to check for NULL pointers all over + // the place + return *tiles[0]; + }*/ +} + /* EOF */ |
|
From: Matze B. <mat...@us...> - 2004-08-05 15:07:11
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8139 Modified Files: Tag: supertux_0_1_1_branch Makefile.am Log Message: added some missing flags, that fix problems when regenerating configure Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/Makefile.am,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- Makefile.am 2 May 2004 23:22:28 -0000 1.5 +++ Makefile.am 5 Aug 2004 15:06:59 -0000 1.5.2.1 @@ -1,5 +1,7 @@ SUBDIRS = src data EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py $(wildcard mk/autoconf/*.m4) autogen.sh +ACLOCAL_AMFLAGS = -I mk/autoconf +AUTOMAKE_OPTIONS = 1.6 dist-bzip2 # EOF # |
|
From: Matze B. <mat...@us...> - 2004-08-05 14:54:18
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6086 Modified Files: Tag: supertux_0_1_1_branch configure.ac Log Message: removed -lGL again. on windows and macosx it's different names. AX_CHECK_GL should detect the correct one anyway and set it to GL_LIBS, if this doesn't work then fix AX_CHECK_GL instead of adding hacks Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -d -r1.23 -r1.23.2.1 --- configure.ac 10 May 2004 23:31:00 -0000 1.23 +++ configure.ac 5 Aug 2004 14:54:09 -0000 1.23.2.1 @@ -88,7 +88,7 @@ else CFLAGS="$CFLAGS $GL_CFLAGS" CXXFLAGS="$CXXFLAGS $GL_CFLAGS" - LIBS="$LIBS $GL_LIBS -lGL" + LIBS="$LIBS $GL_LIBS" fi AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([*** zlib is missing])) |
|
From: Ricardo C. <ri...@ae...> - 2004-08-05 14:14:58
|
I haven't (and will not) look much to the menu code, so I don't know how=20
sucky it is, but just look at this piece of code:
=AB
MenuItem& new_item =3D item[active_item];
if(new_item.kind =3D=3D MN_DEACTIVE ||
new_item.kind =3D=3D MN_LABEL ||
new_item.kind =3D=3D MN_HL)
{
// Skip the horzontal line item
if (menuaction !=3D MENU_ACTION_UP && menuaction !=3D MENU_ACTION_DOWN)
menuaction =3D MENU_ACTION_DOWN;
if (item.size() > 1)
action();
}
menuaction =3D MENU_ACTION_NONE;
if (active_item >=3D int(item.size()))
active_item =3D int(item.size()) - 1;
=BB
What's the point in having this?
if (menuaction !=3D MENU_ACTION_UP && menuaction !=3D MENU_ACTION_DOWN)
menuaction =3D MENU_ACTION_DOWN;
If right after, it is done this:
menuaction =3D MENU_ACTION_NONE;
lol!
And how is the checking of active_item in the end, if there can be a overf=
low=20
before?
Cheers,
Ricardo
Em Quinta, 5 de Agosto de 2004 15:09, o Ricardo Cruz escreveu:
> Update of /cvsroot/super-tux/supertux/lib/gui
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30962/lib/gui
>
> Modified Files:
> menu.cpp
> Log Message:
> When there is no entries in a menu, there is a crash. This delays the cra=
sh
> until an event is triggered. Select a level from Contrib Levels for
> testing. I dunno what changes Tobias made to menu, but I don't think that
> ugly checking for horizontal lines was in there.
>
> Index: menu.cpp
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -d -r1.9 -r1.10
> --- menu.cpp 28 Jul 2004 23:33:23 -0000 1.9
> +++ menu.cpp 5 Aug 2004 14:09:12 -0000 1.10
> @@ -457,17 +457,23 @@
> }
> }
>
> - MenuItem& new_item =3D item[active_item];
> - if(new_item.kind =3D=3D MN_DEACTIVE
> - || new_item.kind =3D=3D MN_LABEL
> - || new_item.kind =3D=3D MN_HL)
> + if(active_item > 0 && active_item < (int)item.size())
> {
> + // FIXME: wtf?! having a hack to avoid horizontal lines...
> + // Elegant solution would be to check for horizontal lines, right
> + // when it was asked to move menu up and down
> + MenuItem& new_item =3D item[active_item];
> + if(new_item.kind =3D=3D MN_DEACTIVE ||
> + new_item.kind =3D=3D MN_LABEL ||
> + new_item.kind =3D=3D MN_HL)
> + {
> // Skip the horzontal line item
> if (menuaction !=3D MENU_ACTION_UP && menuaction !=3D MENU_ACTION_=
DOWN)
> menuaction =3D MENU_ACTION_DOWN;
>
> if (item.size() > 1)
> action();
> + }
> }
>
> menuaction =3D MENU_ACTION_NONE;
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by OSTG. Have you noticed the changes on
> Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
> one more big change to announce. We are now OSTG- Open Source Technology
> Group. Come see the changes on the new OSTG site. www.ostg.com
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit
=2D-=20
You are a fluke of the universe; you have no right to be here.
|
|
From: Marek M. <wa...@us...> - 2004-08-05 14:14:29
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31957/data/levels/world1 Modified Files: Tag: supertux_0_1_1_branch level3.stl Log Message: more work on levels Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- level3.stl 1 May 2004 11:59:49 -0000 1.11 +++ level3.stl 5 Aug 2004 14:14:20 -0000 1.11.2.1 @@ -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 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 85 86 87 88 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 44 44 44 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 133 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 105 105 105 105 105 105 105 105 0 0 0 105 105 105 105 105 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 44 0 44 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 133 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 78 78 78 78 78 78 78 78 0 0 0 78 78 78 78 78 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 83 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 44 0 44 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 133 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 7 8 9 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 44 0 44 0 44 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 114 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 126 0 0 0 0 0 0 0 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 7 8 8 114 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 9 0 0 0 7 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 44 0 44 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 114 23 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 132 132 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 7 8 8 114 14 14 23 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 7 114 14 14 113 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 114 15 0 0 0 13 113 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 0 44 44 44 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 114 23 11 11 11 19 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 132 132 0 0 0 0 0 |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 14:09:21
|
Update of /cvsroot/super-tux/supertux/lib/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30962/lib/gui Modified Files: menu.cpp Log Message: When there is no entries in a menu, there is a crash. This delays the crash until an event is triggered. Select a level from Contrib Levels for testing. I dunno what changes Tobias made to menu, but I don't think that ugly checking for horizontal lines was in there. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- menu.cpp 28 Jul 2004 23:33:23 -0000 1.9 +++ menu.cpp 5 Aug 2004 14:09:12 -0000 1.10 @@ -457,17 +457,23 @@ } } - MenuItem& new_item = item[active_item]; - if(new_item.kind == MN_DEACTIVE - || new_item.kind == MN_LABEL - || new_item.kind == MN_HL) + if(active_item > 0 && active_item < (int)item.size()) { + // FIXME: wtf?! having a hack to avoid horizontal lines... + // Elegant solution would be to check for horizontal lines, right + // when it was asked to move menu up and down + MenuItem& new_item = item[active_item]; + if(new_item.kind == MN_DEACTIVE || + new_item.kind == MN_LABEL || + new_item.kind == MN_HL) + { // Skip the horzontal line item if (menuaction != MENU_ACTION_UP && menuaction != MENU_ACTION_DOWN) menuaction = MENU_ACTION_DOWN; if (item.size() > 1) action(); + } } menuaction = MENU_ACTION_NONE; |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 13:49:30
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27944/src Modified Files: gameobjs.cpp Log Message: Just tweaked the stomp cloud values a little. A destroying animation would fit nicely, if anyone is willing to do it. Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- gameobjs.cpp 5 Aug 2004 10:10:19 -0000 1.44 +++ gameobjs.cpp 5 Aug 2004 13:49:20 -0000 1.45 @@ -418,13 +418,13 @@ SmokeCloud::SmokeCloud(const Vector& pos) : position(pos) { - timer.start(250); + timer.start(300); } void SmokeCloud::action(float elapsed_time) { - position.y -= 2 * elapsed_time; + position.y -= 1.2 * elapsed_time; if(!timer.check()) remove_me(); |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 10:10:38
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25303/src Modified Files: gameobjs.cpp gameobjs.h player.cpp player.h resources.cpp sector.cpp sector.h Log Message: Made the stomp cloud to have an independent movement from Tux by making it a GameObject. Next time, please don't implement it, unless you do it properly. Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- player.h 26 Jul 2004 18:09:13 -0000 1.78 +++ player.h 5 Aug 2004 10:10:19 -0000 1.79 @@ -119,7 +119,6 @@ Sprite* grab_right; Sprite* duck_right; Sprite* duck_left; - Sprite* stomp; }; extern PlayerSprite smalltux; @@ -163,11 +162,8 @@ Timer shooting_timer; // used to show the arm when Tux is shooting Timer dying_timer; Timer growing_timer; - Timer stomp_timer; Physic physic; - Vector stomp_pos; - public: Player(); virtual ~Player(); Index: sector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- sector.h 21 Jul 2004 16:51:53 -0000 1.9 +++ sector.h 5 Aug 2004 10:10:19 -0000 1.10 @@ -45,6 +45,7 @@ class TileMap; class Upgrade; class Bullet; +class SmokeCloud; class BadGuy; class Tile; @@ -102,6 +103,7 @@ void add_upgrade(const Vector& pos, Direction dir, UpgradeKind kind); bool add_bullet(const Vector& pos, float xm, Direction dir); + bool add_smoke_cloud(const Vector& pos); /** Try to grab the coin at the given coordinates */ void trygrabdistro(const Vector& pos, int bounciness); @@ -154,6 +156,7 @@ std::vector<Upgrade*> upgrades; std::vector<Bullet*> bullets; + std::vector<SmokeCloud*> smoke_clouds; public: // ugly typedef std::vector<InteractiveObject*> InteractiveObjects; Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- sector.cpp 25 Jul 2004 19:03:36 -0000 1.18 +++ sector.cpp 5 Aug 2004 10:10:19 -0000 1.19 @@ -423,6 +423,12 @@ std::remove(flying_platforms.begin(), flying_platforms.end(), flying_platform), flying_platforms.end()); } + SmokeCloud* smoke_cloud = dynamic_cast<SmokeCloud*> (*i); + if(smoke_cloud) { + smoke_clouds.erase( + std::remove(smoke_clouds.begin(), smoke_clouds.end(), smoke_cloud), + smoke_clouds.end()); + } delete *i; i = gameobjects.erase(i); @@ -454,6 +460,10 @@ = dynamic_cast<InteractiveObject*> (*i); if(interactive_object) interactive_objects.push_back(interactive_object); + SmokeCloud* smoke_cloud = dynamic_cast<SmokeCloud*> (*i); + if(smoke_cloud) + smoke_clouds.push_back(smoke_cloud); + gameobjects.push_back(*i); } @@ -674,6 +684,13 @@ return true; } +bool +Sector::add_smoke_cloud(const Vector& pos) +{ + add_object(new SmokeCloud(pos)); + return true; +} + /* Break a brick: */ bool Sector::trybreakbrick(const Vector& pos, bool small) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.148 retrieving revision 1.149 diff -u -d -r1.148 -r1.149 --- player.cpp 26 Jul 2004 18:09:13 -0000 1.148 +++ player.cpp 5 Aug 2004 10:10:19 -0000 1.149 @@ -40,7 +40,6 @@ #define TILES_FOR_BUTTJUMP 3 // animation times (in ms): #define SHOOTING_TIME 320 -#define STOMP_TIME 250 // others stuff: #define AUTOSCROLL_DEAD_INTERVAL 300 @@ -118,7 +117,6 @@ can_jump = true; butt_jump = false; - stomp_pos = Vector(0,0); frame_main = 0; frame_ = 0; @@ -510,12 +508,11 @@ // Do butt jump if (butt_jump && on_ground() && size == BIG) { - + // Add a smoke cloud if (duck) - stomp_pos = Vector(base.x - 32, base.y); + Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y)); else - stomp_pos = Vector(base.x - 32, base.y + 32); - stomp_timer.start(STOMP_TIME); + Sector::current()->add_smoke_cloud(Vector(base.x - 32, base.y + 32)); butt_jump = false; @@ -774,10 +771,6 @@ sprite->grab_left->draw(context, pos, LAYER_OBJECTS + 1); } - // Draw stomp clouds when doing a butt jump - if (stomp_timer.check()) - sprite->stomp->draw(context, stomp_pos, LAYER_OBJECTS + 1); - // Draw blinking star overlay if (invincible_timer.started() && (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3)) Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gameobjs.cpp 20 Jul 2004 18:04:47 -0000 1.43 +++ gameobjs.cpp 5 Aug 2004 10:10:19 -0000 1.44 @@ -181,7 +181,7 @@ void Trampoline::draw(DrawingContext& context) { - img_trampoline[frame]->draw(context, Vector(base.x, base.y), LAYER_OBJECTS); + img_trampoline[frame]->draw(context, base, LAYER_OBJECTS); frame = 0; } @@ -336,7 +336,7 @@ void FlyingPlatform::draw(DrawingContext& context) { - img_flying_platform->draw(context, Vector(base.x, base.y), LAYER_OBJECTS); + img_flying_platform->draw(context, base, LAYER_OBJECTS); } void @@ -413,6 +413,29 @@ } } +Sprite *img_smoke_cloud; + +SmokeCloud::SmokeCloud(const Vector& pos) + : position(pos) +{ + timer.start(250); +} + +void +SmokeCloud::action(float elapsed_time) +{ + position.y -= 2 * elapsed_time; + + if(!timer.check()) + remove_me(); +} + +void +SmokeCloud::draw(DrawingContext& context) +{ + img_smoke_cloud->draw(context, position, LAYER_OBJECTS+1); +} + void load_object_gfx() { char sprite_name[16]; @@ -424,4 +447,6 @@ } img_flying_platform = sprite_manager->load("flying_platform"); + + img_smoke_cloud = sprite_manager->load("stomp"); } Index: gameobjs.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- gameobjs.h 21 Jul 2004 16:51:53 -0000 1.31 +++ gameobjs.h 5 Aug 2004 10:10:19 -0000 1.32 @@ -162,6 +162,21 @@ unsigned int frame; }; +extern Sprite *img_smoke_cloud; + +class SmokeCloud : public GameObject +{ +public: + SmokeCloud(const Vector& pos); + + virtual void action(float elapsed_time); + virtual void draw(DrawingContext& context); + +private: + Timer timer; + Vector position; +}; + void load_object_gfx(); #endif Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- resources.cpp 28 Jul 2004 10:48:49 -0000 1.46 +++ resources.cpp 5 Aug 2004 10:10:19 -0000 1.47 @@ -143,7 +143,6 @@ 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"); @@ -159,7 +158,6 @@ 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"); @@ -175,7 +173,6 @@ 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"); @@ -191,8 +188,6 @@ 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: */ img_water = new Surface(datadir + "/images/shared/water.png", false); |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 10:08:52
|
Update of /cvsroot/super-tux/supertux/lib/math In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25085/lib/math Modified Files: vector.h Log Message: Added base_type to vector constructor. This way it is possible to just pass the object's base to draw() and other functions that want Vectors. Index: vector.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/math/vector.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vector.h 21 Jul 2004 16:51:52 -0000 1.3 +++ vector.h 5 Aug 2004 10:08:43 -0000 1.4 @@ -20,6 +20,8 @@ #ifndef SUPERTUX_VECTOR_H #define SUPERTUX_VECTOR_H +#include "special/base.h" + namespace SuperTux { @@ -34,6 +36,9 @@ Vector(const Vector& other) : x(other.x), y(other.y) { } + Vector(const base_type& base) + : x(base.x), y(base.y) + { } Vector() : x(0), y(0) { } |
|
From: Ricardo C. <rm...@us...> - 2004-08-05 10:04:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24599/src Modified Files: Tag: supertux_0_1_1_branch player.cpp Log Message: Bug fix: powerups were going on Tux direction, not based in the bump position. (If there are still problems, we can just disable this thing.) Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.88.2.3 retrieving revision 1.88.2.4 diff -u -d -r1.88.2.3 -r1.88.2.4 --- player.cpp 3 Aug 2004 18:52:48 -0000 1.88.2.3 +++ player.cpp 5 Aug 2004 10:04:17 -0000 1.88.2.4 @@ -228,7 +228,7 @@ World::current()->trygrabdistro(base.x, base.y - 32,BOUNCE); World::current()->trybumpbadguy(base.x, base.y - 64); - World::current()->trybreakbrick(base.x, base.y, size == SMALL, dir); + World::current()->trybreakbrick(base.x, base.y, size == SMALL, RIGHT); bumpbrick(base.x, base.y); World::current()->tryemptybox(base.x, base.y, RIGHT); @@ -241,7 +241,7 @@ World::current()->trybumpbadguy(base.x+ 31, base.y - 64); if(size == BIG) - World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL, dir); + World::current()->trybreakbrick(base.x+ 31, base.y, size == SMALL, LEFT); bumpbrick(base.x+ 31, base.y); World::current()->tryemptybox(base.x+ 31, base.y, LEFT); |
|
From: Marek M. <wa...@us...> - 2004-08-05 08:02:54
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7778/data/images/tilesets Modified Files: coin-8.png Log Message: forgot one image :) Index: coin-8.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-8.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsWCrkYf and /tmp/cvs1mg0wM differ |
|
From: Marek M. <wa...@us...> - 2004-08-05 07:59:08
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6960/data/images/tilesets Modified Files: coin-1.png coin-2.png coin-3.png coin-4.png coin-5.png coin-6.png coin-7.png Log Message: gave the coins another paint job, according to Ingo's suggestions minor fix in level3 Index: coin-5.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-5.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs55mDjU and /tmp/cvsdhKYaD differ Index: coin-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-4.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs7cLI8p and /tmp/cvsitEZk9 differ Index: coin-7.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-7.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsGWJOjM and /tmp/cvs03NQLv differ Index: coin-6.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-6.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs08iECT and /tmp/cvsouks9C differ Index: coin-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsGlQXGX and /tmp/cvsUQRqgH differ Index: coin-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-3.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsDN8ss3 and /tmp/cvszEJb4M differ Index: coin-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/coin-2.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs7cOgNW and /tmp/cvsXY7osG differ |
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7343/data/images/tilesets Modified Files: supertux.stgt Added Files: coin-1.png coin-2.png coin-3.png coin-4.png coin-5.png coin-6.png coin-7.png coin-8.png Log Message: added Ingo's new coin please have a look and decide if you like it :) --- NEW FILE: coin-8.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- supertux.stgt 1 Aug 2004 18:37:10 -0000 1.43 +++ supertux.stgt 4 Aug 2004 17:59:54 -0000 1.44 @@ -145,9 +145,9 @@ (solid #t)) (tile (id 44) - (images "coin1.png" "coin2.png" "coin3.png" "coin2.png") + (images "coin-1.png" "coin-2.png" "coin-3.png" "coin-4.png" "coin-5.png" "coin-6.png" "coin-7.png" "coin-8.png") (distro #t) - (anim-speed 45)) + (anim-speed 50)) (tile (id 45) (images "coin1.png" "coin2.png" "coin3.png" "coin2.png") (distro #t) --- NEW FILE: coin-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coin-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coin-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coin-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coin-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coin-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: coin-2.png --- (This appears to be a binary file; contents omitted.) |
248 messages has been excluded from this view by a project administrator.
