super-tux-commit Mailing List for Super Tux (Page 33)
Brought to you by:
wkendrick
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-09-11 14:22:14
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18229/src Modified Files: gameloop.cpp gameloop.h Log Message: Implemented a cheating system, mainly for debugging. It might be a bit ugly and could be faster. Feel free to replace it. Cheat words are: grow, fire, ice, lifeup, lifedown, invincible. Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- gameloop.h 28 Jul 2004 23:06:12 -0000 1.57 +++ gameloop.h 11 Sep 2004 14:22:01 -0000 1.58 @@ -67,7 +67,6 @@ float fps_fps; FrameRate frame_rate; int pause_menu_frame; - int debug_fps; /** If true the end_sequence will be played, user input will be ignored while doing that */ @@ -116,6 +115,9 @@ private: static GameSession* current_; + // for cheating + std::string last_keys; + void restart_level(); void check_end_conditions(); @@ -127,7 +129,6 @@ void drawendscreen(); void drawresultscreen(void); -private: void on_escape_press(); void process_menu(); }; Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -r1.166 -r1.167 --- gameloop.cpp 8 Sep 2004 17:32:31 -0000 1.166 +++ gameloop.cpp 11 Sep 2004 14:22:00 -0000 1.167 @@ -95,6 +95,8 @@ fps_timer.init(true); frame_timer.init(true); + last_keys.clear(); + #if 0 float old_x_pos = -1; if (world) @@ -361,42 +363,15 @@ } } break; - case SDLK_TAB: - if(debug_mode) + default: + /* Check if chacrater is ASCII */ + char ch[2]; + if((event.key.keysym.unicode & 0xFF80) == 0) { - tux.grow(false); + ch[0] = event.key.keysym.unicode & 0x7F; + ch[1] = '\0'; } - break; - case SDLK_END: - if(debug_mode) - player_status.distros += 50; - break; - case SDLK_DELETE: - if(debug_mode) - tux.got_power = tux.FIRE_POWER; - break; - case SDLK_HOME: - if(debug_mode) - tux.got_power = tux.ICE_POWER; - break; - case SDLK_INSERT: - if(debug_mode) - tux.invincible_timer.start(TUX_INVINCIBLE_TIME); - break; - case SDLK_l: - if(debug_mode) - --player_status.lives; - break; - case SDLK_s: - if(debug_mode) - player_status.score += 1000; - case SDLK_f: - if(debug_fps) - debug_fps = false; - else - debug_fps = true; - break; - default: + last_keys.append(ch); // add to cheat keys break; } } @@ -474,6 +449,48 @@ } } /* while */ } + +// Cheating words (the goal of this is really for debugging, but could +// be used for some cheating) +// TODO: this could be implmented in a more elegant and faster way +if(!last_keys.empty()) + { + Player &tux = *currentsector->player; + if(last_keys.find("grow") != std::string::npos) + { + tux.grow(false); + last_keys.clear(); + } + if(last_keys.find("fire") != std::string::npos) + { + tux.grow(false); + tux.got_power = tux.FIRE_POWER; + last_keys.clear(); + } + if(last_keys.find("ice") != std::string::npos) + { + tux.grow(false); + tux.got_power = tux.ICE_POWER; + last_keys.clear(); + } + if(last_keys.find("lifeup") != std::string::npos) + { + player_status.lives++; + last_keys.clear(); + } + if(last_keys.find("lifedown") != std::string::npos) + { + player_status.lives--; + last_keys.clear(); + } + if(last_keys.find("invincible") != std::string::npos) + { // be invincle for the rest of the level + tux.invincible_timer.start(time_left.get_left()); + last_keys.clear(); + } + if(last_keys.size() > 15) + last_keys.clear(); + } } void |
From: Ricardo C. <rm...@us...> - 2004-09-11 13:32:15
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9126/data/images Modified Files: supertux.strf Log Message: Arms should be drawn above enemies when grabbing. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- supertux.strf 9 Sep 2004 21:02:23 -0000 1.14 +++ supertux.strf 11 Sep 2004 13:32:04 -0000 1.15 @@ -278,12 +278,14 @@ (name "grab-right") (x-offset 5) (y-offset 32) + (z-order 2) (images "shared/bigtux/arms-grab-0.png")) (action (name "grab-left") (x-offset 5) (y-offset 32) + (z-order 2) (mirror-action "grab-right")) (action |
From: Ricardo C. <rm...@us...> - 2004-09-11 13:31:46
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9029/src Modified Files: player.cpp Log Message: Player should be drawn above enemies. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.163 retrieving revision 1.164 diff -u -d -r1.163 -r1.164 --- player.cpp 10 Sep 2004 08:55:49 -0000 1.163 +++ player.cpp 11 Sep 2004 13:31:37 -0000 1.164 @@ -116,13 +116,13 @@ Uint32 drawing_effect) { if(head != NULL) - head->draw(context, pos, layer+2, drawing_effect); + head->draw(context, pos, layer-1, drawing_effect); if(body != NULL) - body->draw(context, pos, layer, drawing_effect); + body->draw(context, pos, layer-3, drawing_effect); if(arms != NULL) - arms->draw(context, pos, layer+3, drawing_effect); + arms->draw(context, pos, layer, drawing_effect); if(feet != NULL) - feet->draw(context, pos, layer+1, drawing_effect); + feet->draw(context, pos, layer-2, drawing_effect); } Player::Player() |
From: Ricardo C. <rm...@us...> - 2004-09-10 08:58:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15185/src Modified Files: badguy.cpp Log Message: Bugfix: when throwing ice block to the left Tux is hurt. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- badguy.cpp 9 Sep 2004 20:44:32 -0000 1.120 +++ badguy.cpp 10 Sep 2004 08:54:29 -0000 1.121 @@ -365,7 +365,7 @@ if(tux.input.fire != DOWN) /* SHOOT! */ { if(dir == LEFT) - base.x = tux.base.x; + base.x = tux.base.x - base.width; else base.x = tux.base.x + tux.base.width; old_base = base; |
From: Ricardo C. <rm...@us...> - 2004-09-10 08:58:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15396/src Modified Files: player.cpp Log Message: Give different layers to different body parts. Bugfix: head not shown when ducking. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.162 retrieving revision 1.163 diff -u -d -r1.162 -r1.163 --- player.cpp 9 Sep 2004 10:40:05 -0000 1.162 +++ player.cpp 10 Sep 2004 08:55:49 -0000 1.163 @@ -116,13 +116,13 @@ Uint32 drawing_effect) { if(head != NULL) - head->draw(context, pos, layer, drawing_effect); + head->draw(context, pos, layer+2, drawing_effect); if(body != NULL) - body->draw(context, pos, layer, drawing_effect); + body->draw(context, pos, layer, drawing_effect); if(arms != NULL) - arms->draw(context, pos, layer, drawing_effect); + arms->draw(context, pos, layer+3, drawing_effect); if(feet != NULL) - feet->draw(context, pos, layer, drawing_effect); + feet->draw(context, pos, layer+1, drawing_effect); } Player::Player() |
From: Ricardo C. <rm...@us...> - 2004-09-09 21:02:33
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7296/data/images Modified Files: supertux.strf Log Message: Fixed spiky's y-offset, as well as a few of others bad values. Looks like I mistakely change them when committing flamefish, since I was doing some testing on that version. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- supertux.strf 9 Sep 2004 10:45:26 -0000 1.13 +++ supertux.strf 9 Sep 2004 21:02:23 -0000 1.14 @@ -904,7 +904,7 @@ (sprite (name "mrbomb-ticking-right") (action (fps 15.0) - (x-offset 255) + (x-offset 10) (y-offset 8) (images "shared/mrbombx-right-0.png" "shared/mrbombx-right-1.png"))) @@ -1016,26 +1016,26 @@ (sprite (name "spiky-left") (action (x-offset 6) - (y-offset 255) + (y-offset 10) (images "shared/spiky-left-0.png" "shared/spiky-left-1.png" "shared/spiky-left-2.png"))) (sprite (name "spiky-right") (action (x-offset 6) - (y-offset 255) + (y-offset 10) (images "shared/spiky-right-0.png" "shared/spiky-right-1.png" "shared/spiky-right-2.png"))) (sprite (name "spiky-iced-left") (action (x-offset 6) - (y-offset 255) + (y-offset 10) (images "shared/spiky-iced-left-0.png"))) (sprite (name "spiky-iced-right") (action (x-offset 6) - (y-offset 255) + (y-offset 10) (images "shared/spiky-iced-right-0.png"))) (sprite (name "snowball-left") @@ -1090,7 +1090,7 @@ (action (x-offset 12) (x-offset 12) - (fps 255) + (fps 20) (images "shared/firebullet-1.png" "shared/firebullet-2.png" "shared/firebullet-3.png" @@ -1099,7 +1099,7 @@ (action (x-offset 12) (x-offset 12) - (fps 255) + (fps 20) (images "shared/icebullet-1.png"))) ; Trampoline (sprite (name "trampoline") |
From: Ricardo C. <rm...@us...> - 2004-09-09 20:44:42
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3539/src Modified Files: badguy.cpp Log Message: Bugfix: ice blocks were hurting player when dropped. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- badguy.cpp 9 Sep 2004 18:57:05 -0000 1.119 +++ badguy.cpp 9 Sep 2004 20:44:32 -0000 1.120 @@ -365,9 +365,9 @@ if(tux.input.fire != DOWN) /* SHOOT! */ { if(dir == LEFT) - base.x -= 24; + base.x = tux.base.x; else - base.x += 24; + base.x = tux.base.x + tux.base.width; old_base = base; mode=KICK; |
From: Ricardo C. <rm...@us...> - 2004-09-09 18:57:18
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12970/src Modified Files: badguy.cpp Log Message: This should fix the position of ice blocks when hold. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- badguy.cpp 9 Sep 2004 18:42:18 -0000 1.118 +++ badguy.cpp 9 Sep 2004 18:57:05 -0000 1.119 @@ -339,16 +339,23 @@ { /* FIXME: The pbad object shouldn't know about pplayer objects. */ /* If we're holding the iceblock */ dir = tux.dir; - if(dir==RIGHT) + if(tux.size == SMALL) { - base.x = tux.base.x + 16; - base.y = tux.base.y + tux.base.height/1.5 - base.height; + if(dir == RIGHT) + base.x = tux.base.x + 24; + else // dir == LEFT + base.x = tux.base.x - 12; + base.y = tux.base.y + tux.base.height/1.5 - base.height; } - else /* facing left */ + else // TUX == BIG { - base.x = tux.base.x - 16; - base.y = tux.base.y + tux.base.height/1.5 - base.height; + if(dir == RIGHT) + base.x = tux.base.x + 24; + else // dir == LEFT + base.x = tux.base.x - 4; + base.y = tux.base.y + tux.base.height/1.5 - base.height; } + if(collision_object_map(base)) { base.x = tux.base.x; @@ -1325,7 +1332,8 @@ // Put bad guys a part (or they get jammed) // only needed to do to one of them - base.x = pbad_c->base.x + pbad_c->base.width + 1; + if (physic.get_velocity_x() != 0) + base.x = pbad_c->base.x + pbad_c->base.width + 1; } else if (dir == RIGHT) { |
From: Ricardo C. <rm...@us...> - 2004-09-09 18:42:28
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9277/src Modified Files: badguy.cpp player.h Log Message: Tweaked scores. Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- player.h 17 Aug 2004 23:23:11 -0000 1.83 +++ player.h 9 Sep 2004 18:42:18 -0000 1.84 @@ -49,7 +49,7 @@ /* Scores: */ #define SCORE_BRICK 5 -#define SCORE_DISTRO 25 +#define SCORE_DISTRO 20 /* Sizes: */ Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- badguy.cpp 8 Sep 2004 13:48:41 -0000 1.117 +++ badguy.cpp 9 Sep 2004 18:42:18 -0000 1.118 @@ -1033,7 +1033,7 @@ player->bounce(this); Sector::current()->add_score(Vector(base.x, base.y), - 50 * player_status.score_multiplier); + 25 * player_status.score_multiplier); SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos()); player_status.score_multiplier++; @@ -1054,7 +1054,7 @@ player->bounce(this); Sector::current()->add_score(Vector(base.x, base.y), - 50 * player_status.score_multiplier); + 25 * player_status.score_multiplier); SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos()); player_status.score_multiplier++; return; |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:45:50
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16404/data/images Modified Files: supertux.strf Log Message: Fixed z-order on smalltux grabbing ice block. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- supertux.strf 9 Sep 2004 10:41:16 -0000 1.12 +++ supertux.strf 9 Sep 2004 10:45:26 -0000 1.13 @@ -84,12 +84,14 @@ (name "grab-right") (x-offset 5) (y-offset 14) + (z-order 2) (images "shared/smalltux/arms-grab-0.png")) (action (name "grab-left") (x-offset 5) (y-offset 14) + (z-order 2) (mirror-action "grab-right"))) ;; Small Tux Body |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:41:27
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15484/data/images Modified Files: supertux.strf Log Message: Fixed a few mistakes from the sprites files. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- supertux.strf 9 Sep 2004 10:00:00 -0000 1.11 +++ supertux.strf 9 Sep 2004 10:41:16 -0000 1.12 @@ -84,13 +84,13 @@ (name "grab-right") (x-offset 5) (y-offset 14) - (images "shared/bigtux/arms-grab-0.png"))) + (images "shared/smalltux/arms-grab-0.png")) (action (name "grab-left") (x-offset 5) (y-offset 14) - (mirror-action "grab-right")) + (mirror-action "grab-right"))) ;; Small Tux Body (sprite @@ -160,13 +160,13 @@ (name "kick-right") (x-offset 5) (y-offset 14) - (images "shared/smalltux/body-kick-0.png"))) + (images "shared/smalltux/body-kick-0.png")) (action (name "kick-left") (x-offset 5) (y-offset 14) - (mirror-action "kick-right")) + (mirror-action "kick-right"))) ; End of Small Tux sprite @@ -223,6 +223,18 @@ (mirror-action "jump-right")) (action + (name "duck-right") + (x-offset 5) + (y-offset 62) + (images "shared/bigtux/arms-duck-0.png")) + + (action + (name "duck-left") + (x-offset 5) + (y-offset 62) + (mirror-action "duck-right")) + + (action (name "skid-right") (x-offset 6) (y-offset 31) @@ -275,14 +287,16 @@ (action (name "duck+grab-right") (x-offset 5) - (y-offset 32) - (images "shared/bigtux/arms-duck+grab-0.png"))) + (y-offset 62) + (z-order 2) + (images "shared/bigtux/arms-duck+grab-0.png")) (action (name "duck+grab-left") (x-offset 5) - (y-offset 32) - (mirror-action "grab-right")) + (y-offset 62) + (z-order 2) + (mirror-action "duck+grab-right"))) ;; Big Tux Head (sprite @@ -333,14 +347,14 @@ (name "duck-right") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (images "shared/bigtux/head-duck-0.png")) (action (name "duck-left") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (mirror-action "duck-right")) (action @@ -387,7 +401,7 @@ (x-offset 6) (y-offset 31) (images "shared/bigtux/head-idle-blink-0.png" - "shared/bigtux/head-idle-blink-1.png"))) + "shared/bigtux/head-idle-blink-1.png")) (action @@ -395,7 +409,7 @@ (fps 1.0) (x-offset 6) (y-offset 31) - (mirror-action "idle-right")) + (mirror-action "idle-right"))) ;; Big Tux Body (sprite @@ -446,14 +460,14 @@ (name "duck-right") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (images "shared/bigtux/body-duck-0.png")) (action (name "duck-left") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (mirror-action "duck-right")) (action @@ -486,14 +500,14 @@ (name "buttjump-right") (x-offset 5) (y-offset 32) - (images "shared/bigtux/body-stand-0.png"))) + (images "shared/bigtux/body-stand-0.png")) (action (name "buttjump-left") (fps 15.0) (x-offset 5) (y-offset 32) - (mirror-action "buttjump-right")) + (mirror-action "buttjump-right"))) ;; Big Tux Feet (sprite @@ -549,14 +563,14 @@ (name "duck-right") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (images "shared/bigtux/feet-duck-0.png")) (action (name "duck-left") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (mirror-action "duck-right")) (action @@ -587,13 +601,13 @@ (name "buttjump-right") (x-offset 5) (y-offset 32) - (images "shared/bigtux/feet-buttjump-0.png"))) + (images "shared/bigtux/feet-buttjump-0.png")) (action (name "buttjump-left") (x-offset 5) (y-offset 32) - (mirror-action "buttjump-right")) + (mirror-action "buttjump-right"))) ; End of Big Tux (no power) sprite @@ -647,14 +661,14 @@ (name "duck-right") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "duck-left") (fps 15.0) (x-offset 5) - (y-offset 30) + (y-offset 62) (mirror-action "duck-right")) (action @@ -699,14 +713,14 @@ (x-offset 6) (y-offset 31) (images "shared/bigtux/head-idle-blink-0.png" - "shared/bigtux/head-idle-blink-1.png"))) + "shared/bigtux/head-idle-blink-1.png")) (action (name "idle-left") (fps 1.0) (x-offset 6) (y-offset 31) - (mirror-action "idle-right")) + (mirror-action "idle-right"))) ; End of Big Fire Tux sprite |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:40:52
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15278/lib/special Modified Files: sprite.cpp Log Message: Do not free mirror surfaces. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- sprite.cpp 9 Sep 2004 10:00:00 -0000 1.25 +++ sprite.cpp 9 Sep 2004 10:40:42 -0000 1.26 @@ -55,7 +55,10 @@ { for(std::vector<Surface*>::iterator i_sur = i_act->second->surfaces.begin(); i_sur != i_act->second->surfaces.end(); ++i_sur) - delete *i_sur; + { + if(!i_act->second->mirror) + delete *i_sur; + } delete i_act->second; } } @@ -106,7 +109,7 @@ { std::vector<std::string> images; if(!lispreader.read_string_vector("images", images)) - Termination::abort("Sprite contains no images: ", action->name.c_str()); + Termination::abort("Sprite contains no images: ", action->name); for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) { |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:40:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15083/src Modified Files: player.cpp Log Message: Made a few mistakes with actions names. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.161 retrieving revision 1.162 diff -u -d -r1.161 -r1.162 --- player.cpp 9 Sep 2004 10:00:00 -0000 1.161 +++ player.cpp 9 Sep 2004 10:40:05 -0000 1.162 @@ -747,7 +747,7 @@ Vector pos = Vector(base.x, base.y); /* Set Tux sprite action */ - if (duck && size != SMALL) + if (duck && size == BIG) { if(dir == LEFT) tux_body->set_action("duck-left"); @@ -807,7 +807,7 @@ if(dir == LEFT) tux_body->head->set_action("idle-left"); else // dir == RIGHT - tux_body->set_action("idle-right"); + tux_body->head->set_action("idle-right"); tux_body->head->start_animation(1); } @@ -822,16 +822,16 @@ if (duck) { if(dir == LEFT) - tux_body->arms->set_action("duck+grab"); + tux_body->arms->set_action("duck+grab-left"); else // dir == RIGHT - tux_body->set_action("duck-right"); + tux_body->arms->set_action("duck+grab-right"); } else { if(dir == LEFT) - tux_body->arms->set_action("grab"); + tux_body->arms->set_action("grab-left"); else // dir == RIGHT - tux_body->set_action("duck-right"); + tux_body->arms->set_action("grab-right"); } } |
From: Matze B. <mat...@us...> - 2004-09-09 10:14:02
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11341/test Modified Files: level4.stl level5.stl Log Message: change bkgd_speed back to old values, if you use levelformat 1 then the speed has to be specified the speed in percent of the player speed, in version2 you have to specify the speed as a multiplier for player speed Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level4.stl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- level4.stl 8 Jun 2004 22:15:31 -0000 1.7 +++ level4.stl 9 Sep 2004 10:13:52 -0000 1.8 @@ -6,7 +6,7 @@ (music "Mortimers_chipdisko.mod") (background "") (particle_system "") - (bkgd_speed 0.5) + (bkgd_speed 50) (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 255) Index: level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level5.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level5.stl 8 Jun 2004 12:09:06 -0000 1.4 +++ level5.stl 9 Sep 2004 10:13:52 -0000 1.5 @@ -6,7 +6,7 @@ (music "Mortimers_chipdisko.mod") (background "arctis.jpg") (particle_system "") - (bkgd_speed 0.5) + (bkgd_speed 50) (bkgd_red_top 50) (bkgd_green_top 150) (bkgd_blue_top 150) |
From: Matze B. <mat...@us...> - 2004-09-09 10:14:02
|
Update of /cvsroot/super-tux/supertux/data/levels/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11341/misc Modified Files: menu.stl Log Message: change bkgd_speed back to old values, if you use levelformat 1 then the speed has to be specified the speed in percent of the player speed, in version2 you have to specify the speed as a multiplier for player speed Index: menu.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/misc/menu.stl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- menu.stl 31 May 2004 02:40:16 -0000 1.9 +++ menu.stl 9 Sep 2004 10:13:52 -0000 1.10 @@ -6,7 +6,7 @@ (music "theme.mod") (background "arctis.jpg") (particle_system "") - (bkgd_speed 0.5) + (bkgd_speed 50) (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) |
From: Matze B. <mat...@us...> - 2004-09-09 10:12:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11097 Modified Files: sector.cpp Log Message: fix old levels background speed not getting adjusted to new format Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- sector.cpp 18 Aug 2004 21:36:00 -0000 1.20 +++ sector.cpp 9 Sep 2004 10:11:56 -0000 1.21 @@ -155,6 +155,7 @@ reader.read_string("background", backgroundimage); float bgspeed = .5; reader.read_float("bkgd_speed", bgspeed); + bgspeed /= 100; Color bkgd_top, bkgd_bottom; int r = 0, g = 0, b = 128; |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:00:13
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9119/lib/special Modified Files: sprite.cpp sprite.h Log Message: Implemented mirroring in Sprite, so that now it's possible to adjust left offsets. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- sprite.cpp 8 Sep 2004 14:12:48 -0000 1.24 +++ sprite.cpp 9 Sep 2004 10:00:00 -0000 1.25 @@ -75,17 +75,7 @@ lispreader.read_int("z-order", action->z_order); lispreader.read_float("fps", action->fps); - std::vector<std::string> images; - if(!lispreader.read_string_vector("images", images)) - Termination::abort("Sprite contains no images: ", action->name.c_str()); - - for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) - { - action->surfaces.push_back( - new Surface(datadir + "/images/" + images[i], true)); - } - - // TODO: add a top filter entry + /* TODO: add a top filter entry */ std::vector <int> mask_color; lispreader.read_int_vector("apply-mask", mask_color); if(mask_color.size() == 4) @@ -97,6 +87,33 @@ } } + action->mirror = false; + std::string mirror_action; + lispreader.read_string("mirror-action", mirror_action); + if(!mirror_action.empty()) + { + action->mirror = true; + Action* act_tmp = get_action(mirror_action); + if(act_tmp == NULL) + std::cerr << "Warning: Could not mirror action. Action not found\n" + "Mirror actions must be defined after the real one!\n"; + else + action->surfaces = act_tmp->surfaces; + } + + // Load images + if(!action->mirror) + { + std::vector<std::string> images; + if(!lispreader.read_string_vector("images", images)) + Termination::abort("Sprite contains no images: ", action->name.c_str()); + + for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) + { + action->surfaces.push_back( + new Surface(datadir + "/images/" + images[i], true)); + } + } actions[action->name] = action; } @@ -133,6 +150,18 @@ action = i->second; } +Sprite::Action* +Sprite::get_action(std::string act) +{ +Actions::iterator i = actions.find(act); +if(i == actions.end()) + { + std::cerr << "Warning: Action '" << act << "' not found on Sprite '" << name << "'\n"; + return NULL; + } +return i->second; +} + void Sprite::start_animation(int loops) { Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- sprite.h 27 Aug 2004 11:20:27 -0000 1.14 +++ sprite.h 9 Sep 2004 10:00:00 -0000 1.15 @@ -48,6 +48,10 @@ /** Frames per second */ float fps; + /** Mirror is used to avoid duplicating left and right side + sprites */ + bool mirror; + std::vector<Surface*> surfaces; }; @@ -112,6 +116,9 @@ void init_defaults(Action* act); void parse_action(LispReader& lispreader); + /** Get an action */ + Action* get_action(std::string act); + void update(); void reset(); |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:00:13
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9119/src Modified Files: player.cpp Log Message: Implemented mirroring in Sprite, so that now it's possible to adjust left offsets. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- player.cpp 8 Sep 2004 11:23:29 -0000 1.160 +++ player.cpp 9 Sep 2004 10:00:00 -0000 1.161 @@ -748,24 +748,55 @@ /* Set Tux sprite action */ if (duck && size != SMALL) - tux_body->set_action("duck"); + { + if(dir == LEFT) + tux_body->set_action("duck-left"); + else // dir == RIGHT + tux_body->set_action("duck-right"); + } else if (skidding_timer.started()) - tux_body->set_action("skid"); + { + if(dir == LEFT) + tux_body->set_action("skid-left"); + else // dir == RIGHT + tux_body->set_action("skid-right"); + } else if (kick_timer.started()) - tux_body->set_action("kick"); + { + if(dir == LEFT) + tux_body->set_action("kick-left"); + else // dir == RIGHT + tux_body->set_action("kick-right"); + } else if (butt_jump) - tux_body->set_action("buttjump"); + { + if(dir == LEFT) + tux_body->set_action("buttjump-left"); + else // dir == RIGHT + tux_body->set_action("buttjump-right"); + } else if (physic.get_velocity_y() != 0) - tux_body->set_action("jump"); + { + if(dir == LEFT) + tux_body->set_action("jump-left"); + else // dir == RIGHT + tux_body->set_action("jump-right"); + } else { if (fabsf(physic.get_velocity_x()) < 1.0f) // standing { - tux_body->set_action("stand"); + if(dir == LEFT) + tux_body->set_action("stand-left"); + else // dir == RIGHT + tux_body->set_action("stand-right"); } else // moving { - tux_body->set_action("walk"); + if(dir == LEFT) + tux_body->set_action("walk-left"); + else // dir == RIGHT + tux_body->set_action("walk-right"); } } @@ -773,7 +804,11 @@ { if(size == BIG) { - tux_body->head->set_action("idle"); + if(dir == LEFT) + tux_body->head->set_action("idle-left"); + else // dir == RIGHT + tux_body->set_action("idle-right"); + tux_body->head->start_animation(1); } @@ -785,9 +820,19 @@ shooting_timer.check()) { if (duck) - tux_body->arms->set_action("duck+grab"); + { + if(dir == LEFT) + tux_body->arms->set_action("duck+grab"); + else // dir == RIGHT + tux_body->set_action("duck-right"); + } else - tux_body->arms->set_action("grab"); + { + if(dir == LEFT) + tux_body->arms->set_action("grab"); + else // dir == RIGHT + tux_body->set_action("duck-right"); + } } /* Draw Tux */ |
From: Ricardo C. <rm...@us...> - 2004-09-09 10:00:10
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9119/data/images Modified Files: supertux.strf Log Message: Implemented mirroring in Sprite, so that now it's possible to adjust left offsets. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- supertux.strf 8 Sep 2004 13:33:30 -0000 1.10 +++ supertux.strf 9 Sep 2004 10:00:00 -0000 1.11 @@ -6,7 +6,7 @@ ;; Small Tux arms (name "small-tux-arms") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 14) @@ -20,43 +20,83 @@ "shared/smalltux/arms-walk-7.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 14) (images "shared/smalltux/arms-walk-5.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 14) (images "shared/smalltux/arms-jump-0.png")) (action - (name "skid") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "jump-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 15) (images "shared/smalltux/arms-skid-0.png")) (action - (name "kick") + (name "skid-left") + (fps 15.0) + (x-offset 6) + (y-offset 15) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 14) (images "shared/smalltux/arms-kick-0.png")) + (action + (name "kick-left") + (x-offset 5) + (y-offset 14) + (mirror-action "kick-right")) + ; Grabbing is arms specific! (action - (name "grab") + (name "grab-right") (x-offset 5) (y-offset 14) (images "shared/bigtux/arms-grab-0.png"))) + (action + (name "grab-left") + (x-offset 5) + (y-offset 14) + (mirror-action "grab-right")) + ;; Small Tux Body (sprite (name "small-tux-body") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 14) @@ -70,31 +110,64 @@ "shared/smalltux/body-walk-7.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 14) (images "shared/smalltux/body-walk-5.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 14) (images "shared/smalltux/body-jump-0.png")) (action - (name "skid") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "jump-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 15) (images "shared/smalltux/body-skid-0.png")) (action - (name "kick") + (name "skid-left") + (x-offset 6) + (y-offset 15) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 14) (images "shared/smalltux/body-kick-0.png"))) + (action + (name "kick-left") + (x-offset 5) + (y-offset 14) + (mirror-action "kick-right")) + ; End of Small Tux sprite ; Big Tux (no power) sprite @@ -103,7 +176,7 @@ (name "big-tux-arms") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 32) @@ -115,101 +188,201 @@ "shared/bigtux/arms-walk-5.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/arms-stand-0.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/arms-jump-0.png")) (action - (name "skid") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "jump-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 31) (images "shared/bigtux/arms-skid-0.png")) (action - (name "kick") + (name "skid-left") + (fps 15.0) + (x-offset 6) + (y-offset 31) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/arms-stand-0.png")) (action - (name "buttjump") + (name "kick-left") + (x-offset 5) + (y-offset 32) + (mirror-action "kick-right")) + + (action + (name "buttjump-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/arms-stand-0.png")) + (action + (name "buttjump-left") + (x-offset 5) + (y-offset 32) + (mirror-action "buttjump-right")) + ; Grabbing is arms specific! (action - (name "grab") + (name "grab-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/arms-grab-0.png")) (action - (name "duck+grab") + (name "grab-left") + (x-offset 5) + (y-offset 32) + (mirror-action "grab-right")) + + (action + (name "duck+grab-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/arms-duck+grab-0.png"))) + (action + (name "duck+grab-left") + (x-offset 5) + (y-offset 32) + (mirror-action "grab-right")) + ;; Big Tux Head (sprite (name "big-tux-head") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/head-stand-0.png")) (action - (name "duck") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "jump-right")) + + (action + (name "duck-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/head-duck-0.png")) (action - (name "skid") + (name "duck-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "duck-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 31) (images "shared/bigtux/head-skid-0.png")) (action - (name "kick") + (name "skid-left") + (fps 15.0) + (x-offset 6) + (y-offset 31) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action - (name "buttjump") + (name "kick-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "kick-right")) + + (action + (name "buttjump-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action - (name "idle") + (name "buttjump-left") + (x-offset 5) + (y-offset 32) + (mirror-action "buttjump-right")) + + (action + (name "idle-right") (fps 1.0) (x-offset 6) (y-offset 31) @@ -217,60 +390,116 @@ "shared/bigtux/head-idle-blink-1.png"))) + (action + (name "idle-left") + (fps 1.0) + (x-offset 6) + (y-offset 31) + (mirror-action "idle-right")) + ;; Big Tux Body (sprite (name "big-tux-body") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/body-stand-0.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/body-stand-0.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/body-stand-0.png")) (action - (name "duck") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "jump-right")) + + (action + (name "duck-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/body-duck-0.png")) (action - (name "skid") + (name "duck-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "duck-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 31) (images "shared/bigtux/body-skid-0.png")) (action - (name "kick") + (name "skid-left") + (fps 15.0) + (x-offset 6) + (y-offset 31) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/body-stand-0.png")) (action - (name "buttjump") + (name "kick-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "kick-right")) + + (action + (name "buttjump-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/body-stand-0.png"))) + (action + (name "buttjump-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "buttjump-right")) + ;; Big Tux Feet (sprite (name "big-tux-feet") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 32) @@ -282,44 +511,90 @@ "shared/bigtux/feet-walk-5.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/feet-stand-0.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/feet-jump-0.png")) (action - (name "duck") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "jump-right")) + + (action + (name "duck-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/feet-duck-0.png")) (action - (name "skid") + (name "duck-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "duck-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 31) (images "shared/bigtux/feet-skid-0.png")) (action - (name "kick") + (name "skid-left") + (x-offset 6) + (y-offset 31) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/feet-kick-0.png")) (action - (name "buttjump") + (name "kick-left") + (x-offset 5) + (y-offset 32) + (mirror-action "kick-right")) + + (action + (name "buttjump-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/feet-buttjump-0.png"))) + (action + (name "buttjump-left") + (x-offset 5) + (y-offset 32) + (mirror-action "buttjump-right")) + ; End of Big Tux (no power) sprite ; Big Fire Tux sprite @@ -327,59 +602,112 @@ (sprite (name "big-fire-tux-head") (action - (name "walk") + (name "walk-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "stand") + (name "walk-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "walk-right")) + + (action + (name "stand-right") (fps 15.0) (x-offset 5) (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "jump") + (name "stand-left") + (fps 15.0) + (x-offset 5) + (y-offset 32) + (mirror-action "stand-right")) + + (action + (name "jump-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "duck") + (name "jump-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "jump-right")) + + (action + (name "duck-right") (fps 15.0) (x-offset 5) (y-offset 30) (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "skid") + (name "duck-left") + (fps 15.0) + (x-offset 5) + (y-offset 30) + (mirror-action "duck-right")) + + (action + (name "skid-right") (x-offset 6) (y-offset 31) (images "shared/bigtux/head-skid-0.png")) (action - (name "kick") + (name "skid-left") + (x-offset 6) + (y-offset 31) + (mirror-action "skid-right")) + + (action + (name "kick-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "buttjump") + (name "kick-left") + (x-offset 5) + (y-offset 32) + (mirror-action "kick-right")) + + (action + (name "buttjump-right") (x-offset 5) (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action - (name "idle") + (name "buttjump-left") + (x-offset 5) + (y-offset 32) + (mirror-action "buttjump-right")) + + (action + (name "idle-right") (fps 1.0) (x-offset 6) (y-offset 31) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) + (action + (name "idle-left") + (fps 1.0) + (x-offset 6) + (y-offset 31) + (mirror-action "idle-right")) + ; End of Big Fire Tux sprite |
From: Marek M. <wa...@us...> - 2004-09-09 09:43:16
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6276/data/levels/test Added Files: level13.stl Log Message: Added a test level that shows several glitches. See mailing list for more info --- NEW FILE: level13.stl --- ;SuperTux-Level (supertux-level (version 1) (name "Sliding Glitches Demo") (author "Marek") (music "cave.mod") (background "cave2.jpg") (particle_system "") (bkgd_speed 50) (bkgd_red_top 0) (bkgd_green_top 0) (bkgd_blue_top 0) (bkgd_red_bottom 255) (bkgd_green_bottom 255) (bkgd_blue_bottom 255) (time 200) (width 50) (back_scrolling #f) (hor_autoscroll_speed 0.0) (gravity 10.0) (background-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (interactive-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 27 28 28 28 28 28 28 28 28 28 28 28 28 29 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 44 44 44 44 44 0 0 0 0 0 48 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 44 0 44 0 0 0 0 0 0 48 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 44 0 44 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 0 44 0 44 0 0 0 0 0 0 27 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 102 0 0 0 0 48 48 48 48 48 0 0 0 0 44 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 0 0 0 0 0 0 48 48 48 48 48 0 0 0 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 48 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (foreground-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (reset-points ) (objects ) ) |
From: Matze B. <mat...@us...> - 2004-09-08 20:21:55
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9097 Modified Files: configure.ac Log Message: do nto enable debug by default, otherwise we'll forget to disable that before making a release Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- configure.ac 10 Aug 2004 11:32:54 -0000 1.32 +++ configure.ac 8 Sep 2004 20:21:47 -0000 1.33 @@ -48,7 +48,7 @@ AC_MSG_CHECKING(for debug mode) AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes") + AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="no") if test "x${enable_debug}" != "xno"; then CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O3 -g" AC_MSG_RESULT([enabled]) |
From: Ricardo C. <rm...@us...> - 2004-09-08 17:40:11
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9937/src Modified Files: tile.cpp Log Message: Netsrot patch duplicated an include. Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- tile.cpp 8 Sep 2004 17:32:31 -0000 1.36 +++ tile.cpp 8 Sep 2004 17:40:02 -0000 1.37 @@ -20,7 +20,6 @@ #include <cmath> #include <cassert> -#include <cmath> #include <iostream> #include "app/globals.h" |
From: Matze B. <mat...@us...> - 2004-09-08 17:32:42
|
Update of /cvsroot/super-tux/supertux/lib/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8100/lib/gui Modified Files: menu.cpp Log Message: applied netsrot's patch Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/gui/menu.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- menu.cpp 18 Aug 2004 10:38:10 -0000 1.12 +++ menu.cpp 8 Sep 2004 17:32:32 -0000 1.13 @@ -846,6 +846,13 @@ joystick_timer.stop(); } break; + case SDL_JOYHATMOTION: + if(event.jhat.value & SDL_HAT_UP) { + menuaction = MENU_ACTION_UP; + } else if(event.jhat.value & SDL_HAT_DOWN) { + menuaction = MENU_ACTION_DOWN; + } + break; case SDL_JOYBUTTONDOWN: if (item.size() > 0 && item[active_item].kind == MN_CONTROLFIELD_JS) { |
From: Matze B. <mat...@us...> - 2004-09-08 17:32:42
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8100/src Modified Files: gameloop.cpp tile.cpp worldmap.cpp Log Message: applied netsrot's patch Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- worldmap.cpp 26 Aug 2004 23:05:03 -0000 1.114 +++ worldmap.cpp 8 Sep 2004 17:32:31 -0000 1.115 @@ -684,6 +684,18 @@ break; } break; + + case SDL_JOYHATMOTION: + if(event.jhat.value & SDL_HAT_UP) { + tux->set_direction(D_NORTH); + } else if(event.jhat.value & SDL_HAT_DOWN) { + tux->set_direction(D_SOUTH); + } else if(event.jhat.value & SDL_HAT_LEFT) { + tux->set_direction(D_WEST); + } else if(event.jhat.value & SDL_HAT_RIGHT) { + tux->set_direction(D_EAST); + } + break; case SDL_JOYAXISMOTION: if (event.jaxis.axis == joystick_keymap.x_axis) Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- tile.cpp 20 Jul 2004 18:04:48 -0000 1.35 +++ tile.cpp 8 Sep 2004 17:32:31 -0000 1.36 @@ -20,6 +20,7 @@ #include <cmath> #include <cassert> +#include <cmath> #include <iostream> #include "app/globals.h" Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -r1.165 -r1.166 --- gameloop.cpp 6 Aug 2004 11:43:09 -0000 1.165 +++ gameloop.cpp 8 Sep 2004 17:32:31 -0000 1.166 @@ -431,6 +431,27 @@ tux.input.down = UP; } break; + + case SDL_JOYHATMOTION: + if(event.jhat.value & SDL_HAT_UP) { + tux.input.up = DOWN; + tux.input.down = UP; + } else if(event.jhat.value & SDL_HAT_DOWN) { + tux.input.up = UP; + tux.input.down = DOWN; + } else if(event.jhat.value & SDL_HAT_LEFT) { + tux.input.left = DOWN; + tux.input.right = UP; + } else if(event.jhat.value & SDL_HAT_RIGHT) { + tux.input.left = UP; + tux.input.right = DOWN; + } else if(event.jhat.value == SDL_HAT_CENTERED) { + tux.input.left = UP; + tux.input.right = UP; + tux.input.up = UP; + tux.input.down = UP; + } + break; case SDL_JOYBUTTONDOWN: if (event.jbutton.button == joystick_keymap.a_button) |
From: Ricardo C. <rm...@us...> - 2004-09-08 14:12:58
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv902/lib/special Modified Files: sprite.cpp Log Message: This should definitively fix frames out of range. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- sprite.cpp 8 Sep 2004 13:59:09 -0000 1.23 +++ sprite.cpp 8 Sep 2004 14:12:48 -0000 1.24 @@ -170,7 +170,11 @@ Sprite::update() { if(animation_loops == 0) + { + if(frame >= get_frames() || frame < 0) + frame = 0; return; + } float frame_inc = (action->fps/1000.0) * (SDL_GetTicks() - last_tick); last_tick = SDL_GetTicks(); @@ -182,9 +186,9 @@ if(animation_reversed) { - float excedent = frame - 0; - if((int)excedent < 0 || excedent >= get_frames()) + if(frame < 0 || frame >= (float)get_frames()) { // last case can happen when not used reverse_animation() + float excedent = frame - 0; frame = get_frames() - 1; if(animation_loops > 0) { @@ -202,9 +206,9 @@ } else { - float excedent = frame - (get_frames()+1); - if((int)excedent >= 0) + if(frame >= (float)get_frames()) { + float excedent = frame - get_frames(); frame = 0; if(animation_loops > 0) { |