super-tux-commit Mailing List for Super Tux (Page 91)
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-22 17:51:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14376/src Modified Files: menu.cpp Log Message: Removed a few useless code (it was commented anyway). Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- menu.cpp 22 Apr 2004 14:11:57 -0000 1.47 +++ menu.cpp 22 Apr 2004 17:51:03 -0000 1.48 @@ -329,8 +329,6 @@ Menu::set_current(0); item[active_item].toggled = true; break; - case MN_CONTROLFIELD: - break; case MN_BACK: Menu::pop_current(); @@ -515,32 +513,6 @@ A_HMIDDLE, A_VMIDDLE, shadow_size); break; } -// case MN_CONTROLFIELD: -// { - /* display key */ // FIXME: the key number is not that obvious to the user :P -/* char str[12]; - sprintf(str, "%i", *pitem.int_p); - input_width = strlen(str) * font_width; - - int input_pos = input_width/2; - int text_pos = (text_width + font_width)/2; - - fillrect(x_pos - input_pos + text_pos - 1, y_pos - 10, - input_width + font_width + 2, 20, - 255,255,255,255); - fillrect(x_pos - input_pos + text_pos, y_pos - 9, - input_width + font_width, 18, - 0,0,0,128); - - gold_text->draw_align(str, - x_pos + text_pos, y_pos, - A_HMIDDLE, A_VMIDDLE, 2); - - text_font->draw_align(pitem.text, - x_pos - (input_width + font_width)/2, y_pos, - A_HMIDDLE, A_VMIDDLE, shadow_size); - break; - }*/ case MN_STRINGSELECT: { int list_pos_2 = list_width + font_width; |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 17:39:05
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11621/src Modified Files: defines.h Log Message: Changed MAX_BULLETS from 2 to 1. As someone said Tux with bullets power is totally invencible, this will make it a bit harder. Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- defines.h 21 Apr 2004 22:48:30 -0000 1.20 +++ defines.h 22 Apr 2004 17:38:56 -0000 1.21 @@ -70,7 +70,7 @@ #define RUN_SPEED 1.5 #define JUMP_SPEED 1.2 -#define MAX_BULLETS 2 +#define MAX_BULLETS 1 #define GRAVITY 1.0 #define YM_FOR_JUMP 6.0 |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:52:11
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv753 Modified Files: badguy.cpp Log Message: - undo of my last patch, removing 'this' is not a good idea and causes even worse side effects Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- badguy.cpp 22 Apr 2004 16:49:28 -0000 1.44 +++ badguy.cpp 22 Apr 2004 16:52:02 -0000 1.45 @@ -856,7 +856,6 @@ BadGuy::squish(Player* player) { if(kind == BAD_MRBOMB) { - remove_me(); // mrbomb transforms into a bomb now World::current()->add_bad_guy(base.x, base.y, BAD_BOMB); @@ -864,7 +863,7 @@ World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier); play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); player_status.score_multiplier++; - + remove_me(); return; } else if(kind == BAD_BSOD) { |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:49:37
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32652 Modified Files: badguy.cpp Log Message: - fixed bomb-dup bug (vector increases on add, and this changes I guess, so remove doesn't work, vector should really store pointers, not values) Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- badguy.cpp 22 Apr 2004 16:25:23 -0000 1.43 +++ badguy.cpp 22 Apr 2004 16:49:28 -0000 1.44 @@ -856,6 +856,7 @@ BadGuy::squish(Player* player) { if(kind == BAD_MRBOMB) { + remove_me(); // mrbomb transforms into a bomb now World::current()->add_bad_guy(base.x, base.y, BAD_BOMB); @@ -864,7 +865,6 @@ play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); player_status.score_multiplier++; - remove_me(); return; } else if(kind == BAD_BSOD) { |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:45:25
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31798 Modified Files: supertux.strf Log Message: - fixed bomb Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- supertux.strf 22 Apr 2004 16:36:59 -0000 1.12 +++ supertux.strf 22 Apr 2004 16:45:15 -0000 1.13 @@ -91,20 +91,22 @@ (images "shared/jumpy-left-middle-0.png")) (sprite (name "mrbomb-left") + (fps 10.0) (x-hotspot 3) (y-hotspot 12) - (images "shared/mrbomb-left-0.png") - (images "shared/mrbomb-left-1.png") - (images "shared/mrbomb-left-2.png") - (images "shared/mrbomb-left-3.png")) + (images "shared/mrbomb-left-0.png" + "shared/mrbomb-left-1.png" + "shared/mrbomb-left-2.png" + "shared/mrbomb-left-3.png")) (sprite (name "mrbomb-right") + (fps 10.0) (x-hotspot 7) (y-hotspot 12) - (images "shared/mrbomb-right-0.png") - (images "shared/mrbomb-right-1.png") - (images "shared/mrbomb-right-2.png") - (images "shared/mrbomb-right-3.png")) + (images "shared/mrbomb-right-0.png" + "shared/mrbomb-right-1.png" + "shared/mrbomb-right-2.png" + "shared/mrbomb-right-3.png")) (sprite (name "mrbomb-ticking-left") |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:37:14
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29663 Modified Files: supertux.strf Log Message: - fixed hotspot Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- supertux.strf 22 Apr 2004 16:28:28 -0000 1.11 +++ supertux.strf 22 Apr 2004 16:36:59 -0000 1.12 @@ -91,18 +91,16 @@ (images "shared/jumpy-left-middle-0.png")) (sprite (name "mrbomb-left") - (fps 15.0) - (x-hotspot 0) - (y-hotspot 15) + (x-hotspot 3) + (y-hotspot 12) (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") - (fps 15.0) - (x-hotspot 0) - (y-hotspot 15) + (x-hotspot 7) + (y-hotspot 12) (images "shared/mrbomb-right-0.png") (images "shared/mrbomb-right-1.png") (images "shared/mrbomb-right-2.png") @@ -111,15 +109,15 @@ (sprite (name "mrbomb-ticking-left") (fps 15.0) - (x-hotspot 0) - (y-hotspot 10) + (x-hotspot 3) + (y-hotspot 8) (images "shared/mrbombx-left-0.png" "shared/mrbombx-left-1.png")) (sprite (name "mrbomb-ticking-right") (fps 15.0) - (x-hotspot 0) - (y-hotspot 10) + (x-hotspot 10) + (y-hotspot 8) (images "shared/mrbombx-right-0.png" "shared/mrbombx-right-1.png")) |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:28:37
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27919 Modified Files: supertux.strf Log Message: - supertux stand gfx Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- supertux.strf 22 Apr 2004 15:53:32 -0000 1.10 +++ supertux.strf 22 Apr 2004 16:28:28 -0000 1.11 @@ -91,6 +91,7 @@ (images "shared/jumpy-left-middle-0.png")) (sprite (name "mrbomb-left") + (fps 15.0) (x-hotspot 0) (y-hotspot 15) (images "shared/mrbomb-left-0.png") @@ -99,6 +100,7 @@ (images "shared/mrbomb-left-3.png")) (sprite (name "mrbomb-right") + (fps 15.0) (x-hotspot 0) (y-hotspot 15) (images "shared/mrbomb-right-0.png") @@ -108,14 +110,18 @@ (sprite (name "mrbomb-ticking-left") + (fps 15.0) (x-hotspot 0) (y-hotspot 10) - (images "shared/mrbombx-left-0.png")) + (images "shared/mrbombx-left-0.png" + "shared/mrbombx-left-1.png")) (sprite (name "mrbomb-ticking-right") + (fps 15.0) (x-hotspot 0) (y-hotspot 10) - (images "shared/mrbombx-right-0.png")) + (images "shared/mrbombx-right-0.png" + "shared/mrbombx-right-1.png")) (sprite (name "mrbomb-explosion") (x-hotspot 32) @@ -213,6 +219,16 @@ "shared/snowball-right-1.png")) + (sprite (name "largetux-stand-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-stand-left.png")) + + (sprite (name "largetux-stand-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-stand-right.png")) + (sprite (name "largetux-walk-left") (x-hotspot 6) (y-hotspot 2) |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:28:12
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27836 Added Files: largetux-stand-left.png largetux-stand-right.png Log Message: - supertux stand gfx --- NEW FILE: largetux-stand-right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-stand-left.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-22 16:25:41
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27263 Modified Files: badguy.cpp player.cpp player.h resources.cpp Log Message: - synced walk speed of walking enemies - added standing tux Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- player.cpp 22 Apr 2004 13:24:15 -0000 1.53 +++ player.cpp 22 Apr 2004 16:25:24 -0000 1.54 @@ -38,6 +38,8 @@ Sprite* smalltux_gameover; Sprite* smalltux_skid_left; Sprite* smalltux_skid_right; +Sprite* largetux_stand_left; +Sprite* largetux_stand_right; Sprite* bigtux_right; Sprite* bigtux_left; @@ -598,10 +600,20 @@ { if (physic.get_velocity_y() == 0) { - if (dir == RIGHT) - bigtux_right->draw(base.x - scroll_x, base.y); - else - bigtux_left->draw(base.x - scroll_x, base.y); + if (fabsf(physic.get_velocity_x()) < 1.0f) // standing + { + if (dir == RIGHT) + largetux_stand_right->draw(base.x - scroll_x, base.y); + else + largetux_stand_left->draw(base.x - scroll_x, base.y); + } + else // walking + { + if (dir == RIGHT) + bigtux_right->draw(base.x - scroll_x, base.y); + else + bigtux_left->draw(base.x - scroll_x, base.y); + } } else { Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- player.h 22 Apr 2004 00:13:33 -0000 1.34 +++ player.h 22 Apr 2004 16:25:32 -0000 1.35 @@ -84,6 +84,8 @@ extern Sprite* smalltux_skid_left; extern Sprite* smalltux_skid_right; extern Sprite* smalltux_gameover; +extern Sprite* largetux_stand_left; +extern Sprite* largetux_stand_right; extern Sprite* bigtux_right; extern Sprite* bigtux_left; extern Sprite* bigtux_right_jump; Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- badguy.cpp 22 Apr 2004 15:52:47 -0000 1.42 +++ badguy.cpp 22 Apr 2004 16:25:23 -0000 1.43 @@ -70,6 +70,8 @@ Sprite* img_snowball_squished_left; Sprite* img_snowball_squished_right; +#define BADGUY_WALK_SPEED .8f + BadGuyKind badguykind_from_string(const std::string& str) { if (str == "money") @@ -166,13 +168,13 @@ timer.init(true); if(kind == BAD_BSOD) { - physic.set_velocity(-1.3, 0); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_bsod_left, img_bsod_right); } else if(kind == BAD_MRBOMB) { - physic.set_velocity(-1.3, 0); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_mrbomb_left, img_mrbomb_right); } else if (kind == BAD_LAPTOP) { - physic.set_velocity(-.8, 0); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_laptop_left, img_laptop_right); } else if(kind == BAD_MONEY) { set_sprite(img_jumpy_left_up, img_jumpy_left_up); @@ -185,7 +187,7 @@ physic.enable_gravity(false); set_sprite(img_flame, img_flame); } else if(kind == BAD_BOUNCINGSNOWBALL) { - physic.set_velocity(-1.3, 0); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right); } else if(kind == BAD_STALACTITE) { physic.enable_gravity(false); @@ -197,10 +199,10 @@ set_sprite(img_flyingsnowball, img_flyingsnowball); physic.enable_gravity(false); } else if(kind == BAD_SPIKY) { - physic.set_velocity(-1.3, 0); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_spiky_left, img_spiky_right); } else if(kind == BAD_SNOWBALL) { - physic.set_velocity(-1.3, 0); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_snowball_left, img_snowball_right); } Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- resources.cpp 22 Apr 2004 11:17:34 -0000 1.15 +++ resources.cpp 22 Apr 2004 16:25:32 -0000 1.16 @@ -48,6 +48,9 @@ sprite_manager = new SpriteManager(datadir + "/supertux.strf"); /* Tuxes: */ + largetux_stand_left = sprite_manager->load("largetux-stand-left"); + largetux_stand_right = sprite_manager->load("largetux-stand-right"); + smalltux_gameover = sprite_manager->load("smalltux-gameover"); smalltux_skid_left = sprite_manager->load("smalltux-skid-left"); |
|
From: Ingo R. <gr...@us...> - 2004-04-22 15:58:42
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21853 Modified Files: Makefile.am Log Message: - little makefile fix Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 22 Mar 2004 10:33:16 -0000 1.5 +++ Makefile.am 22 Apr 2004 15:58:20 -0000 1.6 @@ -12,8 +12,6 @@ $(wildcard images/themes/*/*.png) \ $(wildcard images/worldmap/*.png) \ $(wildcard images/title/*.png) \ - levels/default/info.png \ - levels/default/info \ levels/default/worldmap.stwm \ $(wildcard levels/default/*.dat) \ $(wildcard levels/default/*.stl) \ |
|
From: Ingo R. <gr...@us...> - 2004-04-22 15:53:43
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20854 Modified Files: supertux.strf Log Message: - removed wrong bsod Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- supertux.strf 22 Apr 2004 15:41:40 -0000 1.9 +++ supertux.strf 22 Apr 2004 15:53:32 -0000 1.10 @@ -32,12 +32,12 @@ (sprite (name "snowball-squished-left") (x-hotspot 1) (y-hotspot -19) - (images "shared/bsod-squished-left.png")) + (images "shared/snowball-squished-left.png")) (sprite (name "snowball-squished-right") (x-hotspot 1) (y-hotspot -19) - (images "shared/bsod-squished-right.png")) + (images "shared/snowball-squished-right.png")) (sprite (name "bsod-falling-left") (images "shared/bsod-falling-left.png")) @@ -181,7 +181,7 @@ (sprite (name "flyingsnowball-squished") (x-hotspot 1) (y-hotspot -19) - (images "shared/bsod-squished-left.png")) + (images "shared/snowball-squished-left.png")) (sprite (name "spiky-left") (x-hotspot 6) |
|
From: Ingo R. <gr...@us...> - 2004-04-22 15:52:57
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20671 Modified Files: badguy.cpp badguy.h Log Message: - some cleanup Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- badguy.h 21 Apr 2004 12:44:52 -0000 1.31 +++ badguy.h 22 Apr 2004 15:52:47 -0000 1.32 @@ -121,8 +121,6 @@ Sprite* sprite_right; int animation_offset; - size_t animation_length; - float animation_speed; public: void init(float x, float y, BadGuyKind kind, bool stay_on_platform); @@ -173,8 +171,7 @@ /** squish ourself, give player score and set dying to DYING_SQICHED */ void squish_me(Player* player); /** set image of the badguy */ - void set_sprite(Sprite* left, Sprite* right, - int animlength = 1, float animspeed = 1); + void set_sprite(Sprite* left, Sprite* right); }; #endif /*SUPERTUX_BADGUY_H*/ Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- badguy.cpp 22 Apr 2004 10:43:36 -0000 1.41 +++ badguy.cpp 22 Apr 2004 15:52:47 -0000 1.42 @@ -160,8 +160,6 @@ old_base = base; dir = LEFT; seen = false; - animation_speed = 1; - animation_length = 1; animation_offset = 0; sprite_left = sprite_right = 0; physic.reset(); @@ -169,41 +167,41 @@ if(kind == BAD_BSOD) { physic.set_velocity(-1.3, 0); - set_sprite(img_bsod_left, img_bsod_right, 4); + set_sprite(img_bsod_left, img_bsod_right); } else if(kind == BAD_MRBOMB) { physic.set_velocity(-1.3, 0); - set_sprite(img_mrbomb_left, img_mrbomb_right, 4); + set_sprite(img_mrbomb_left, img_mrbomb_right); } else if (kind == BAD_LAPTOP) { physic.set_velocity(-.8, 0); - set_sprite(img_laptop_left, img_laptop_right, 4, 5); + set_sprite(img_laptop_left, img_laptop_right); } else if(kind == BAD_MONEY) { - set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1); + set_sprite(img_jumpy_left_up, img_jumpy_left_up); } else if(kind == BAD_BOMB) { - set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right, 1); + set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right); // hack so that the bomb doesn't hurt until it expldes... dying = DYING_SQUISHED; } else if(kind == BAD_FLAME) { base.ym = 0; // we misuse base.ym as angle for the flame physic.enable_gravity(false); - set_sprite(img_flame, img_flame, 2, 0.5); + set_sprite(img_flame, img_flame); } else if(kind == BAD_BOUNCINGSNOWBALL) { physic.set_velocity(-1.3, 0); - set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right, 6); + set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right); } else if(kind == BAD_STALACTITE) { physic.enable_gravity(false); - set_sprite(img_stalactite, img_stalactite, 1); + set_sprite(img_stalactite, img_stalactite); } else if(kind == BAD_FISH) { - set_sprite(img_fish, img_fish, 2, 1); + set_sprite(img_fish, img_fish); physic.enable_gravity(true); } else if(kind == BAD_FLYINGSNOWBALL) { - set_sprite(img_flyingsnowball, img_flyingsnowball, 2, 5); + set_sprite(img_flyingsnowball, img_flyingsnowball); physic.enable_gravity(false); } else if(kind == BAD_SPIKY) { physic.set_velocity(-1.3, 0); - set_sprite(img_spiky_left, img_spiky_right, 3); + set_sprite(img_spiky_left, img_spiky_right); } else if(kind == BAD_SNOWBALL) { physic.set_velocity(-1.3, 0); - set_sprite(img_snowball_left, img_snowball_right, 4, 5); + set_sprite(img_snowball_left, img_snowball_right); } // if we're in a solid tile at start correct that now @@ -291,7 +289,7 @@ old_base = base; mode=KICK; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); + set_sprite(img_laptop_flat_left, img_laptop_flat_right); physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5); play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER); } @@ -319,7 +317,7 @@ if(!timer.check()) { mode = NORMAL; - set_sprite(img_laptop_left, img_laptop_right, 4, 5); + set_sprite(img_laptop_left, img_laptop_right); physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0); } } @@ -422,11 +420,11 @@ BadGuy::action_money(float frame_ratio) { if (fabsf(physic.get_velocity_y()) < 2.5f) - set_sprite(img_jumpy_left_middle, img_jumpy_left_middle, 1); + set_sprite(img_jumpy_left_middle, img_jumpy_left_middle); else if (physic.get_velocity_y() < 0) - set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1); + set_sprite(img_jumpy_left_up, img_jumpy_left_up); else - set_sprite(img_jumpy_left_down, img_jumpy_left_down, 1); + set_sprite(img_jumpy_left_down, img_jumpy_left_down); Player& tux = *World::current()->get_tux(); @@ -485,7 +483,7 @@ } else if(!timer.check()) { if(mode == BOMB_TICKING) { mode = BOMB_EXPLODE; - set_sprite(img_mrbomb_explosion, img_mrbomb_explosion, 1); + set_sprite(img_mrbomb_explosion, img_mrbomb_explosion); dying = DYING_NOT; // now the bomb hurts timer.start(EXPLODETIME); } else if(mode == BOMB_EXPLODE) { @@ -528,7 +526,7 @@ timer.start(2000); dying = DYING_SQUISHED; mode = FLAT; - set_sprite(img_stalactite_broken, img_stalactite_broken, 1); + set_sprite(img_stalactite_broken, img_stalactite_broken); } } else if(mode == FLAT) { fall(); @@ -571,8 +569,7 @@ else if(mode == FISH_WAIT && !timer.check()) { // jump again - set_sprite(img_fish, img_fish, 2, 2); - animation_offset = global_frame_counter; // restart animation + set_sprite(img_fish, img_fish); mode = NORMAL; physic.set_velocity(0, JUMPV); physic.enable_gravity(true); @@ -778,13 +775,9 @@ if(sprite_left == 0 || sprite_right == 0) { - std::cout << "BadGuy: Error no sprite loaded" << std::endl; return; } - float global_frame = (float(global_frame_counter - animation_offset) / 10); - global_frame *= animation_speed; - //size_t frame = size_t(global_frame) % animation_length; Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right; sprite->draw(base.x - scroll_x, base.y); @@ -793,8 +786,7 @@ } void -BadGuy::set_sprite(Sprite* left, Sprite* right, - int nanimlength, float nanimspeed) +BadGuy::set_sprite(Sprite* left, Sprite* right) { if (1) { @@ -822,8 +814,6 @@ } } - animation_length = nanimlength; - animation_speed = nanimspeed; animation_offset = 0; sprite_left = left; sprite_right = right; @@ -877,7 +867,7 @@ } else if(kind == BAD_BSOD) { squish_me(player); - set_sprite(img_bsod_squished_left, img_bsod_squished_right, 1); + set_sprite(img_bsod_squished_left, img_bsod_squished_right); physic.set_velocity_x(0); return; @@ -887,7 +877,7 @@ /* Flatten! */ play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER); mode = FLAT; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); + set_sprite(img_laptop_flat_left, img_laptop_flat_right); physic.set_velocity_x(0); timer.start(4000); @@ -904,7 +894,7 @@ } mode = KICK; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); + set_sprite(img_laptop_flat_left, img_laptop_flat_right); } make_player_jump(player); @@ -927,15 +917,15 @@ return; } else if(kind == BAD_BOUNCINGSNOWBALL) { squish_me(player); - set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished,1); + set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished); return; } else if(kind == BAD_FLYINGSNOWBALL) { squish_me(player); - set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished,1); + set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished); return; } else if(kind == BAD_SNOWBALL) { squish_me(player); - set_sprite(img_snowball_squished_left, img_snowball_squished_right, 1); + set_sprite(img_snowball_squished_left, img_snowball_squished_right); return; } } @@ -948,9 +938,9 @@ dying = DYING_FALLING; if(kind == BAD_LAPTOP) - set_sprite(img_laptop_falling_left, img_laptop_falling_right, 1); + set_sprite(img_laptop_falling_left, img_laptop_falling_right); else if(kind == BAD_BSOD) - set_sprite(img_bsod_falling_left, img_bsod_falling_right, 1); + set_sprite(img_bsod_falling_left, img_bsod_falling_right); physic.enable_gravity(true); physic.set_velocity_y(0); @@ -1074,7 +1064,7 @@ } mode = KICK; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); + set_sprite(img_laptop_flat_left, img_laptop_flat_right); } break; |
|
From: Ingo R. <gr...@us...> - 2004-04-22 15:42:05
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18067 Modified Files: supertux.strf Log Message: - fixed hotspots Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- supertux.strf 22 Apr 2004 10:44:17 -0000 1.8 +++ supertux.strf 22 Apr 2004 15:41:40 -0000 1.9 @@ -30,9 +30,13 @@ (images "shared/bsod-squished-right.png")) (sprite (name "snowball-squished-left") + (x-hotspot 1) + (y-hotspot -19) (images "shared/bsod-squished-left.png")) (sprite (name "snowball-squished-right") + (x-hotspot 1) + (y-hotspot -19) (images "shared/bsod-squished-right.png")) (sprite (name "bsod-falling-left") @@ -42,21 +46,29 @@ (images "shared/bsod-falling-right.png")) (sprite (name "laptop-left") + (x-hotspot 2) + (y-hotspot 3) (images "shared/mriceblock-left-0.png" "shared/mriceblock-left-1.png" "shared/mriceblock-left-2.png" "shared/mriceblock-left-1.png")) (sprite (name "laptop-right") + (x-hotspot 2) + (y-hotspot 3) (images "shared/mriceblock-right-0.png" "shared/mriceblock-right-1.png" "shared/mriceblock-right-2.png" "shared/mriceblock-right-1.png")) (sprite (name "laptop-flat-left") + (x-hotspot 2) + (y-hotspot 3) (images "shared/mriceblock-flat-left.png")) (sprite (name "laptop-flat-right") + (x-hotspot 2) + (y-hotspot 3) (images "shared/mriceblock-flat-right.png")) (sprite (name "laptop-falling-left") @@ -66,10 +78,16 @@ (images "shared/laptop-falling-right.png")) (sprite (name "jumpy-left-up") + (x-hotspot 7) + (y-hotspot 8) (images "shared/jumpy-left-up-0.png")) (sprite (name "jumpy-left-down") + (x-hotspot 7) + (y-hotspot 8) (images "shared/jumpy-left-down-0.png")) (sprite (name "jumpy-left-middle") + (x-hotspot 7) + (y-hotspot 8) (images "shared/jumpy-left-middle-0.png")) (sprite (name "mrbomb-left") @@ -105,9 +123,13 @@ (images "shared/mrbomb-explosion.png")) (sprite (name "stalactite") + (x-hotspot 0) + (y-hotspot 0) (images "shared/stalactite.png")) (sprite (name "stalactite-broken") + (x-hotspot 0) + (y-hotspot 16) (images "shared/stalactite-broken.png")) (sprite (name "flame") @@ -115,13 +137,19 @@ "shared/flame-1.png")) (sprite (name "fish") + (x-hotspot 2) + (y-hotspot 3) (images "shared/fish-left-0.png" "shared/fish-left-1.png")) (sprite (name "fish-down") + (x-hotspot 2) + (y-hotspot 11) (images "shared/fish-down-0.png")) (sprite (name "bouncingsnowball-left") + (x-hotspot 1) + (y-hotspot 0) (images "shared/bouncingsnowball-left-0.png" "shared/bouncingsnowball-left-1.png" "shared/bouncingsnowball-left-2.png" @@ -130,6 +158,8 @@ "shared/bouncingsnowball-left-5.png")) (sprite (name "bouncingsnowball-right") + (x-hotspot 1) + (y-hotspot 0) (images "shared/bouncingsnowball-right-0.png" "shared/bouncingsnowball-right-1.png" "shared/bouncingsnowball-right-2.png" @@ -138,31 +168,45 @@ "shared/bouncingsnowball-right-5.png")) (sprite (name "bouncingsnowball-squished") + (x-hotspot 1) + (y-hotspot -19) (images "shared/bsod-squished-left.png")) (sprite (name "flyingsnowball") + (x-hotspot 4) + (y-hotspot 3) (images "shared/flyingsnowball-left-0.png" "shared/flyingsnowball-left-1.png")) (sprite (name "flyingsnowball-squished") + (x-hotspot 1) + (y-hotspot -19) (images "shared/bsod-squished-left.png")) (sprite (name "spiky-left") + (x-hotspot 6) + (y-hotspot 10) (images "shared/spiky-left-0.png" "shared/spiky-left-1.png" "shared/spiky-left-2.png")) (sprite (name "spiky-right") + (x-hotspot 6) + (y-hotspot 10) (images "shared/spiky-right-0.png" "shared/spiky-right-1.png" "shared/spiky-right-2.png")) (sprite (name "snowball-left") + (x-hotspot 2) + (y-hotspot 4) (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") + (x-hotspot 2) + (y-hotspot 4) (images "shared/snowball-right-0.png" "shared/snowball-right-1.png" "shared/snowball-right-2.png" @@ -230,6 +274,7 @@ "shared/iceflower-1.png")) (sprite (name "smalltux-gameover") + (fps 10.0) (images "shared/smalltux-gameover-0.png" "shared/smalltux-gameover-1.png")) |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 14:15:16
|
Update of /cvsroot/super-tux/supertux/data/levels/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30960/data/levels/misc Modified Files: menu.stl Log Message: Make use of Marek's music at the beggining. Index: menu.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/misc/menu.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- menu.stl 10 Apr 2004 11:42:42 -0000 1.2 +++ menu.stl 22 Apr 2004 14:14:51 -0000 1.3 @@ -5,7 +5,7 @@ (width 300) (height 15) (background "arctis.png") - (music "Mortimers_chipdisko.mod") + (music "theme.mod") (bkgd_red 150) (bkgd_green 200) (bkgd_blue 255) |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 14:12:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29740/src Modified Files: menu.cpp menu.h Log Message: Improved the control key code a bit, in order to make it possible to write the keys right in the first dialog display (still to be done). Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- menu.cpp 22 Apr 2004 11:20:58 -0000 1.46 +++ menu.cpp 22 Apr 2004 14:11:57 -0000 1.47 @@ -149,6 +149,57 @@ } } +/* Set ControlField a key */ +void MenuItem::set_controlfield_key(SDLKey key, char ch[]) +{ +*int_p = key; +if(ch[0] != '\0') + strcpy(input, ch); +else + switch(key) + { + case SDLK_UP: + strcpy(input, "Up cursor"); + break; + case SDLK_DOWN: + strcpy(input, "Down cursor"); + break; + case SDLK_LEFT: + strcpy(input, "Left cursor"); + break; + case SDLK_RIGHT: + strcpy(input, "Right cursor"); + break; + case SDLK_RETURN: + strcpy(input, "Return"); + break; + case SDLK_SPACE: + strcpy(input, "Space"); + break; + case SDLK_RSHIFT: + strcpy(input, "Right Shift"); + break; + case SDLK_LSHIFT: + strcpy(input, "Left Shift"); + break; + case SDLK_RCTRL: + strcpy(input, "Right Control"); + break; + case SDLK_LCTRL: + strcpy(input, "Left Control"); + break; + case SDLK_RALT: + strcpy(input, "Right Alt"); + break; + case SDLK_LALT: + strcpy(input, "Left Alt"); + break; + default: + strcpy(input, "?"); + break; + } +} + /* Free a menu and all its items */ Menu::~Menu() { @@ -619,53 +670,7 @@ if(item[active_item].kind == MN_CONTROLFIELD) { - *item[active_item].int_p = event.key.keysym.sym; - if(ch[0] != '\0') - strcpy(item[active_item].input, ch); - else - switch(key) - { - case SDLK_UP: - strcpy(item[active_item].input, "Up cursor"); - break; - case SDLK_DOWN: - strcpy(item[active_item].input, "Down cursor"); - break; - case SDLK_LEFT: - strcpy(item[active_item].input, "Left cursor"); - break; - case SDLK_RIGHT: - strcpy(item[active_item].input, "Right cursor"); - break; - case SDLK_RETURN: - strcpy(item[active_item].input, "Return"); - break; - case SDLK_SPACE: - strcpy(item[active_item].input, "Space"); - break; - case SDLK_RSHIFT: - strcpy(item[active_item].input, "Right Shift"); - break; - case SDLK_LSHIFT: - strcpy(item[active_item].input, "Left Shift"); - break; - case SDLK_RCTRL: - strcpy(item[active_item].input, "Right Control"); - break; - case SDLK_LCTRL: - strcpy(item[active_item].input, "Left Control"); - break; - case SDLK_RALT: - strcpy(item[active_item].input, "Right Alt"); - break; - case SDLK_LALT: - strcpy(item[active_item].input, "Left Alt"); - break; - default: - strcpy(item[active_item].input, "?"); - break; - } - + item[active_item].set_controlfield_key(key, ch); menuaction = MENU_ACTION_DOWN; return; } Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- menu.h 21 Apr 2004 15:15:27 -0000 1.41 +++ menu.h 22 Apr 2004 14:11:57 -0000 1.42 @@ -59,6 +59,8 @@ void change_input(const char *text); static MenuItem* create(MenuItemKind kind, const char *text, int init_toggle, Menu* target_menu, int* int_p); + + void set_controlfield_key(SDLKey key, char ch[]); }; class Menu @@ -69,6 +71,7 @@ static void push_current(Menu* pmenu); static void pop_current(); + public: /** Set the current menu, if pmenu is NULL, hide the current menu */ static void set_current(Menu* pmenu); |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 13:47:12
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22766/data/music Modified Files: theme.mod Log Message: Title music update by Marek. Index: theme.mod =================================================================== RCS file: /cvsroot/super-tux/supertux/data/music/theme.mod,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsYGznov and /tmp/cvszPNFq7 differ |
|
From: Ingo R. <gr...@us...> - 2004-04-22 13:24:24
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17655 Modified Files: player.cpp world.cpp Log Message: - merged a few duplicated if's in player - added live-lost tux Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- player.cpp 22 Apr 2004 00:13:33 -0000 1.52 +++ player.cpp 22 Apr 2004 13:24:15 -0000 1.53 @@ -177,15 +177,15 @@ { bool jumped_in_solid = false; - /* --- HANDLE TUX! --- */ + /* Move tux: */ + previous_base = base; + /* --- HANDLE TUX! --- */ if(dying == DYING_NOT) handle_input(); - /* Move tux: */ - previous_base = base; - physic.apply(frame_ratio, base.x, base.y); + if(dying == DYING_NOT) { base_type target = base; @@ -206,14 +206,9 @@ previous_base = old_base = base; } keep_in_bounds(); - } - - if (dying == DYING_NOT) - { - /* Land: */ - - if( !on_ground()) + // Land: + if (!on_ground()) { physic.enable_gravity(true); if(under_solid()) @@ -394,7 +389,7 @@ { if (on_ground()) { - // jump + // jump higher if we are running if (physic.get_velocity_x() > MAX_WALK_XM) physic.set_velocity_y(5.8); else @@ -513,159 +508,163 @@ { if (!safe_timer.started() || (global_frame_counter % 2) == 0) { - if (size == SMALL) + if (dying == DYING_SQUISHED) { - if (invincible_timer.started()) - { - /* Draw cape: */ - - if (dir == RIGHT) - 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); - } - - - if (!got_coffee) + smalltux_gameover->draw(base.x - scroll_x, base.y); + } + else + { + if (size == SMALL) { - if (!skidding_timer.started()) + if (invincible_timer.started()) { - if (physic.get_velocity_y() != 0) - { - if (dir == RIGHT) - smalltux_jump_right->draw( base.x - scroll_x, base.y - 10); - else - smalltux_jump_left->draw( base.x - scroll_x, base.y - 10); - } + if (dir == RIGHT) + 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); + } + + if (!got_coffee) + { + if (!skidding_timer.started()) { - if (fabsf(physic.get_velocity_x()) < 1.0f) // standing + if (physic.get_velocity_y() != 0) { if (dir == RIGHT) - smalltux_stand_right->draw( base.x - scroll_x, base.y - 9); + smalltux_jump_right->draw( base.x - scroll_x, base.y - 10); else - smalltux_stand_left->draw( base.x - scroll_x, base.y - 9); + smalltux_jump_left->draw( base.x - scroll_x, base.y - 10); } - else // moving + else { - if (dir == RIGHT) - 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); + if (fabsf(physic.get_velocity_x()) < 1.0f) // standing + { + if (dir == RIGHT) + smalltux_stand_right->draw( base.x - scroll_x, base.y - 9); + else + smalltux_stand_left->draw( base.x - scroll_x, base.y - 9); + } + else // moving + { + if (dir == RIGHT) + 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); + } } } + else + { + if (dir == RIGHT) + smalltux_skid_right->draw(base.x - scroll_x, base.y); + else + smalltux_skid_left->draw(base.x - scroll_x, base.y); + } } else { + /* Tux got coffee! */ + if (dir == RIGHT) - smalltux_skid_right->draw(base.x - scroll_x, base.y); + { + firetux_right[frame_]->draw( base.x- scroll_x, base.y); + } else - smalltux_skid_left->draw(base.x - scroll_x, base.y); + { + firetux_left[frame_]->draw( base.x- scroll_x, base.y); + } } } - else + else // Large Tux { - /* Tux got coffee! */ - - if (dir == RIGHT) - { - firetux_right[frame_]->draw( base.x- scroll_x, base.y); - } - else + if (invincible_timer.started()) { - firetux_left[frame_]->draw( base.x- scroll_x, base.y); - } - } - } - else // Large Tux - { - if (invincible_timer.started()) - { - float capex = base.x + (base.width - bigcape_right[0]->w) / 2; - capex -= scroll_x; - float capey = base.y + (base.height - bigcape_right[0]->h) / 2; + float capex = base.x + (base.width - bigcape_right[0]->w) / 2; + capex -= scroll_x; + float capey = base.y + (base.height - bigcape_right[0]->h) / 2; - /* Draw cape (just not in ducked mode since that looks silly): */ - if (dir == RIGHT) - bigcape_right[global_frame_counter % 2]->draw(capex, capey); - else - bigcape_left[global_frame_counter % 2]->draw(capex, capey); - } + /* Draw cape (just not in ducked mode since that looks silly): */ + if (dir == RIGHT) + bigcape_right[global_frame_counter % 2]->draw(capex, capey); + else + bigcape_left[global_frame_counter % 2]->draw(capex, capey); + } - if (!got_coffee) - { - if (!duck) + if (!got_coffee) { - if (!skidding_timer.started()) + if (!duck) { - if (physic.get_velocity_y() == 0) + if (!skidding_timer.started()) { - if (dir == RIGHT) - bigtux_right->draw(base.x - scroll_x, base.y); + if (physic.get_velocity_y() == 0) + { + if (dir == RIGHT) + bigtux_right->draw(base.x - scroll_x, base.y); + else + bigtux_left->draw(base.x - scroll_x, base.y); + } else - bigtux_left->draw(base.x - scroll_x, base.y); + { + if (dir == RIGHT) + bigtux_right_jump->draw(base.x - scroll_x, base.y); + else + bigtux_left_jump->draw(base.x - scroll_x, base.y); + } } else { if (dir == RIGHT) - bigtux_right_jump->draw(base.x - scroll_x, base.y); + skidtux_right->draw(base.x - scroll_x - 8, base.y); else - bigtux_left_jump->draw(base.x - scroll_x, base.y); + skidtux_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - skidtux_right->draw(base.x - scroll_x - 8, base.y); + ducktux_right->draw(base.x - scroll_x, base.y); else - skidtux_left->draw(base.x - scroll_x - 8, base.y); + ducktux_left->draw(base.x - scroll_x, base.y); } } else { - if (dir == RIGHT) - ducktux_right->draw(base.x - scroll_x, base.y); - else - ducktux_left->draw(base.x - scroll_x, base.y); - } - } - else - { - /* Tux has coffee! */ - if (!duck) - { - if (!skidding_timer.started()) + /* Tux has coffee! */ + if (!duck) { - if (!jumping || physic.get_velocity_y() > 0) + if (!skidding_timer.started()) { - if (dir == RIGHT) - bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y); + if (!jumping || physic.get_velocity_y() > 0) + { + if (dir == RIGHT) + bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y); + else + bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y); + } else - bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y); + { + if (dir == RIGHT) + bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y); + else + bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y); + } } else { if (dir == RIGHT) - bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y); + skidfiretux_right->draw(base.x- scroll_x - 8, base.y); else - bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y); + skidfiretux_left->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - skidfiretux_right->draw(base.x- scroll_x - 8, base.y); + duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); else - skidfiretux_left->draw(base.x- scroll_x - 8, base.y); + duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); } } - else - { - if (dir == RIGHT) - duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); - else - duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); - } } } } @@ -741,7 +740,7 @@ { play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER); - physic.set_velocity(0, physic.get_velocity_y()); + physic.set_velocity_x(0); if (mode == SHRINK && size == BIG) { Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- world.cpp 22 Apr 2004 11:17:34 -0000 1.36 +++ world.cpp 22 Apr 2004 13:24:15 -0000 1.37 @@ -554,7 +554,7 @@ void World::trybumpbadguy(float x, float y) { - /* Bad guys: */ + // Bad guys: for (unsigned int i = 0; i < bad_guys.size(); i++) { if (bad_guys[i].base.x >= x - 32 && bad_guys[i].base.x <= x + 32 && @@ -564,8 +564,7 @@ } } - - /* Upgrades: */ + // Upgrades: for (unsigned int i = 0; i < upgrades.size(); i++) { if (upgrades[i].base.height == 32 && |
|
From: Ingo R. <gr...@us...> - 2004-04-22 12:48:10
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8825 Added Files: smalltux-gameover-0.png smalltux-gameover-1.png Log Message: - new gfx --- NEW FILE: smalltux-gameover-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-gameover-1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 11:31:02
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25909/src Modified Files: title.cpp Log Message: Just made the intro's Tux to honour the keys chosen by the user. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- title.cpp 22 Apr 2004 11:17:34 -0000 1.56 +++ title.cpp 22 Apr 2004 11:30:53 -0000 1.57 @@ -189,14 +189,14 @@ } global_frame_counter++; - tux->key_event(SDLK_RIGHT,DOWN); + tux->key_event((SDLKey) keymap.right,DOWN); if(random_timer.check()) { if(walking) - tux->key_event(SDLK_UP,UP); + tux->key_event((SDLKey) keymap.jump,UP); else - tux->key_event(SDLK_UP,DOWN); + tux->key_event((SDLKey) keymap.jump,DOWN); } else { |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 11:26:49
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25096/src Modified Files: setup.cpp Log Message: Changed icon.png to icon.xpm. This way we don't have to worry about masks. But not sure if it works well under windows (someone give a try). Anyway, I just comment the old code, so we can reverse this any time. Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- setup.cpp 21 Apr 2004 23:38:03 -0000 1.47 +++ setup.cpp 22 Apr 2004 11:26:39 -0000 1.48 @@ -855,39 +855,39 @@ void seticon(void) { - int masklen; - Uint8 * mask; +// int masklen; +// Uint8 * mask; SDL_Surface * icon; /* Load icon into a surface: */ - icon = IMG_Load((datadir + "/images/icon.png").c_str()); + icon = IMG_Load((datadir + "/images/icon.xpm").c_str()); if (icon == NULL) { fprintf(stderr, "\nError: I could not load the icon image: %s%s\n" "The Simple DirectMedia error that occured was:\n" - "%s\n\n", datadir.c_str(), "/images/icon.png", SDL_GetError()); + "%s\n\n", datadir.c_str(), "/images/icon.xpm", SDL_GetError()); exit(1); } /* Create mask: */ - +/* masklen = (((icon -> w) + 7) / 8) * (icon -> h); mask = (Uint8*) malloc(masklen * sizeof(Uint8)); memset(mask, 0xFF, masklen); - +*/ /* Set icon: */ - SDL_WM_SetIcon(icon, mask); + SDL_WM_SetIcon(icon, NULL);//mask); /* Free icon surface & mask: */ - free(mask); +// free(mask); SDL_FreeSurface(icon); } |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 11:26:48
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25096/data/images Added Files: icon.xpm Log Message: Changed icon.png to icon.xpm. This way we don't have to worry about masks. But not sure if it works well under windows (someone give a try). Anyway, I just comment the old code, so we can reverse this any time. --- NEW FILE: icon.xpm --- /* XPM */ static char * icon_xpm[] = { "44 44 615 2", " c None", ". c #59A6EF", "+ c #5AA7EF", "@ c #5DA9EF", "# c #5BA7EF", "$ c #64ACEF", "% c #61ABEF", "& c #5EA9EF", "* c #6AAFF1", "= c #68AEF0", "- c #65ADF0", "; c #62ABEF", "> c #5FA9EF", ", c #5CA8EF", "' c #5BA8EF", ") c #70B3F1", "! c #6DB1F1", "~ c #6BB0F0", "{ c #68AFF0", "] c #5AA6EF", "^ c #77B7F2", "/ c #74B5F1", "( c #71B3F1", "_ c #6EB1F1", ": c #62ABF0", "< c #5DA8EF", "[ c #59A7EF", "} c #7CB9F2", "| c #7BB8F2", "1 c #78B7F2", "2 c #69AFF0", "3 c #66ADF0", "4 c #63ABEF", "5 c #60AAEF", "6 c #83BDF3", "7 c #81BCF2", "8 c #7EBAF2", "9 c #78B7F1", "0 c #75B5F1", "a c #72B3F1", "b c #6FB2F1", "c c #6CB0F0", "d c #63ACEF", "e c #89C1F3", "f c #87BFF3", "g c #84BDF3", "h c #7CB7EF", "i c #74ADE1", "j c #6B9AC5", "k c #5D80A1", "l c #50708D", "m c #446686", "n c #426A91", "o c #5187BA", "p c #5E9FDD", "q c #61A8EA", "r c #59A5EF", "s c #91C4F3", "t c #8EC2F4", "u c #8AC0F3", "v c #85BDF1", "w c #7BB0E3", "x c #6184A5", "y c #596876", "z c #565C62", "A c #484A4C", "B c #3C3C3C", "C c #1E1F20", "D c #070A0E", "E c #0C141B", "F c #1C2F40", "G c #3F6A92", "H c #5B9EDD", "I c #97C7F4", "J c #94C5F4", "K c #91C4F4", "L c #7EAFDB", "M c #51677A", "N c #4F4F4F", "O c #595959", "P c #515151", "Q c #454545", "R c #393939", "S c #1B1B1B", "T c #14110B", "U c #241F17", "V c #1D1912", "W c #080705", "X c #243D54", "Y c #5A9CD9", "Z c #9DCBF6", "` c #9AC9F5", " . c #97C8F4", ".. c #94C6F4", "+. c #8EBFEE", "@. c #6886A3", "#. c #474A4E", "$. c #5A5A5A", "%. c #575757", "&. c #494949", "*. c #383838", "=. c #262626", "-. c #0B0B0B", ";. c #59554D", ">. c #B5B0A3", ",. c #B5B19F", "'. c #514D47", "). c #0C1217", "!. c #43719D", "~. c #63ABED", "{. c #A2CDF6", "]. c #A0CCF5", "^. c #9DCBF5", "/. c #7AA1C5", "(. c #4C5762", "_. c #4D4D4D", ":. c #3E3E3E", "<. c #2A2A2A", "[. c #121212", "}. c #42413E", "|. c #D5D5C5", "1. c #F4F4E1", "2. c #C0C0BE", "3. c #7B7A7A", "4. c #141310", "5. c #2B4760", "6. c #63A6E5", "7. c #AAD1F6", "8. c #A7D0F6", "9. c #A4CEF6", "0. c #A1CCF5", "a. c #9ECBF5", "b. c #9BC9F5", "c. c #516374", "d. c #424446", "e. c #535353", "f. c #545454", "g. c #474747", "h. c #3B3B3B", "i. c #171717", "j. c #8E877B", "k. c #F1F2E2", "l. c #E1DBD7", "m. c #605D5D", "n. c #3F3F3F", "o. c #1B1918", "p. c #121717", "q. c #639CD0", "r. c #69AEEF", "s. c #5FAAEF", "t. c #B0D5F7", "u. c #ADD3F7", "v. c #AAD2F7", "w. c #8DB5DB", "x. c #333C44", "y. c #3F4041", "z. c #555555", "A. c #505050", "B. c #3D3D3D", "C. c #2B2B2B", "D. c #1A1A1A", "E. c #958D81", "F. c #EFF0EB", "G. c #DFD8D7", "H. c #524C4C", "I. c #1E1D1D", "J. c #2C2920", "K. c #665810", "L. c #B4BC75", "M. c #A4BFA1", "N. c #83B6CB", "O. c #6AAEE8", "P. c #62ABEE", "Q. c #B7D9F8", "R. c #B4D7F7", "S. c #B1D5F7", "T. c #A5CEF6", "U. c #6D8BA6", "V. c #1B2025", "W. c #3C3D3D", "X. c #404040", "Y. c #2F2F2F", "Z. c #161616", "`. c #766D5E", " + c #D5D4D3", ".+ c #E9E7E7", "++ c #B9AFAF", "@+ c #817B79", "#+ c #8B793A", "$+ c #E2C127", "%+ c #F8D62B", "&+ c #F8D72D", "*+ c #F0D538", "=+ c #D7CE5A", "-+ c #B6C485", ";+ c #99BBA8", ">+ c #78B1D0", ",+ c #64AAE5", "'+ c #BDDBF8", ")+ c #BAD9F8", "!+ c #B7D8F8", "~+ c #AED3F7", "{+ c #ABD2F6", "]+ c #A5CCF2", "^+ c #617990", "/+ c #15171A", "(+ c #424242", "_+ c #2C2C2C", ":+ c #131313", "<+ c #141312", "[+ c #736F65", "}+ c #A4A19C", "|+ c #A9A39D", "1+ c #B19772", "2+ c #CDA234", "3+ c #E6BA36", "4+ c #F3CB30", "5+ c #FBD82A", "6+ c #FBD72A", "7+ c #F7D12D", "8+ c #F2CA31", "9+ c #E8C53B", "0+ c #D1C25A", "a+ c #95B6AA", "b+ c #C3DFF8", "c+ c #C0DDF8", "d+ c #AED4F7", "e+ c #94B6D7", "f+ c #323D49", "g+ c #121314", "h+ c #444444", "i+ c #282828", "j+ c #202020", "k+ c #0A0A0A", "l+ c #000000", "m+ c #13120E", "n+ c #201F1C", "o+ c #544432", "p+ c #B07F46", "q+ c #C38F43", "r+ c #D49F44", "s+ c #DBA741", "t+ c #DFB03E", "u+ c #DBA942", "v+ c #D3A144", "w+ c #D4A642", "x+ c #D1B152", "y+ c #ACB68B", "z+ c #7CB0CD", "A+ c #60AAF0", "B+ c #5EA8EF", "C+ c #5CA7EF", "D+ c #C9E1F9", "E+ c #C7E1F9", "F+ c #C4DFF9", "G+ c #BDDCF8", "H+ c #BADAF8", "I+ c #B1D6F7", "J+ c #6B8399", "K+ c #0D1013", "L+ c #1C1C1C", "M+ c #353535", "N+ c #292929", "O+ c #0E0E0E", "P+ c #070707", "Q+ c #010101", "R+ c #040301", "S+ c #5A4023", "T+ c #906539", "U+ c #986C3A", "V+ c #AA7B46", "W+ c #A6957F", "X+ c #939FA7", "Y+ c #83A8C9", "Z+ c #78ADDC", "`+ c #71AFE7", " @ c #6BAFEE", ".@ c #67AEF0", "+@ c #64ACF0", "@@ c #61ABF0", "#@ c #D0E5F9", "$@ c #CDE4FA", "%@ c #CAE2F9", "&@ c #C4E0F9", "*@ c #C1DEF8", "=@ c #BEDCF8", "-@ c #A5C4E1", ";@ c #2A3239", ">@ c #121313", ",@ c #2E2E2E", "'@ c #181818", ")@ c #060606", "!@ c #211A12", "~@ c #2C2319", "{@ c #594C3B", "]@ c #84B3DA", "^@ c #79B6F0", "/@ c #76B4EF", "(@ c #73B3F0", "_@ c #70B2F1", ":@ c #6DB1F0", "<@ c #6AAFF0", "[@ c #5EA9F0", "}@ c #D6E9FB", "|@ c #D3E8FA", "1@ c #D0E6FA", "2@ c #CAE2FA", "3@ c #C7E1FA", "4@ c #B0CDE9", "5@ c #596977", "6@ c #131415", "7@ c #363636", "8@ c #080808", "9@ c #0D0D0D", "0@ c #414141", "a@ c #7B7B7B", "b@ c #7F7F7F", "c@ c #5D5F60", "d@ c #6C94B9", "e@ c #7BB7EF", "f@ c #79B8F1", "g@ c #76B6F1", "h@ c #73B4F1", "i@ c #6DB2F1", "j@ c #6AB0F1", "k@ c #5CA9EF", "l@ c #DCECFB", "m@ c #D9EAFB", "n@ c #D6E9FA", "o@ c #C8E1F9", "p@ c #C5E0F9", "q@ c #BFDBF5", "r@ c #798C9D", "s@ c #222629", "t@ c #434343", "u@ c #1F1F1F", "v@ c #030303", "w@ c #929292", "x@ c #D4D4D4", "y@ c #F8F8F8", "z@ c #F4F4F4", "A@ c #C0C5C9", "B@ c #88AED3", "C@ c #7DB9F2", "D@ c #6EB2F0", "E@ c #DFEEFB", "F@ c #DDECFB", "G@ c #CBE3F9", "H@ c #B4CCE3", "I@ c #404951", "J@ c #272728", "K@ c #111111", "L@ c #040404", "M@ c #2D2D2D", "N@ c #808080", "O@ c #DADADA", "P@ c #FDFDFD", "Q@ c #FEFEFE", "R@ c #FCFCFC", "S@ c #D8E0E7", "T@ c #7CB3E7", "U@ c #7DBAF2", "V@ c #7AB8F1", "W@ c #77B6F1", "X@ c #74B4F1", "Y@ c #65ADEF", "Z@ c #DDEDFB", "`@ c #DAEBFB", " # c #D7E9FA", ".# c #D4E8FA", "+# c #D1E6FA", "@# c #CEE5FA", "## c #9DB1C4", "$# c #272A2D", "%# c #4A4A4A", "&# c #333333", "*# c #0F0F0F", "=# c #9A9A9A", "-# c #D8D8D8", ";# c #F7F7F7", "># c #A6B9CB", ",# c #7EB8EE", "'# c #7AB8F2", ")# c #74B4F2", "!# c #69AEF0", "~# c #66ACEF", "{# c #DFEEFC", "]# c #D8E9FA", "^# c #7D8C9A", "/# c #262829", "(# c #4C4C4C", "_# c #020202", ":# c #191919", "<# c #8E8E8E", "[# c #EDEDED", "}# c #F9F9F9", "|# c #D3DCE3", "1# c #82AFDA", "2# c #80BBF3", "3# c #6BAFF1", "4# c #E0EEFC", "5# c #DEEDFB", "6# c #DBEBFB", "7# c #D8EAFA", "8# c #D5E9FA", "9# c #D0E5F8", "0# c #6D7984", "a# c #27292B", "b# c #373737", "c# c #050505", "d# c #090909", "e# c #979797", "f# c #CFCFCF", "g# c #E4E4E4", "h# c #E2E3E4", "i# c #8DAECC", "j# c #88BEF0", "k# c #88C0F0", "l# c #7DBAF1", "m# c #7BB9F2", "n# c #E0EEFB", "o# c #D8EAF9", "p# c #DAE6E3", "q# c #8A907E", "r# c #2B2E30", "s# c #1E1E1E", "t# c #0C0C0C", "u# c #646464", "v# c #B3B3B3", "w# c #E8E8E8", "x# c #EFEFEF", "y# c #A3B9CA", "z# c #D2DB8D", "A# c #E9DB38", "B# c #A5BB93", "C# c #7EBBF2", "D# c #77B7F1", "E# c #DCE9F4", "F# c #DAD199", "G# c #D6BF3E", "H# c #655D2E", "I# c #363736", "J# c #565656", "K# c #272727", "L# c #676767", "M# c #AFAFAF", "N# c #FBFBFB", "O# c #F0F0F0", "P# c #BDB88D", "Q# c #F1E01B", "R# c #F2E10E", "S# c #B4A31E", "T# c #81BCF3", "U# c #DDEBF7", "V# c #C4BB89", "W# c #C6A92F", "X# c #DCC226", "Y# c #655C2B", "Z# c #535251", "`# c #222222", " $ c #A1A1A1", ".$ c #ADA768", "+$ c #E4D314", "@$ c #B19924", "#$ c #8C9166", "$$ c #84BEF3", "%$ c #E1EFFB", "&$ c #D9DDD4", "*$ c #B19B45", "=$ c #D1B428", "-$ c #E8CA24", ";$ c #7D7336", ">$ c #4E4E4D", ",$ c #232323", "'$ c #101010", ")$ c #4E4E4E", "!$ c #909090", "~$ c #838383", "{$ c #797979", "]$ c #F2F2F2", "^$ c #FAFAFA", "/$ c #C3C3C2", "($ c #9F9461", "_$ c #A78E2F", ":$ c #8E916A", "<$ c #89B7DB", "[$ c #E1EFFC", "}$ c #C3BF9F", "|$ c #A68D2B", "1$ c #D8BC24", "2$ c #CAB32B", "3$ c #656044", "4$ c #434342", "5$ c #323232", "6$ c #1D1D1D", "7$ c #B8B8B8", "8$ c #BABABA", "9$ c #C3C3C3", "0$ c #C8C8C8", "a$ c #D1D1D1", "b$ c #D9D9D9", "c$ c #E0E0E0", "d$ c #EAEAEA", "e$ c #B8B8B5", "f$ c #93844E", "g$ c #919063", "h$ c #8EB4CD", "i$ c #686B6A", "j$ c #887945", "k$ c #967F23", "l$ c #E1C528", "m$ c #D7C324", "n$ c #656239", "o$ c #BDBDBD", "p$ c #CACACA", "q$ c #CDCDCD", "r$ c #C7C7C7", "s$ c #CCCCCC", "t$ c #D0D0D0", "u$ c #DBDBDB", "v$ c #E2E2E2", "w$ c #E3E3E3", "x$ c #A19E8E", "y$ c #8C895E", "z$ c #93B7CE", "A$ c #101011", "B$ c #322F26", "C$ c #796829", "D$ c #A18924", "E$ c #D3BE26", "F$ c #D8C91A", "G$ c #6B663A", "H$ c #393938", "I$ c #A3A3A3", "J$ c #CECECE", "K$ c #D6D6D6", "L$ c #C5C5C5", "M$ c #868770", "N$ c #96B2BD", "O$ c #484333", "P$ c #8D7622", "Q$ c #B69D26", "R$ c #E5D01B", "S$ c #D9CC1D", "T$ c #625E38", "U$ c #9C9C9C", "V$ c #CBCBCB", "W$ c #C1C1C1", "X$ c #89856D", "Y$ c #97B2C1", "Z$ c #504722", "`$ c #877221", " % c #CEB420", ".% c #E6D314", "+% c #DBCD16", "@% c #958F06", "#% c #868107", "$% c #49460A", "%% c #1C1A07", "&% c #030202", "*% c #5E5E5E", "=% c #6D6D6D", "-% c #5C5C5C", ";% c #6D6C64", ">% c #80867F", ",% c #9CB7C9", "'% c #555753", ")% c #938D6A", "!% c #8D7A26", "~% c #A8911E", "{% c #C2B20E", "]% c #D7CA0B", "^% c #E2D40B", "/% c #E4D70B", "(% c #8B8215", "_% c #0C0B09", ":% c #211D0C", "<% c #494018", "[% c #6D6943", "}% c #9FB4B9", "|% c #B5B499", "1% c #857635", "2% c #7C6A19", "3% c #867419", "4% c #8F7C19", "5% c #978518", "6% c #9C9960", "7% c #9BAAB9", "8% c #96A7B7", "9% c #94A6B6", "0% c #88969D", "a% c #554813", "b% c #645516", "c% c #7B691E", "d% c #A6B6B2", "e% c #E4F1FC", "f% c #D8EBFB", "g% c #D5E9FB", "h% c #D2E7FA", "i% c #CAE3F9", "j% c #C4DFF8", "k% c #C1DDF8", "l% c #E2EFFB", "m% c #DFEDFB", "n% c #D9EBFB", "o% c #D3E8FB", "p% c #D1E7FB", "q% c #E5F1FC", "r% c #E3EFFB", "s% c #DEECFC", "t% c #D7E9FB", "u% c #E3F0FC", "v% c #E1EEFC", "w% c #E5F2FC", "x% c #E3F1FC", " . + ", " @ # + + ", " $ % & # # + ", " * = - ; > , ' + ", " ) ! ~ { - ; > , # ] ", " ^ / ( _ ~ { - : > < # [ ", " } | 1 / ( _ ~ 2 3 4 5 @ ' [ ", " 6 7 8 | 9 0 a b c 2 3 d 5 @ # . ", " e f g 7 h i j k l m n o p q 5 @ # r ", " s t u v w x y z A B C D E F G H 5 & # . ", " I J K t L M N O P Q R S T U V W X Y % & ' . ", " Z ` ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.% > , ] ", " {.].^.` ./.(._.O _.:.<.[.}.|.1.2.3.4.5.6.- ; > , ] ", " 7.8.9.0.a.b.c.d.e.f.g.h.<.i.j.k.l.m.n.o.p.q.r.- ; s., ] ", " t.u.v.8.9.{.w.x.y.z.A.Q B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.s.< ] ", " Q.R.S.u.7.8.T.U.V.W.z.N g.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,++ ", " '+)+!+R.S.~+{+]+^+/+R A.g.(+:._+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+@ + ", " b+c+'+)+!+R.S.d+e+f+g+*.h+_+i+Y.j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+ ", " D+E+F+c+G+H+!+R.I+J+K+L+M+R N+i.O+P+Q+l+l+l+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@& C+ ", " #@$@%@E+&@*@=@H+!+-@;@>@,@:.R <.'@)@l+l+l+l+l+l+l+!@~@{@]@^@/@(@_@:@<@.@+@@@[@C+ ", " }@|@1@$@2@3@&@*@=@4@5@6@<.n.X.7@D.8@Q+l+l+l+l+l+9@0@a@b@c@d@e@f@g@h@) i@j@.@+@@@& k@ ", "l@m@n@|@1@$@2@o@p@q@r@s@M+n.t@:.7@u@k+Q+v@l+l+l+Q+,@w@x@y@z@A@B@C@f@g@h@) D@~ .@$ ; > @ ", "E@F@m@n@|@1@$@G@o@H@I@J@0@g.(+:.B C.K@L@i.k+l+v@M@N@O@P@Q@Q@R@S@T@U@V@W@X@( D@~ = Y@; & ", " E@Z@`@ #.#+#@#G@##$#7@%#%#(+:.&#[.L@Q+*#Y.:+,@=#-#;#Q@Q@Q@Q@P@>#,#U@'#W@)#( D@c !#~# ", " {#Z@`@]#.#+#@#^#/#B P (#g.X.	@_#l+_#:#e.<#O@[#}#Q@Q@Q@Q@Q@|#1#2#U@'#W@0 a D@3# ", " 4#5#6#7#8#9#0#a#:.z._.t@b#_+Z.*#c#Q+d#Q e#f#g#z@Q@Q@Q@Q@Q@h#i#j#k#l#m#9 0 ( ", " n#5#6#o#p#q#r#B %.N h.<.L+O+s#s#8@l+t#,@u#v#w#Q@Q@Q@Q@Q@x#y#z#A#B#C#m#D# ", " n#5#E#F#G#H#I#J#A.h.K#Z.8@:+B i+d#v@O+_+L#M#N#Q@Q@Q@Q@O#P#Q#R#S#T#8 ", " n#U#V#W#X#Y#Z#N :.<.S k+v@`#%#B D.O+Z.B $;#R@Q@Q@Q@g#.$+$@$#$$$ ", " %$&$*$=$-$;$>$X.&#,$[.L@Q+'$)$!$~${$w@f#w#]$R@^$y@/$($_$:$<$ ", " [$}$|$1$2$3$4$h.5$6$P+l+L@b#7$8$9$0$a$b$c$[#[#d$e$f$g$h$ ", " i$j$k$l$m$n$0@B ,@i.L@8@_.o$0$p$q$r$s$t$u$v$w$x$y$z$ ", " A$B$C$D$E$F$G$H$<.D.c#v@,@I$J$-#u$x@f#f#a$K$L$M$N$ ", " l+t#N+O$P$Q$R$S$T$t#)@_#l+k+e.U$L$J$a$0$s$V$W$X$Y$ ", " l+_#k+Z.Z$`$ %.%+%@%#%$%%%&%)@S K#n.*%=%-%;%>%,% ", " '%)%!%~%{%]%^%/%(%_%l+l+Q+)@9@:%<%[%}% ", " |%1%2%3%4%5%6%7%8%9%0%a%a%b%c%d% ", " e%%$5#l@f%g%h%1@$@i%E+j%k%=@ ", " e%l%m%l@n%}@|@1@@#G@E+j% ", " e%l%m%F@n%}@o%+#@#G@ ", " e%l%n#F@`@}@o%p% ", " q%r%4#s%`@t% ", " q%u%v%5# ", " w%x% "}; |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 11:21:07
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23994/src Modified Files: menu.cpp Log Message: Mistake that was making non-characters keys not to work after configuring keys. Anyway, we still have to fix the fact that the keys are not shown when you open Controls for the first time. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- menu.cpp 21 Apr 2004 17:45:17 -0000 1.45 +++ menu.cpp 22 Apr 2004 11:20:58 -0000 1.46 @@ -619,7 +619,7 @@ if(item[active_item].kind == MN_CONTROLFIELD) { - *item[active_item].int_p = event.key.keysym.unicode; + *item[active_item].int_p = event.key.keysym.sym; if(ch[0] != '\0') strcpy(item[active_item].input, ch); else |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 11:17:52
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23341/src Modified Files: gameloop.cpp level.cpp resources.cpp sound.cpp title.cpp world.cpp worldmap.cpp Log Message: Applied MatzeB (Ryan?) patch that fixes crash and also improves music. Ingo, you seem to have forgotten to add two files to cvs: smalltux-gameover-0.png smalltux-gameover-1.png Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- gameloop.cpp 22 Apr 2004 00:00:58 -0000 1.93 +++ gameloop.cpp 22 Apr 2004 11:17:34 -0000 1.94 @@ -474,7 +474,6 @@ GameSession::run() { Menu::set_current(0); - Player* tux = world->get_tux(); current_ = this; int fps_cnt = 0; @@ -504,7 +503,7 @@ } /* Handle events: */ - tux->input.old_fire = tux->input.fire; + world->get_tux()->input.old_fire = world->get_tux()->input.fire; process_events(); process_menu(); @@ -555,11 +554,11 @@ } /* Handle time: */ - if (!time_left.check() && tux->dying == DYING_NOT) - tux->kill(KILL); + if (!time_left.check() && world->get_tux()->dying == DYING_NOT) + world->get_tux()->kill(KILL); /* Handle music: */ - if(tux->invincible_timer.check()) + if(world->get_tux()->invincible_timer.check()) { if(world->get_music_type() != HERRING_MUSIC) world->play_music(HERRING_MUSIC); Index: sound.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- sound.cpp 21 Apr 2004 23:38:04 -0000 1.10 +++ sound.cpp 22 Apr 2004 11:17:34 -0000 1.11 @@ -102,7 +102,6 @@ snd = Mix_LoadWAV(file.c_str()); - /* printf message and abort if there is an initialized audio device */ if ((snd == NULL) && audio_device) st_abort("Can't load", file); @@ -115,17 +114,10 @@ Mix_Music * load_song(const std::string& file) { if(!audio_device) - return 0; + return (Mix_Music*) ~0; - Mix_Music * sng; - - sng = Mix_LoadMUS(file.c_str()); - - /* printf message and abort if there is an initialized audio device */ - if (sng == NULL) - st_abort("Can't load", file); - - return (sng); + Mix_Music* song = Mix_LoadMUS(file.c_str()); + return song; } @@ -160,7 +152,6 @@ { if (chunk != NULL) { - DEBUG_MSG( __PRETTY_FUNCTION__ ); Mix_FreeChunk( chunk ); chunk = NULL; } @@ -180,6 +171,8 @@ { if (!audio_device) return; + if(music == current_song) + return; if (use_music && Mix_PlayMusic(music, -1) < 0) st_abort("Couldn't play music: ", Mix_GetError()); @@ -190,6 +183,9 @@ void free_music(Mix_Music *music) { + if(!audio_device) + return; + Mix_FreeMusic( music ); } Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- title.cpp 22 Apr 2004 00:13:33 -0000 1.55 +++ title.cpp 22 Apr 2004 11:17:34 -0000 1.56 @@ -139,6 +139,7 @@ { index -= 1; // FIXME: Hack std::cout << "Sarting level: " << index << std::endl; + halt_music(); GameSession session(current_contrib_subset, index, ST_GL_PLAY); session.run(); Menu::set_current(main_menu); @@ -159,6 +160,8 @@ //World* world = session->get_world(); Level* plevel = session->get_level(); Player* tux = session->get_world()->get_tux(); + + session->get_world()->play_music(LEVEL_MUSIC); /* FIXME: // update particle systems @@ -248,9 +251,6 @@ update_time = st_get_ticks(); random_timer.start(rand() % 2000 + 2000); - Mix_Music* music = load_song(datadir + "/music/theme.mod"); - play_music(music); - Menu::set_current(main_menu); while (Menu::current()) { @@ -357,14 +357,11 @@ /* Pause: */ frame++; SDL_Delay(25); - - play_music(music); } /* Free surfaces: */ delete bkg_title; delete logo; - free_music(music); } #define MAX_VEL 10 Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- worldmap.cpp 21 Apr 2004 23:38:14 -0000 1.42 +++ worldmap.cpp 22 Apr 2004 11:17:34 -0000 1.43 @@ -726,6 +726,9 @@ quit = false; song = load_song(datadir + "/music/" + music); + if(!song) + st_abort("Couldn't load song ", music.c_str()); + play_music(song); while(!quit) { Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- world.cpp 21 Apr 2004 23:38:08 -0000 1.35 +++ world.cpp 22 Apr 2004 11:17:34 -0000 1.36 @@ -68,8 +68,6 @@ activate_bad_guys(); activate_particle_systems(); get_level()->load_song(); - - play_music(LEVEL_MUSIC); } World::~World() Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- level.cpp 21 Apr 2004 23:37:39 -0000 1.45 +++ level.cpp 22 Apr 2004 11:17:34 -0000 1.46 @@ -199,18 +199,18 @@ } Level::Level() - : level_song(0), level_song_fast(0) + : img_bkgd(0), level_song(0), level_song_fast(0) { } Level::Level(const std::string& subset, int level) - : level_song(0), level_song_fast(0) + : img_bkgd(0), level_song(0), level_song_fast(0) { load(subset, level); } Level::Level(const std::string& filename) - : level_song(0), level_song_fast(0) + : img_bkgd(0), level_song(0), level_song_fast(0) { load(filename); } @@ -696,10 +696,13 @@ void Level::free_song(void) { + if(level_song_fast != level_song) { + free_music(level_song_fast); + level_song_fast = 0; + } + free_music(level_song); level_song = 0; - free_music(level_song_fast); - level_song_fast = 0; } void @@ -711,6 +714,8 @@ char* song_subtitle; level_song = ::load_song(datadir + "/music/" + song_title); + if(!level_song) + st_abort("Couldn't load song: " , song_title.c_str()); song_path = (char *) malloc(sizeof(char) * datadir.length() + strlen(song_title.c_str()) + 8 + 5); @@ -719,6 +724,9 @@ sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), song_subtitle, strstr(song_title.c_str(), ".")); level_song_fast = ::load_song(song_path); + if(!level_song_fast) { + level_song_fast = level_song; + } free(song_subtitle); free(song_path); } Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- resources.cpp 22 Apr 2004 00:13:33 -0000 1.14 +++ resources.cpp 22 Apr 2004 11:17:34 -0000 1.15 @@ -25,6 +25,7 @@ #include "special.h" #include "resources.h" #include "sprite_manager.h" +#include "setup.h" Surface* img_waves[3]; Surface* img_water; @@ -289,6 +290,8 @@ /* Herring song */ herring_song = load_song(datadir + "/music/SALCON.MOD"); + if(!herring_song) + st_abort("Couldn't load song ", "/music/SALCON.MOD"); } |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 10:44:26
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15843/data Modified Files: supertux.strf Log Message: Applied Ryan's patch for MrBomb hotspot. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- supertux.strf 22 Apr 2004 00:13:33 -0000 1.7 +++ supertux.strf 22 Apr 2004 10:44:17 -0000 1.8 @@ -73,12 +73,16 @@ (images "shared/jumpy-left-middle-0.png")) (sprite (name "mrbomb-left") + (x-hotspot 0) + (y-hotspot 15) (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") + (x-hotspot 0) + (y-hotspot 15) (images "shared/mrbomb-right-0.png") (images "shared/mrbomb-right-1.png") (images "shared/mrbomb-right-2.png") @@ -86,12 +90,18 @@ (sprite (name "mrbomb-ticking-left") + (x-hotspot 0) + (y-hotspot 10) (images "shared/mrbombx-left-0.png")) (sprite (name "mrbomb-ticking-right") + (x-hotspot 0) + (y-hotspot 10) (images "shared/mrbombx-right-0.png")) (sprite (name "mrbomb-explosion") + (x-hotspot 32) + (y-hotspot 32) (images "shared/mrbomb-explosion.png")) (sprite (name "stalactite") |
|
From: Ricardo C. <rm...@us...> - 2004-04-22 10:43:44
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15673/src Modified Files: badguy.cpp Log Message: Applied Ryan's patch for overlaping badguys. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- badguy.cpp 20 Apr 2004 20:10:26 -0000 1.40 +++ badguy.cpp 22 Apr 2004 10:43:36 -0000 1.41 @@ -1025,6 +1025,26 @@ // Jumpy is an exception if (pbad_c->kind == BAD_MONEY) break; + + // Bounce off of other badguy if we land on top of him + if (base.y + base.height < pbad_c->base.y + pbad_c->base.height) + { + Direction old_dir = dir; + if (pbad_c->dir == LEFT) + dir = RIGHT; + else if (pbad_c->dir == RIGHT) + dir = LEFT; + + if (dir != old_dir) + physic.inverse_velocity_x(); + + physic.set_velocity(fabs(physic.get_velocity_x()), 2); + + break; + } + else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height) + break; + if (dir == LEFT) dir = RIGHT; else if (dir == RIGHT) |
248 messages has been excluded from this view by a project administrator.
