super-tux-commit Mailing List for Super Tux (Page 94)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Ricardo C. <rm...@us...> - 2004-04-19 14:29:03
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23419/data Modified Files: CREDITS Log Message: Changed Ingo description in Credits as suggested by Marek. I really should get some English lessons :D Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CREDITS 19 Apr 2004 11:46:41 -0000 1.6 +++ CREDITS 19 Apr 2004 14:28:49 -0000 1.7 @@ -49,9 +49,9 @@ --------- Ingo Ruhnke - This guy is a not ever end of ideas and - a good constructive criticist - Author and maintainer of the webpage + Good constructive criticist and + never-ending source of inspiration. + Author and maintainer of the webpage. Basically he makes suggestions for everything from the engine itself to the gameplay. |
|
From: Ingo R. <gr...@us...> - 2004-04-19 14:27:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22902/src Modified Files: special.cpp Log Message: - changed upgrades to use sprites - added glowing iceflower and star (hardly visible) Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- special.cpp 19 Apr 2004 14:06:10 -0000 1.20 +++ special.cpp 19 Apr 2004 14:27:11 -0000 1.21 @@ -20,13 +20,15 @@ #include "scene.h" #include "globals.h" #include "player.h" +#include "sprite_manager.h" #include "resources.h" Surface* img_bullet; -Surface* img_golden_herring; -Surface* img_growup; -Surface* img_iceflower; -Surface* img_1up; + +Sprite* img_star; +Sprite* img_growup; +Sprite* img_iceflower; +Sprite* img_1up; #define GROWUP_SPEED 1.0f @@ -237,7 +239,7 @@ else if (kind == UPGRADE_ICEFLOWER) img_iceflower->draw_part(0,0,dest.x,dest.y,dest.w,dest.h); else if (kind == UPGRADE_HERRING) - img_golden_herring->draw_part(0,0,dest.x,dest.y,dest.w,dest.h); + img_star->draw_part(0,0,dest.x,dest.y,dest.w,dest.h); else if (kind == UPGRADE_1UP) img_1up->draw_part( 0, 0, dest.x, dest.y, dest.w, dest.h); } @@ -255,7 +257,7 @@ } else if (kind == UPGRADE_HERRING) { - img_golden_herring->draw( + img_star->draw( base.x - scroll_x, base.y); } else if (kind == UPGRADE_1UP) @@ -324,23 +326,17 @@ void load_special_gfx() { - img_growup = new Surface(datadir + "/images/shared/egg.png", USE_ALPHA); - img_iceflower = new Surface(datadir + "/images/shared/iceflower.png", - USE_ALPHA); - img_golden_herring = new Surface(datadir + "/images/shared/star.png", USE_ALPHA); - img_1up = new Surface(datadir + "/images/shared/1up.png", - USE_ALPHA); + img_growup = sprite_manager->load("egg"); + img_iceflower = sprite_manager->load("iceflower"); + img_star = sprite_manager->load("star"); + img_1up = sprite_manager->load("1up"); - img_bullet = new Surface(datadir + "/images/shared/bullet.png", - USE_ALPHA); + img_bullet = new Surface(datadir + "/images/shared/bullet.png", + USE_ALPHA); } void free_special_gfx() { - delete img_growup; - delete img_iceflower; - delete img_1up; - delete img_golden_herring; - delete img_bullet; + delete img_bullet; } |
|
From: Ingo R. <gr...@us...> - 2004-04-19 14:27:20
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22902/data Modified Files: supertux.strf Log Message: - changed upgrades to use sprites - added glowing iceflower and star (hardly visible) Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- supertux.strf 19 Apr 2004 12:05:22 -0000 1.5 +++ supertux.strf 19 Apr 2004 14:27:11 -0000 1.6 @@ -52,151 +52,172 @@ "shared/mriceblock-right-1.png" "shared/mriceblock-right-2.png" "shared/mriceblock-right-1.png")) - - (sprite (name "laptop-flat-left") - (images "shared/mriceblock-flat-left.png")) + + (sprite (name "laptop-flat-left") + (images "shared/mriceblock-flat-left.png")) - (sprite (name "laptop-flat-right") - (images "shared/mriceblock-flat-right.png")) + (sprite (name "laptop-flat-right") + (images "shared/mriceblock-flat-right.png")) - (sprite (name "laptop-falling-left") - (images "shared/laptop-falling-left.png")) + (sprite (name "laptop-falling-left") + (images "shared/laptop-falling-left.png")) - (sprite (name "laptop-falling-right") - (images "shared/laptop-falling-right.png")) + (sprite (name "laptop-falling-right") + (images "shared/laptop-falling-right.png")) - (sprite (name "jumpy-left-up") - (images "shared/jumpy-left-up-0.png")) - (sprite (name "jumpy-left-down") - (images "shared/jumpy-left-down-0.png")) - (sprite (name "jumpy-left-middle") - (images "shared/jumpy-left-middle-0.png")) + (sprite (name "jumpy-left-up") + (images "shared/jumpy-left-up-0.png")) + (sprite (name "jumpy-left-down") + (images "shared/jumpy-left-down-0.png")) + (sprite (name "jumpy-left-middle") + (images "shared/jumpy-left-middle-0.png")) - (sprite (name "mrbomb-left") - (images "shared/mrbomb-left-0.png") - (images "shared/mrbomb-left-1.png") - (images "shared/mrbomb-left-2.png") - (images "shared/mrbomb-left-3.png")) + (sprite (name "mrbomb-left") + (images "shared/mrbomb-left-0.png") + (images "shared/mrbomb-left-1.png") + (images "shared/mrbomb-left-2.png") + (images "shared/mrbomb-left-3.png")) - (sprite (name "mrbomb-right") - (images "shared/mrbomb-right-0.png") - (images "shared/mrbomb-right-1.png") - (images "shared/mrbomb-right-2.png") - (images "shared/mrbomb-right-3.png")) - + (sprite (name "mrbomb-right") + (images "shared/mrbomb-right-0.png") + (images "shared/mrbomb-right-1.png") + (images "shared/mrbomb-right-2.png") + (images "shared/mrbomb-right-3.png")) + - (sprite (name "mrbomb-ticking-left") - (images "shared/mrbombx-left-0.png")) + (sprite (name "mrbomb-ticking-left") + (images "shared/mrbombx-left-0.png")) - (sprite (name "mrbomb-ticking-right") - (images "shared/mrbombx-right-0.png")) + (sprite (name "mrbomb-ticking-right") + (images "shared/mrbombx-right-0.png")) - (sprite (name "mrbomb-explosion") - (images "shared/mrbomb-explosion.png")) + (sprite (name "mrbomb-explosion") + (images "shared/mrbomb-explosion.png")) - (sprite (name "stalactite") - (images "shared/stalactite.png")) + (sprite (name "stalactite") + (images "shared/stalactite.png")) - (sprite (name "stalactite-broken") - (images "shared/stalactite-broken.png")) + (sprite (name "stalactite-broken") + (images "shared/stalactite-broken.png")) - (sprite (name "flame") - (images "shared/flame-0.png" - "shared/flame-1.png")) + (sprite (name "flame") + (images "shared/flame-0.png" + "shared/flame-1.png")) - (sprite (name "fish") - (images "shared/fish-left-0.png" - "shared/fish-left-1.png")) + (sprite (name "fish") + (images "shared/fish-left-0.png" + "shared/fish-left-1.png")) - (sprite (name "fish-down") - (images "shared/fish-down-0.png")) + (sprite (name "fish-down") + (images "shared/fish-down-0.png")) - (sprite (name "bouncingsnowball-left") - (images "shared/bouncingsnowball-left-0.png" - "shared/bouncingsnowball-left-1.png" - "shared/bouncingsnowball-left-2.png" - "shared/bouncingsnowball-left-3.png" - "shared/bouncingsnowball-left-4.png" - "shared/bouncingsnowball-left-5.png")) + (sprite (name "bouncingsnowball-left") + (images "shared/bouncingsnowball-left-0.png" + "shared/bouncingsnowball-left-1.png" + "shared/bouncingsnowball-left-2.png" + "shared/bouncingsnowball-left-3.png" + "shared/bouncingsnowball-left-4.png" + "shared/bouncingsnowball-left-5.png")) - (sprite (name "bouncingsnowball-right") - (images "shared/bouncingsnowball-right-0.png" - "shared/bouncingsnowball-right-1.png" - "shared/bouncingsnowball-right-2.png" - "shared/bouncingsnowball-right-3.png" - "shared/bouncingsnowball-right-4.png" - "shared/bouncingsnowball-right-5.png")) + (sprite (name "bouncingsnowball-right") + (images "shared/bouncingsnowball-right-0.png" + "shared/bouncingsnowball-right-1.png" + "shared/bouncingsnowball-right-2.png" + "shared/bouncingsnowball-right-3.png" + "shared/bouncingsnowball-right-4.png" + "shared/bouncingsnowball-right-5.png")) - (sprite (name "bouncingsnowball-squished") - (images "shared/bsod-squished-left.png")) + (sprite (name "bouncingsnowball-squished") + (images "shared/bsod-squished-left.png")) - (sprite (name "flyingsnowball") - (images "shared/flyingsnowball-left-0.png" - "shared/flyingsnowball-left-1.png")) + (sprite (name "flyingsnowball") + (images "shared/flyingsnowball-left-0.png" + "shared/flyingsnowball-left-1.png")) - (sprite (name "flyingsnowball-squished") - (images "shared/bsod-squished-left.png")) + (sprite (name "flyingsnowball-squished") + (images "shared/bsod-squished-left.png")) - (sprite (name "spiky-left") - (images "shared/spiky-left-0.png" - "shared/spiky-left-1.png" - "shared/spiky-left-2.png")) - (sprite (name "spiky-right") - (images "shared/spiky-right-0.png" - "shared/spiky-right-1.png" - "shared/spiky-right-2.png")) + (sprite (name "spiky-left") + (images "shared/spiky-left-0.png" + "shared/spiky-left-1.png" + "shared/spiky-left-2.png")) + (sprite (name "spiky-right") + (images "shared/spiky-right-0.png" + "shared/spiky-right-1.png" + "shared/spiky-right-2.png")) - (sprite (name "snowball-left") - (images "shared/snowball-left-0.png" - "shared/snowball-left-1.png" - "shared/snowball-left-2.png" - "shared/snowball-left-1.png")) + (sprite (name "snowball-left") + (images "shared/snowball-left-0.png" + "shared/snowball-left-1.png" + "shared/snowball-left-2.png" + "shared/snowball-left-1.png")) - (sprite (name "snowball-right") - (images "shared/snowball-right-0.png" - "shared/snowball-right-1.png" - "shared/snowball-right-2.png" - "shared/snowball-right-1.png")) + (sprite (name "snowball-right") + (images "shared/snowball-right-0.png" + "shared/snowball-right-1.png" + "shared/snowball-right-2.png" + "shared/snowball-right-1.png")) - (sprite (name "largetux-walk-left") - (x-hotspot 6) - (y-hotspot 2) - (images "shared/largetux-walk-left-0.png" - "shared/largetux-walk-left-1.png" - "shared/largetux-walk-left-2.png" - "shared/largetux-walk-left-3.png" - "shared/largetux-walk-left-4.png" - "shared/largetux-walk-left-5.png")) + (sprite (name "largetux-walk-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/largetux-walk-left-0.png" + "shared/largetux-walk-left-1.png" + "shared/largetux-walk-left-2.png" + "shared/largetux-walk-left-3.png" + "shared/largetux-walk-left-4.png" + "shared/largetux-walk-left-5.png")) - (sprite (name "largetux-walk-right") - (x-hotspot 6) - (y-hotspot 2) - (images "shared/largetux-walk-right-0.png" - "shared/largetux-walk-right-1.png" - "shared/largetux-walk-right-2.png" - "shared/largetux-walk-right-3.png" - "shared/largetux-walk-right-4.png" - "shared/largetux-walk-right-5.png")) + (sprite (name "largetux-walk-right") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/largetux-walk-right-0.png" + "shared/largetux-walk-right-1.png" + "shared/largetux-walk-right-2.png" + "shared/largetux-walk-right-3.png" + "shared/largetux-walk-right-4.png" + "shared/largetux-walk-right-5.png")) - (sprite (name "largetux-jump-left") - (x-hotspot 9) - (y-hotspot 2) - (images "shared/largetux-jump-left-0.png")) - (sprite (name "largetux-jump-right") - (x-hotspot 9) - (y-hotspot 2) - (images "shared/largetux-jump-right-0.png")) + (sprite (name "largetux-jump-left") + (x-hotspot 9) + (y-hotspot 2) + (images "shared/largetux-jump-left-0.png")) + (sprite (name "largetux-jump-right") + (x-hotspot 9) + (y-hotspot 2) + (images "shared/largetux-jump-right-0.png")) - (sprite (name "largetux-duck-left") - (x-hotspot 6) - (y-hotspot 2) - (images "shared/tux-duck-left.png")) - (sprite (name "largetux-duck-right") - (x-hotspot 6) - (y-hotspot 6) - (images "shared/tux-duck-right.png")) -) + (sprite (name "largetux-duck-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/tux-duck-left.png")) + (sprite (name "largetux-duck-right") + (x-hotspot 6) + (y-hotspot 6) + (images "shared/tux-duck-right.png")) + + (sprite (name "egg") + (images "shared/egg.png")) + (sprite (name "1up") + (images "shared/1up.png")) + (sprite (name "star") + (images "shared/star.png" + "shared/star-1.png" + "shared/star-2.png" + "shared/star-3.png" + "shared/star-4.png" + "shared/star-3.png" + "shared/star-2.png" + "shared/star-1.png")) + (sprite (name "iceflower") + (images "shared/iceflower.png" + "shared/iceflower-1.png" + "shared/iceflower-2.png" + "shared/iceflower-3.png" + "shared/iceflower-2.png" + "shared/iceflower-1.png")) + ) ;; EOF ;; |
|
From: Ricardo C. <rm...@us...> - 2004-04-19 14:24:39
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22306/src Modified Files: leveleditor.cpp Log Message: Fixed a help font bug (was using normal fonts, instead of the small ones). Tried to make leveleditor quit when SDL_QUIT signal is received without success. Why doesn't this work? :( Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- leveleditor.cpp 18 Apr 2004 21:45:13 -0000 1.51 +++ leveleditor.cpp 19 Apr 2004 14:24:30 -0000 1.52 @@ -38,8 +38,7 @@ #include "resources.h" /* definitions to aid development */ -#define DONE_LEVELEDITOR 1 -#define DONE_QUIT 2 + /* definitions that affect gameplay */ #define KEY_CURSOR_SPEED 32 @@ -223,7 +222,7 @@ update_subset_settings_menu(); break; case 7: - done = DONE_LEVELEDITOR; + done = 1; break; } } @@ -333,8 +332,11 @@ mouse_cursor->draw(); +printf("done: %i\n", done); + if(done) { +printf("done\n"); le_quit(); return 0; } @@ -794,6 +796,10 @@ { switch(event.type) { + case SDL_QUIT: // window closed +printf("window closed\n"); + done = -1; + break; case SDL_KEYDOWN: // key pressed key = event.key.keysym.sym; switch(key) @@ -909,9 +915,6 @@ } } break; - case SDL_QUIT: // window closed - done = DONE_QUIT; - break; default: break; } @@ -1217,7 +1220,7 @@ void le_showhelp() { SDL_Event event; - unsigned int i, done; + unsigned int i, done_; char *text[] = { " - This is SuperTux's built-in level editor -", "It has been designed to be light and easy to use from the start.", @@ -1253,17 +1256,17 @@ blue_text->drawf("- Help -", 0, 30, A_HMIDDLE, A_TOP, 2); for(i = 0; i < sizeof(text)/sizeof(char *); i++) - white_text->draw(text[i], 5, 80+(i*18), 1); + white_small_text->draw(text[i], 5, 80+(i*white_small_text->h), 1); gold_text->drawf("Press Any Key to Continue", 0, 440, A_HMIDDLE, A_TOP, 1); flipscreen(); - done = 0; + done_ = 0; - while(done == 0) + while(done_ == 0) { - done = wait_for_event(event); + done_ = wait_for_event(event); SDL_Delay(50); } } |
|
From: Ingo R. <gr...@us...> - 2004-04-19 14:14:55
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20092 Modified Files: supertux.stgt Log Message: - fixed problem with asyncron blinkig bonus block - fixed indention Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- supertux.stgt 16 Apr 2004 16:24:53 -0000 1.16 +++ supertux.stgt 19 Apr 2004 14:14:46 -0000 1.17 @@ -234,105 +234,108 @@ (images "backgroundtile5.png") (solid #t)) - (tile (id 75) - (images "water.png") - (water #t)) - (tile (id 76) - (images "waves-0.png" "waves-1.png" "waves-2.png") - (water #t) - (anim-speed 25)) + (tile (id 75) + (images "water.png") + (water #t)) + (tile (id 76) + (images "waves-0.png" "waves-1.png" "waves-2.png") + (water #t) + (anim-speed 25)) - ;; Normal brick - (tile (id 77) - (images "brick0.png") - (brick #t) - (next-tile 0) - (solid #t)) - (tile (id 78) - (images "brick1.png") - (brick #t) - (next-tile 0) - (solid #t)) + ;; Normal brick + (tile (id 77) + (images "brick0.png") + (brick #t) + (next-tile 0) + (solid #t)) + (tile (id 78) + (images "brick1.png") + (brick #t) + (next-tile 0) + (solid #t)) - (tile (id 79) - (images "pole.png") - (solid #f)) - (tile (id 80) - (images "poletop.png") - (solid #f)) - (tile (id 81) - (images "flag-0.png" "flag-1.png") - (solid #f)) + (tile (id 79) + (images "pole.png") + (solid #f)) + (tile (id 80) + (images "poletop.png") + (solid #f)) + (tile (id 81) + (images "flag-0.png" "flag-1.png") + (solid #f)) - (tile (id 82) - (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png") - (solid #f) - (distro #t)) + (tile (id 82) + (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png") + (solid #f) + (distro #t)) - (tile (id 83) - (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" + (tile (id 83) + (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") - (fullbox #t) - (solid #t) - (next-tile 84) - (data 1)) + (anim-speed 50) + (fullbox #t) + (solid #t) + (next-tile 84) + (data 1)) - (tile (id 84) - (solid #t) - (images "bonus2-d.png")) + (tile (id 84) + (solid #t) + (images "bonus2-d.png")) - (tile (id 85) (images "cloud-00.png")) - (tile (id 86) (images "cloud-01.png")) - (tile (id 87) (images "cloud-02.png")) - (tile (id 88) (images "cloud-03.png")) - (tile (id 89) (images "cloud-10.png")) - (tile (id 90) (images "cloud-11.png")) - (tile (id 91) (images "cloud-12.png")) - (tile (id 92) (images "cloud-13.png")) + (tile (id 85) (images "cloud-00.png")) + (tile (id 86) (images "cloud-01.png")) + (tile (id 87) (images "cloud-02.png")) + (tile (id 88) (images "cloud-03.png")) + (tile (id 89) (images "cloud-10.png")) + (tile (id 90) (images "cloud-11.png")) + (tile (id 91) (images "cloud-12.png")) + (tile (id 92) (images "cloud-13.png")) - (tile (id 93) (images "bkgd-00.png")) - (tile (id 94) (images "bkgd-01.png")) - (tile (id 95) (images "bkgd-02.png")) - (tile (id 96) (images "bkgd-03.png")) - (tile (id 97) (images "bkgd-10.png")) - (tile (id 98) (images "bkgd-11.png")) - (tile (id 99) (images "bkgd-12.png")) - (tile (id 100) (images "bkgd-13.png")) - (tile (id 101) (images "bkgd-00.png")) + (tile (id 93) (images "bkgd-00.png")) + (tile (id 94) (images "bkgd-01.png")) + (tile (id 95) (images "bkgd-02.png")) + (tile (id 96) (images "bkgd-03.png")) + (tile (id 97) (images "bkgd-10.png")) + (tile (id 98) (images "bkgd-11.png")) + (tile (id 99) (images "bkgd-12.png")) + (tile (id 100) (images "bkgd-13.png")) + (tile (id 101) (images "bkgd-00.png")) - (tile (id 102) - (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" - "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") - (editor-images "bonus-flower.png") - (solid #t) - (fullbox #t) - (data 2) - (next-tile 84)) - (tile (id 103) - (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" - "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") - (editor-images "bonus-herring.png") - (solid #t) - (fullbox #t) - (data 3) - (next-tile 84)) + (tile (id 102) + (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" + "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") + (anim-speed 50) + (editor-images "bonus-flower.png") + (solid #t) + (fullbox #t) + (data 2) + (next-tile 84)) + (tile (id 103) + (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" + "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") + (anim-speed 50) + (editor-images "bonus-herring.png") + (solid #t) + (fullbox #t) + (data 3) + (next-tile 84)) - ;; Brick with bonus content - (tile (id 104) - (images "brick0.png") - (brick #t) - (data 1) - (next-tile 84) - (solid #t)) + ;; Brick with bonus content + (tile (id 104) + (images "brick0.png") + (brick #t) + (data 1) + (next-tile 84) + (solid #t)) - ;; Brick with bonus content - (tile (id 105) - (images "brick1.png") - (brick #t) - (data 1) - (next-tile 84) - (solid #t)) + ;; Brick with bonus content + (tile (id 105) + (images "brick1.png") + (brick #t) + (data 1) + (next-tile 84) + (solid #t)) (tile (id 106) (images "background1.png") @@ -410,13 +413,14 @@ (images "exitfg.png") (solid #f)) - (tile (id 128) - (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" - "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") - (editor-images "bonus-1up.png") - (solid #t) - (fullbox #t) - (data 4) - (next-tile 84)) + (tile (id 128) + (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png" + "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png") + (anim-speed 50) + (editor-images "bonus-1up.png") + (solid #t) + (fullbox #t) + (data 4) + (next-tile 84)) ) |
|
From: Ricardo C. <rm...@us...> - 2004-04-19 14:09:04
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18865/src Modified Files: high_scores.cpp high_scores.h Log Message: Made high_scores to use the lispreader (i wasn't able to do proper testing, could someone give a look at the code). Anyway, do you think high_scores.* should be merged with configfile.* ? If nobody says anything, I'll do that. Index: high_scores.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- high_scores.cpp 13 Apr 2004 12:25:22 -0000 1.11 +++ high_scores.cpp 19 Apr 2004 14:08:54 -0000 1.12 @@ -16,6 +16,7 @@ #include "screen.h" #include "texture.h" #include "setup.h" +#include "lispreader.h" #ifdef WIN32 const char * highscore_filename = "/st_highscore.dat"; @@ -24,58 +25,45 @@ #endif int hs_score; -char hs_name[62]; /* highscores global variables*/ +std::string hs_name; /* highscores global variables*/ /* Load data from high score file: */ void load_hs(void) { - FILE * fi; - char temp[128]; - int strl; - unsigned int i, c; - hs_score = 100; - strcpy(hs_name, "Grandma\0"); - c = 0; - - /* Try to open file: */ + hs_name = "Grandma"; - fi = opendata(highscore_filename, "r"); - if (fi != NULL) + FILE * fi; + lisp_object_t* root_obj = 0; + fi = fopen(highscore_filename, "r"); + if (fi == NULL) { - do - { - fgets(temp, sizeof(temp), fi); - - if (!feof(fi)) - { - temp[strlen(temp) - 1] = '\0'; + perror(highscore_filename); + return; + } + lisp_stream_t stream; + lisp_stream_init_file (&stream, fi); + root_obj = lisp_read (&stream); - /* Parse each line: */ + if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) + { + printf("HighScore: Parse Error in file %s", highscore_filename); + } - if (strstr(temp, "highscore=") == temp) - { - hs_score = atoi(temp + 10); - if (hs_score == 0) - hs_score = 100; - } - if (strstr(temp, "name=") == temp) - { - fprintf(stderr, "name found\n"); - strl = strlen("name="); - for(c = strl, i = 0; c < strlen(temp); ++c, ++i) - hs_name[i] = temp[c]; - hs_name[i]= '\0'; - } - } - } - while (!feof(fi)); - - fclose(fi); + if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-highscore") == 0) + { + LispReader reader(lisp_cdr(root_obj)); + reader.read_int("score", &hs_score); + reader.read_string("name", &hs_name); } + + fclose(fi); + +printf("name=%s\n", hs_name.c_str()); +printf("score=%i\n\n", hs_score); } void save_hs(int score) @@ -84,7 +72,6 @@ Surface* bkgd; SDL_Event event; - FILE * fi; bkgd = new Surface(datadir + "/images/highscore/highscore.png", IGNORE_ALPHA); @@ -94,9 +81,9 @@ Menu::set_current(highscore_menu); if(!highscore_menu->item[0].input) - highscore_menu->item[0].input = (char*) malloc(strlen(hs_name) + 1); + highscore_menu->item[0].input = (char*) malloc(strlen(hs_name.c_str()) + 1); - strcpy(highscore_menu->item[0].input,hs_name); + strcpy(highscore_menu->item[0].input,hs_name.c_str()); /* ask for player's name */ show_menu = 1; @@ -120,7 +107,7 @@ { case 0: if(highscore_menu->item[0].input != NULL) - strcpy(hs_name, highscore_menu->item[0].input); + hs_name = highscore_menu->item[0].input; break; } @@ -128,8 +115,38 @@ } - /* Try to open file: */ + /* Save to file: */ + + FILE* fi; + std::string filename; + + /* Save data file: */ + filename = highscore_filename; + fcreatedir(filename.c_str()); + if(fwriteable(filename.c_str())) + { + fi = fopen(filename.c_str(), "w"); + if (fi == NULL) + { + perror(filename.c_str()); + } + + /* Write header: */ + fprintf(fi,";SuperTux HighScores\n"); + fprintf(fi,"(supertux-highscore\n"); + + /* Save title info: */ + fprintf(fi," (name \"%s\")\n", hs_name.c_str()); + + /* Save the description: */ + fprintf(fi," (score \"%i\")\n", hs_score); + + fprintf( fi,")"); + fclose(fi); + } + +/* fi = opendata(highscore_filename, "w"); if (fi != NULL) { @@ -141,5 +158,5 @@ fprintf(fi, "# (File automatically created.)\n"); fclose(fi); - } + }*/ } Index: high_scores.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/high_scores.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- high_scores.h 24 Mar 2004 14:35:11 -0000 1.5 +++ high_scores.h 19 Apr 2004 14:08:54 -0000 1.6 @@ -11,7 +11,7 @@ #include <stdio.h> extern int hs_score; -extern char hs_name[62]; /* highscores global variables*/ +extern std::string hs_name; /* highscores global variables*/ void save_hs(int score); void load_hs(); |
|
From: Ingo R. <gr...@us...> - 2004-04-19 14:06:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18290 Modified Files: special.cpp special.h world.cpp world.h Log Message: - added UpgradeKind name to nameless enum - slowed down grow-up upgrade Index: world.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- world.h 17 Apr 2004 13:56:48 -0000 1.23 +++ world.h 19 Apr 2004 14:06:10 -0000 1.24 @@ -85,7 +85,7 @@ void add_broken_brick_piece(Tile* tile, float x, float y, float xm, float ym); void add_bouncy_brick(float x, float y); void add_bad_guy(float x, float y, BadGuyKind kind); - void add_upgrade(float x, float y, int dir, int kind); + void add_upgrade(float x, float y, int dir, UpgradeKind kind); void add_bullet(float x, float y, float xm, int dir); /** Try to grab the coin at the given coordinates */ Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- world.cpp 18 Apr 2004 13:42:15 -0000 1.29 +++ world.cpp 19 Apr 2004 14:06:10 -0000 1.30 @@ -386,7 +386,7 @@ } void -World::add_upgrade(float x, float y, int dir, int kind) +World::add_upgrade(float x, float y, int dir, UpgradeKind kind) { Upgrade new_upgrade; new_upgrade.init(x,y,dir,kind); Index: special.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- special.h 12 Apr 2004 18:57:36 -0000 1.13 +++ special.h 19 Apr 2004 14:06:10 -0000 1.14 @@ -26,7 +26,7 @@ /* Upgrade types: */ -enum { +enum UpgradeKind { UPGRADE_GROWUP, UPGRADE_ICEFLOWER, UPGRADE_HERRING, @@ -39,13 +39,13 @@ class Upgrade { public: - int kind; + UpgradeKind kind; int dir; base_type base; base_type old_base; Physic physic; - void init(float x, float y, int dir, int kind); + void init(float x, float y, int dir, UpgradeKind kind); void action(double frame_ratio); void draw(); void collision(void* p_c_object, int c_object); Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- special.cpp 18 Apr 2004 13:42:15 -0000 1.19 +++ special.cpp 19 Apr 2004 14:06:10 -0000 1.20 @@ -28,6 +28,8 @@ Surface* img_iceflower; Surface* img_1up; +#define GROWUP_SPEED 1.0f + void Bullet::init(float x, float y, float xm, int dir) { @@ -113,7 +115,7 @@ } void -Upgrade::init(float x_, float y_, int dir_, int kind_) +Upgrade::init(float x_, float y_, int dir_, UpgradeKind kind_) { kind = kind_; dir = dir_; @@ -133,6 +135,8 @@ base.height = 32; } else if (kind == UPGRADE_ICEFLOWER) { // nothing + } else if (kind == UPGRADE_GROWUP) { + physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0); } else { physic.set_velocity(dir == LEFT ? -2 : 2, 0); } @@ -188,7 +192,7 @@ old_base = base; if(kind == UPGRADE_GROWUP) { physic.enable_gravity(false); - physic.set_velocity(dir == LEFT ? -2 : 2, 0); + physic.set_velocity(dir == LEFT ? -GROWUP_SPEED : GROWUP_SPEED, 0); } else if(kind == UPGRADE_HERRING) { physic.set_velocity(dir == LEFT ? -2 : 2, 3); } |
|
From: Ingo R. <gr...@us...> - 2004-04-19 13:56:19
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16297 Modified Files: player.cpp Log Message: - added more mario lik duck behaviour Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- player.cpp 18 Apr 2004 22:36:03 -0000 1.44 +++ player.cpp 19 Apr 2004 13:56:10 -0000 1.45 @@ -314,10 +314,10 @@ float ay = physic.get_acceleration_y(); float dirsign = 0; - if(!duck && input.left == DOWN && input.right == UP) { + if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) { dir = LEFT; dirsign = -1; - } else if(!duck && input.left == UP && input.right == DOWN) { + } else if(input.left == UP && input.right == DOWN && (!duck || physic.get_velocity_y() != 0)) { dir = RIGHT; dirsign = 1; } @@ -394,7 +394,7 @@ { if(input.up == DOWN) { - if (on_ground() && !duck) + if (on_ground()) { // jump physic.set_velocity(physic.get_velocity_x(), 5.5); @@ -458,7 +458,7 @@ } /* Duck! */ - if (input.down == DOWN && size == BIG && !duck) + if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0) { duck = true; base.height = 32; @@ -466,7 +466,7 @@ // changing base size confuses collision otherwise old_base = previous_base = base; } - else if(input.down == UP && size == BIG && duck) + else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0) { duck = false; base.y -= 32; |
|
From: Ingo R. <gr...@us...> - 2004-04-19 13:34:54
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11510 Modified Files: worldmap.cpp Log Message: - fixed back direction saving Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- worldmap.cpp 19 Apr 2004 13:23:33 -0000 1.33 +++ worldmap.cpp 19 Apr 2004 13:34:43 -0000 1.34 @@ -769,10 +769,14 @@ if (reader.read_lisp("tux", &tux_cur)) { Point p; + std::string back_str = "none"; + LispReader tux_reader(tux_cur); tux_reader.read_int("x", &p.x); tux_reader.read_int("y", &p.y); - + tux_reader.read_string("back", &back_str); + + tux->back_direction = string_to_direction(back_str); tux->set_tile_pos(p); } @@ -788,16 +792,10 @@ { std::string name; bool solved = false; - std::string back_str =""; - Direction back = NONE; LispReader level_reader(data); level_reader.read_string("name", &name); level_reader.read_bool("solved", &solved); - if (level_reader.read_string("back", &back_str)) - back = string_to_direction(back_str); - - std::cout << "Name: " << name << " " << solved << std::endl; for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { |
|
From: Ingo R. <gr...@us...> - 2004-04-19 13:23:42
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9182 Modified Files: defines.h gameloop.cpp gameloop.h setup.cpp worldmap.cpp Log Message: - fixed bug in live counting - added save menu to the worldmap - removed load/save from the game menu Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- gameloop.h 17 Apr 2004 13:56:47 -0000 1.40 +++ gameloop.h 19 Apr 2004 13:23:33 -0000 1.41 @@ -51,9 +51,12 @@ // FIXME: Hack for restarting the level std::string subset; + public: enum ExitStatus { NONE, LEVEL_FINISHED, GAME_OVER, LEVEL_ABORT }; + private: ExitStatus exit_status; public: + Timer time_left; GameSession(const std::string& subset, int levelnb, int mode); Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- defines.h 12 Apr 2004 13:16:07 -0000 1.13 +++ defines.h 19 Apr 2004 13:23:33 -0000 1.14 @@ -68,7 +68,7 @@ #define MAX_RUN_XM 3.2 #define MAX_YM 20.0 #define MAX_JUMP_TIME 375 -#define MAX_LIVES 4.0 +#define MAX_LIVES 99 #define WALK_SPEED 1.0 #define RUN_SPEED 1.5 Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- worldmap.cpp 18 Apr 2004 12:03:07 -0000 1.32 +++ worldmap.cpp 19 Apr 2004 13:23:33 -0000 1.33 @@ -499,19 +499,39 @@ { if (enter_level && !tux->is_moving()) { - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + Level* level = at_level(); + if (level) { - if (i->x == tux->get_tile_pos().x && - i->y == tux->get_tile_pos().y) + if (level->x == tux->get_tile_pos().x && + level->y == tux->get_tile_pos().y) { - std::cout << "Enter the current level: " << i->name << std::endl;; + std::cout << "Enter the current level: " << level->name << std::endl;; halt_music(); - GameSession session(datadir + "levels/" + i->name, + + GameSession session(datadir + "levels/" + level->name, 1, ST_GL_LOAD_LEVEL_FILE); - session.run(); - if (1) // FIXME: insert exit status checker here - i->solved = true; + switch (session.run()) + { + case GameSession::LEVEL_FINISHED: + level->solved = true; + break; + case GameSession::LEVEL_ABORT: + // Reseting the player_status might be a worthy + // consideration, but I don't think we need it + // 'cause only the bad players will use it to + // 'cheat' a few items and that isn't necesarry a + // bad thing (ie. better they continue that way, + // then stop playing the game all together since it + // is to hard) + break; + case GameSession::GAME_OVER: + quit = true; + break; + case GameSession::NONE: + // Should never be reached + break; + } play_music(song, 1); show_menu = 0; @@ -521,8 +541,11 @@ return; } } - std::cout << "Nothing to enter at: " - << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + else + { + std::cout << "Nothing to enter at: " + << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + } } else { @@ -539,7 +562,12 @@ case 2: // Return to game menu_reset(); break; - case 5: // Quit Worldmap + case 3: + if (!savegame_file.empty()) + savegame(savegame_file); + break; + + case 6: // Quit Worldmap quit = true; break; } @@ -674,6 +702,7 @@ SDL_Delay(20); } + halt_music(); free_music(song); } @@ -733,6 +762,9 @@ reader.read_int("score", &player_status.score); reader.read_int("distros", &player_status.distros); + if (player_status.lives < 0) + player_status.lives = 3; + lisp_object_t* tux_cur = 0; if (reader.read_lisp("tux", &tux_cur)) { @@ -782,4 +814,7 @@ } // namespace WorldMapNS -/* EOF */ +/* Local Variables: */ +/* mode:c++ */ +/* End: */ + Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- gameloop.cpp 18 Apr 2004 20:36:00 -0000 1.77 +++ gameloop.cpp 19 Apr 2004 13:23:33 -0000 1.78 @@ -319,7 +319,8 @@ // Check End conditions if (tux->is_dead()) { - + player_status.lives -= 1; + if (player_status.lives < 0) { // No more lives!? if(st_gl_mode != ST_GL_TEST) @@ -327,8 +328,10 @@ if(st_gl_mode != ST_GL_TEST) { - if (player_status.score > hs_score) - save_hs(player_status.score); + // FIXME: highscore soving doesn't make sense in its + // current form + //if (player_status.score > hs_score) + //save_hs(player_status.score); } exit_status = GAME_OVER; @@ -436,14 +439,7 @@ case 2: st_pause_ticks_stop(); break; - case 3: - // FIXME: - //update_load_save_game_menu(save_game_menu); - break; - case 4: - update_load_save_game_menu(load_game_menu); - break; - case 7: + case 5: st_pause_ticks_stop(); exit_status = LEVEL_ABORT; break; Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- setup.cpp 17 Apr 2004 00:49:54 -0000 1.40 +++ setup.cpp 19 Apr 2004 13:23:33 -0000 1.41 @@ -422,18 +422,17 @@ save_game_menu->additem(MN_HL,"",0,0); save_game_menu->additem(MN_BACK,"Back",0,0); - game_menu->additem(MN_LABEL,"InGame Menu",0,0); + game_menu->additem(MN_LABEL,"Pause",0,0); game_menu->additem(MN_HL,"",0,0); - game_menu->additem(MN_ACTION,"Return To Game",0,0); - game_menu->additem(MN_GOTO,"Save Game",0,save_game_menu); - game_menu->additem(MN_GOTO,"Load Game",0,load_game_menu); + game_menu->additem(MN_ACTION,"Continue",0,0); game_menu->additem(MN_GOTO,"Options",0,options_menu); game_menu->additem(MN_HL,"",0,0); - game_menu->additem(MN_ACTION,"Quit Game",0,0); + game_menu->additem(MN_ACTION,"Abort Level",0,0); - worldmap_menu->additem(MN_LABEL,"Worldmap Menu",0,0); + worldmap_menu->additem(MN_LABEL,"Pause",0,0); worldmap_menu->additem(MN_HL,"",0,0); - worldmap_menu->additem(MN_ACTION,"Return To Game",0,0); + worldmap_menu->additem(MN_ACTION,"Continue",0,0); + worldmap_menu->additem(MN_ACTION,"Save",0,0); worldmap_menu->additem(MN_GOTO,"Options",0,options_menu); worldmap_menu->additem(MN_HL,"",0,0); worldmap_menu->additem(MN_ACTION,"Quit Game",0,0); @@ -463,7 +462,8 @@ char slotfile[1024]; snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot-1); - + + // Load the game or at least set the savegame_file variable worldmap.loadgame(slotfile); worldmap.display(); |
|
From: Ricardo C. <rm...@us...> - 2004-04-19 12:05:38
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760/data Modified Files: supertux.strf Log Message: Added a flat Mr. Ice Block. It is ugly as hell, but better than having a laptop. Ingo, could you make a decent one? ;) Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- supertux.strf 18 Apr 2004 21:16:51 -0000 1.4 +++ supertux.strf 19 Apr 2004 12:05:22 -0000 1.5 @@ -54,10 +54,10 @@ "shared/mriceblock-right-1.png")) (sprite (name "laptop-flat-left") - (images "shared/laptop-flat-left.png")) + (images "shared/mriceblock-flat-left.png")) (sprite (name "laptop-flat-right") - (images "shared/laptop-flat-right.png")) + (images "shared/mriceblock-flat-right.png")) (sprite (name "laptop-falling-left") (images "shared/laptop-falling-left.png")) |
|
From: Ricardo C. <rm...@us...> - 2004-04-19 12:05:38
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760/data/images/shared Added Files: mriceblock-flat-left.png mriceblock-flat-right.png Log Message: Added a flat Mr. Ice Block. It is ugly as hell, but better than having a laptop. Ingo, could you make a decent one? ;) --- NEW FILE: mriceblock-flat-left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-flat-right.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-19 11:46:51
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22620/data Modified Files: CREDITS Log Message: Added Marek to in-game credits. Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CREDITS 18 Apr 2004 18:00:27 -0000 1.5 +++ CREDITS 19 Apr 2004 11:46:41 -0000 1.6 @@ -55,9 +55,15 @@ Basically he makes suggestions for everything from the engine itself to the gameplay. +Marek Moeckel + Level organization and polishing. + Sound Effects ------------- +Marek Moeckel + Made a few musics. + Royalty free sound effects CDROMs and FTP sites |
|
From: Ingo R. <gr...@us...> - 2004-04-18 22:36:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22217 Modified Files: level.cpp level.h player.cpp Log Message: - commited start_pos patch from sik0fewl Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- player.cpp 18 Apr 2004 21:16:53 -0000 1.43 +++ player.cpp 18 Apr 2004 22:36:03 -0000 1.44 @@ -64,15 +64,16 @@ void Player::init() { + Level* plevel = World::current()->get_level(); + base.width = 32; base.height = 32; size = SMALL; got_coffee = false; - // FIXME: Make the start position configurable via the levelfile - base.x = 100; - base.y = 170; + base.x = plevel->start_pos_x; + base.y = plevel->start_pos_y; base.xm = 0; base.ym = 0; previous_base = old_base = base; Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- level.cpp 18 Apr 2004 21:16:53 -0000 1.37 +++ level.cpp 18 Apr 2004 22:36:03 -0000 1.38 @@ -213,6 +213,8 @@ song_title = "Mortimers_chipdisko.mod"; bkgd_image = "arctis.png"; width = 21; + start_pos_x = 100; + start_pos_y = 170; time_left = 100; gravity = 10.; bkgd_top.red = 0; @@ -285,9 +287,10 @@ if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { LispReader reader(lisp_cdr(root_obj)); - reader.read_int("version", &version); reader.read_int("width", &width); + if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100; + if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170; reader.read_int("time", &time_left); reader.read_int("bkgd_top_red", &bkgd_top.red); Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- level.h 18 Apr 2004 13:42:15 -0000 1.31 +++ level.h 18 Apr 2004 22:36:03 -0000 1.32 @@ -68,6 +68,8 @@ Color bkgd_top; Color bkgd_bottom; int width; + int start_pos_x; + int start_pos_y; int endpos; float gravity; |
|
From: Ingo R. <gr...@us...> - 2004-04-18 21:45:22
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11732 Modified Files: leveleditor.cpp Log Message: - removed static_cast hack Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- leveleditor.cpp 18 Apr 2004 12:03:06 -0000 1.50 +++ leveleditor.cpp 18 Apr 2004 21:45:13 -0000 1.51 @@ -1139,7 +1139,7 @@ /* if there is a bad guy over there, remove it */ for(i = 0; i < le_world.bad_guys.size(); ++i) if(xx == le_world.bad_guys[i].base.x/32 && yy == le_world.bad_guys[i].base.y/32) - le_world.bad_guys.erase(static_cast<std::vector<BadGuy>::iterator>(&le_world.bad_guys[i])); + le_world.bad_guys.erase(le_world.bad_guys.begin() + i); if(c == '0') /* if it's a bad guy */ le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); |
|
From: Ingo R. <gr...@us...> - 2004-04-18 21:17:10
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/src Modified Files: level.cpp player.cpp player.h resources.cpp Log Message: - fixed some align problems with tux - fixed bug in tilemap resize Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- player.cpp 18 Apr 2004 20:36:00 -0000 1.42 +++ player.cpp 18 Apr 2004 21:16:53 -0000 1.43 @@ -32,8 +32,8 @@ Sprite* bigtux_left; Sprite* bigtux_right_jump; Sprite* bigtux_left_jump; -Surface* ducktux_right; -Surface* ducktux_left; +Sprite* ducktux_right; +Sprite* ducktux_left; Surface* skidtux_right; Surface* skidtux_left; Surface* firetux_right[3]; @@ -517,14 +517,9 @@ /* Draw cape: */ if (dir == RIGHT) - { - cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); - } + cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); else - { - cape_left[global_frame_counter % 2]->draw( - base.x- scroll_x, base.y); - } + cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); } @@ -549,11 +544,9 @@ else // moving { if (dir == RIGHT) - tux_right[(global_frame_counter/2) % tux_right.size()]->draw( - base.x - scroll_x, base.y - 9); + tux_right[(global_frame_counter/2) % tux_right.size()]->draw(base.x - scroll_x, base.y - 9); else - tux_left[(global_frame_counter/2) % tux_left.size()]->draw( - base.x - scroll_x, base.y - 9); + tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9); } } } @@ -581,15 +574,9 @@ /* Draw cape (just not in ducked mode since that looks silly): */ if (dir == RIGHT) - { - bigcape_right[global_frame_counter % 2]->draw( - capex, capey); - } + bigcape_right[global_frame_counter % 2]->draw(capex, capey); else - { - bigcape_left[global_frame_counter % 2]->draw( - capex, capey); - } + bigcape_left[global_frame_counter % 2]->draw(capex, capey); } if (!got_coffee) @@ -601,36 +588,32 @@ if (physic.get_velocity_y() == 0) { if (dir == RIGHT) - bigtux_right->draw(base.x- scroll_x - 8, base.y); + bigtux_right->draw(base.x - scroll_x, base.y); else - bigtux_left->draw(base.x- scroll_x - 8, base.y); + bigtux_left->draw(base.x - scroll_x, base.y); } else { if (dir == RIGHT) - bigtux_right_jump->draw(base.x- scroll_x - 8, base.y); + bigtux_right_jump->draw(base.x - scroll_x, base.y); else - bigtux_left_jump->draw(base.x- scroll_x - 8, base.y); + bigtux_left_jump->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - skidtux_right->draw(base.x- scroll_x - 8, base.y); + skidtux_right->draw(base.x - scroll_x - 8, base.y); else - skidtux_left->draw(base.x- scroll_x - 8, base.y); + skidtux_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - ducktux_right->draw( base.x- scroll_x - 8, base.y - 16); - } + ducktux_right->draw(base.x - scroll_x, base.y); else - { - ducktux_left->draw( base.x- scroll_x - 8, base.y - 16); - } + ducktux_left->draw(base.x - scroll_x, base.y); } } else @@ -643,54 +626,32 @@ if (!jumping || physic.get_velocity_y() > 0) { if (dir == RIGHT) - { - bigfiretux_right[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y); else - { - bigfiretux_left[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y); } else { if (dir == RIGHT) - { - bigfiretux_right_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y); else - { - bigfiretux_left_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - skidfiretux_right->draw( - base.x- scroll_x - 8, base.y); - } + skidfiretux_right->draw(base.x- scroll_x - 8, base.y); else - { - skidfiretux_left->draw( - base.x- scroll_x - 8, base.y); - } + skidfiretux_left->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); - } + duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); else - { - duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); - } + duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); } } } Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- player.h 18 Apr 2004 20:36:00 -0000 1.28 +++ player.h 18 Apr 2004 21:16:53 -0000 1.29 @@ -73,8 +73,8 @@ extern Sprite* bigtux_left; extern Sprite* bigtux_right_jump; extern Sprite* bigtux_left_jump; -extern Surface* ducktux_right; -extern Surface* ducktux_left; +extern Sprite* ducktux_right; +extern Sprite* ducktux_left; extern Surface* skidtux_right; extern Surface* skidtux_left; extern Surface* firetux_right[3]; Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- level.cpp 18 Apr 2004 13:42:15 -0000 1.36 +++ level.cpp 18 Apr 2004 21:16:53 -0000 1.37 @@ -289,12 +289,15 @@ reader.read_int("version", &version); reader.read_int("width", &width); reader.read_int("time", &time_left); + reader.read_int("bkgd_top_red", &bkgd_top.red); reader.read_int("bkgd_top_green", &bkgd_top.green); reader.read_int("bkgd_top_blue", &bkgd_top.blue); + reader.read_int("bkgd_bottom_red", &bkgd_bottom.red); reader.read_int("bkgd_bottom_green", &bkgd_bottom.green); reader.read_int("bkgd_bottom_blue", &bkgd_bottom.blue); + reader.read_float("gravity", &gravity); reader.read_string("name", &name); reader.read_string("author", &author); @@ -597,19 +600,6 @@ *ptexture = new Surface(fname, use_alpha); } -void tilemap_change_size(unsigned int** tilemap[15], int w, int old_w) -{ - int j,y; - for(y = 0; y < 15; ++y) - { - *tilemap[y] = (unsigned int*) realloc(*tilemap[y],(w+1)*sizeof(unsigned int)); - if(w > old_w) - for(j = 0; j < w - old_w; ++j) - *tilemap[y][old_w+j] = 0; - *tilemap[y][w] = 0; - } -} - /* Change the size of a level (width) */ void Level::change_size (int new_width) @@ -617,9 +607,12 @@ if(new_width < 21) new_width = 21; - tilemap_change_size((unsigned int***)&ia_tiles, new_width, width); - tilemap_change_size((unsigned int***)&bg_tiles, new_width, width); - tilemap_change_size((unsigned int***)&fg_tiles, new_width, width); + for(int y = 0; y < 15; ++y) + { + ia_tiles[y].resize(new_width, 0); + bg_tiles[y].resize(new_width, 0); + fg_tiles[y].resize(new_width, 0); + } width = new_width; } Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- resources.cpp 18 Apr 2004 20:36:01 -0000 1.11 +++ resources.cpp 18 Apr 2004 21:16:53 -0000 1.12 @@ -128,13 +128,8 @@ USE_ALPHA); - ducktux_right = new Surface(datadir + - "/images/shared/tux-duck-right.png", - USE_ALPHA); - - ducktux_left = new Surface(datadir + - "/images/shared/tux-duck-left.png", - USE_ALPHA); + ducktux_left = sprite_manager->load("largetux-duck-left"); + ducktux_right = sprite_manager->load("largetux-duck-right"); skidtux_right = new Surface(datadir + "/images/shared/skidtux-right.png", |
|
From: Ingo R. <gr...@us...> - 2004-04-18 21:17:03
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6171/data Modified Files: supertux.strf Log Message: - fixed some align problems with tux - fixed bug in tilemap resize Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- supertux.strf 18 Apr 2004 20:35:04 -0000 1.3 +++ supertux.strf 18 Apr 2004 21:16:51 -0000 1.4 @@ -160,6 +160,8 @@ (sprite (name "largetux-walk-left") + (x-hotspot 6) + (y-hotspot 2) (images "shared/largetux-walk-left-0.png" "shared/largetux-walk-left-1.png" "shared/largetux-walk-left-2.png" @@ -168,6 +170,8 @@ "shared/largetux-walk-left-5.png")) (sprite (name "largetux-walk-right") + (x-hotspot 6) + (y-hotspot 2) (images "shared/largetux-walk-right-0.png" "shared/largetux-walk-right-1.png" "shared/largetux-walk-right-2.png" @@ -176,11 +180,23 @@ "shared/largetux-walk-right-5.png")) (sprite (name "largetux-jump-left") + (x-hotspot 9) + (y-hotspot 2) (images "shared/largetux-jump-left-0.png")) - (sprite (name "largetux-jump-right") + (x-hotspot 9) + (y-hotspot 2) (images "shared/largetux-jump-right-0.png")) + + (sprite (name "largetux-duck-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/tux-duck-left.png")) + (sprite (name "largetux-duck-right") + (x-hotspot 6) + (y-hotspot 6) + (images "shared/tux-duck-right.png")) ) ;; EOF ;; |
|
From: Ingo R. <gr...@us...> - 2004-04-18 20:36:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31092 Modified Files: gameloop.cpp player.cpp player.h resources.cpp sound.h Log Message: - added new bigtux Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- player.cpp 18 Apr 2004 15:08:27 -0000 1.41 +++ player.cpp 18 Apr 2004 20:36:00 -0000 1.42 @@ -17,6 +17,7 @@ #include "defines.h" #include "scene.h" #include "tile.h" +#include "sprite.h" #include "screen.h" Surface* tux_life; @@ -27,10 +28,10 @@ Surface* smalltux_stand_left; Surface* smalltux_stand_right; -Surface* bigtux_right[3]; -Surface* bigtux_left[3]; -Surface* bigtux_right_jump; -Surface* bigtux_left_jump; +Sprite* bigtux_right; +Sprite* bigtux_left; +Sprite* bigtux_right_jump; +Sprite* bigtux_left_jump; Surface* ducktux_right; Surface* ducktux_left; Surface* skidtux_right; @@ -597,45 +598,27 @@ { if (!skidding_timer.started()) { - if (!jumping || physic.get_velocity_y() > 0) + if (physic.get_velocity_y() == 0) { if (dir == RIGHT) - { - bigtux_right[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_right->draw(base.x- scroll_x - 8, base.y); else - { - bigtux_left[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_left->draw(base.x- scroll_x - 8, base.y); } else { if (dir == RIGHT) - { - bigtux_right_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_right_jump->draw(base.x- scroll_x - 8, base.y); else - { - bigtux_left_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_left_jump->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - skidtux_right->draw( - base.x- scroll_x - 8, base.y); - } + skidtux_right->draw(base.x- scroll_x - 8, base.y); else - { - skidtux_left->draw( - base.x- scroll_x - 8, base.y); - } + skidtux_left->draw(base.x- scroll_x - 8, base.y); } } else Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- player.h 16 Apr 2004 16:52:18 -0000 1.27 +++ player.h 18 Apr 2004 20:36:00 -0000 1.28 @@ -60,6 +60,8 @@ void player_input_init(player_input_type* pplayer_input); +class Sprite; + extern Surface* tux_life; extern std::vector<Surface*> tux_right; extern std::vector<Surface*> tux_left; @@ -67,10 +69,10 @@ extern Surface* smalltux_jump_right; extern Surface* smalltux_stand_left; extern Surface* smalltux_stand_right; -extern Surface* bigtux_right[3]; -extern Surface* bigtux_left[3]; -extern Surface* bigtux_right_jump; -extern Surface* bigtux_left_jump; +extern Sprite* bigtux_right; +extern Sprite* bigtux_left; +extern Sprite* bigtux_right_jump; +extern Sprite* bigtux_left_jump; extern Surface* ducktux_right; extern Surface* ducktux_left; extern Surface* skidtux_right; Index: sound.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- sound.h 24 Mar 2004 14:35:11 -0000 1.21 +++ sound.h 18 Apr 2004 20:36:01 -0000 1.22 @@ -71,8 +71,10 @@ #include <SDL_mixer.h> /* variables for stocking the sound and music */ -extern Mix_Chunk * sounds[NUM_SOUNDS]; -extern Mix_Music * level_song, * level_song_fast, * herring_song; +extern Mix_Chunk* sounds[NUM_SOUNDS]; +extern Mix_Music* level_song; +extern Mix_Music* level_song_fast; +extern Mix_Music* herring_song; /* functions handling the sound and music */ int open_audio(int frequency, Uint16 format, int channels, int chunksize); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- gameloop.cpp 18 Apr 2004 13:42:14 -0000 1.76 +++ gameloop.cpp 18 Apr 2004 20:36:00 -0000 1.77 @@ -63,6 +63,8 @@ fps_timer.init(true); frame_timer.init(true); + delete world; + if (st_gl_mode == ST_GL_LOAD_LEVEL_FILE) { world = new World(subset); Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- resources.cpp 18 Apr 2004 13:42:15 -0000 1.10 +++ resources.cpp 18 Apr 2004 20:36:01 -0000 1.11 @@ -75,27 +75,11 @@ cape_left[1] = new Surface(datadir + "/images/shared/cape-left-1.png", USE_ALPHA); - bigtux_right[0] = new Surface(datadir + "/images/shared/bigtux-right-0.png", - USE_ALPHA); - - bigtux_right[1] = new Surface(datadir + "/images/shared/bigtux-right-1.png", - USE_ALPHA); - - bigtux_right[2] = new Surface(datadir + "/images/shared/bigtux-right-2.png", - USE_ALPHA); - - bigtux_right_jump = new Surface(datadir + "/images/shared/bigtux-right-jump.png", USE_ALPHA); - - bigtux_left[0] = new Surface(datadir + "/images/shared/bigtux-left-0.png", - USE_ALPHA); - - bigtux_left[1] = new Surface(datadir + "/images/shared/bigtux-left-1.png", - USE_ALPHA); - - bigtux_left[2] = new Surface(datadir + "/images/shared/bigtux-left-2.png", - USE_ALPHA); + bigtux_right = sprite_manager->load("largetux-walk-right"); + bigtux_left = sprite_manager->load("largetux-walk-left"); - bigtux_left_jump = new Surface(datadir + "/images/shared/bigtux-left-jump.png", USE_ALPHA); + bigtux_left_jump = sprite_manager->load("largetux-jump-left"); + bigtux_right_jump = sprite_manager->load("largetux-jump-right"); bigcape_right[0] = new Surface(datadir + "/images/shared/bigcape-right-0.png", USE_ALPHA); @@ -302,8 +286,6 @@ { delete tux_right[i]; delete tux_left[i]; - delete bigtux_right[i]; - delete bigtux_left[i]; } delete bigtux_right_jump; |
|
From: Ingo R. <gr...@us...> - 2004-04-18 20:35:21
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30979 Modified Files: supertux.strf Log Message: - added new tux Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- supertux.strf 17 Apr 2004 12:13:42 -0000 1.2 +++ supertux.strf 18 Apr 2004 20:35:04 -0000 1.3 @@ -158,6 +158,29 @@ "shared/snowball-right-2.png" "shared/snowball-right-1.png")) - ) + + (sprite (name "largetux-walk-left") + (images "shared/largetux-walk-left-0.png" + "shared/largetux-walk-left-1.png" + "shared/largetux-walk-left-2.png" + "shared/largetux-walk-left-3.png" + "shared/largetux-walk-left-4.png" + "shared/largetux-walk-left-5.png")) + + (sprite (name "largetux-walk-right") + (images "shared/largetux-walk-right-0.png" + "shared/largetux-walk-right-1.png" + "shared/largetux-walk-right-2.png" + "shared/largetux-walk-right-3.png" + "shared/largetux-walk-right-4.png" + "shared/largetux-walk-right-5.png")) + + (sprite (name "largetux-jump-left") + (images "shared/largetux-jump-left-0.png")) + + (sprite (name "largetux-jump-right") + (images "shared/largetux-jump-right-0.png")) + +) ;; EOF ;; |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17970 Modified Files: iceflower.png star.png Added Files: iceflower-1.png iceflower-2.png iceflower-3.png largetux-jump-left-0.png largetux-jump-right-0.png largetux-walk-left-0.png largetux-walk-left-1.png largetux-walk-left-2.png largetux-walk-left-3.png largetux-walk-left-4.png largetux-walk-left-5.png largetux-walk-right-0.png largetux-walk-right-1.png largetux-walk-right-2.png largetux-walk-right-3.png largetux-walk-right-4.png largetux-walk-right-5.png star-1.png star-2.png star-3.png star-4.png Log Message: - some graphics --- NEW FILE: largetux-walk-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-left-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: iceflower-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: iceflower-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-right-2.png --- (This appears to be a binary file; contents omitted.) Index: iceflower.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/iceflower.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs0mUs5V and /tmp/cvsZcfz5T differ --- NEW FILE: star-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: star-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: iceflower-1.png --- (This appears to be a binary file; contents omitted.) Index: star.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/star.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsVqK7y0 and /tmp/cvseG98BY differ --- NEW FILE: largetux-jump-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: star-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: star-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-jump-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-walk-right-4.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-18 18:00:36
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31556/data Modified Files: CREDITS Log Message: Added Ryan full name. Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CREDITS 18 Apr 2004 12:11:11 -0000 1.4 +++ CREDITS 18 Apr 2004 18:00:27 -0000 1.5 @@ -23,7 +23,7 @@ Made a lot of C++ ports, introduced the worldmap and the lispreader. -Ryan +Ryan Flegel Duong-Khang NGUYEN Contributors |
|
From: Ricardo C. <rm...@us...> - 2004-04-18 17:55:08
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30132/data/music Added Files: cave-fast.mod cave.mod Log Message: Musics by Marek, they are pretty cool and could be used in cave levels. --- NEW FILE: cave-fast.mod --- (This appears to be a binary file; contents omitted.) --- NEW FILE: cave.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-18 15:08:39
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28599 Modified Files: player.cpp Log Message: - moved default start position two tiles higher Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- player.cpp 18 Apr 2004 11:09:55 -0000 1.40 +++ player.cpp 18 Apr 2004 15:08:27 -0000 1.41 @@ -71,7 +71,7 @@ // FIXME: Make the start position configurable via the levelfile base.x = 100; - base.y = 240; + base.y = 170; base.xm = 0; base.ym = 0; previous_base = old_base = base; @@ -136,7 +136,7 @@ Player::level_begin() { base.x = 100; - base.y = 240; + base.y = 170; base.xm = 0; base.ym = 0; previous_base = old_base = base; |
|
From: Ingo R. <gr...@us...> - 2004-04-18 13:42:24
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12758 Modified Files: gameloop.cpp globals.cpp globals.h level.cpp level.h resources.cpp special.cpp world.cpp Log Message: - added constructor to level - changed framerate handling to avoid large frame_ratio's Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- special.cpp 16 Apr 2004 16:52:18 -0000 1.18 +++ special.cpp 18 Apr 2004 13:42:15 -0000 1.19 @@ -323,8 +323,7 @@ img_growup = new Surface(datadir + "/images/shared/egg.png", USE_ALPHA); img_iceflower = new Surface(datadir + "/images/shared/iceflower.png", USE_ALPHA); - img_golden_herring = new Surface(datadir + - "/images/shared/star.png", USE_ALPHA); + img_golden_herring = new Surface(datadir + "/images/shared/star.png", USE_ALPHA); img_1up = new Surface(datadir + "/images/shared/1up.png", USE_ALPHA); Index: globals.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/globals.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- globals.cpp 13 Apr 2004 12:25:22 -0000 1.11 +++ globals.cpp 18 Apr 2004 13:42:15 -0000 1.12 @@ -32,6 +32,7 @@ bool use_fullscreen; bool debug_mode; bool show_fps; +float game_speed = 1.0f; int joystick_num = 0; char* level_startup_file = 0; Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- level.h 16 Apr 2004 14:26:19 -0000 1.30 +++ level.h 18 Apr 2004 13:42:15 -0000 1.31 @@ -73,6 +73,10 @@ std::vector<BadGuyData> badguy_data; public: + Level(); + Level(const std::string& subset, int level); + Level(const std::string& filename); + /** Will the Level structure with default values */ void init_defaults(); @@ -88,6 +92,7 @@ int load(const std::string& filename); void load_gfx(); + void free_gfx(); void load_song(); void free_song(); @@ -103,8 +108,6 @@ /** Return the id of the tile at position x/y */ unsigned int gettileid(float x, float y); - void free_gfx(); - void load_image(Surface** ptexture, std::string theme, const char * file, int use_alpha); }; Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- level.cpp 16 Apr 2004 14:26:19 -0000 1.35 +++ level.cpp 18 Apr 2004 13:42:15 -0000 1.36 @@ -190,6 +190,20 @@ levels = 0; } +Level::Level() +{ +} + +Level::Level(const std::string& subset, int level) +{ + load(subset, level); +} + +Level::Level(const std::string& filename) +{ + load(filename); +} + void Level::init_defaults() { @@ -659,7 +673,6 @@ free(song_path); } - unsigned int Level::gettileid(float x, float y) { Index: globals.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/globals.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- globals.h 13 Apr 2004 12:25:22 -0000 1.23 +++ globals.h 18 Apr 2004 13:42:15 -0000 1.24 @@ -49,6 +49,7 @@ extern char* st_dir; extern char* st_save_dir; +extern float game_speed; extern SDL_Joystick * js; int wait_for_event(SDL_Event& event,unsigned int min_delay = 0, unsigned int max_delay = 0, bool empty_events = false); Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- world.cpp 18 Apr 2004 11:09:55 -0000 1.28 +++ world.cpp 18 Apr 2004 13:42:15 -0000 1.29 @@ -39,10 +39,9 @@ // world calls child functions current_ = this; - level = new Level; + level = new Level(filename); tux.init(); - level->load(filename); set_defaults(); get_level()->load_gfx(); @@ -57,10 +56,9 @@ // world calls child functions current_ = this; - level = new Level; + level = new Level(subset, level_nr); tux.init(); - level->load(subset, level_nr); set_defaults(); get_level()->load_gfx(); @@ -205,6 +203,8 @@ void World::action(double frame_ratio) { + tux.action(frame_ratio); + /* Handle bouncy distros: */ for (unsigned int i = 0; i < bouncy_distros.size(); i++) bouncy_distros[i].action(frame_ratio); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- gameloop.cpp 18 Apr 2004 12:03:06 -0000 1.75 +++ gameloop.cpp 18 Apr 2004 13:42:14 -0000 1.76 @@ -10,6 +10,7 @@ April 11, 2000 - March 15, 2004 */ +#include <iostream> #include <assert.h> #include <stdio.h> #include <stdlib.h> @@ -345,10 +346,7 @@ if (exit_status == NONE) { - Player* tux = world->get_tux(); - // Update Tux and the World - tux->action(frame_ratio); world->action(frame_ratio); } } @@ -410,12 +408,11 @@ draw(); + float overlap = 0.0f; while (exit_status == NONE) { /* Calculate the movement-factor */ double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE); - if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */ - frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85; if(!frame_timer.check()) { @@ -463,7 +460,15 @@ // Handle actions: if(!game_pause && !show_menu) { - action(frame_ratio); + frame_ratio *= game_speed; + frame_ratio += overlap; + while (frame_ratio > 0) + { + action(1.0f); + frame_ratio -= 1.0f; + } + overlap = frame_ratio; + if (exit_status != NONE) return exit_status; } Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- resources.cpp 17 Apr 2004 10:48:04 -0000 1.9 +++ resources.cpp 18 Apr 2004 13:42:15 -0000 1.10 @@ -145,11 +145,11 @@ ducktux_right = new Surface(datadir + - "/images/shared/ducktux-right.png", + "/images/shared/tux-duck-right.png", USE_ALPHA); ducktux_left = new Surface(datadir + - "/images/shared/ducktux-left.png", + "/images/shared/tux-duck-left.png", USE_ALPHA); skidtux_right = new Surface(datadir + |
|
From: Ingo R. <gr...@us...> - 2004-04-18 12:31:17
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30698/data/images/shared Added Files: tux-duck-left.png tux-duck-right.png Log Message: - added tux ducking images --- NEW FILE: tux-duck-right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tux-duck-left.png --- (This appears to be a binary file; contents omitted.) |
248 messages has been excluded from this view by a project administrator.
