super-tux-commit Mailing List for Super Tux (Page 83)
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: Ingo R. <gr...@us...> - 2004-04-28 21:27:39
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20276/data/levels/world1 Modified Files: level1.stl level7.stl Log Message: - fixed author of level7 - added 'tutorial' for run Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level1.stl 28 Apr 2004 00:14:52 -0000 1.10 +++ level1.stl 28 Apr 2004 21:27:15 -0000 1.11 @@ -27,11 +27,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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 89 90 91 92 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 77 44 44 44 44 44 44 44 77 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 77 77 77 77 77 77 77 77 77 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 83 83 83 102 83 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 26 26 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 44 44 44 44 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 102 0 0 0 0 0 7 8 8 8 8 8 9 0 0 0 0 0 7 8 8 8 8 8 8 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 7 8 8 8 8 8 8 8 8 8 8 8 9 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 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 44 44 44 44 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 44 44 44 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 27 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 15 0 0 0 0 0 13 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 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 133 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 7 8 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 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 12 0 0 0 0 0 10 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 10 11 11 11 11 11 11 11 11 11 44 44 12 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 132 132 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 26 77 26 77 26 77 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 77 83 77 83 77 83 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 0 0 0 0 0 0 13 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 44 44 44 44 44 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 113 9 0 0 0 0 0 0 0 0 0 0 0 26 26 26 26 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 9 0 0 0 0 0 7 8 8 8 8 8 8 8 9 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 22 11 11 11 11 11 12 0 0 0 0 0 10 11 11 11 11 11 11 11 12 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 7 8 8 8 22 11 11 11 11 11 11 11 11 11 44 44 12 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 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 7 8 8 9 0 0 0 0 0 0 0 0 0 0 10 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 27 28 28 28 29 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 20 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 13 14 14 14 14 15 0 0 0 0 0 13 14 14 14 14 14 14 14 15 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 23 11 11 11 11 11 21 9 0 0 0 7 22 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 13 14 14 14 23 11 11 11 11 11 11 11 11 11 44 44 12 0 44 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 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 44 44 44 44 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 102 0 0 0 0 0 7 8 8 8 8 8 9 0 0 0 0 0 7 8 8 8 8 8 8 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 7 8 8 8 8 8 8 8 8 8 9 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 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 44 44 44 44 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 44 44 44 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 27 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 15 0 0 0 0 0 13 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 0 7 8 8 8 8 8 114 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 133 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 7 8 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 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 12 0 0 0 0 0 10 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 13 14 14 14 14 14 23 11 11 11 11 11 11 11 44 44 12 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 132 132 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 26 77 26 77 26 77 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 77 83 77 83 77 83 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 0 0 0 0 0 0 0 0 0 0 13 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 44 44 44 44 44 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 113 9 0 0 0 0 0 0 0 0 0 0 0 26 26 26 26 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 9 0 0 0 0 0 7 8 8 8 8 8 8 8 9 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 22 11 11 11 11 11 12 0 0 0 0 0 10 11 11 11 11 11 11 11 12 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 0 0 0 0 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 44 44 12 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 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 7 8 8 9 0 0 0 0 0 0 0 0 0 0 10 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 27 28 28 28 29 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 20 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 13 14 14 14 14 15 0 0 0 0 0 13 14 14 14 14 14 14 14 15 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 23 11 11 11 11 11 21 9 0 0 0 7 22 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 10 11 11 11 11 11 11 11 11 11 11 11 11 11 44 44 12 0 44 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 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 13 14 14 15 0 0 0 0 0 0 0 0 0 0 10 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 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 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 10 11 11 11 11 12 0 0 0 0 0 10 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 15 0 0 0 13 23 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 10 11 11 11 11 11 11 11 11 11 11 11 11 11 44 44 0 44 44 44 44 44 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 132 132 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 21 8 8 8 8 8 8 8 8 8 8 22 11 11 21 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 7 8 8 8 8 8 8 8 8 8 22 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 20 113 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 11 11 12 0 0 0 0 0 10 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 21 8 8 8 22 11 11 11 11 11 11 11 11 12 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 11 11 11 11 11 11 11 11 11 11 11 44 44 0 8 44 8 8 8 8 8 8 133 8 8 8 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0 0 0 0 0 132 132 8 8 8 9 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 14 14 14 14 14 14 14 14 14 14 23 11 11 20 14 14 14 14 14 14 14 14 14 14 23 11 11 20 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 13 14 14 14 14 14 14 14 14 14 23 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 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 11 11 12 0 0 0 0 0 10 11 11 11 11 11 11 11 12 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 23 11 11 11 11 11 11 11 11 12 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 23 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 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 @@ -50,8 +50,8 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 24 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 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 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 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 8 0 0 0 0 0 129 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 8 8 8 8 8 8 8 8 8 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 136 137 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 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 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 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 138 139 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 0 0 0 0 129 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 8 8 8 8 8 8 8 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level7.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- level7.stl 28 Apr 2004 00:14:55 -0000 1.9 +++ level7.stl 28 Apr 2004 21:27:16 -0000 1.10 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "Voluptuous Pachyderm") (name "Oh no! More Snowballs!") (width 525) (height 15) |
|
From: Ricardo C. <rm...@us...> - 2004-04-28 21:23:25
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18796/src Modified Files: badguy.cpp Log Message: Tux kicking animation wasn't being used in some circustances - fixed. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- badguy.cpp 28 Apr 2004 18:45:24 -0000 1.57 +++ badguy.cpp 28 Apr 2004 21:23:14 -0000 1.58 @@ -845,6 +845,7 @@ } mode = KICK; + player->kick_timer.start(KICKING_TIME); set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } @@ -1036,6 +1037,7 @@ } mode = KICK; + player->kick_timer.start(KICKING_TIME); set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } break; |
|
From: Ricardo C. <ri...@ae...> - 2004-04-28 21:15:40
|
Well, I made that dialog and I know it didn't work. It was just to be a jumping step for someone that would have a joystick and would like to implement the setup for it. Ricardo Cruz Em Quarta, 28 de Abril de 2004 21:51, o Ingo Ruhnke escreveu: > - removed joystick setup menu, since it won't work anyway -- Why, every one as they like; as the good woman said when she kissed her cow. -- Rabelais |
|
From: Ingo R. <gr...@us...> - 2004-04-28 20:51:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10651 Modified Files: menu.cpp setup.cpp Log Message: - removed joystick setup menu, since it won't work anyway - changed wording from key to keyboard - fixed strcpy versus change_input Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- menu.cpp 25 Apr 2004 21:55:39 -0000 1.57 +++ menu.cpp 28 Apr 2004 20:51:24 -0000 1.58 @@ -158,43 +158,47 @@ switch(*item->int_p) { case SDLK_UP: - strcpy(item->input, "Up cursor"); + item->change_input("Up cursor"); break; case SDLK_DOWN: - strcpy(item->input, "Down cursor"); + item->change_input("Down cursor"); break; case SDLK_LEFT: - strcpy(item->input, "Left cursor"); + item->change_input("Left cursor"); break; case SDLK_RIGHT: - strcpy(item->input, "Right cursor"); + item->change_input("Right cursor"); break; case SDLK_RETURN: - strcpy(item->input, "Return"); + item->change_input("Return"); break; case SDLK_SPACE: - strcpy(item->input, "Space"); + item->change_input("Space"); break; case SDLK_RSHIFT: - strcpy(item->input, "Right Shift"); + item->change_input("Right Shift"); break; case SDLK_LSHIFT: - strcpy(item->input, "Left Shift"); + item->change_input("Left Shift"); break; case SDLK_RCTRL: - strcpy(item->input, "Right Control"); + item->change_input("Right Control"); break; case SDLK_LCTRL: - strcpy(item->input, "Left Control"); + item->change_input("Left Control"); break; case SDLK_RALT: - strcpy(item->input, "Right Alt"); + item->change_input("Right Alt"); break; case SDLK_LALT: - strcpy(item->input, "Left Alt"); + item->change_input("Left Alt"); break; default: - strcpy(item->input, (char*)item->int_p); + { + char tmp[64]; + snprintf(tmp, 64, "%d", *item->int_p); + item->change_input(tmp); + } break; } } Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- setup.cpp 28 Apr 2004 13:18:54 -0000 1.63 +++ setup.cpp 28 Apr 2004 20:51:25 -0000 1.64 @@ -405,9 +405,11 @@ options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC); } options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS); - options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu); - if(use_joystick) - options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu); + options_menu->additem(MN_GOTO,"Keyboard Setup",0,options_keys_menu); + + //if(use_joystick) + // options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu); + options_menu->additem(MN_HL,"",0,0); options_menu->additem(MN_BACK,"Back",0,0); |
|
From: Ingo R. <gr...@us...> - 2004-04-28 20:34:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6526 Modified Files: special.cpp world.cpp Log Message: - memleak fix for my last patch - iceflower/growup crash fix (well, maybe) Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- world.cpp 28 Apr 2004 20:24:34 -0000 1.46 +++ world.cpp 28 Apr 2004 20:34:24 -0000 1.47 @@ -105,6 +105,22 @@ for (ParticleSystems::iterator i = particle_systems.begin(); i != particle_systems.end(); ++i) delete *i; + + for (std::vector<BouncyDistro*>::iterator i = bouncy_distros.begin(); + i != bouncy_distros.end(); ++i) + delete *i; + + for (std::vector<BrokenBrick*>::iterator i = broken_bricks.begin(); + i != broken_bricks.end(); ++i) + delete *i; + + for (std::vector<BouncyBrick*>::iterator i = bouncy_bricks.begin(); + i != bouncy_bricks.end(); ++i) + delete *i; + + for (std::vector<FloatingScore*>::iterator i = floating_scores.begin(); + i != floating_scores.end(); ++i) + delete *i; delete level; } Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- special.cpp 28 Apr 2004 20:24:34 -0000 1.37 +++ special.cpp 28 Apr 2004 20:34:24 -0000 1.38 @@ -333,12 +333,6 @@ pplayer->size = BIG; pplayer->base.height = 64; pplayer->base.y -= 32; - if(collision_object_map(pplayer->base)) - { - pplayer->base.height = 32; - pplayer->base.y += 32; - pplayer->duck = true; - } } else if (kind == UPGRADE_ICEFLOWER) { |
|
From: Ingo R. <gr...@us...> - 2004-04-28 20:28:47
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5112 Modified Files: gameobjs.cpp Log Message: - replaced evil cast with std::find Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gameobjs.cpp 28 Apr 2004 20:24:34 -0000 1.13 +++ gameobjs.cpp 28 Apr 2004 20:28:38 -0000 1.14 @@ -79,7 +79,12 @@ if (!timer.check()) { - World::current()->broken_bricks.erase(static_cast<std::vector<BrokenBrick>::iterator>(this)); + std::vector<BrokenBrick*>::iterator i + = std::find(World::current()->broken_bricks.begin(), + World::current()->broken_bricks.end(), + this); + if (i != World::current()->broken_bricks.end()) + World::current()->broken_bricks.erase(i); } } @@ -123,7 +128,14 @@ /* Stop bouncing? */ if (offset >= 0) - World::current()->bouncy_bricks.erase(static_cast<std::vector<BouncyBrick>::iterator>(this)); + { + std::vector<BouncyBrick*>::iterator i + = std::find(World::current()->bouncy_bricks.begin(), + World::current()->bouncy_bricks.end(), + this); + if (i != World::current()->bouncy_bricks.end()) + World::current()->bouncy_bricks.erase(i); + } } void @@ -179,7 +191,14 @@ base.y = base.y - 2 * frame_ratio; if(!timer.check()) - World::current()->floating_scores.erase(static_cast<std::vector<FloatingScore>::iterator>(this)); + { + std::vector<FloatingScore*>::iterator i + = std::find(World::current()->floating_scores.begin(), + World::current()->floating_scores.end(), + this); + if (i != World::current()->floating_scores.end()) + World::current()->floating_scores.erase(i); + } } void |
|
From: Ingo R. <gr...@us...> - 2004-04-28 20:24:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3778 Modified Files: gameobjs.cpp special.cpp world.cpp world.h Log Message: MatzeB: that shoudl fix the cases where you die when picking up an iceflower Index: gameobjs.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gameobjs.cpp 26 Apr 2004 11:14:11 -0000 1.12 +++ gameobjs.cpp 28 Apr 2004 20:24:34 -0000 1.13 @@ -40,7 +40,14 @@ base.ym += 0.1 * frame_ratio; if (base.ym >= 0) - World::current()->bouncy_distros.erase(static_cast<std::vector<BouncyDistro>::iterator>(this)); + { + std::vector<BouncyDistro*>::iterator i + = std::find(World::current()->bouncy_distros.begin(), + World::current()->bouncy_distros.end(), + this); + if (i != World::current()->bouncy_distros.end()) + World::current()->bouncy_distros.erase(i); + } } void @@ -71,7 +78,9 @@ base.y = base.y + base.ym * frame_ratio; if (!timer.check()) - World::current()->broken_bricks.erase(static_cast<std::vector<BrokenBrick>::iterator>(this)); + { + World::current()->broken_bricks.erase(static_cast<std::vector<BrokenBrick>::iterator>(this)); + } } void Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- world.h 28 Apr 2004 13:18:54 -0000 1.32 +++ world.h 28 Apr 2004 20:24:34 -0000 1.33 @@ -50,10 +50,10 @@ static World* current_; public: - std::vector<BouncyDistro> bouncy_distros; - std::vector<BrokenBrick> broken_bricks; - std::vector<BouncyBrick> bouncy_bricks; - std::vector<FloatingScore> floating_scores; + std::vector<BouncyDistro*> bouncy_distros; + std::vector<BrokenBrick*> broken_bricks; + std::vector<BouncyBrick*> bouncy_bricks; + std::vector<FloatingScore*> floating_scores; std::vector<Upgrade> upgrades; std::vector<Bullet> bullets; Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- world.cpp 28 Apr 2004 13:18:54 -0000 1.45 +++ world.cpp 28 Apr 2004 20:24:34 -0000 1.46 @@ -198,7 +198,7 @@ /* (Bouncy bricks): */ for (unsigned int i = 0; i < bouncy_bricks.size(); ++i) - bouncy_bricks[i].draw(); + bouncy_bricks[i]->draw(); for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i) (*i)->draw(); @@ -209,16 +209,16 @@ bullets[i].draw(); for (unsigned int i = 0; i < floating_scores.size(); ++i) - floating_scores[i].draw(); + floating_scores[i]->draw(); for (unsigned int i = 0; i < upgrades.size(); ++i) upgrades[i].draw(); for (unsigned int i = 0; i < bouncy_distros.size(); ++i) - bouncy_distros[i].draw(); + bouncy_distros[i]->draw(); for (unsigned int i = 0; i < broken_bricks.size(); ++i) - broken_bricks[i].draw(); + broken_bricks[i]->draw(); /* Draw foreground: */ for (y = 0; y < 15; ++y) @@ -244,11 +244,11 @@ /* Handle bouncy distros: */ for (unsigned int i = 0; i < bouncy_distros.size(); i++) - bouncy_distros[i].action(frame_ratio); + bouncy_distros[i]->action(frame_ratio); /* Handle broken bricks: */ for (unsigned int i = 0; i < broken_bricks.size(); i++) - broken_bricks[i].action(frame_ratio); + broken_bricks[i]->action(frame_ratio); /* Handle distro counting: */ if (counting_distros) @@ -261,10 +261,10 @@ // Handle all kinds of game objects for (unsigned int i = 0; i < bouncy_bricks.size(); i++) - bouncy_bricks[i].action(frame_ratio); + bouncy_bricks[i]->action(frame_ratio); for (unsigned int i = 0; i < floating_scores.size(); i++) - floating_scores[i].action(frame_ratio); + floating_scores[i]->action(frame_ratio); for (unsigned int i = 0; i < bullets.size(); ++i) bullets[i].action(frame_ratio); @@ -387,16 +387,16 @@ { player_status.score += s; - FloatingScore new_floating_score; - new_floating_score.init(x,y,s); + FloatingScore* new_floating_score = new FloatingScore(); + new_floating_score->init(x,y,s); floating_scores.push_back(new_floating_score); } void World::add_bouncy_distro(float x, float y) { - BouncyDistro new_bouncy_distro; - new_bouncy_distro.init(x,y); + BouncyDistro* new_bouncy_distro = new BouncyDistro(); + new_bouncy_distro->init(x,y); bouncy_distros.push_back(new_bouncy_distro); } @@ -413,16 +413,16 @@ void World::add_broken_brick_piece(Tile* tile, float x, float y, float xm, float ym) { - BrokenBrick new_broken_brick; - new_broken_brick.init(tile, x, y, xm, ym); + BrokenBrick* new_broken_brick = new BrokenBrick(); + new_broken_brick->init(tile, x, y, xm, ym); broken_bricks.push_back(new_broken_brick); } void World::add_bouncy_brick(float x, float y) { - BouncyBrick new_bouncy_brick; - new_bouncy_brick.init(x,y); + BouncyBrick* new_bouncy_brick = new BouncyBrick(); + new_bouncy_brick->init(x,y); bouncy_bricks.push_back(new_bouncy_brick); } Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- special.cpp 28 Apr 2004 11:43:47 -0000 1.36 +++ special.cpp 28 Apr 2004 20:24:34 -0000 1.37 @@ -350,12 +350,6 @@ pplayer->base.height = 64; pplayer->base.y -= 32; } - if(collision_object_map(pplayer->base)) - { - pplayer->base.height = 32; - pplayer->base.y += 32; - pplayer->duck = true; - } } else if (kind == UPGRADE_HERRING) { |
|
From: Ingo R. <gr...@us...> - 2004-04-28 20:07:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32468 Modified Files: leveleditor.cpp Log Message: MatzeBs patch for evil cast Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- leveleditor.cpp 28 Apr 2004 18:45:24 -0000 1.68 +++ leveleditor.cpp 28 Apr 2004 20:07:20 -0000 1.69 @@ -1193,10 +1193,16 @@ y2 /= 32; /* if there is a bad guy over there, remove it */ - for(i = 0; i < le_world.bad_guys.size(); ++i) - if(le_world.bad_guys[i].base.x/32 >= x1 && le_world.bad_guys[i].base.x/32 <= x2 - && le_world.bad_guys[i].base.y/32 >= y1 && le_world.bad_guys[i].base.y/32 <= y2) - le_world.bad_guys.erase(static_cast<std::vector<BadGuy>::iterator>(&le_world.bad_guys[i])); + for(std::vector<BadGuy>::iterator i = le_world.bad_guys.begin(); + i != le_world.bad_guys.end(); /* will be at end of loop */) { + if(i->base.x/32 >= x1 && i->base.x/32 <= x2 + && i->base.y/32 >= y1 && i->base.y/32 <= y2) { + i = le_world.bad_guys.erase(i); + continue; + } else { + ++i; + } + } for(xx = x1; xx <= x2; xx++) for(yy = y1; yy <= y2; yy++) |
|
From: Ingo R. <gr...@us...> - 2004-04-28 18:46:24
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15519 Modified Files: CREDITS Log Message: added story credits Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- CREDITS 28 Apr 2004 15:07:40 -0000 1.17 +++ CREDITS 28 Apr 2004 18:46:14 -0000 1.18 @@ -44,6 +44,11 @@ Ingo (Grumbel) Ruhnke +-Story + + Christopher A. (Paroneayea) Webber + + -Music Marek (Wansti) Moeckel |
|
From: Ingo R. <gr...@us...> - 2004-04-28 18:45:37
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15303/src Modified Files: badguy.cpp badguy.h level.cpp level.h leveleditor.cpp title.cpp Log Message: <MatzeB> my patch fixes another leak in the levelsubset code and cleans that up a little bit <MatzeB> it also removes the code for the bsod badguy, since that was a duplication of the snowball code anyway Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- level.h 26 Apr 2004 19:11:54 -0000 1.38 +++ level.h 28 Apr 2004 18:45:24 -0000 1.39 @@ -31,14 +31,15 @@ /** This type holds meta-information about a level-subset. It could be extended to handle manipulation of subsets. */ -class st_subset +class LevelSubset { public: - st_subset(); + LevelSubset(); + ~LevelSubset(); + static void create(const std::string& subset_name); void load(char *subset); void save(); - void free(); std::string name; std::string title; Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- badguy.h 28 Apr 2004 14:09:26 -0000 1.35 +++ badguy.h 28 Apr 2004 18:45:24 -0000 1.36 @@ -35,7 +35,6 @@ /* Bad guy kinds: */ enum BadGuyKind { - BAD_BSOD, BAD_MRICEBLOCK, BAD_JUMPY, BAD_MRBOMB, @@ -65,7 +64,7 @@ : kind(kind_), x(x_), y(y_), stay_on_platform(stay_on_platform_) {} BadGuyData() - : kind(BAD_BSOD), x(0), y(0), stay_on_platform(false) {} + : kind(BAD_SNOWBALL), x(0), y(0), stay_on_platform(false) {} }; class Player; @@ -142,7 +141,6 @@ bool is_removable() const { return removable; } private: - void action_bsod(float frame_ratio); void action_mriceblock(float frame_ratio); void action_jumpy(float frame_ratio); void action_bomb(float frame_ratio); Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- badguy.cpp 28 Apr 2004 14:09:26 -0000 1.56 +++ badguy.cpp 28 Apr 2004 18:45:24 -0000 1.57 @@ -33,16 +33,10 @@ #include "resources.h" #include "sprite_manager.h" -Sprite* img_bsod_squished_left; -Sprite* img_bsod_squished_right; -Sprite* img_bsod_falling_left; -Sprite* img_bsod_falling_right; Sprite* img_mriceblock_flat_left; Sprite* img_mriceblock_flat_right; Sprite* img_mriceblock_falling_left; Sprite* img_mriceblock_falling_right; -Sprite* img_bsod_left; -Sprite* img_bsod_right; Sprite* img_mriceblock_left; Sprite* img_mriceblock_right; Sprite* img_jumpy_left_up; @@ -78,8 +72,6 @@ return BAD_JUMPY; else if (str == "laptop" || str == "mriceblock") // was laptop in old maps return BAD_MRICEBLOCK; - else if (str == "bsod") - return BAD_BSOD; else if (str == "mrbomb") return BAD_MRBOMB; else if (str == "stalactite") @@ -94,12 +86,12 @@ return BAD_FLYINGSNOWBALL; else if (str == "spiky") return BAD_SPIKY; - else if (str == "snowball") + else if (str == "snowball" || str == "bsod") // was bsod in old maps return BAD_SNOWBALL; else { printf("Couldn't convert badguy: '%s'\n", str.c_str()); - return BAD_BSOD; + return BAD_SNOWBALL; } } @@ -113,9 +105,6 @@ case BAD_MRICEBLOCK: return "mriceblock"; break; - case BAD_BSOD: - return "bsod"; - break; case BAD_MRBOMB: return "mrbomb"; break; @@ -141,7 +130,7 @@ return "snowball"; break; default: - return "bsod"; + return "snowball"; } } @@ -167,10 +156,7 @@ physic.reset(); timer.init(true); - if(kind == BAD_BSOD) { - physic.set_velocity(-BADGUY_WALK_SPEED, 0); - set_sprite(img_bsod_left, img_bsod_right); - } else if(kind == BAD_MRBOMB) { + if(kind == BAD_MRBOMB) { physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_mrbomb_left, img_mrbomb_right); } else if (kind == BAD_MRICEBLOCK) { @@ -215,38 +201,6 @@ } void -BadGuy::action_bsod(float frame_ratio) -{ - static const float BSODJUMP = 2; - - if (dying == DYING_NOT) - check_horizontal_bump(); - - fall(); - - // jump when we're about to fall - if (physic.get_velocity_y() == 0 && - !issolid(base.x+base.width/2, base.y + base.height)) - { - physic.enable_gravity(true); - physic.set_velocity(physic.get_velocity_x(), BSODJUMP); - } - - // Handle dying timer: - if (dying == DYING_SQUISHED && !timer.check()) - { - /* Remove it if time's up: */ - remove_me(); - return; - } - - // move - physic.apply(frame_ratio, base.x, base.y); - if(dying != DYING_FALLING) - collision_swept_object_map(&old_base, &base); -} - -void BadGuy::action_mriceblock(float frame_ratio) { Player& tux = *World::current()->get_tux(); @@ -721,10 +675,6 @@ switch (kind) { - case BAD_BSOD: - action_bsod(frame_ratio); - break; - case BAD_MRICEBLOCK: action_mriceblock(frame_ratio); break; @@ -872,12 +822,6 @@ remove_me(); return; - } else if(kind == BAD_BSOD) { - squish_me(player); - set_sprite(img_bsod_squished_left, img_bsod_squished_right); - physic.set_velocity_x(0); - return; - } else if (kind == BAD_MRICEBLOCK) { if (mode == NORMAL || mode == KICK) { @@ -958,20 +902,14 @@ Player& tux = *World::current()->get_tux(); tux.holding_something = false; } - } else if(kind == BAD_BSOD) { - set_sprite(img_bsod_falling_left, img_bsod_falling_right); } physic.enable_gravity(true); physic.set_velocity_y(0); /* Gain some points: */ -// if (kind == BAD_BSOD) World::current()->add_score(base.x - scroll_x, base.y, score * player_status.score_multiplier); -/* else - World::current()->add_score(base.x - scroll_x, base.y, - 25 * player_status.score_multiplier);*/ /* Play death sound: */ play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); @@ -1109,16 +1047,10 @@ void load_badguy_gfx() { - img_bsod_squished_left = sprite_manager->load("bsod-squished-left"); - img_bsod_squished_right = sprite_manager->load("bsod-squished-right"); - img_bsod_falling_left = sprite_manager->load("bsod-falling-left"); - img_bsod_falling_right = sprite_manager->load("bsod-falling-right"); img_mriceblock_flat_left = sprite_manager->load("mriceblock-flat-left"); img_mriceblock_flat_right = sprite_manager->load("mriceblock-flat-right"); img_mriceblock_falling_left = sprite_manager->load("mriceblock-falling-left"); img_mriceblock_falling_right = sprite_manager->load("mriceblock-falling-right"); - img_bsod_left = sprite_manager->load("bsod-left"); - img_bsod_right = sprite_manager->load("bsod-right"); img_mriceblock_left = sprite_manager->load("mriceblock-left"); img_mriceblock_right = sprite_manager->load("mriceblock-right"); img_jumpy_left_up = sprite_manager->load("jumpy-left-up"); Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- title.cpp 28 Apr 2004 14:58:24 -0000 1.66 +++ title.cpp 28 Apr 2004 18:45:26 -0000 1.67 @@ -62,22 +62,33 @@ static unsigned int last_update_time; static unsigned int update_time; -std::vector<st_subset> contrib_subsets; +std::vector<LevelSubset*> contrib_subsets; std::string current_contrib_subset; +void free_contrib_menu() +{ + for(std::vector<LevelSubset*>::iterator i = contrib_subsets.begin(); + i != contrib_subsets.end(); ++i) + delete *i; + + contrib_subsets.clear(); + contrib_menu->clear(); +} + void generate_contrib_menu() { string_list_type level_subsets = dsubdirs("/levels", "info"); - contrib_menu->clear(); + free_contrib_menu(); + contrib_menu->additem(MN_LABEL,"Contrib Levels",0,0); contrib_menu->additem(MN_HL,"",0,0); for (int i = 0; i < level_subsets.num_items; ++i) { - st_subset subset; - subset.load(level_subsets.item[i]); - contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, + LevelSubset* subset = new LevelSubset(); + subset->load(level_subsets.item[i]); + contrib_menu->additem(MN_GOTO, subset->title.c_str(), i, contrib_subset_menu, i+1); contrib_subsets.push_back(subset); } @@ -102,7 +113,7 @@ { current_subset = index; // FIXME: This shouln't be busy looping - st_subset& subset = contrib_subsets[index]; + LevelSubset& subset = * (contrib_subsets[index]); current_contrib_subset = subset.name; @@ -222,7 +233,6 @@ /* --- TITLE SCREEN --- */ void title(void) { - st_subset subset; random_timer.init(true); walking = true; @@ -360,6 +370,7 @@ } /* Free surfaces: */ + free_contrib_menu(); delete bkg_title; delete logo; delete img_choose_subset; Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- leveleditor.cpp 27 Apr 2004 17:09:35 -0000 1.67 +++ leveleditor.cpp 28 Apr 2004 18:45:24 -0000 1.68 @@ -113,7 +113,7 @@ static int pos_x, cursor_x, cursor_y, fire; static int le_level; static LevelEditorWorld le_world; -static st_subset le_level_subset; +static LevelSubset le_level_subset; static int le_show_grid; static int le_frame; static Surface* le_selection; @@ -303,7 +303,7 @@ switch (i = subset_new_menu->check()) { case 3: - st_subset::create(subset_new_menu->item[2].input); + LevelSubset::create(subset_new_menu->item[2].input); le_level_subset.load(subset_new_menu->item[2].input); leveleditor_menu->item[3].kind = MN_GOTO; le_level = 1; @@ -1158,7 +1158,7 @@ le_world.bad_guys.erase(le_world.bad_guys.begin() + i); if(c == '0') /* if it's a bad guy */ - le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); + le_world.add_bad_guy(xx*32, yy*32, BAD_SNOWBALL); else if(c == '1') le_world.add_bad_guy(xx*32, yy*32, BAD_MRICEBLOCK); else if(c == '2') @@ -1204,7 +1204,7 @@ le_current_level->change(xx*32, yy*32, tm, c); if(c == '0') // if it's a bad guy - le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); + le_world.add_bad_guy(xx*32, yy*32, BAD_SNOWBALL); else if(c == '1') le_world.add_bad_guy(xx*32, yy*32, BAD_MRICEBLOCK); else if(c == '2') Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- level.cpp 27 Apr 2004 15:15:17 -0000 1.55 +++ level.cpp 28 Apr 2004 18:45:24 -0000 1.56 @@ -36,15 +36,20 @@ using namespace std; -st_subset::st_subset() +LevelSubset::LevelSubset() + : image(0), levels(0) { - levels = 0; } -void st_subset::create(const std::string& subset_name) +LevelSubset::~LevelSubset() +{ + delete image; +} + +void LevelSubset::create(const std::string& subset_name) { Level new_lev; - st_subset new_subset; + LevelSubset new_subset; new_subset.name = subset_name; new_subset.title = "Unknown Title"; new_subset.description = "No description so far."; @@ -53,7 +58,7 @@ new_lev.save(subset_name.c_str(),1); } -void st_subset::parse (lisp_object_t* cursor) +void LevelSubset::parse (lisp_object_t* cursor) { while(!lisp_nil_p(cursor)) { @@ -85,7 +90,7 @@ } } -void st_subset::load(char *subset) +void LevelSubset::load(char *subset) { FILE* fi; char filename[1024]; @@ -156,7 +161,7 @@ levels = --i; } -void st_subset::save() +void LevelSubset::save() { FILE* fi; string filename; @@ -192,15 +197,6 @@ } } -void st_subset::free() -{ - title.clear(); - description.clear(); - name.clear(); - delete image; - levels = 0; -} - Level::Level() : img_bkgd(0) { |
|
From: Ingo R. <gr...@us...> - 2004-04-28 17:27:30
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30977 Modified Files: gameloop.cpp resources.cpp resources.h Log Message: - added level done song, endseq needs to be a bit longer to get the song right Index: resources.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- resources.h 24 Apr 2004 14:49:04 -0000 1.8 +++ resources.h 28 Apr 2004 17:27:15 -0000 1.9 @@ -36,6 +36,7 @@ extern Surface* img_red_glow; extern MusicRef herring_song; +extern MusicRef level_end_song; extern SpriteManager* sprite_manager; extern MusicManager* music_manager; Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- gameloop.cpp 27 Apr 2004 18:29:17 -0000 1.114 +++ gameloop.cpp 28 Apr 2004 17:27:14 -0000 1.115 @@ -428,6 +428,7 @@ end_sequence = true; last_x_pos = -1; music_manager->halt_music(); + music_manager->play_music(level_end_song); endsequence_timer.start(5000); // 5 seconds until we finish the map } else if (!end_sequence && tux->is_dead()) Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- resources.cpp 28 Apr 2004 13:18:54 -0000 1.28 +++ resources.cpp 28 Apr 2004 17:27:15 -0000 1.29 @@ -37,6 +37,7 @@ Surface* img_red_glow; MusicRef herring_song; +MusicRef level_end_song; SpriteManager* sprite_manager = 0; MusicManager* music_manager = 0; @@ -197,6 +198,7 @@ /* Herring song */ herring_song = music_manager->load_music(datadir + "/music/SALCON.MOD"); + level_end_song = music_manager->load_music(datadir + "/music/tux-leveldone.mod"); } |
|
From: Ingo R. <gr...@us...> - 2004-04-28 15:08:05
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31659 Modified Files: CREDITS Log Message: -changed wording Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- CREDITS 28 Apr 2004 13:27:56 -0000 1.16 +++ CREDITS 28 Apr 2004 15:07:40 -0000 1.17 @@ -12,7 +12,7 @@ Bill Kendrick --Programmers +-Programming Tobias (Tobgle) Glaesser |
|
From: Ricardo C. <rm...@us...> - 2004-04-28 14:34:16
|
Update of /cvsroot/super-tux/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24083 Modified Files: Makefile submenu.xml Added Files: authors.xml Log Message: Added an Authors section. Ingo, please type make. Also add breaklines, I wasn't sure if you could do <br> or not, so I leave it. Thx Index: Makefile =================================================================== RCS file: /cvsroot/super-tux/htdocs/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 16 Mar 2004 14:12:52 -0000 1.8 +++ Makefile 28 Apr 2004 14:34:05 -0000 1.9 @@ -1,6 +1,7 @@ HTMLOUT = \ index.html \ download.html \ + authors.html \ \ development/index.html \ development/map.html \ Index: submenu.xml =================================================================== RCS file: /cvsroot/super-tux/htdocs/submenu.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- submenu.xml 7 Mar 2004 23:20:27 -0000 1.2 +++ submenu.xml 28 Apr 2004 14:34:05 -0000 1.3 @@ -2,5 +2,6 @@ <submenu> <item file="index.html">Intro</item> + <item file="authors.html">Authors</item> <item file="download.html">Download</item> </submenu> --- NEW FILE: authors.xml --- <?xml version="1.0"?> <page title="SuperTux"> <section title="Authors"> <p> Here goes the list of the people behind this project: (as a note, noone earns money by making this game, our only incentivation is the amusement of doing it.) </p> <b>Project leader</b> Tobias (Tobgle) Glaesser tob...@gm... <b>Original author</b> Bill Kendrick nb...@so... http://www.newbreedsoftware.com/ <b>Programmers</b> Tobias (Tobgle) Glaesser tob...@gm... Ricardo (Blacksheep) Cruz ri...@ae... / http://rpmcruz.planetaclix.pt/ Ingo (Grumbel) Ruhnke gr...@gm... / http://pingus.seul.org/~grumbel/ Matthias (MatzeB) Braun ma...@br... <b>Contrib Programming</b> Ryan Flegel xxd...@ho... / http://digitalhell.cjb.net/~ryan/ Duong-Khang NGUYEN neo...@us... <b>Graphics</b> Ingo (Grumbel) Ruhnke gr...@gm... / http://pingus.seul.org/~grumbel/ Christopher A. (Paroneayea) Webber cr...@li... <b>Level Design</b> Marek (Wansti) Moeckel wa...@gm... Ingo (Grumbel) Ruhnke gr...@gm... / http://pingus.seul.org/~grumbel/ <b>Music</b> Marek (Wansti) Moeckel wa...@gm... Mystical Mortimer Twang <b>Sounds</b> Royalty free sound effects from CDROMs and FTP sites <b>Thanks to</b> Larry Ewing Creator of Tux, the Linux penguin SDL and OpenGL For giving such a great gaming experience possible in Linux We hope you enjoy our work. - SuperTux team </section> </page> |
|
From: Ingo R. <gr...@us...> - 2004-04-28 14:29:06
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22759 Added Files: tux-leveldone.mod Log Message: - leveldone music from Wansti --- NEW FILE: tux-leveldone.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-28 14:12:45
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19583/src Modified Files: player.cpp Log Message: Forgot to commit this file. It used badguy's killme() somewhere. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- player.cpp 28 Apr 2004 13:45:37 -0000 1.70 +++ player.cpp 28 Apr 2004 14:12:37 -0000 1.71 @@ -631,7 +631,7 @@ } else { - pbad_c->kill_me(); + pbad_c->kill_me(25); } } player_status.score_multiplier++; |
|
From: Ricardo C. <rm...@us...> - 2004-04-28 14:09:35
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19048/src Modified Files: badguy.cpp badguy.h Log Message: Changed kill_me() in order to get the score has an argument. This way, it makes much more flexible the way we give scores. Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- badguy.h 27 Apr 2004 17:09:35 -0000 1.34 +++ badguy.h 28 Apr 2004 14:09:26 -0000 1.35 @@ -132,7 +132,7 @@ /** this functions tries to kill the badguy and lets him fall off the * screen. Some badguys like the flame might ignore this. */ - void kill_me(); + void kill_me(int score); /** remove ourself from the list of badguys. WARNING! This function will * invalidate all members. So don't do anything else with member after calling Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- badguy.cpp 28 Apr 2004 12:13:00 -0000 1.55 +++ badguy.cpp 28 Apr 2004 14:09:26 -0000 1.56 @@ -831,7 +831,7 @@ if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH) return; - kill_me(); + kill_me(25); } void @@ -906,16 +906,12 @@ make_player_jump(player); - if((kind != BAD_MRICEBLOCK && mode != dying)) - { - World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier); - player_status.score_multiplier++; - } + player_status.score_multiplier++; // check for maximum number of squiches squishcount++; if(squishcount >= MAX_ICEBLOCK_SQUICHES) { - kill_me(); + kill_me(50); return; } @@ -949,7 +945,7 @@ } void -BadGuy::kill_me() +BadGuy::kill_me(int score) { if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME) return; @@ -970,12 +966,12 @@ physic.set_velocity_y(0); /* Gain some points: */ - if (kind == BAD_BSOD) +// if (kind == BAD_BSOD) World::current()->add_score(base.x - scroll_x, base.y, - 50 * player_status.score_multiplier); - else + score * player_status.score_multiplier); +/* else World::current()->add_score(base.x - scroll_x, base.y, - 25 * player_status.score_multiplier); + 25 * player_status.score_multiplier);*/ /* Play death sound: */ play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); @@ -1001,7 +997,7 @@ switch (c_object) { case CO_BULLET: - kill_me(); + kill_me(10); break; case CO_BADGUY: @@ -1010,14 +1006,14 @@ /* If we're a kicked mriceblock, kill any badguys we hit */ if(kind == BAD_MRICEBLOCK && mode == KICK) { - pbad_c->kill_me(); + pbad_c->kill_me(25); } // a held mriceblock gets kills the enemy too but falls to ground then else if(kind == BAD_MRICEBLOCK && mode == HELD) { - pbad_c->kill_me(); - kill_me(); + pbad_c->kill_me(25); + kill_me(0); } /* Kill badguys that run into exploding bomb */ @@ -1033,14 +1029,14 @@ } else if (pbad_c->kind != BAD_MRBOMB) { - pbad_c->kill_me(); + pbad_c->kill_me(50); } } /* Kill any badguys that get hit by stalactite */ else if (kind == BAD_STALACTITE && dying == DYING_NOT) { - pbad_c->kill_me(); + pbad_c->kill_me(50); } /* When enemies run into eachother, make them change directions */ |
|
From: Ingo R. <gr...@us...> - 2004-04-28 14:02:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17733/src Modified Files: worldmap.cpp Log Message: - added new extro background Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- worldmap.cpp 28 Apr 2004 13:18:54 -0000 1.61 +++ worldmap.cpp 28 Apr 2004 14:02:02 -0000 1.62 @@ -683,7 +683,7 @@ if (!level->extro_filename.empty()) { // Display final credits and go back to the main menu display_text_file(level->extro_filename, - "/images/background/arctis2.jpg"); + "/images/background/extro.jpg"); display_text_file("CREDITS", "/images/background/oiltux.jpg"); quit = true; |
|
From: Ingo R. <gr...@us...> - 2004-04-28 14:02:41
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17733/data/levels/world1 Modified Files: level26.stl Log Message: - added new extro background Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- level26.stl 27 Apr 2004 21:33:28 -0000 1.7 +++ level26.stl 28 Apr 2004 14:02:01 -0000 1.8 @@ -13,8 +13,8 @@ (bkgd_green_top 0) (bkgd_blue_top 0) (bkgd_red_bottom 150) - (bkgd_green_bottom 150) - (bkgd_blue_bottom 150) + (bkgd_green_bottom 0) + (bkgd_blue_bottom 0) (time 300) (gravity 10) (particle_system "") |
|
From: Ingo R. <gr...@us...> - 2004-04-28 14:02:17
|
Update of /cvsroot/super-tux/supertux/data/images/background In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17733/data/images/background Added Files: extro.jpg Log Message: - added new extro background --- NEW FILE: extro.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-28 13:45:49
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14690/src Modified Files: player.cpp Log Message: - added fire duck tux - turned iceflower into a fire flower Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- player.cpp 26 Apr 2004 19:58:11 -0000 1.69 +++ player.cpp 28 Apr 2004 13:45:37 -0000 1.70 @@ -510,13 +510,13 @@ else sprite = &largetux; - if (duck) + if (duck && size != SMALL) { if (dir == RIGHT) sprite->duck_right->draw(base.x - scroll_x, base.y); else sprite->duck_left->draw(base.x - scroll_x, base.y); - } + } else if (skidding_timer.started()) { if (dir == RIGHT) |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14690/data/images/shared Modified Files: iceflower-1.png iceflower-2.png iceflower-3.png iceflower.png Added Files: firetux-duck-left.png firetux-duck-right.png Log Message: - added fire duck tux - turned iceflower into a fire flower --- NEW FILE: firetux-duck-left.png --- (This appears to be a binary file; contents omitted.) Index: iceflower.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/iceflower.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvs2vI7oG and /tmp/cvsWcvjr5 differ --- NEW FILE: firetux-duck-right.png --- (This appears to be a binary file; contents omitted.) Index: iceflower-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/iceflower-3.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsG4iT7W and /tmp/cvsgw1Ykm differ Index: iceflower-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/iceflower-2.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsFOWki9 and /tmp/cvsZNSoDy differ Index: iceflower-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/iceflower-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsIJXFjo and /tmp/cvsPm53MN differ |
|
From: Ingo R. <gr...@us...> - 2004-04-28 13:45:45
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14690/data/levels/world1 Modified Files: level19.stl Log Message: - added fire duck tux - turned iceflower into a fire flower Index: level19.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level19.stl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- level19.stl 28 Apr 2004 00:14:54 -0000 1.8 +++ level19.stl 28 Apr 2004 13:45:36 -0000 1.9 @@ -82,7 +82,7 @@ (mrbomb (x 2152) (y 361)) (mrbomb (x 2257) (y 363)) (spiky (x 2864) (y 370)) - (money (x 4738) (y 346)) + (money (x 4714) (y 346)) (mrbomb (x 6252) (y 302)) (snowball (x 5836) (y 376)) (snowball (x 5789) (y 375)) |
|
From: Ingo R. <gr...@us...> - 2004-04-28 13:45:45
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14690/data Modified Files: supertux.strf Log Message: - added fire duck tux - turned iceflower into a fire flower Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- supertux.strf 27 Apr 2004 18:35:18 -0000 1.26 +++ supertux.strf 28 Apr 2004 13:45:35 -0000 1.27 @@ -241,11 +241,11 @@ (sprite (name "firetux-duck-left") (x-hotspot 6) (y-hotspot 6) - (images "shared/tux-duck-left.png")) + (images "shared/firetux-duck-left.png")) (sprite (name "firetux-duck-right") (x-hotspot 6) (y-hotspot 6) - (images "shared/tux-duck-right.png")) + (images "shared/firetux-duck-right.png")) (sprite (name "firetux-kick-left") |
|
From: Ingo R. <gr...@us...> - 2004-04-28 13:28:05
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11224/data Modified Files: CREDITS Log Message: - added two music authors Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- CREDITS 28 Apr 2004 12:39:01 -0000 1.15 +++ CREDITS 28 Apr 2004 13:27:56 -0000 1.16 @@ -2,10 +2,10 @@ Milestone 1 --Project leader +-Maintainer + + Tobias (Tobgle) Glaesser - Tobias Glaesser -Tobgle -Originally developed by @@ -14,14 +14,14 @@ -Programmers - Ricardo Cruz -Blacksheep + Tobias (Tobgle) Glaesser + + Ricardo (Blacksheep) Cruz - Ingo Ruhnke -Grumbel + Ingo (Grumbel) Ruhnke - Matthias Braun -MatzeB + Matthias (MatzeB) Braun + -Contrib Programming @@ -32,26 +32,25 @@ -Graphics - Ingo Ruhnke -Grumbel + Ingo (Grumbel) Ruhnke - Christopher A. Webber -Paroneayea + Christopher A. (Paroneayea) Webber -Level Design - Marek Moeckel -Wansti + Marek (Wansti) Moeckel - Ingo Ruhnke -Grumbel + Ingo (Grumbel) Ruhnke -Music - Marek Moeckel -Wansti + Marek (Wansti) Moeckel + + Mystical + + Mortimer Twang -Sounds |
|
From: Ingo R. <gr...@us...> - 2004-04-28 13:28:04
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11224 Modified Files: AUTHORS Log Message: - added two music authors Index: AUTHORS =================================================================== RCS file: /cvsroot/super-tux/supertux/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- AUTHORS 28 Apr 2004 12:15:42 -0000 1.3 +++ AUTHORS 28 Apr 2004 13:27:56 -0000 1.4 @@ -69,6 +69,10 @@ Marek Moeckel wa...@gm... + Mystical + + Mortimer Twang + Sounds ------ |
248 messages has been excluded from this view by a project administrator.
