super-tux-commit Mailing List for Super Tux (Page 36)
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-23 21:58:52
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22586 Modified Files: Tag: supertux_0_1_1_branch NEWS Log Message: changed the release date of 0.1.2 to 24 August 2004 --READY FOR RELEASE Index: NEWS =================================================================== RCS file: /cvsroot/super-tux/supertux/NEWS,v retrieving revision 1.9.2.8 retrieving revision 1.9.2.9 diff -u -d -r1.9.2.8 -r1.9.2.9 --- NEWS 13 Aug 2004 11:19:17 -0000 1.9.2.8 +++ NEWS 23 Aug 2004 21:58:35 -0000 1.9.2.9 @@ -1,4 +1,4 @@ -Super Tux 0.1.2 (13 August 04) +Super Tux 0.1.2 (24 August 04) ===================== * a brand new island containing 22 contributed and "official" levels! * a "new" enemy: The Fish |
|
From: Ricardo C. <rm...@us...> - 2004-08-21 13:10:16
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26869/lib/special Modified Files: sprite.cpp sprite.h Log Message: Renamed code variables, as well. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- sprite.cpp 21 Aug 2004 11:47:07 -0000 1.18 +++ sprite.cpp 21 Aug 2004 13:09:52 -0000 1.19 @@ -70,8 +70,8 @@ if(!lispreader.read_string("name", action->name)) if(!actions.empty()) Termination::abort("Error: If there are more than one action, they need names!", ""); - lispreader.read_int("x-offset", action->x_hotspot); - lispreader.read_int("y-offset", action->y_hotspot); + lispreader.read_int("x-offset", action->x_offset); + lispreader.read_int("y-offset", action->y_offset); lispreader.read_float("fps", action->fps); std::vector<std::string> images; @@ -90,8 +90,8 @@ void Sprite::init_defaults(Action* act) { - act->x_hotspot = 0; - act->y_hotspot = 0; + act->x_offset = 0; + act->y_offset = 0; act->fps = 10; start_animation(-1); @@ -215,7 +215,7 @@ << "/" << get_action_name() << std::endl; else context.draw_surface(action->surfaces[(int)frame], - pos - Vector(action->x_hotspot, action->y_hotspot), layer, drawing_effect); + pos - Vector(action->x_offset, action->y_offset), layer, drawing_effect); } #if 0 @@ -226,7 +226,7 @@ unsigned int frame = get_current_frame(); if (frame < surfaces.size()) - surfaces[frame]->draw_part(sx, sy, x - x_hotspot, y - y_hotspot, w, h); + surfaces[frame]->draw_part(sx, sy, x - x_offset, y - y_offset, w, h); } #endif Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- sprite.h 18 Aug 2004 10:32:26 -0000 1.12 +++ sprite.h 21 Aug 2004 13:09:52 -0000 1.13 @@ -39,8 +39,8 @@ { std::string name; - int x_hotspot; - int y_hotspot; + int x_offset; + int y_offset; /** Frames per second */ float fps; @@ -49,8 +49,8 @@ }; public: - /** cur has to be a pointer to data in the form of ((x-hotspot 5) - (y-hotspot 10) ...) */ + /** cur has to be a pointer to data in the form of ((x-offset 5) + (y-offset 10) ...) */ Sprite(lisp_object_t* cur); ~Sprite(); |
|
From: Ricardo C. <rm...@us...> - 2004-08-21 11:47:22
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2958/data/images Modified Files: supertux.strf Log Message: Changed hotspot keyword by offset, as asked by Benjamin. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- supertux.strf 19 Aug 2004 11:04:45 -0000 1.4 +++ supertux.strf 21 Aug 2004 11:47:06 -0000 1.5 @@ -9,8 +9,8 @@ (action (name "walk") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/arms-walk-0.png" "shared/bigtux/arms-walk-1.png" "shared/bigtux/arms-walk-2.png" @@ -21,40 +21,40 @@ (action (name "stand") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/arms-stand-0.png")) (action (name "jump") (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) + (x-offset 5) + (y-offset 7) (images "shared/bigtux/arms-jump-0.png")) (action (name "skid") - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/arms-skid-0.png")) (action (name "kick") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/arms-stand-0.png")) (action (name "buttjump") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/arms-stand-0.png")) ; Grabbing is arms specific! (action (name "grab") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/arms-grab-0.png"))) ;; Big Tux Head @@ -63,47 +63,47 @@ (action (name "walk") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-stand-0.png")) (action (name "stand") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-stand-0.png")) (action (name "jump") (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) + (x-offset 5) + (y-offset 7) (images "shared/bigtux/head-stand-0.png")) (action (name "skid") - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/head-skid-0.png")) (action (name "kick") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-stand-0.png")) (action (name "buttjump") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-stand-0.png")) (action (name "idle") (fps 1.0) - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) @@ -114,40 +114,40 @@ (action (name "walk") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/body-stand-0.png")) (action (name "stand") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/body-stand-0.png")) (action (name "jump") (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) + (x-offset 5) + (y-offset 7) (images "shared/bigtux/body-stand-0.png")) (action (name "skid") - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/body-skid-0.png")) (action (name "kick") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/body-stand-0.png")) (action (name "buttjump") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/body-stand-0.png"))) ;; Big Tux Feet @@ -156,8 +156,8 @@ (action (name "walk") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/feet-walk-0.png" "shared/bigtux/feet-walk-1.png" "shared/bigtux/feet-walk-2.png" @@ -168,33 +168,33 @@ (action (name "stand") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/feet-stand-0.png")) (action (name "jump") (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) + (x-offset 5) + (y-offset 7) (images "shared/bigtux/feet-jump-0.png")) (action (name "skid") - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/feet-skid-0.png")) (action (name "kick") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/feet-kick-0.png")) (action (name "buttjump") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/feet-buttjump-0.png"))) ; End of Big Tux (no power) sprite @@ -206,47 +206,47 @@ (action (name "walk") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "stand") (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "jump") (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) + (x-offset 5) + (y-offset 7) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "skid") - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/head-skid-0.png")) (action (name "kick") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "buttjump") - (x-hotspot 5) - (y-hotspot 9) + (x-offset 5) + (y-offset 9) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "idle") (fps 1.0) - (x-hotspot 6) - (y-hotspot 8) + (x-offset 6) + (y-offset 8) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) @@ -256,23 +256,23 @@ (sprite (name "smalltux-gameover") (action (fps 10.0) - (x-hotspot 13) - (y-hotspot 6) + (x-offset 13) + (y-offset 6) (images "shared/smalltux/gameover-0.png" "shared/smalltux/gameover-1.png"))) (sprite (name "smalltux-star") (action - (x-hotspot 5) - (y-hotspot 15) + (x-offset 5) + (y-offset 15) (images "shared/smalltux/extra-star-0.png" "shared/smalltux/extra-star-1.png" "shared/smalltux/extra-star-2.png"))) (sprite (name "bigtux-star") (action - (x-hotspot 8) - (y-hotspot 8) + (x-offset 8) + (y-offset 8) (images "shared/bigtux/extra-star-0.png" "shared/bigtux/extra-star-1.png" "shared/bigtux/extra-star-2.png"))) @@ -281,8 +281,8 @@ ; (sprite (name "tux-grow-left") ; (action ; (fps 4.0) -; (x-hotspot 6) -; (y-hotspot 2) +; (x-offset 6) +; (y-offset 2) ; (images "shared/tux-grow-left-1.png" ; "shared/tux-grow-left-2.png" ; "shared/tux-grow-left-3.png" @@ -294,8 +294,8 @@ ; (sprite (name "tux-grow-right") ; (action ; (fps 4.0) -; (x-hotspot 6) -; (y-hotspot 2) +; (x-offset 6) +; (y-offset 2) ; (images "shared/tux-grow-right-1.png" ; "shared/tux-grow-right-2.png" ; "shared/tux-grow-right-3.png" @@ -308,8 +308,8 @@ ;; Laptop (sprite (name "mriceblock-left") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/mriceblock-left-0.png" "shared/mriceblock-left-1.png" "shared/mriceblock-left-2.png" @@ -317,8 +317,8 @@ (sprite (name "mriceblock-right") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/mriceblock-right-0.png" "shared/mriceblock-right-1.png" "shared/mriceblock-right-2.png" @@ -326,26 +326,26 @@ (sprite (name "mriceblock-falling-right") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/mriceblock-flat-right.png"))) (sprite (name "mriceblock-falling-left") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/mriceblock-flat-left.png"))) (sprite (name "mriceblock-flat-left") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/mriceblock-flat-left.png"))) (sprite (name "mriceblock-flat-right") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/mriceblock-flat-right.png"))) ; (sprite (name "mriceblock-falling-left") @@ -356,42 +356,42 @@ (sprite (name "snowball-squished-left") (action - (x-hotspot 1) - (y-hotspot -19) + (x-offset 1) + (y-offset -19) (images "shared/snowball-squished-left.png"))) (sprite (name "snowball-squished-right") (action - (x-hotspot 1) - (y-hotspot -19) + (x-offset 1) + (y-offset -19) (images "shared/snowball-squished-right.png"))) (sprite (name "jumpy-left-up") (action - (x-hotspot 7) - (y-hotspot 8) + (x-offset 7) + (y-offset 8) (images "shared/jumpy-left-up-0.png"))) (sprite (name "jumpy-left-down") (action - (x-hotspot 7) - (y-hotspot 8) + (x-offset 7) + (y-offset 8) (images "shared/jumpy-left-down-0.png"))) (sprite (name "jumpy-left-middle") (action - (x-hotspot 7) - (y-hotspot 8) + (x-offset 7) + (y-offset 8) (images "shared/jumpy-left-middle-0.png"))) (sprite (name "jumpy-left-iced") (action - (x-hotspot 7) - (y-hotspot 8) + (x-offset 7) + (y-offset 8) (images "shared/jumpy-iced-left-up-0.png"))) (sprite (name "mrbomb-left") (action (fps 10.0) - (x-hotspot 3) - (y-hotspot 12) + (x-offset 3) + (y-offset 12) (images "shared/mrbomb-left-0.png" "shared/mrbomb-left-1.png" "shared/mrbomb-left-2.png" @@ -400,59 +400,59 @@ (sprite (name "mrbomb-right") (action (fps 10.0) - (x-hotspot 7) - (y-hotspot 12) + (x-offset 7) + (y-offset 12) (images "shared/mrbomb-right-0.png" "shared/mrbomb-right-1.png" "shared/mrbomb-right-2.png" "shared/mrbomb-right-3.png"))) (sprite (name "mrbomb-iced-left") (action - (x-hotspot 3) - (y-hotspot 12) + (x-offset 3) + (y-offset 12) (images "shared/mrbomb-iced-left-0.png"))) (sprite (name "mrbomb-iced-right") (action - (x-hotspot 7) - (y-hotspot 12) + (x-offset 7) + (y-offset 12) (images "shared/mrbomb-iced-right-0.png"))) (sprite (name "mrbomb-ticking-left") (action (fps 15.0) - (x-hotspot 3) - (y-hotspot 8) + (x-offset 3) + (y-offset 8) (images "shared/mrbombx-left-0.png" "shared/mrbombx-left-1.png"))) (sprite (name "mrbomb-ticking-right") (action (fps 15.0) - (x-hotspot 10) - (y-hotspot 8) + (x-offset 10) + (y-offset 8) (images "shared/mrbombx-right-0.png" "shared/mrbombx-right-1.png"))) (sprite (name "mrbomb-explosion") (action (fps 15.0) - (x-hotspot 32) - (y-hotspot 32) + (x-offset 32) + (y-offset 32) (images "shared/mrbomb-explosion.png" "shared/mrbomb-explosion-1.png"))) (sprite (name "stalactite") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/stalactite.png"))) (sprite (name "stalactite-broken") (action - (x-hotspot 0) - (y-hotspot 16) + (x-offset 0) + (y-offset 16) (images "shared/stalactite-broken.png"))) (sprite (name "flame") @@ -462,33 +462,33 @@ (sprite (name "fish") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/fish-left-0.png" "shared/fish-left-1.png"))) (sprite (name "fish-down") (action - (x-hotspot 2) - (y-hotspot 11) + (x-offset 2) + (y-offset 11) (images "shared/fish-down-0.png"))) (sprite (name "fish-iced") (action - (x-hotspot 2) - (y-hotspot 3) + (x-offset 2) + (y-offset 3) (images "shared/fish-iced-left-0.png"))) (sprite (name "fish-iced-down") (action - (x-hotspot 2) - (y-hotspot 11) + (x-offset 2) + (y-offset 11) (images "shared/fish-iced-down-0.png"))) (sprite (name "bouncingsnowball-left") (action - (x-hotspot 1) - (y-hotspot 0) + (x-offset 1) + (y-offset 0) (images "shared/bouncingsnowball-left-0.png" "shared/bouncingsnowball-left-1.png" "shared/bouncingsnowball-left-2.png" @@ -498,8 +498,8 @@ (sprite (name "bouncingsnowball-right") (action - (x-hotspot 1) - (y-hotspot 0) + (x-offset 1) + (y-offset 0) (images "shared/bouncingsnowball-right-0.png" "shared/bouncingsnowball-right-1.png" "shared/bouncingsnowball-right-2.png" @@ -509,52 +509,52 @@ (sprite (name "bouncingsnowball-squished") (action - (x-hotspot 1) - (y-hotspot -19) + (x-offset 1) + (y-offset -19) (images "shared/snowball-squished-left.png"))) (sprite (name "flyingsnowball") (action - (x-hotspot 4) - (y-hotspot 3) + (x-offset 4) + (y-offset 3) (images "shared/flyingsnowball-left-0.png" "shared/flyingsnowball-left-1.png"))) (sprite (name "flyingsnowball-squished") (action - (x-hotspot 4) - (y-hotspot -12) + (x-offset 4) + (y-offset -12) (images "shared/flyingsnowball-squished-left.png"))) (sprite (name "spiky-left") (action - (x-hotspot 6) - (y-hotspot 10) + (x-offset 6) + (y-offset 10) (images "shared/spiky-left-0.png" "shared/spiky-left-1.png" "shared/spiky-left-2.png"))) (sprite (name "spiky-right") (action - (x-hotspot 6) - (y-hotspot 10) + (x-offset 6) + (y-offset 10) (images "shared/spiky-right-0.png" "shared/spiky-right-1.png" "shared/spiky-right-2.png"))) (sprite (name "spiky-iced-left") (action - (x-hotspot 6) - (y-hotspot 10) + (x-offset 6) + (y-offset 10) (images "shared/spiky-iced-left-0.png"))) (sprite (name "spiky-iced-right") (action - (x-hotspot 6) - (y-hotspot 10) + (x-offset 6) + (y-offset 10) (images "shared/spiky-iced-right-0.png"))) (sprite (name "snowball-left") (action - (x-hotspot 2) - (y-hotspot 4) + (x-offset 2) + (y-offset 4) (images "shared/snowball-left-0.png" "shared/snowball-left-1.png" "shared/snowball-left-2.png" @@ -562,8 +562,8 @@ (sprite (name "snowball-right") (action - (x-hotspot 2) - (y-hotspot 4) + (x-offset 2) + (y-offset 4) (images "shared/snowball-right-0.png" "shared/snowball-right-1.png" "shared/snowball-right-2.png" @@ -601,8 +601,8 @@ (sprite (name "firebullet") (action - (x-hotspot 12) - (x-hotspot 12) + (x-offset 12) + (x-offset 12) (fps 20) (images "shared/firebullet-1.png" "shared/firebullet-2.png" @@ -610,15 +610,15 @@ "shared/firebullet-4.png"))) (sprite (name "icebullet") (action - (x-hotspot 12) - (x-hotspot 12) + (x-offset 12) + (x-offset 12) (fps 20) (images "shared/icebullet-1.png"))) ; Trampoline (sprite (name "trampoline") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/trampoline-1.png" "shared/trampoline-2.png" "shared/trampoline-3.png" @@ -627,8 +627,8 @@ ; Flying platform (sprite (name "flying_platform") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/flying_platform-1.png" "shared/flying_platform-2.png" "shared/flying_platform-3.png" @@ -637,33 +637,33 @@ ; Wingling (sprite (name "wingling-left") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/wingling-1.png"))) ; Walkingtree (sprite (name "walkingtree-left") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/walkingtree-left-1.png"))) (sprite (name "walkingtree-left-small") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/walkingtree-left-small-1.png"))) ; Door (sprite (name "door") (action - (x-hotspot 0) - (y-hotspot 64) + (x-offset 0) + (y-offset 64) (images "shared/door-1.png") )) ; (sprite (name "openingdoor") ; (action -; (x-hotspot 0) -; (y-hotspot 64) +; (x-offset 0) +; (y-offset 64) ; (images "shared/door-1.png" ; "shared/door-2.png" ; "shared/door-3.png" @@ -685,8 +685,8 @@ ; Stomp (sprite (name "stomp") (action - (x-hotspot 0) - (y-hotspot 0) + (x-offset 0) + (y-offset 0) (images "shared/stomp.png") )) ) |
|
From: Ricardo C. <rm...@us...> - 2004-08-21 11:47:20
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2958/lib/special Modified Files: sprite.cpp Log Message: Changed hotspot keyword by offset, as asked by Benjamin. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- sprite.cpp 19 Aug 2004 11:00:53 -0000 1.17 +++ sprite.cpp 21 Aug 2004 11:47:07 -0000 1.18 @@ -39,6 +39,8 @@ name = lisp_string(data); else if(token == "action") parse_action(reader); + else + std::cerr << "Warning: Unknown sprite field: " << token << std::endl; } if(name.empty()) @@ -68,8 +70,8 @@ if(!lispreader.read_string("name", action->name)) if(!actions.empty()) Termination::abort("Error: If there are more than one action, they need names!", ""); - lispreader.read_int("x-hotspot", action->x_hotspot); - lispreader.read_int("y-hotspot", action->y_hotspot); + lispreader.read_int("x-offset", action->x_hotspot); + lispreader.read_int("y-offset", action->y_hotspot); lispreader.read_float("fps", action->fps); std::vector<std::string> images; |
|
From: Ricardo C. <rm...@us...> - 2004-08-21 11:45:31
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2490/data/levels/test Modified Files: level12.stl Log Message: Changed the background format. Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level12.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- level12.stl 7 Jul 2004 15:01:46 -0000 1.1 +++ level12.stl 21 Aug 2004 11:45:20 -0000 1.2 @@ -15,12 +15,8 @@ ) (music "fortress.mod") (background - (top_red 0) - (top_green 0) - (top_blue 0) - (bottom_red 150) - (bottom_green 0) - (bottom_blue 0) + (top_color 0 0 0) + (bottom_color 150 0 0) ) (tilemap (layer "interactive") |
|
From: Ricardo C. <rm...@us...> - 2004-08-21 11:44:54
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2324/src Modified Files: background.cpp Log Message: Changed the background feeding format for the new level format. Instead of: (top_red 255) (top_green 60) (top_blue 10) It'd be: (top_color 255 60 10) Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- background.cpp 20 Jul 2004 18:04:47 -0000 1.12 +++ background.cpp 21 Aug 2004 11:44:42 -0000 1.13 @@ -36,13 +36,10 @@ set_image(imagefile, speed); } - int tr, tg, tb, br, bg, bb; - if(reader.read_int("top_red", tr) && reader.read_int("top_green", tg) - && reader.read_int("top_blue", tb) && reader.read_int("bottom_red", br) - && reader.read_int("bottom_green", bg) - && reader.read_int("bottom_blue", bb)) { - set_gradient(Color(tr, tg, tb), Color(br, bg, bb)); - } + std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color; + if(reader.read_int_vector("top_color", bkgd_top_color) && + reader.read_int_vector("bottom_color", bkgd_bottom_color)) + set_gradient(Color(bkgd_top_color), Color(bkgd_bottom_color)); } Background::~Background() @@ -62,12 +59,15 @@ writer.write_string("image", imagefile); writer.write_float("speed", speed); } else if(type == GRADIENT) { - writer.write_int("top_red", gradient_top.red); - writer.write_int("top_green", gradient_top.green); - writer.write_int("top_blue", gradient_top.blue); - writer.write_int("bottom_red", gradient_bottom.red); - writer.write_int("bottom_green", gradient_bottom.green); - writer.write_int("bottom_blue", gradient_bottom.blue); + std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color; + bkgd_top_color.push_back(gradient_top.red); + bkgd_top_color.push_back(gradient_top.green); + bkgd_top_color.push_back(gradient_top.blue); + bkgd_bottom_color.push_back(gradient_top.red); + bkgd_bottom_color.push_back(gradient_top.green); + bkgd_bottom_color.push_back(gradient_top.blue); + writer.write_int_vector("top_color", bkgd_top_color); + writer.write_int_vector("bottom_color", bkgd_bottom_color); } writer.end_list("background"); |
|
From: Ricardo C. <rm...@us...> - 2004-08-21 11:40:10
|
Update of /cvsroot/super-tux/supertux/lib/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv960/lib/video Modified Files: screen.h Log Message: Allow creation of a Color object feeding with a vector of Uints. Index: screen.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/screen.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- screen.h 21 Jul 2004 16:51:53 -0000 1.2 +++ screen.h 21 Aug 2004 11:39:59 -0000 1.3 @@ -26,6 +26,8 @@ #endif #include <iostream> +#include <vector> + namespace SuperTux { @@ -42,6 +44,11 @@ : red(red_), green(green_), blue(blue_), alpha(alpha_) {} + Color(std::vector <unsigned int> color) + : red(0), green(0), blue(0), alpha(255) + { if(color.size() >= 3) { red = color[0]; green = color[1]; blue = color[2]; } + if(color.size() == 4) alpha = color[3]; } + Color(const Color& o) : red(o.red), green(o.green), blue(o.blue), alpha(o.alpha) { } |
|
From: Ricardo C. <rm...@us...> - 2004-08-19 11:05:41
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9233/src Modified Files: player.cpp Log Message: Only use one type of actions for both directions. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- player.cpp 18 Aug 2004 18:27:32 -0000 1.156 +++ player.cpp 19 Aug 2004 11:05:32 -0000 1.157 @@ -736,70 +736,32 @@ /* Set Tux sprite action */ if (duck && size != SMALL) - { - if (dir == RIGHT) - tux_body->set_action("duck-right"); - else - tux_body->set_action("duck-left"); - } + tux_body->set_action("duck"); else if (skidding_timer.started()) - { - if (dir == RIGHT) - tux_body->set_action("skid-right"); - else - tux_body->set_action("skid-left"); - } + tux_body->set_action("skid"); else if (kick_timer.started()) - { - if (dir == RIGHT) - tux_body->set_action("kick-right"); - else - tux_body->set_action("kick-left"); - } + tux_body->set_action("kick"); else if (butt_jump) - { - if (dir == RIGHT) - tux_body->set_action("buttjump-right"); - else - tux_body->set_action("buttjump-left"); - } + tux_body->set_action("buttjump"); else if (physic.get_velocity_y() != 0) - { - if (dir == RIGHT) - tux_body->set_action("jump-right"); - else - tux_body->set_action("jump-left"); - } + tux_body->set_action("jump"); else { if (fabsf(physic.get_velocity_x()) < 1.0f) // standing { - if (dir == RIGHT) - tux_body->set_action("stand-right"); - else - tux_body->set_action("stand-left"); + tux_body->set_action("stand"); } else // moving { - if (dir == RIGHT) - tux_body->set_action("walk-right"); - else - tux_body->set_action("walk-left"); + tux_body->set_action("walk"); } } if(idle_timer.get_left() < 0) { - if (dir == RIGHT) - { - tux_body->head->set_action("idle-right"); - tux_body->head->start_animation(1); - } - else - { - tux_body->head->set_action("idle-right"); - tux_body->head->start_animation(1); - } + tux_body->head->set_action("idle"); + tux_body->head->start_animation(1); + idle_timer.start(IDLE_TIME); } @@ -807,10 +769,7 @@ if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck) { - if (dir == RIGHT) - tux_body->arms->set_action("grab-right"); - else - tux_body->arms->set_action("grab-left"); + tux_body->arms->set_action("grab"); } /* Draw Tux */ @@ -844,7 +803,7 @@ else if (safe_timer.started() && global_frame_counter%2) ; // don't draw Tux else - tux_body->draw(context, pos, layer); + tux_body->draw(context, pos, layer, dir == LEFT ? HORIZONTAL_FLIP : NONE_EFFECT); // Draw blinking star overlay if (invincible_timer.started() && |
|
From: Ricardo C. <rm...@us...> - 2004-08-19 11:04:54
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9106/data/images Modified Files: supertux.strf Log Message: Renamed actions. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- supertux.strf 18 Aug 2004 10:31:26 -0000 1.3 +++ supertux.strf 19 Aug 2004 11:04:45 -0000 1.4 @@ -5,376 +5,197 @@ (sprite ;; Big Tux arms (name "big-tux-arms") - (action - (name "walk-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/arms-walk-left-0.png" - "shared/bigtux/arms-walk-left-1.png" - "shared/bigtux/arms-walk-left-2.png" - "shared/bigtux/arms-walk-left-3.png" - "shared/bigtux/arms-walk-left-4.png" - "shared/bigtux/arms-walk-left-5.png")) - - (action - (name "walk-right") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/arms-walk-right-0.png" - "shared/bigtux/arms-walk-right-1.png" - "shared/bigtux/arms-walk-right-2.png" - "shared/bigtux/arms-walk-right-3.png" - "shared/bigtux/arms-walk-right-4.png" - "shared/bigtux/arms-walk-right-5.png")) (action - (name "stand-left") + (name "walk") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/arms-stand-left-0.png")) + (images "shared/bigtux/arms-walk-0.png" + "shared/bigtux/arms-walk-1.png" + "shared/bigtux/arms-walk-2.png" + "shared/bigtux/arms-walk-3.png" + "shared/bigtux/arms-walk-4.png" + "shared/bigtux/arms-walk-5.png")) (action - (name "stand-right") + (name "stand") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/arms-stand-right-0.png")) - - (action - (name "jump-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) - (images "shared/bigtux/arms-jump-left-0.png")) + (images "shared/bigtux/arms-stand-0.png")) (action - (name "jump-right") + (name "jump") (fps 15.0) (x-hotspot 5) (y-hotspot 7) - (images "shared/bigtux/arms-jump-right-0.png")) - - (action - (name "skid-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/arms-skid-left-0.png")) + (images "shared/bigtux/arms-jump-0.png")) (action - (name "skid-right") + (name "skid") (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/arms-skid-right-0.png")) - - (action - (name "kick-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/arms-stand-left-0.png")) - - (action - (name "kick-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/arms-stand-right-0.png")) + (images "shared/bigtux/arms-skid-0.png")) (action - (name "buttjump-left") + (name "kick") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/arms-stand-left-0.png")) + (images "shared/bigtux/arms-stand-0.png")) (action - (name "buttjump-right") + (name "buttjump") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/arms-stand-right-0.png")) + (images "shared/bigtux/arms-stand-0.png")) ; Grabbing is arms specific! - (action - (name "grab-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/arms-grab-left-0.png")) - (action - (name "grab-right") + (name "grab") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/arms-grab-right-0.png"))) + (images "shared/bigtux/arms-grab-0.png"))) ;; Big Tux Head (sprite (name "big-tux-head") (action - (name "walk-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-stand-left-0.png")) - - (action - (name "walk-right") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-stand-right-0.png")) - - (action - (name "stand-left") + (name "walk") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-stand-left-0.png")) + (images "shared/bigtux/head-stand-0.png")) (action - (name "stand-right") + (name "stand") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-stand-right-0.png")) - - (action - (name "jump-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) - (images "shared/bigtux/head-stand-left-0.png")) + (images "shared/bigtux/head-stand-0.png")) (action - (name "jump-right") + (name "jump") (fps 15.0) (x-hotspot 5) (y-hotspot 7) - (images "shared/bigtux/head-stand-right-0.png")) - - (action - (name "skid-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/head-skid-left-0.png")) + (images "shared/bigtux/head-stand-0.png")) (action - (name "skid-right") + (name "skid") (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/head-skid-right-0.png")) - - (action - (name "kick-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-stand-left-0.png")) - - (action - (name "kick-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-stand-right-0.png")) + (images "shared/bigtux/head-skid-0.png")) (action - (name "buttjump-left") + (name "kick") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-stand-left-0.png")) + (images "shared/bigtux/head-stand-0.png")) (action - (name "buttjump-right") + (name "buttjump") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-stand-right-0.png")) - - (action - (name "idle-left") - (fps 1.0) - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/head-idle-blink-left-0.png" - "shared/bigtux/head-idle-blink-left-1.png")) + (images "shared/bigtux/head-stand-0.png")) (action - (name "idle-right") + (name "idle") (fps 1.0) (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/head-idle-blink-right-0.png" - "shared/bigtux/head-idle-blink-right-1.png"))) + (images "shared/bigtux/head-idle-blink-0.png" + "shared/bigtux/head-idle-blink-1.png"))) ;; Big Tux Body (sprite (name "big-tux-body") (action - (name "walk-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/body-stand-left-0.png")) - - (action - (name "walk-right") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/body-stand-right-0.png")) - - (action - (name "stand-left") + (name "walk") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/body-stand-left-0.png")) + (images "shared/bigtux/body-stand-0.png")) (action - (name "stand-right") + (name "stand") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/body-stand-right-0.png")) - - (action - (name "jump-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) - (images "shared/bigtux/body-stand-left-0.png")) + (images "shared/bigtux/body-stand-0.png")) (action - (name "jump-right") + (name "jump") (fps 15.0) (x-hotspot 5) (y-hotspot 7) - (images "shared/bigtux/body-stand-right-0.png")) - - (action - (name "skid-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/body-skid-left-0.png")) + (images "shared/bigtux/body-stand-0.png")) (action - (name "skid-right") + (name "skid") (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/body-skid-right-0.png")) - - (action - (name "kick-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/body-stand-left-0.png")) - - (action - (name "kick-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/body-stand-right-0.png")) + (images "shared/bigtux/body-skid-0.png")) (action - (name "buttjump-left") + (name "kick") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/body-stand-left-0.png")) + (images "shared/bigtux/body-stand-0.png")) (action - (name "buttjump-right") + (name "buttjump") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/body-stand-right-0.png"))) + (images "shared/bigtux/body-stand-0.png"))) ;; Big Tux Feet (sprite (name "big-tux-feet") (action - (name "walk-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/feet-walk-left-0.png" - "shared/bigtux/feet-walk-left-1.png" - "shared/bigtux/feet-walk-left-2.png" - "shared/bigtux/feet-walk-left-3.png" - "shared/bigtux/feet-walk-left-4.png" - "shared/bigtux/feet-walk-left-5.png")) - - (action - (name "walk-right") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/feet-walk-right-0.png" - "shared/bigtux/feet-walk-right-1.png" - "shared/bigtux/feet-walk-right-2.png" - "shared/bigtux/feet-walk-right-3.png" - "shared/bigtux/feet-walk-right-4.png" - "shared/bigtux/feet-walk-right-5.png")) - - (action - (name "stand-left") + (name "walk") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/feet-stand-left-0.png")) + (images "shared/bigtux/feet-walk-0.png" + "shared/bigtux/feet-walk-1.png" + "shared/bigtux/feet-walk-2.png" + "shared/bigtux/feet-walk-3.png" + "shared/bigtux/feet-walk-4.png" + "shared/bigtux/feet-walk-5.png")) (action - (name "stand-right") + (name "stand") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/feet-stand-right-0.png")) - - (action - (name "jump-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) - (images "shared/bigtux/feet-jump-left-0.png")) + (images "shared/bigtux/feet-stand-0.png")) (action - (name "jump-right") + (name "jump") (fps 15.0) (x-hotspot 5) (y-hotspot 7) - (images "shared/bigtux/feet-jump-right-0.png")) - - (action - (name "skid-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/feet-skid-left-0.png")) + (images "shared/bigtux/feet-jump-0.png")) (action - (name "skid-right") + (name "skid") (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/feet-skid-right-0.png")) - - (action - (name "kick-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/feet-kick-left-0.png")) - - (action - (name "kick-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/feet-kick-right-0.png")) + (images "shared/bigtux/feet-skid-0.png")) (action - (name "buttjump-left") + (name "kick") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/feet-buttjump-left-0.png")) + (images "shared/bigtux/feet-kick-0.png")) (action - (name "buttjump-right") + (name "buttjump") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/feet-buttjump-right-0.png"))) + (images "shared/bigtux/feet-buttjump-0.png"))) ; End of Big Tux (no power) sprite @@ -383,98 +204,51 @@ (sprite (name "big-fire-tux-head") (action - (name "walk-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-left-0.png")) - - (action - (name "walk-right") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-right-0.png")) - - (action - (name "stand-left") + (name "walk") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-left-0.png")) + (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "stand-right") + (name "stand") (fps 15.0) (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-right-0.png")) - - (action - (name "jump-left") - (fps 15.0) - (x-hotspot 5) - (y-hotspot 7) - (images "shared/bigtux/head-fire-stand-left-0.png")) + (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "jump-right") + (name "jump") (fps 15.0) (x-hotspot 5) (y-hotspot 7) - (images "shared/bigtux/head-fire-stand-right-0.png")) - - (action - (name "skid-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/head-skid-left-0.png")) + (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "skid-right") + (name "skid") (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/head-skid-right-0.png")) - - (action - (name "kick-left") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-left-0.png")) - - (action - (name "kick-right") - (x-hotspot 5) - (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-right-0.png")) + (images "shared/bigtux/head-skid-0.png")) (action - (name "buttjump-left") + (name "kick") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-left-0.png")) + (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "buttjump-right") + (name "buttjump") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/head-fire-stand-right-0.png")) - - (action - (name "idle-left") - (fps 1.0) - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/head-idle-blink-left-0.png" - "shared/bigtux/head-idle-blink-left-1.png")) + (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "idle-right") + (name "idle") (fps 1.0) (x-hotspot 6) (y-hotspot 8) - (images "shared/bigtux/head-idle-blink-right-0.png" - "shared/bigtux/head-idle-blink-right-1.png"))) + (images "shared/bigtux/head-idle-blink-0.png" + "shared/bigtux/head-idle-blink-1.png"))) ; End of Big Fire Tux sprite |
Update of /cvsroot/super-tux/supertux/data/images/shared/bigtux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8998/data/images/shared/bigtux Added Files: arms-grab-0.png arms-jump-0.png arms-skid-0.png arms-stand-0.png arms-walk-0.png arms-walk-1.png arms-walk-2.png arms-walk-3.png arms-walk-4.png arms-walk-5.png body-skid-0.png body-stand-0.png feet-buttjump-0.png feet-jump-0.png feet-kick-0.png feet-skid-0.png feet-stand-0.png feet-walk-0.png feet-walk-1.png feet-walk-2.png feet-walk-3.png feet-walk-4.png feet-walk-5.png head-angry-stand-0.png head-cool-stand-0.png head-fire-stand-0.png head-idle-blink-0.png head-idle-blink-1.png head-skid-0.png head-stand-0.png Removed Files: arms-grab-left-0.png arms-grab-right-0.png arms-jump-left-0.png arms-jump-right-0.png arms-skid-left-0.png arms-skid-right-0.png arms-stand-left-0.png arms-stand-right-0.png arms-walk-left-0.png arms-walk-left-1.png arms-walk-left-2.png arms-walk-left-3.png arms-walk-left-4.png arms-walk-left-5.png arms-walk-right-0.png arms-walk-right-1.png arms-walk-right-2.png arms-walk-right-3.png arms-walk-right-4.png arms-walk-right-5.png body-skid-left-0.png body-skid-right-0.png body-stand-left-0.png body-stand-right-0.png feet-buttjump-left-0.png feet-buttjump-right-0.png feet-jump-left-0.png feet-jump-right-0.png feet-kick-left-0.png feet-kick-right-0.png feet-skid-left-0.png feet-skid-right-0.png feet-stand-left-0.png feet-stand-right-0.png feet-walk-left-0.png feet-walk-left-1.png feet-walk-left-2.png feet-walk-left-3.png feet-walk-left-4.png feet-walk-left-5.png feet-walk-right-0.png feet-walk-right-1.png feet-walk-right-2.png feet-walk-right-3.png feet-walk-right-4.png feet-walk-right-5.png head-angry-stand-left-0.png head-angry-stand-right-0.png head-cool-stand-left-0.png head-cool-stand-right-0.png head-fire-stand-left-0.png head-fire-stand-right-0.png head-idle-blink-left-0.png head-idle-blink-left-1.png head-idle-blink-right-0.png head-idle-blink-right-1.png head-skid-left-0.png head-skid-right-0.png head-stand-left-0.png head-stand-right-0.png Log Message: Renamed images. --- feet-kick-right-0.png DELETED --- --- NEW FILE: feet-stand-0.png --- (This appears to be a binary file; contents omitted.) --- head-cool-stand-right-0.png DELETED --- --- arms-walk-left-2.png DELETED --- --- arms-stand-right-0.png DELETED --- --- head-fire-stand-left-0.png DELETED --- --- head-cool-stand-left-0.png DELETED --- --- arms-walk-right-0.png DELETED --- --- NEW FILE: head-cool-stand-0.png --- (This appears to be a binary file; contents omitted.) --- feet-walk-left-5.png DELETED --- --- arms-walk-right-5.png DELETED --- --- feet-walk-right-5.png DELETED --- --- feet-walk-right-2.png DELETED --- --- head-idle-blink-left-1.png DELETED --- --- head-fire-stand-right-0.png DELETED --- --- NEW FILE: arms-jump-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: feet-jump-0.png --- (This appears to be a binary file; contents omitted.) --- arms-skid-left-0.png DELETED --- --- arms-walk-left-5.png DELETED --- --- head-idle-blink-left-0.png DELETED --- --- NEW FILE: head-stand-0.png --- (This appears to be a binary file; contents omitted.) --- arms-walk-right-1.png DELETED --- --- NEW FILE: feet-kick-0.png --- (This appears to be a binary file; contents omitted.) --- body-skid-left-0.png DELETED --- --- NEW FILE: arms-walk-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: feet-walk-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: feet-walk-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: feet-walk-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-stand-0.png --- (This appears to be a binary file; contents omitted.) --- head-angry-stand-left-0.png DELETED --- --- NEW FILE: head-angry-stand-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: head-idle-blink-0.png --- (This appears to be a binary file; contents omitted.) --- arms-walk-left-3.png DELETED --- --- NEW FILE: body-stand-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-3.png --- (This appears to be a binary file; contents omitted.) --- feet-stand-right-0.png DELETED --- --- NEW FILE: feet-walk-1.png --- (This appears to be a binary file; contents omitted.) --- body-stand-right-0.png DELETED --- --- feet-skid-left-0.png DELETED --- --- arms-walk-right-4.png DELETED --- --- NEW FILE: feet-skid-0.png --- (This appears to be a binary file; contents omitted.) --- arms-walk-left-0.png DELETED --- --- feet-stand-left-0.png DELETED --- --- feet-walk-left-0.png DELETED --- --- feet-walk-left-1.png DELETED --- --- feet-walk-left-2.png DELETED --- --- NEW FILE: arms-grab-0.png --- (This appears to be a binary file; contents omitted.) --- head-skid-left-0.png DELETED --- --- feet-walk-right-3.png DELETED --- --- head-stand-right-0.png DELETED --- --- feet-walk-right-1.png DELETED --- --- arms-jump-right-0.png DELETED --- --- arms-grab-right-0.png DELETED --- --- feet-walk-right-4.png DELETED --- --- head-skid-right-0.png DELETED --- --- arms-walk-right-2.png DELETED --- --- NEW FILE: head-fire-stand-0.png --- (This appears to be a binary file; contents omitted.) --- arms-grab-left-0.png DELETED --- --- feet-walk-left-3.png DELETED --- --- feet-jump-right-0.png DELETED --- --- NEW FILE: feet-walk-4.png --- (This appears to be a binary file; contents omitted.) --- arms-walk-left-4.png DELETED --- --- feet-jump-left-0.png DELETED --- --- feet-kick-left-0.png DELETED --- --- NEW FILE: arms-skid-0.png --- (This appears to be a binary file; contents omitted.) --- head-angry-stand-right-0.png DELETED --- --- feet-skid-right-0.png DELETED --- --- head-idle-blink-right-0.png DELETED --- --- head-idle-blink-right-1.png DELETED --- --- NEW FILE: head-idle-blink-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: feet-buttjump-0.png --- (This appears to be a binary file; contents omitted.) --- arms-skid-right-0.png DELETED --- --- NEW FILE: feet-walk-2.png --- (This appears to be a binary file; contents omitted.) --- body-skid-right-0.png DELETED --- --- feet-walk-right-0.png DELETED --- --- arms-stand-left-0.png DELETED --- --- feet-buttjump-left-0.png DELETED --- --- arms-walk-right-3.png DELETED --- --- NEW FILE: body-skid-0.png --- (This appears to be a binary file; contents omitted.) --- arms-walk-left-1.png DELETED --- --- feet-buttjump-right-0.png DELETED --- --- NEW FILE: arms-walk-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-1.png --- (This appears to be a binary file; contents omitted.) --- feet-walk-left-4.png DELETED --- --- NEW FILE: arms-walk-4.png --- (This appears to be a binary file; contents omitted.) --- head-stand-left-0.png DELETED --- --- body-stand-left-0.png DELETED --- --- NEW FILE: head-skid-0.png --- (This appears to be a binary file; contents omitted.) --- arms-jump-left-0.png DELETED --- --- NEW FILE: arms-walk-2.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-08-19 11:01:58
|
Update of /cvsroot/super-tux/supertux/lib/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8382/lib/video Modified Files: surface.cpp surface.h Log Message: Added horizontal flip effect, as well as both horizontal and vertical together. Index: surface.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/surface.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- surface.h 28 Jul 2004 22:23:23 -0000 1.4 +++ surface.h 19 Aug 2004 11:01:46 -0000 1.5 @@ -50,8 +50,10 @@ NONE_EFFECT = 0x0000, /** Draw the Surface upside down */ VERTICAL_FLIP = 0x0001, + /** Draw the Surface from left to down */ + HORIZONTAL_FLIP = 0x0002, /** Draw the Surface with alpha equal to 128 */ - SEMI_TRANSPARENT = 0x0002 + SEMI_TRANSPARENT = 0x0004 }; /** This class holds all the data necessary to construct a surface */ Index: surface.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- surface.cpp 29 Jul 2004 11:23:21 -0000 1.6 +++ surface.cpp 19 Aug 2004 11:01:46 -0000 1.7 @@ -568,7 +568,21 @@ glBegin(GL_QUADS); - if(effect & VERTICAL_FLIP) + if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP) + { + glTexCoord2f(0, 0); + glVertex2f((float)w+x, (float)h+y); + + glTexCoord2f((float)w / pw, 0); + glVertex2f(x, (float)h+y); + + glTexCoord2f((float)w / pw, (float)h / ph); + glVertex2f(x, y); + + glTexCoord2f(0, (float)h / ph); + glVertex2f((float)w+x, y); + } + else if(effect & VERTICAL_FLIP) { glTexCoord2f(0, 0); glVertex2f(x, (float)h+y); @@ -582,6 +596,20 @@ glTexCoord2f(0, (float)h / ph); glVertex2f(x, y); } + else if(effect & HORIZONTAL_FLIP) + { + glTexCoord2f(0, 0); + glVertex2f((float)w+x, y); + + glTexCoord2f((float)w / pw, 0); + glVertex2f(x, y); + + glTexCoord2f((float)w / pw, (float)h / ph); + glVertex2f(x, (float)h+y); + + glTexCoord2f(0, (float)h / ph); + glVertex2f((float)w+x, (float)h+y); + } else { glTexCoord2f(0, 0); @@ -625,7 +653,21 @@ glBegin(GL_QUADS); - if(effect & VERTICAL_FLIP) + if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP) + { + glTexCoord2f(sx / pw, (float)(sy+h) / ph); + glVertex2f((float)w+x, (float)h+y); + + glTexCoord2f((sx+w) / pw, (sy+h) / ph); + glVertex2f(x, (float)h+y); + + glTexCoord2f((float)(sx + w) / pw, sy / ph); + glVertex2f(x, y); + + glTexCoord2f(sx / pw, sy / ph); + glVertex2f((float)w+x, y); + } + else if(effect & VERTICAL_FLIP) { glTexCoord2f(sx / pw, sy / ph); glVertex2f(x, y); @@ -639,6 +681,20 @@ glTexCoord2f(sx / pw, (float)(sy+h) / ph); glVertex2f(x, h+y); } + else if(effect & HORIZONTAL_FLIP) + { + glTexCoord2f(sx / pw, sy / ph); + glVertex2f((float)w+x, y); + + glTexCoord2f((float)(sx + w) / pw, sy / ph); + glVertex2f(x, y); + + glTexCoord2f((sx+w) / pw, (sy+h) / ph); + glVertex2f(x, (float)h+y); + + glTexCoord2f(sx / pw, (float)(sy+h) / ph); + glVertex2f((float)w+x, (float)h+y); + } else { glTexCoord2f(sx / pw, (float)(sy+h) / ph); @@ -684,7 +740,21 @@ glBegin(GL_QUADS); - if(effect & VERTICAL_FLIP) + if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP) + { + glTexCoord2f(0, 0); + glVertex2f((float)sw+x, (float)sh+y); + + glTexCoord2f((float)w / pw, 0); + glVertex2f(x, (float)sh+y); + + glTexCoord2f((float)w / pw, (float)h / ph); + glVertex2f(x, y); + + glTexCoord2f(0, (float)h / ph); + glVertex2f((float)sw+x, y); + } + else if(effect & VERTICAL_FLIP) { glTexCoord2f(0, 0); glVertex2f(x, (float)sh+y); @@ -698,6 +768,20 @@ glTexCoord2f(0, (float)h / ph); glVertex2f(x, y); } + else if(effect & HORIZONTAL_FLIP) + { + glTexCoord2f(0, 0); + glVertex2f((float)sw+x, y); + + glTexCoord2f((float)w / pw, 0); + glVertex2f(x, y); + + glTexCoord2f((float)w / pw, (float)h / ph); + glVertex2f(x, (float)sh+y); + + glTexCoord2f(0, (float)h / ph); + glVertex2f((float)sw+x, (float)sh+y); + } else { glTexCoord2f(0, 0); @@ -763,13 +847,29 @@ if(effect & SEMI_TRANSPARENT) alpha = 128; - if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack + if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP) + { + // FIXME: this hack is damn slow. Just keep it cause it isn't that used. + for(float sx = 0; sx < w; sx++) + for(float sy = 0; sy < h; sy++) + if(draw_part(sx, sy, x+(w-sx), y+(h-sy), 1, 1, alpha, NONE_EFFECT) == -2) + return -2; + return 0; + } + else if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack { for(float sy = 0; sy < h; sy++) if(draw_part(0, sy, x, y+(h-sy), w, 1, alpha, NONE_EFFECT) == -2) return -2; return 0; } + else if(effect & HORIZONTAL_FLIP) // FIXME: feel free to replace this hack + { + for(float sx = 0; sx < w; sx++) + if(draw_part(sx, 0, x+(w-sx), y, 1, h, alpha, NONE_EFFECT) == -2) + return -2; + return 0; + } if(alpha != 255) { @@ -820,13 +920,29 @@ if(effect & SEMI_TRANSPARENT) alpha = 128; - if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack + if(effect & VERTICAL_FLIP & HORIZONTAL_FLIP) + { + // FIXME: this hack is damn slow. Just keep it cause it isn't that used. + for(float sx_ = 0; sx_ < w; sx++) + for(float sy_ = 0; sy_ < h; sy++) + if(draw_part(sx_, sy_, sx+(w-sx_), sy+(h-sy_), 1, 1, alpha, NONE_EFFECT) == -2) + return -2; + return 0; + } + else if(effect & VERTICAL_FLIP) // FIXME: feel free to replace this hack { for(float sy_ = sy; sy_ < h; sy_++) if(draw_part(sx, sy_, x, y+(h-sy_), w, 1, alpha, NONE_EFFECT) == -2) return -2; return 0; } + else if(effect & HORIZONTAL_FLIP) // FIXME: feel free to replace this hack + { + for(float sx_ = 0; sx_ < w; sx_++) + if(draw_part(sx_, 0, sx+(w-sx_), sy, 1, h, alpha, NONE_EFFECT) == -2) + return -2; + return 0; + } if(alpha != 255) { |
|
From: Ricardo C. <rm...@us...> - 2004-08-19 11:01:05
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8154/lib/special Modified Files: sprite.cpp Log Message: Added message when no action is found. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sprite.cpp 18 Aug 2004 18:26:40 -0000 1.16 +++ sprite.cpp 19 Aug 2004 11:00:53 -0000 1.17 @@ -104,6 +104,11 @@ return; } Actions::iterator i = actions.find(act); +if(i == actions.end()) + { + std::cerr << "Warning: Action '" << act << "' not found on Sprite '" << name << "'\n"; + return; + } action = i->second; } |
|
From: Marek M. <wa...@us...> - 2004-08-19 08:29:44
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18676/data/levels/world1 Modified Files: Tag: supertux_0_1_1_branch level5.stl Log Message: small beauty fixes Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level5.stl,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -u -d -r1.14.2.2 -r1.14.2.3 --- level5.stl 12 Aug 2004 15:09:07 -0000 1.14.2.2 +++ level5.stl 19 Aug 2004 08:29:34 -0000 1.14.2.3 @@ -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 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 124 125 0 0 0 0 0 124 125 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 106 107 108 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 24 109 110 111 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 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 0 0 0 0 109 110 111 0 0 0 0 0 24 0 0 0 0 0 0 0 0 0 0 124 125 0 124 125 0 25 0 0 0 124 125 0 124 125 0 0 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 109 110 111 0 0 0 0 25 0 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 25 0 0 0 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 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 109 110 111 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 109 110 111 0 0 0 0 0 0 0 0 0 0 0 24 0 109 110 111 0 8 8 8 8 8 8 8 8 8 8 0 0 0 0 0 0 0 0 25 0 0 109 110 111 0 0 0 0 0 0 0 0 0 0 0 0 0 17 17 17 17 0 0 0 24 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 109 110 111 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 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 0 0 0 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 76 76 76 76 76 76 76 76 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 76 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 76 76 76 76 76 76 76 76 0 0 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 0 0 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) |
|
From: Marek M. <wa...@us...> - 2004-08-19 08:29:44
|
Update of /cvsroot/super-tux/supertux/data/levels/bonus1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18676/data/levels/bonus1 Modified Files: Tag: supertux_0_1_1_branch matr1x-level2.stl Log Message: small beauty fixes Index: matr1x-level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/matr1x-level2.stl,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- matr1x-level2.stl 14 Aug 2004 09:55:40 -0000 1.1.2.4 +++ matr1x-level2.stl 19 Aug 2004 08:29:33 -0000 1.1.2.5 @@ -56,9 +56,9 @@ ) (foreground-tm - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 184 185 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 184 185 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 184 185 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 21:36:10
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16288/src Modified Files: sector.cpp special.cpp special.h Log Message: Forward bug fix port to HEAD. Bug reported by Seneca. Also changed UPGRADE_HERRING by UPGRADE_STAR. Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- sector.cpp 5 Aug 2004 10:10:19 -0000 1.19 +++ sector.cpp 18 Aug 2004 21:36:00 -0000 1.20 @@ -804,7 +804,7 @@ break; case 3: // Add a golden herring - add_upgrade(Vector(posx, posy), col_side, UPGRADE_HERRING); + add_upgrade(Vector(posx, posy), col_side, UPGRADE_STAR); break; case 4: // Add a 1up extra Index: special.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- special.h 20 Jul 2004 18:04:48 -0000 1.27 +++ special.h 18 Aug 2004 21:36:00 -0000 1.28 @@ -35,7 +35,7 @@ UPGRADE_GROWUP, UPGRADE_FIREFLOWER, UPGRADE_ICEFLOWER, - UPGRADE_HERRING, + UPGRADE_STAR, UPGRADE_1UP }; Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- special.cpp 10 Aug 2004 11:43:57 -0000 1.66 +++ special.cpp 18 Aug 2004 21:36:00 -0000 1.67 @@ -161,7 +161,7 @@ physic.reset(); physic.enable_gravity(false); - if(kind == UPGRADE_1UP || kind == UPGRADE_HERRING) { + if(kind == UPGRADE_1UP || kind == UPGRADE_STAR) { physic.set_velocity(dir == LEFT ? -1 : 1, 4); physic.enable_gravity(true); base.height = 32; @@ -210,12 +210,12 @@ /* Move around? */ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity); - if(kind == UPGRADE_GROWUP) { + if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) { collision_swept_object_map(&old_base, &base); } // fall down? - if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) { + if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) { // falling? if(physic.get_velocity_y() != 0) { if(issolid(base.x, base.y + base.height)) { @@ -224,7 +224,7 @@ if(kind == UPGRADE_GROWUP) { physic.enable_gravity(false); physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0); - } else if(kind == UPGRADE_HERRING) { + } else if(kind == UPGRADE_STAR) { physic.set_velocity(dir == LEFT ? -2 : 2, 3); } } @@ -239,7 +239,7 @@ } // horizontal bounce? - if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) { + if(kind == UPGRADE_GROWUP || kind == UPGRADE_STAR) { if ( (physic.get_velocity_x() < 0 && issolid(base.x, (int) base.y + base.height/2)) || (physic.get_velocity_x() > 0 @@ -258,7 +258,7 @@ case UPGRADE_GROWUP: sprite = img_growup; break; case UPGRADE_ICEFLOWER: sprite = img_iceflower; break; case UPGRADE_FIREFLOWER: sprite = img_fireflower; break; - case UPGRADE_HERRING: sprite = img_star; break; + case UPGRADE_STAR: sprite = img_star; break; case UPGRADE_1UP: sprite = img_1up; break; default: assert(!"wrong type in Powerup::draw()"); @@ -348,7 +348,7 @@ pplayer->grow(true); pplayer->got_power = pplayer->FIRE_POWER; } - else if (kind == UPGRADE_HERRING) + else if (kind == UPGRADE_STAR) { SoundManager::get()->play_sound(IDToSound(SND_HERRING)); pplayer->invincible_timer.start(TUX_INVINCIBLE_TIME); |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 21:27:41
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14424/src Modified Files: Tag: supertux_0_1_1_branch special.cpp Log Message: Bugfix: Collisions were not being applied for the Star powerup. Bug reported by Seneca. Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.39 retrieving revision 1.39.2.1 diff -u -d -r1.39 -r1.39.2.1 --- special.cpp 29 Apr 2004 00:15:10 -0000 1.39 +++ special.cpp 18 Aug 2004 21:27:29 -0000 1.39.2.1 @@ -204,7 +204,7 @@ /* Move around? */ physic.apply(frame_ratio, base.x, base.y); - if(kind == UPGRADE_GROWUP) { + if(kind == UPGRADE_GROWUP || kind == UPGRADE_HERRING) { collision_swept_object_map(&old_base, &base); } |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 18:27:40
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10337/src Modified Files: player.cpp Log Message: Made draw() func on Player more sane. Bugfix: blink Tux on safe time. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- player.cpp 18 Aug 2004 10:31:49 -0000 1.155 +++ player.cpp 18 Aug 2004 18:27:32 -0000 1.156 @@ -734,91 +734,58 @@ int layer = LAYER_OBJECTS - 1; Vector pos = Vector(base.x, base.y); - if ((!safe_timer.started() || growing_timer.started()) && (global_frame_counter % 2)) + /* Set Tux sprite action */ + if (duck && size != SMALL) { - if (dying == DYING_SQUISHED) - { - smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1); - } + if (dir == RIGHT) + tux_body->set_action("duck-right"); + else + tux_body->set_action("duck-left"); + } + else if (skidding_timer.started()) + { + if (dir == RIGHT) + tux_body->set_action("skid-right"); + else + tux_body->set_action("skid-left"); + } + else if (kick_timer.started()) + { + if (dir == RIGHT) + tux_body->set_action("kick-right"); + else + tux_body->set_action("kick-left"); + } + else if (butt_jump) + { + if (dir == RIGHT) + tux_body->set_action("buttjump-right"); + else + tux_body->set_action("buttjump-left"); + } + else if (physic.get_velocity_y() != 0) + { + if (dir == RIGHT) + tux_body->set_action("jump-right"); + else + tux_body->set_action("jump-left"); + } + else + { + if (fabsf(physic.get_velocity_x()) < 1.0f) // standing + { + if (dir == RIGHT) + tux_body->set_action("stand-right"); else - { - if(growing_timer.check()) - { - if(size == SMALL) - { - if (dir == RIGHT) - context.draw_surface(growingtux_right[GROWING_FRAMES-1 - - ((growing_timer.get_gone() * - GROWING_FRAMES) / GROWING_TIME)], pos, layer); - else - context.draw_surface(growingtux_left[GROWING_FRAMES-1 - - ((growing_timer.get_gone() * - GROWING_FRAMES) / GROWING_TIME)], pos, layer); - } - else - { - if (dir == RIGHT) - context.draw_surface(growingtux_right[(growing_timer.get_gone() * - GROWING_FRAMES) / GROWING_TIME], pos, layer); - else - context.draw_surface(growingtux_left[(growing_timer.get_gone() * - GROWING_FRAMES) / GROWING_TIME], pos, layer); - } - } - else if (duck && size != SMALL) - { - if (dir == RIGHT) - tux_body->set_action("duck-right"); - else - tux_body->set_action("duck-left"); - } - - else if (skidding_timer.started()) - { - if (dir == RIGHT) - tux_body->set_action("skid-right"); - else - tux_body->set_action("skid-left"); - } - else if (kick_timer.started()) - { - if (dir == RIGHT) - tux_body->set_action("kick-right"); - else - tux_body->set_action("kick-left"); - } - else if (butt_jump) - { - if (dir == RIGHT) - tux_body->set_action("buttjump-right"); - else - tux_body->set_action("buttjump-left"); - } - else if (physic.get_velocity_y() != 0) - { - if (dir == RIGHT) - tux_body->set_action("jump-right"); - else - tux_body->set_action("jump-left"); - } - else - { - if (fabsf(physic.get_velocity_x()) < 1.0f) // standing - { - if (dir == RIGHT) - tux_body->set_action("stand-right"); - else - tux_body->set_action("stand-left"); - } - else // moving - { - if (dir == RIGHT) - tux_body->set_action("walk-right"); - else - tux_body->set_action("walk-left"); - } - } - } + tux_body->set_action("stand-left"); + } + else // moving + { + if (dir == RIGHT) + tux_body->set_action("walk-right"); + else + tux_body->set_action("walk-left"); + } } if(idle_timer.get_left() < 0) @@ -846,12 +813,42 @@ tux_body->arms->set_action("grab-left"); } - if(dying != DYING_SQUISHED && !growing_timer.check()) + /* Draw Tux */ + if (dying == DYING_SQUISHED) + { + smalltux_gameover->draw(context, pos, LAYER_FOREGROUNDTILES+1); + } + else if(growing_timer.check()) + { + if(size == SMALL) + { + if (dir == RIGHT) + context.draw_surface(growingtux_right[GROWING_FRAMES-1 - + ((growing_timer.get_gone() * + GROWING_FRAMES) / GROWING_TIME)], pos, layer); + else + context.draw_surface(growingtux_left[GROWING_FRAMES-1 - + ((growing_timer.get_gone() * + GROWING_FRAMES) / GROWING_TIME)], pos, layer); + } + else + { + if (dir == RIGHT) + context.draw_surface(growingtux_right[(growing_timer.get_gone() * + GROWING_FRAMES) / GROWING_TIME], pos, layer); + else + context.draw_surface(growingtux_left[(growing_timer.get_gone() * + GROWING_FRAMES) / GROWING_TIME], pos, layer); + } + } + else if (safe_timer.started() && global_frame_counter%2) + ; // don't draw Tux + else tux_body->draw(context, pos, layer); // Draw blinking star overlay if (invincible_timer.started() && - (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3)) + (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3)) { if (size == SMALL || duck) smalltux_star->draw(context, pos, LAYER_OBJECTS + 2); |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 18:26:49
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10214/lib/special Modified Files: sprite.cpp Log Message: Round frame on checking for last frame, so that the last frame is used. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- sprite.cpp 18 Aug 2004 10:32:26 -0000 1.15 +++ sprite.cpp 18 Aug 2004 18:26:40 -0000 1.16 @@ -119,7 +119,7 @@ { frame = 0; last_tick = SDL_GetTicks(); -animation_reversed = true; +animation_reversed = false; next_action.clear(); } @@ -157,7 +157,7 @@ if(animation_reversed) { float excedent = frame - 0; - if(excedent < 0 || excedent >= get_frames()) + if((int)excedent < 0 || excedent >= get_frames()) { // last case can happen when not used reverse_animation() frame = get_frames() - 1; if(animation_loops > 0) @@ -177,7 +177,7 @@ else { float excedent = frame - action->surfaces.size(); - if(excedent >= 0) + if((int)excedent >= 0) { frame = 0; if(animation_loops > 0) |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 11:04:16
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10833/data/images/tilesets Modified Files: supertux.stgt Added Files: block1b.png block2b.png block3b.png snow14b.png snow15b.png snow18b.png snow19b.png snow1b.png snow7b.png snow7c.png snowbg1b.png snowbg3b.png Log Message: A few more tiles for World 1 by Demon Night! --- NEW FILE: block2b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: block3b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow7c.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow7b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowbg3b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: block1b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow15b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow14b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow1b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowbg1b.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.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- supertux.stgt 16 Aug 2004 17:02:50 -0000 1.46 +++ supertux.stgt 18 Aug 2004 11:04:06 -0000 1.47 @@ -1,13 +1,13 @@ ;; -*- mode: scheme -*- (supertux-tiles - (properties + (properties (id 0)) ;; Zero tile (tilegroup (name "Snow") (tiles 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 30 31)) - (tilegroup (name "Snow (More)") (tiles 122 123 124 125 113 114 115 116 117 118)) + (tilegroup (name "Snow (More)") (tiles 122 123 124 125 113 114 115 116 117 118 202 203 204 205 206 207 208 208 210)) (tilegroup (name "Darksnow") (tiles 32 33 34 35 36 37 38 39 40 41 42 43)) - (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62 77 78)) + (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62 77 78 211 212 213)) (tilegroup (name "Background") (tiles 24 25 63 70 71 72 73 74 106 107 108 109 110 111)) (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101)) (tilegroup (name "Points") (tiles 132 133)) @@ -246,7 +246,7 @@ (tile (id 74) (images "backgroundtile5.png") (solid #t)) - + (tile (id 75) (images "water.png") (water #t)) @@ -258,7 +258,7 @@ ;; Normal brick (tile (id 77) (images "brick0.png") - (brick #t) + (brick #t) (next-tile 0) (solid #t)) (tile (id 78) @@ -290,12 +290,12 @@ "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") (anim-speed 50) (fullbox #t) - (solid #t) + (solid #t) (next-tile 84) (data 1)) (tile (id 84) - (solid #t) + (solid #t) (images "bonus2-d.png")) @@ -349,7 +349,7 @@ ;; Brick with bonus content (tile (id 104) (images "brick0.png") - (brick #t) + (brick #t) (data 1) (next-tile 84) (solid #t)) @@ -593,7 +593,7 @@ (images (region "snow-para-2.png" 96 64 32 32))) ;; Lava - + (tile (id 173) (images "lava1-1.png" "lava1-2.png" "lava1-3.png" "lava1-4.png") (water #t) @@ -602,7 +602,7 @@ (images "lava2-1.png" "lava2-2.png" "lava2-3.png" "lava2-4.png") (water #t) (anim-speed 120)) - + ;; WaterFall (tile (id 175) (images "waterfall-trans1-1-1.png" "waterfall-trans1-1-2.png" "waterfall-trans1-1-3.png" "waterfall-trans1-1-4.png") @@ -614,62 +614,62 @@ (anim-speed 45)) (tile (id 177) (images "waterfall-trans1-3-1.png" "waterfall-trans1-3-2.png" "waterfall-trans1-3-3.png" "waterfall-trans1-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 178) (images "waterfall-trans1-4-1.png" "waterfall-trans1-4-2.png" "waterfall-trans1-4-3.png" "waterfall-trans1-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 179) (images "waterfall-trans2-1-1.png" "waterfall-trans2-1-2.png" "waterfall-trans2-1-3.png" "waterfall-trans2-1-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 180) (images "waterfall-trans2-2-1.png" "waterfall-trans2-2-2.png" "waterfall-trans2-2-3.png" "waterfall-trans2-2-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 181) (images "waterfall-trans2-3-1.png" "waterfall-trans2-3-2.png" "waterfall-trans2-3-3.png" "waterfall-trans2-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 182) (images "waterfall-trans2-4-1.png" "waterfall-trans2-4-2.png" "waterfall-trans2-4-3.png" "waterfall-trans2-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 183) (images "waterfall-trans3-1-1.png" "waterfall-trans3-1-2.png" "waterfall-trans3-1-3.png" "waterfall-trans3-1-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 184) (images "waterfall-trans3-2-1.png" "waterfall-trans3-2-2.png" "waterfall-trans3-2-3.png" "waterfall-trans3-2-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 185) (images "waterfall-trans3-3-1.png" "waterfall-trans3-3-2.png" "waterfall-trans3-3-3.png" "waterfall-trans3-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 186) (images "waterfall-trans3-4-1.png" "waterfall-trans3-4-2.png" "waterfall-trans3-4-3.png" "waterfall-trans3-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 187) (images "waterfall-trans4-1-1.png" "waterfall-trans4-1-2.png" "waterfall-trans4-1-3.png" "waterfall-trans4-1-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 188) (images "waterfall-trans4-2-1.png" "waterfall-trans4-2-2.png" "waterfall-trans4-2-3.png" "waterfall-trans4-2-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 189) (images "waterfall-trans4-3-1.png" "waterfall-trans4-3-2.png" "waterfall-trans4-3-3.png" "waterfall-trans4-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 190) (images "waterfall-trans4-4-1.png" "waterfall-trans4-4-2.png" "waterfall-trans4-4-3.png" "waterfall-trans4-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 191) @@ -709,7 +709,7 @@ (images "waterfall0-2-1.png" "waterfall0-2-2.png" "waterfall0-2-3.png" "waterfall0-2-4.png") (water #t) (anim-speed 45)) - + (tile (id 200) (images "water-trans.png") (water #t)) @@ -718,6 +718,43 @@ (water #t) (anim-speed 50)) + (tile (id 202) + (images "snow1b.png") + (solid #f)) + (tile (id 203) + (images "snow7b.png") + (solid #t)) + (tile (id 204) + (images "snow7c.png") + (solid #t)) + (tile (id 205) + (images "snow15b.png") + (solid #t)) + (tile (id 206) + (images "snow14b.png") + (solid #t)) + (tile (id 207) + (images "snow18b.png") + (solid #t)) + (tile (id 208) + (images "snow19b.png") + (solid #t)) + (tile (id 209) + (images "snowbg1b.png") + (solid #t)) + (tile (id 210) + (images "snowbg3b.png") + (solid #t)) + (tile (id 211) + (images "block1b.png") + (solid #t)) + (tile (id 212) + (images "block2b.png") + (solid #t)) + (tile (id 213) + (images "block3b.png") + (solid #t)) + (tile (id 275) (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") (water #t) @@ -728,62 +765,62 @@ (anim-speed 45)) (tile (id 277) (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 278) (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 279) (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 280) (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 281) (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 282) (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 283) (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 284) (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 285) (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 286) (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 287) (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 288) (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 289) (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 290) (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") - (water #t) + (water #t) (anim-speed 45)) (tile (id 291) @@ -803,14 +840,14 @@ (water #t) (anim-speed 45)) - + ;; Spike - + (tile (id 300) (spike #t) (images "spike.png")) - + ;; Jungle (tile (id 301) --- NEW FILE: snow19b.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow18b.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 10:44:28
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7092 Modified Files: TODO Log Message: Added menu bugs. Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- TODO 10 Jul 2004 21:01:09 -0000 1.73 +++ TODO 18 Aug 2004 10:44:15 -0000 1.74 @@ -72,6 +72,8 @@ [M] You shouldn't be able to stand on invisible blocks, before you bumped them the roof [M] Implement Unisolid type for tiles (where collisions from below are ignored). +[M] Menu doesn't jump titles, and doesn't seem to like having menu entries created + after initialization. [L] Allow any object to be inside of a [?] box, ie. trampoline or badguy - Not sure if this would be gameplay wise. |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 10:38:31
|
Update of /cvsroot/super-tux/supertux/lib/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6037/lib/gui Modified Files: menu.cpp Log Message: Just got rid of the damn reference. Can anyone fix this hack with horizontal lines, titles...? Maybe we should just replace this code by the old one. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- menu.cpp 7 Aug 2004 11:34:41 -0000 1.11 +++ menu.cpp 18 Aug 2004 10:38:10 -0000 1.12 @@ -462,10 +462,9 @@ // 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) + if(item[active_item].kind == MN_DEACTIVE || + item[active_item].kind == MN_LABEL || + item[active_item].kind == MN_HL) { // Skip the horzontal line item if (menuaction != MENU_ACTION_UP && menuaction != MENU_ACTION_DOWN) |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 10:32:40
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5157/lib/special Modified Files: sprite.cpp sprite.h Log Message: Improvements. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- sprite.cpp 17 Aug 2004 23:22:47 -0000 1.14 +++ sprite.cpp 18 Aug 2004 10:32:26 -0000 1.15 @@ -130,9 +130,9 @@ } void -Sprite::reverse_animation() +Sprite::reverse_animation(bool reverse) { -animation_reversed = !animation_reversed; +animation_reversed = reverse; if(animation_reversed) frame = get_frames()-1; @@ -147,14 +147,13 @@ return; float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick); +last_tick = SDL_GetTicks(); if(animation_reversed) frame -= frame_inc; else frame += frame_inc; -last_tick = SDL_GetTicks(); - if(animation_reversed) { float excedent = frame - 0; @@ -164,7 +163,7 @@ if(animation_loops > 0) { animation_loops--; - if(animation_loops == 0) + if(animation_loops == 0 && !next_action.empty()) { set_action(next_action); start_animation(-1); @@ -184,7 +183,7 @@ if(animation_loops > 0) { animation_loops--; - if(animation_loops == 0) + if(animation_loops == 0 && !next_action.empty()) { set_action(next_action); start_animation(-1); Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- sprite.h 17 Aug 2004 23:22:47 -0000 1.11 +++ sprite.h 18 Aug 2004 10:32:26 -0000 1.12 @@ -66,10 +66,13 @@ 0 - stopped 1,2,3 - one, two, three times... */ void start_animation(int loops); + /* Stop animation */ + void stop_animation() + { start_animation(0); } /** Check if animation is stopped or not */ bool check_animation(); /** Reverse the animation */ - void reverse_animation(); + void reverse_animation(bool reverse); float get_fps() { return action->fps; } |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 10:32:05
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5030/src Modified Files: player.cpp Log Message: Idle change. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- player.cpp 17 Aug 2004 23:23:11 -0000 1.154 +++ player.cpp 18 Aug 2004 10:31:49 -0000 1.155 @@ -820,22 +820,22 @@ } } } -/* + if(idle_timer.get_left() < 0) { if (dir == RIGHT) { - tux_body->set_action("idle-right"); - tux_body->one_time_animation(); + tux_body->head->set_action("idle-right"); + tux_body->head->start_animation(1); } else { - tux_body->set_action("idle-left"); - tux_body->one_time_animation(); + tux_body->head->set_action("idle-right"); + tux_body->head->start_animation(1); } idle_timer.start(IDLE_TIME); } -*/ + // Tux is holding something if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck) |
|
From: Ricardo C. <rm...@us...> - 2004-08-18 10:31:36
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4973/data/images Modified Files: supertux.strf Log Message: Idle change. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- supertux.strf 17 Aug 2004 23:05:25 -0000 1.2 +++ supertux.strf 18 Aug 2004 10:31:26 -0000 1.3 @@ -93,18 +93,6 @@ (y-hotspot 9) (images "shared/bigtux/arms-stand-right-0.png")) - (action - (name "idle-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/arms-stand-left-0.png")) - - (action - (name "idle-right") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/arms-stand-right-0.png")) - ; Grabbing is arms specific! (action (name "grab-left") @@ -295,18 +283,6 @@ (name "buttjump-right") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/body-stand-right-0.png")) - - (action - (name "idle-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/body-stand-left-0.png")) - - (action - (name "idle-right") - (x-hotspot 6) - (y-hotspot 8) (images "shared/bigtux/body-stand-right-0.png"))) ;; Big Tux Feet @@ -398,20 +374,7 @@ (name "buttjump-right") (x-hotspot 5) (y-hotspot 9) - (images "shared/bigtux/feet-buttjump-right-0.png")) - - - (action - (name "idle-left") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/feet-stand-left-0.png")) - - (action - (name "idle-right") - (x-hotspot 6) - (y-hotspot 8) - (images "shared/bigtux/feet-stand-right-0.png"))) + (images "shared/bigtux/feet-buttjump-right-0.png"))) ; End of Big Tux (no power) sprite @@ -499,6 +462,7 @@ (action (name "idle-left") + (fps 1.0) (x-hotspot 6) (y-hotspot 8) (images "shared/bigtux/head-idle-blink-left-0.png" @@ -506,6 +470,7 @@ (action (name "idle-right") + (fps 1.0) (x-hotspot 6) (y-hotspot 8) (images "shared/bigtux/head-idle-blink-right-0.png" |
|
From: Ryan F. <sik...@us...> - 2004-08-18 00:11:31
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11576 Modified Files: .cvsignore Removed Files: libtool Log Message: - removing generated file Index: .cvsignore =================================================================== RCS file: /cvsroot/super-tux/supertux/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 3 Jun 2004 11:29:28 -0000 1.2 +++ .cvsignore 18 Aug 2004 00:11:22 -0000 1.3 @@ -12,4 +12,4 @@ mkinstalldirs Makefile autom4te.cache - +libtool --- libtool DELETED --- |
248 messages has been excluded from this view by a project administrator.
