super-tux-commit Mailing List for Super Tux (Page 68)
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: Ryan F. <sik...@us...> - 2004-05-14 17:35:40
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19219 Modified Files: tile.cpp world.cpp Log Message: - fixed drawing crash - not quite in a playable state yet :) Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- world.cpp 14 May 2004 16:02:41 -0000 1.86 +++ world.cpp 14 May 2004 17:35:30 -0000 1.87 @@ -196,16 +196,11 @@ (*p)->draw(scroll_x, 0, 0); } -fprintf(stderr, "level->height: %i\n", level->height); -fprintf(stderr, "scroll_x: %i\n", scroll_x); -fprintf(stderr, "scroll_y: %i\n", scroll_y); /* Draw background: */ for (y = 0; y < VISIBLE_TILES_Y && y < level->height; ++y) { -fprintf(stderr, "drawing row: %i\n", y); for (x = 0; x < VISIBLE_TILES_X; ++x) { -fprintf(stderr, "x: %i\n", x); Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32), level->bg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]); } @@ -340,9 +335,15 @@ // this code prevent the screen to scroll before the start or after the level's end if(scroll_y < 0) scroll_y = 0; - if(scroll_y > level->height * 32 - screen->h) + else if(scroll_y > level->height * 32 - screen->h) scroll_y = level->height * 32 - screen->h; + if (scroll_y < 0) + { + std::cerr << "Level too short!!" << std::endl; + scroll_y = 0; + } + /* X-axis scrolling */ /* Auto scrolling */ @@ -384,8 +385,6 @@ scroll_x += (final_scroll_x - scroll_x) / (frame_ratio * (CHANGE_DIR_SCROLL_SPEED / 100)) + (tux.physic.get_velocity_x() * frame_ratio + tux.physic.get_acceleration_x() * frame_ratio * frame_ratio); - // std::cerr << tux_pos_x << " " << final_scroll_x << " " << scroll_x << std::endl; - } else { @@ -398,7 +397,7 @@ // this code prevent the screen to scroll before the start or after the level's end if(scroll_x < 0) scroll_x = 0; - if(scroll_x > level->width * 32 - screen->w) + else if(scroll_x > level->width * 32 - screen->w) scroll_x = level->width * 32 - screen->w; } Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- tile.cpp 14 May 2004 16:02:41 -0000 1.21 +++ tile.cpp 14 May 2004 17:35:30 -0000 1.22 @@ -185,8 +185,6 @@ void Tile::draw(float x, float y, unsigned int c, Uint8 alpha) { -fprintf(stderr, "x: %i\n", x); -fprintf(stderr, "y: %i\n", y); if (c != 0) { Tile* ptile = TileManager::instance()->get(c); |
|
From: Ricardo C. <rm...@us...> - 2004-05-14 16:02:59
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31278/src Modified Files: defines.h leveleditor.cpp setup.cpp tile.cpp world.cpp Log Message: First try to switch to 800x600. Unfortanely, the game crashes when drawing the tiles. I committed this in the hope that somebody fixes it. :D Index: defines.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/defines.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- defines.h 12 May 2004 17:56:33 -0000 1.37 +++ defines.h 14 May 2004 16:02:40 -0000 1.38 @@ -48,6 +48,11 @@ DYING_FALLING = 2 }; +/* Screen-related stuff */ + +#define VISIBLE_TILES_X 25 +#define VISIBLE_TILES_Y 19 + /* Sizes: */ #define SMALL 0 Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- leveleditor.cpp 14 May 2004 14:04:48 -0000 1.116 +++ leveleditor.cpp 14 May 2004 16:02:40 -0000 1.117 @@ -952,8 +952,8 @@ /* clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue); */ - for (y = 0; y < 16 && y < (unsigned)le_world->get_level()->height; ++y) - for (x = 0; x < 20; ++x) + for (y = 0; y < VISIBLE_TILES_Y && y < (unsigned)le_world->get_level()->height; ++y) + for (x = 0; x < (unsigned)VISIBLE_TILES_X-80; ++x) { if(active_tm == TM_BG) Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- setup.cpp 14 May 2004 02:44:34 -0000 1.82 +++ setup.cpp 14 May 2004 16:02:41 -0000 1.83 @@ -64,8 +64,8 @@ /* Screen proprities: */ /* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */ -#define SCREEN_W 640 -#define SCREEN_H 480 +#define SCREEN_W 800 +#define SCREEN_H 600 /* Local function prototypes: */ Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- world.cpp 13 May 2004 10:03:17 -0000 1.85 +++ world.cpp 14 May 2004 16:02:41 -0000 1.86 @@ -196,20 +196,25 @@ (*p)->draw(scroll_x, 0, 0); } +fprintf(stderr, "level->height: %i\n", level->height); +fprintf(stderr, "scroll_x: %i\n", scroll_x); +fprintf(stderr, "scroll_y: %i\n", scroll_y); /* Draw background: */ - for (y = 0; y < 16 && y < level->height; ++y) + for (y = 0; y < VISIBLE_TILES_Y && y < level->height; ++y) { - for (x = 0; x < 21; ++x) +fprintf(stderr, "drawing row: %i\n", y); + for (x = 0; x < VISIBLE_TILES_X; ++x) { +fprintf(stderr, "x: %i\n", x); Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32), level->bg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]); } } /* Draw interactive tiles: */ - for (y = 0; y < 16 && y < level->height; ++y) + for (y = 0; y < VISIBLE_TILES_Y && y < level->height; ++y) { - for (x = 0; x < 21; ++x) + for (x = 0; x < VISIBLE_TILES_X; ++x) { Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32), level->ia_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]); @@ -241,9 +246,9 @@ broken_bricks[i]->draw(); /* Draw foreground: */ - for (y = 0; y < 16 && y < level->height; ++y) + for (y = 0; y < VISIBLE_TILES_Y && y < level->height; ++y) { - for (x = 0; x < 21; ++x) + for (x = 0; x < VISIBLE_TILES_X; ++x) { Tile::draw(32*x - fmodf(scroll_x, 32), y * 32 - fmodf(scroll_y, 32), level->fg_tiles[(int)y + (int)(scroll_y / 32)][(int)x + (int)(scroll_x / 32)]); @@ -312,10 +317,10 @@ /* the space that it takes for the screen to start scrolling, regarding */ /* screen bounds (in pixels) */ -// should be higher than screen->w/2 (320) -#define X_SPACE (400-16) -// should be less than screen->h/2 (240) -#define Y_SPACE 200 +// should be higher than screen->w/2 (400) +#define X_SPACE (500-16) +// should be less than screen->h/2 (300) +#define Y_SPACE 250 // the time it takes to move the camera (in ms) #define CHANGE_DIR_SCROLL_SPEED 2000 Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- tile.cpp 6 May 2004 19:55:39 -0000 1.20 +++ tile.cpp 14 May 2004 16:02:41 -0000 1.21 @@ -185,6 +185,8 @@ void Tile::draw(float x, float y, unsigned int c, Uint8 alpha) { +fprintf(stderr, "x: %i\n", x); +fprintf(stderr, "y: %i\n", y); if (c != 0) { Tile* ptile = TileManager::instance()->get(c); |
|
From: Ricardo C. <rm...@us...> - 2004-05-14 14:04:58
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4454/src Modified Files: leveleditor.cpp Log Message: Just changed hard coded values by definitions. Please do this, or else the code turns ugly and gets hard to change that value everywhere. Also tuned the values. Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- leveleditor.cpp 13 May 2004 17:50:51 -0000 1.115 +++ leveleditor.cpp 14 May 2004 14:04:48 -0000 1.116 @@ -54,9 +54,10 @@ #define MOUSE_LEFT_MARGIN 80 #define MOUSE_RIGHT_MARGIN (560-32) -/* right_margin should noticed that the cursor is 32 pixels, - so it should subtract that value */ -#define MOUSE_POS_SPEED 20 + +/* scolling speed */ +#define KEYBOARD_SPEED 140 +#define MOUSE_SPEED 40 /* look */ #define SELECT_W 2 // size of the selections lines @@ -1512,11 +1513,11 @@ switch(le_move_left_bt->get_state()) { case BUTTON_PRESSED: - pos_x -= 192; + pos_x -= KEYBOARD_SPEED; show_minimap = true; break; case BUTTON_HOVER: - pos_x -= 32; + pos_x -= MOUSE_SPEED; show_minimap = true; break; case BUTTON_CLICKED: @@ -1529,11 +1530,11 @@ switch(le_move_right_bt->get_state()) { case BUTTON_PRESSED: - pos_x += 192; + pos_x += KEYBOARD_SPEED; show_minimap = true; break; case BUTTON_HOVER: - pos_x += 32; + pos_x += MOUSE_SPEED; show_minimap = true; break; case BUTTON_CLICKED: @@ -1546,11 +1547,11 @@ switch(le_move_up_bt->get_state()) { case BUTTON_PRESSED: - pos_y -= 192; + pos_y -= KEYBOARD_SPEED; show_minimap = true; break; case BUTTON_HOVER: - pos_y -= 32; + pos_y -= MOUSE_SPEED; show_minimap = true; break; case BUTTON_CLICKED: @@ -1563,11 +1564,11 @@ switch(le_move_down_bt->get_state()) { case BUTTON_PRESSED: - pos_y += 192; + pos_y += KEYBOARD_SPEED; show_minimap = true; break; case BUTTON_HOVER: - pos_y += 32; + pos_y += MOUSE_SPEED; show_minimap = true; break; case BUTTON_CLICKED: |
|
From: Ricardo C. <ri...@ae...> - 2004-05-14 13:59:30
|
Obviously, the direction should taken the player's position in consideration. Ricardo Em Sexta, 14 de Maio de 2004 09:36, o Ryan Flegel escreveu: > Update of /cvsroot/super-tux/supertux/src > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4415 > > Modified Files: > special.cpp > Log Message: > - fixed [sorta] the mushroom bumping problems > - is it okay to determine the direction from the player's position? > > Index: special.cpp > =================================================================== > RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v > retrieving revision 1.44 > retrieving revision 1.45 > diff -u -d -r1.44 -r1.45 > --- special.cpp 12 May 2004 18:28:37 -0000 1.44 > +++ special.cpp 14 May 2004 08:36:13 -0000 1.45 > @@ -309,7 +309,7 @@ > } > > void > -Upgrade::bump(Player* ) > +Upgrade::bump(Player* player) > { > // these can't be bumped > if(kind != UPGRADE_GROWUP) > @@ -317,9 +317,14 @@ > > play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER); > > + // determine new direction > + if (player->base.x + player->base.width/2 > base.x + base.width/2) > + dir = LEFT; > + else > + dir = RIGHT; > + > // do a little jump and change direction > physic.set_velocity(-physic.get_velocity_x(), 3); > - dir = dir == LEFT ? RIGHT : LEFT; > physic.enable_gravity(true); > } > > > > > ------------------------------------------------------- > This SF.Net email is sponsored by: SourceForge.net Broadband > Sign-up now for SourceForge Broadband and get the fastest > 6.0/768 connection for only $19.95/mo for the first 3 months! > http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click > _______________________________________________ > Super-tux-commit mailing list > Sup...@li... > https://lists.sourceforge.net/lists/listinfo/super-tux-commit -- "Calling J-Man Kink. Calling J-Man Kink. Hash missile sighted, target Los Angeles. Disregard personal feelings about city and intercept." -- The Firesign Theatre movie, _J-Men Forever_ |
|
From: Marek M. <wa...@us...> - 2004-05-14 11:38:41
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3978/data/music Added Files: factory-fast.mod factory.mod Log Message: Added factory(-fast).mod to the music directory Use for inspiration! :) --- NEW FILE: factory-fast.mod --- (This appears to be a binary file; contents omitted.) --- NEW FILE: factory.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Ryan F. <sik...@us...> - 2004-05-14 08:36:23
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4415 Modified Files: special.cpp Log Message: - fixed [sorta] the mushroom bumping problems - is it okay to determine the direction from the player's position? Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- special.cpp 12 May 2004 18:28:37 -0000 1.44 +++ special.cpp 14 May 2004 08:36:13 -0000 1.45 @@ -309,7 +309,7 @@ } void -Upgrade::bump(Player* ) +Upgrade::bump(Player* player) { // these can't be bumped if(kind != UPGRADE_GROWUP) @@ -317,9 +317,14 @@ play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER); + // determine new direction + if (player->base.x + player->base.width/2 > base.x + base.width/2) + dir = LEFT; + else + dir = RIGHT; + // do a little jump and change direction physic.set_velocity(-physic.get_velocity_x(), 3); - dir = dir == LEFT ? RIGHT : LEFT; physic.enable_gravity(true); } |
|
From: Ryan F. <sik...@us...> - 2004-05-14 08:16:28
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv568 Modified Files: TODO Log Message: - updated TODO Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- TODO 13 May 2004 23:16:45 -0000 1.46 +++ TODO 14 May 2004 08:16:13 -0000 1.47 @@ -12,7 +12,6 @@ L: low priority [H] AX_CHECK_GL produces an error during configure -[M] Enemies can get stuck when colliding. [M] When aborting a level, lives and score should remain the same as they were before. Solution: make more dependency between the game engine and worldmap or just backup those variables before starting a level. @@ -21,12 +20,13 @@ [M] Tux should fall while walking in tiles that have a space between. [M] Camera movement shouldn't be so fast at the beggining, it takes the focus from the game. +[M] Change resolution to 800x600, increasing visible game area. +[M] Moving platforms [L] time runs while being in in-game menu, at least a bit (jump, go to menu, wait a bit, leave menu, Tux will 'flip' to the ground, instead of fall, pause mode doesn't seem to have this problem, only menu) -[L] change lispreader to throw exceptions instead of simply assert() on - syntax error +[L] catch exceptions thrown by lispreader [L] fadein/out for intro/extro would be nice [L] when bumping a special with 2 blocks at once, it won't change direction [L] tux get killed if he kicks a iceblock while at the same time @@ -35,7 +35,7 @@ look like there are 2 blocks above each other when bumping against them as small tux... [L] Enemies should turn upside down after being hit by an kicked - iceblock + iceblock, fireball or bomb Stuff for past milestone1: |
|
From: Ryan F. <sik...@us...> - 2004-05-14 08:10:34
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31799 Modified Files: badguy.cpp Log Message: - fixed badguy collisions so they no longer get jammed Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- badguy.cpp 14 May 2004 07:42:30 -0000 1.74 +++ badguy.cpp 14 May 2004 08:10:24 -0000 1.75 @@ -1018,13 +1018,14 @@ case CO_BADGUY: pbad_c = (BadGuy*) p_c_object; - /* If we're a kicked mriceblock, kill any badguys we hit */ - if(kind == BAD_MRICEBLOCK && mode == KICK) + /* If we're a kicked mriceblock, kill [almost] any badguys we hit */ + if(kind == BAD_MRICEBLOCK && mode == KICK && + kind != BAD_FLAME && kind != BAD_BOMB && kind != BAD_STALACTITE) { pbad_c->kill_me(25); } - // a held mriceblock gets kills the enemy too but falls to ground then + // a held mriceblock kills the enemy too but falls to ground then else if(kind == BAD_MRICEBLOCK && mode == HELD) { pbad_c->kill_me(25); @@ -1081,8 +1082,6 @@ physic.set_velocity(-fabsf(physic.get_velocity_x()), 2); } - - break; } else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height) @@ -1094,6 +1093,9 @@ { dir = RIGHT; physic.set_velocity_x(fabsf(physic.get_velocity_x())); + + // in case badguys get "jammed" + base.x = pbad_c->base.x + pbad_c->base.width; } else if (dir == RIGHT) { |
|
From: Ryan F. <sik...@us...> - 2004-05-14 07:42:53
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26272 Modified Files: title.cpp badguy.cpp Log Message: - changed b/g for credits - fixed firebullet not killing some enemies Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- badguy.cpp 13 May 2004 21:02:14 -0000 1.73 +++ badguy.cpp 14 May 2004 07:42:30 -0000 1.74 @@ -961,7 +961,7 @@ tux.holding_something = false; } } - + physic.enable_gravity(true); /* Gain some points: */ @@ -1003,16 +1003,14 @@ if(pbullet_c->kind == FIRE_BULLET) { - if(kind == BAD_MRICEBLOCK || kind == BAD_STALACTITE || - kind == BAD_FISH || kind == BAD_BOUNCINGSNOWBALL || - kind == BAD_FLYINGSNOWBALL || kind == BAD_FLYINGSNOWBALL) - kill_me(10); + if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME) + kill_me(10); } else if(pbullet_c->kind == ICE_BULLET) { - if(kind == BAD_FLAME) - kill_me(10); - else + //if(kind == BAD_FLAME) + // kill_me(10); + //else frozen_timer.start(FROZEN_TIME); } break; Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- title.cpp 10 May 2004 20:37:59 -0000 1.81 +++ title.cpp 14 May 2004 07:42:29 -0000 1.82 @@ -52,6 +52,7 @@ #include "resources.h" static Surface* bkg_title; +static Surface* bkg_credits; static Surface* logo; static Surface* img_choose_subset; @@ -227,6 +228,7 @@ /* Load images: */ bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA); + bkg_credits = new Surface(datadir + "/images/background/oiltux.jpg", IGNORE_ALPHA); logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA); img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA); @@ -303,7 +305,7 @@ Menu::set_current(main_menu); break; case MNID_CREDITS: - display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS); + display_text_file("CREDITS", bkg_credits, SCROLL_SPEED_CREDITS); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: @@ -370,6 +372,7 @@ free_contrib_menu(); delete bkg_title; + delete bkg_credits; delete logo; delete img_choose_subset; } |
|
From: Ryan F. <sik...@us...> - 2004-05-14 05:24:35
|
Update of /cvsroot/super-tux/supertux/data/sounds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4713 Modified Files: distro.wav fall.wav lifeup.wav shoot.wav Log Message: - added sounds from Nathan McCoy Index: shoot.wav =================================================================== RCS file: /cvsroot/super-tux/supertux/data/sounds/shoot.wav,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 Binary files /tmp/cvs2iZbat and /tmp/cvsqvBH4K differ Index: lifeup.wav =================================================================== RCS file: /cvsroot/super-tux/supertux/data/sounds/lifeup.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsVq8WbY and /tmp/cvsnHpstg differ Index: fall.wav =================================================================== RCS file: /cvsroot/super-tux/supertux/data/sounds/fall.wav,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsjia1ft and /tmp/cvsDHiGRL differ Index: distro.wav =================================================================== RCS file: /cvsroot/super-tux/supertux/data/sounds/distro.wav,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsfKJIOG and /tmp/cvsm6JfFZ differ |
|
From: Ryan F. <sik...@us...> - 2004-05-14 05:14:38
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3401 Modified Files: menu.cpp Log Message: - uncomment crash fix that was accidentally commented Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- menu.cpp 14 May 2004 02:44:34 -0000 1.71 +++ menu.cpp 14 May 2004 05:14:30 -0000 1.72 @@ -490,8 +490,8 @@ menuaction = MENU_ACTION_NONE; - //if (active_item >= int(item.size())) - // active_item = int(item.size()) - 1; + if (active_item >= int(item.size())) + active_item = int(item.size()) - 1; } int |
|
From: Ryan F. <sik...@us...> - 2004-05-14 02:44:44
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14444 Modified Files: menu.h menu.cpp setup.cpp Log Message: - fixed an ugly hack I was using before for the JS config menu Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- menu.cpp 14 May 2004 02:29:15 -0000 1.70 +++ menu.cpp 14 May 2004 02:44:34 -0000 1.71 @@ -240,67 +240,65 @@ return string; } -/* Set ControlField a key */ +/* Set ControlField for keyboard key */ void Menu::get_controlfield_key_into_input(MenuItem *item) { - if (this == options_joystick_menu) - { - std::ostringstream oss; - oss << "Button " << *item->int_p; - item->change_input(oss.str().c_str()); - } - - else if (this == options_keys_menu) + switch(*item->int_p) { - switch(*item->int_p) + case SDLK_UP: + item->change_input("Up cursor"); + break; + case SDLK_DOWN: + item->change_input("Down cursor"); + break; + case SDLK_LEFT: + item->change_input("Left cursor"); + break; + case SDLK_RIGHT: + item->change_input("Right cursor"); + break; + case SDLK_RETURN: + item->change_input("Return"); + break; + case SDLK_SPACE: + item->change_input("Space"); + break; + case SDLK_RSHIFT: + item->change_input("Right Shift"); + break; + case SDLK_LSHIFT: + item->change_input("Left Shift"); + break; + case SDLK_RCTRL: + item->change_input("Right Control"); + break; + case SDLK_LCTRL: + item->change_input("Left Control"); + break; + case SDLK_RALT: + item->change_input("Right Alt"); + break; + case SDLK_LALT: + item->change_input("Left Alt"); + break; + default: { - case SDLK_UP: - item->change_input("Up cursor"); - break; - case SDLK_DOWN: - item->change_input("Down cursor"); - break; - case SDLK_LEFT: - item->change_input("Left cursor"); - break; - case SDLK_RIGHT: - item->change_input("Right cursor"); - break; - case SDLK_RETURN: - item->change_input("Return"); - break; - case SDLK_SPACE: - item->change_input("Space"); - break; - case SDLK_RSHIFT: - item->change_input("Right Shift"); - break; - case SDLK_LSHIFT: - item->change_input("Left Shift"); - break; - case SDLK_RCTRL: - item->change_input("Right Control"); - break; - case SDLK_LCTRL: - item->change_input("Left Control"); - break; - case SDLK_RALT: - item->change_input("Right Alt"); - break; - case SDLK_LALT: - item->change_input("Left Alt"); - break; - default: - { - char tmp[64]; - snprintf(tmp, 64, "%d", *item->int_p); - item->change_input(tmp); - } - break; + char tmp[64]; + snprintf(tmp, 64, "%d", *item->int_p); + item->change_input(tmp); } + break; } } +/* Set ControlField for joystick button */ +void Menu::get_controlfield_js_into_input(MenuItem *item) +{ + std::ostringstream oss; + oss << "Button " << *item->int_p; + item->change_input(oss.str().c_str()); +} + /* Free a menu and all its items */ Menu::~Menu() { @@ -572,7 +570,8 @@ } case MN_TEXTFIELD: case MN_NUMFIELD: - case MN_CONTROLFIELD: + case MN_CONTROLFIELD_KB: + case MN_CONTROLFIELD_JS: { int input_pos = input_width/2; int text_pos = (text_width + font_width)/2; @@ -584,8 +583,10 @@ input_width + font_width, 18, 0,0,0,128); - if(pitem.kind == MN_CONTROLFIELD) + if(pitem.kind == MN_CONTROLFIELD_KB) get_controlfield_key_into_input(&pitem); + else if (pitem.kind == MN_CONTROLFIELD_JS) + get_controlfield_js_into_input(&pitem); if(pitem.kind == MN_TEXTFIELD || pitem.kind == MN_NUMFIELD) { @@ -756,7 +757,7 @@ /* An International Character. */ } - if(item[active_item].kind == MN_CONTROLFIELD && this == options_keys_menu) + if(item[active_item].kind == MN_CONTROLFIELD_KB) { if(key == SDLK_ESCAPE) { @@ -824,7 +825,7 @@ } break; case SDL_JOYBUTTONDOWN: - if (item[active_item].kind == MN_CONTROLFIELD && this == options_joystick_menu) + if (item[active_item].kind == MN_CONTROLFIELD_JS) { *item[active_item].int_p = key; menuaction = MENU_ACTION_DOWN; Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- setup.cpp 14 May 2004 02:29:15 -0000 1.81 +++ setup.cpp 14 May 2004 02:44:34 -0000 1.82 @@ -420,11 +420,11 @@ options_keys_menu->additem(MN_LABEL,"Key Setup",0,0); options_keys_menu->additem(MN_HL,"",0,0); - options_keys_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, 0,&keymap.left); - options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, 0,&keymap.right); - options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, 0,&keymap.jump); - options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, 0,&keymap.duck); - options_keys_menu->additem(MN_CONTROLFIELD,"Power/Run", 0,0, 0,&keymap.fire); + options_keys_menu->additem(MN_CONTROLFIELD_KB,"Left move", 0,0, 0,&keymap.left); + options_keys_menu->additem(MN_CONTROLFIELD_KB,"Right move", 0,0, 0,&keymap.right); + options_keys_menu->additem(MN_CONTROLFIELD_KB,"Jump", 0,0, 0,&keymap.jump); + options_keys_menu->additem(MN_CONTROLFIELD_KB,"Duck", 0,0, 0,&keymap.duck); + options_keys_menu->additem(MN_CONTROLFIELD_KB,"Power/Run", 0,0, 0,&keymap.fire); options_keys_menu->additem(MN_HL,"",0,0); options_keys_menu->additem(MN_BACK,"Back",0,0); @@ -432,12 +432,12 @@ { options_joystick_menu->additem(MN_LABEL,"Joystick Setup",0,0); options_joystick_menu->additem(MN_HL,"",0,0); - //options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, 0,&joystick_keymap.x_axis); - //options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, 0,&joystick_keymap.y_axis); - options_joystick_menu->additem(MN_CONTROLFIELD,"A button", 0,0, 0,&joystick_keymap.a_button); - options_joystick_menu->additem(MN_CONTROLFIELD,"B button", 0,0, 0,&joystick_keymap.b_button); - //options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, 0,&joystick_keymap.start_button); - //options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone); + //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"X axis", 0,0, 0,&joystick_keymap.x_axis); + //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"Y axis", 0,0, 0,&joystick_keymap.y_axis); + options_joystick_menu->additem(MN_CONTROLFIELD_JS,"A button", 0,0, 0,&joystick_keymap.a_button); + options_joystick_menu->additem(MN_CONTROLFIELD_JS,"B button", 0,0, 0,&joystick_keymap.b_button); + //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"Start", 0,0, 0,&joystick_keymap.start_button); + //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone); options_joystick_menu->additem(MN_HL,"",0,0); options_joystick_menu->additem(MN_BACK,"Back",0,0); } Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- menu.h 11 May 2004 18:26:27 -0000 1.61 +++ menu.h 14 May 2004 02:44:34 -0000 1.62 @@ -104,7 +104,8 @@ MN_DEACTIVE, MN_TEXTFIELD, MN_NUMFIELD, - MN_CONTROLFIELD, + MN_CONTROLFIELD_KB, + MN_CONTROLFIELD_JS, MN_STRINGSELECT, MN_LABEL, MN_HL, /* horizontal line */ @@ -209,6 +210,7 @@ bool isToggled(int id); void Menu::get_controlfield_key_into_input(MenuItem *item); + void Menu::get_controlfield_js_into_input(MenuItem *item); void draw (); void draw_item(int index, int menu_width, int menu_height); |
|
From: Ryan F. <sik...@us...> - 2004-05-14 02:29:25
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11967 Modified Files: menu.cpp setup.cpp Log Message: - added some joystick config options.. I think - I don't have a joystick/gamepad so this could use some testing Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- menu.cpp 13 May 2004 02:50:13 -0000 1.69 +++ menu.cpp 14 May 2004 02:29:15 -0000 1.70 @@ -23,9 +23,10 @@ #endif #include <iostream> +#include <sstream> #include <stdlib.h> #include <stdio.h> -#include <string.h> +#include <string> #include <assert.h> #include "defines.h" @@ -242,51 +243,61 @@ /* Set ControlField a key */ void Menu::get_controlfield_key_into_input(MenuItem *item) { - switch(*item->int_p) + if (this == options_joystick_menu) { - case SDLK_UP: - item->change_input("Up cursor"); - break; - case SDLK_DOWN: - item->change_input("Down cursor"); - break; - case SDLK_LEFT: - item->change_input("Left cursor"); - break; - case SDLK_RIGHT: - item->change_input("Right cursor"); - break; - case SDLK_RETURN: - item->change_input("Return"); - break; - case SDLK_SPACE: - item->change_input("Space"); - break; - case SDLK_RSHIFT: - item->change_input("Right Shift"); - break; - case SDLK_LSHIFT: - item->change_input("Left Shift"); - break; - case SDLK_RCTRL: - item->change_input("Right Control"); - break; - case SDLK_LCTRL: - item->change_input("Left Control"); - break; - case SDLK_RALT: - item->change_input("Right Alt"); - break; - case SDLK_LALT: - item->change_input("Left Alt"); - break; - default: + std::ostringstream oss; + oss << "Button " << *item->int_p; + item->change_input(oss.str().c_str()); + } + + else if (this == options_keys_menu) + { + switch(*item->int_p) { - char tmp[64]; - snprintf(tmp, 64, "%d", *item->int_p); - item->change_input(tmp); + case SDLK_UP: + item->change_input("Up cursor"); + break; + case SDLK_DOWN: + item->change_input("Down cursor"); + break; + case SDLK_LEFT: + item->change_input("Left cursor"); + break; + case SDLK_RIGHT: + item->change_input("Right cursor"); + break; + case SDLK_RETURN: + item->change_input("Return"); + break; + case SDLK_SPACE: + item->change_input("Space"); + break; + case SDLK_RSHIFT: + item->change_input("Right Shift"); + break; + case SDLK_LSHIFT: + item->change_input("Left Shift"); + break; + case SDLK_RCTRL: + item->change_input("Right Control"); + break; + case SDLK_LCTRL: + item->change_input("Left Control"); + break; + case SDLK_RALT: + item->change_input("Right Alt"); + break; + case SDLK_LALT: + item->change_input("Left Alt"); + break; + default: + { + char tmp[64]; + snprintf(tmp, 64, "%d", *item->int_p); + item->change_input(tmp); + } + break; } - break; } } @@ -481,8 +492,8 @@ menuaction = MENU_ACTION_NONE; - if (active_item >= int(item.size())) - active_item = int(item.size()) - 1; + //if (active_item >= int(item.size())) + // active_item = int(item.size()) - 1; } int @@ -745,7 +756,7 @@ /* An International Character. */ } - if(item[active_item].kind == MN_CONTROLFIELD) + if(item[active_item].kind == MN_CONTROLFIELD && this == options_keys_menu) { if(key == SDLK_ESCAPE) { @@ -813,6 +824,11 @@ } break; case SDL_JOYBUTTONDOWN: + if (item[active_item].kind == MN_CONTROLFIELD && this == options_joystick_menu) + { + *item[active_item].int_p = key; + menuaction = MENU_ACTION_DOWN; + } menuaction = MENU_ACTION_HIT; break; case SDL_MOUSEBUTTONDOWN: Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- setup.cpp 13 May 2004 23:16:46 -0000 1.80 +++ setup.cpp 14 May 2004 02:29:15 -0000 1.81 @@ -412,8 +412,8 @@ options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS); options_menu->additem(MN_GOTO,"Keyboard Setup",0,options_keys_menu); - //if(use_joystick) - // options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu); + if(use_joystick) + options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu); options_menu->additem(MN_HL,"",0,0); options_menu->additem(MN_BACK,"Back",0,0); @@ -432,12 +432,12 @@ { options_joystick_menu->additem(MN_LABEL,"Joystick Setup",0,0); options_joystick_menu->additem(MN_HL,"",0,0); - options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, 0,&joystick_keymap.x_axis); - options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, 0,&joystick_keymap.y_axis); + //options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, 0,&joystick_keymap.x_axis); + //options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, 0,&joystick_keymap.y_axis); options_joystick_menu->additem(MN_CONTROLFIELD,"A button", 0,0, 0,&joystick_keymap.a_button); options_joystick_menu->additem(MN_CONTROLFIELD,"B button", 0,0, 0,&joystick_keymap.b_button); - options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, 0,&joystick_keymap.start_button); - options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone); + //options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, 0,&joystick_keymap.start_button); + //options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone); options_joystick_menu->additem(MN_HL,"",0,0); options_joystick_menu->additem(MN_BACK,"Back",0,0); } |
|
From: Ryan F. <sik...@us...> - 2004-05-13 23:20:54
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8272 Modified Files: Makefile.am Log Message: - oops. Fixed filename extension Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile.am 13 May 2004 23:16:45 -0000 1.12 +++ Makefile.am 13 May 2004 23:20:45 -0000 1.13 @@ -1,5 +1,5 @@ iconsdir=$(datadir)/pixmaps -icons_DATA = images/supertux.xpm +icons_DATA = images/supertux.png desktopdir = $(datadir)/applications desktop_DATA = supertux.desktop |
|
From: Ryan F. <sik...@us...> - 2004-05-13 23:16:55
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7323/data/images Added Files: supertux.png supertux.xpm Removed Files: icon.xpm Log Message: - added freedesktop.org .desktop file from Mike Hearn - added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved) - added TODO item --- icon.xpm DELETED --- --- NEW FILE: supertux.xpm --- /* XPM */ static char * icon_xpm[] = { "32 32 462 2", " c None", ". c #5AA7EF", "+ c #66B4FC", "@ c #5CA9EF", "# c #5AA6EF", "$ c #5EB0FC", "% c #70B8FE", "& c #66ADF0", "* c #62ABEF", "= c #5EA9EF", "- c #5AA8EF", "; c #79BEFE", "> c #6EB2F1", ", c #6BB0F0", "' c #67AEF0", ") c #5CA7EF", "! c #82C2FF", "~ c #78B8F2", "{ c #73B5F2", "] c #70B3F3", "^ c #6CB2F2", "/ c #68B0F3", "( c #64ACF1", "_ c #5FAAF0", ": c #5CA8F0", "< c #8BC7FF", "[ c #81BCF3", "} c #7EBDF7", "| c #7ABAF6", "1 c #75B5F2", "2 c #6FB2EF", "3 c #6AADED", "4 c #69B0F4", "5 c #68B3F8", "6 c #62AEF5", "7 c #5CA9F1", "8 c #5FAEFC", "9 c #94CDFF", "0 c #8AC2F6", "a c #85C2F9", "b c #77AEE1", "c c #688DB1", "d c #5B7186", "e c #485663", "f c #283848", "g c #26415B", "h c #3F6B96", "i c #5CA0DE", "j c #63B1F8", "k c #5DAAF2", "l c #5EAFFC", "m c #A6DBFF", "n c #93C5F5", "o c #90C7FB", "p c #73A1CB", "q c #515E6A", "r c #575554", "s c #4E4B48", "t c #3E3B38", "u c #090602", "v c #020000", "w c #050100", "x c #0D1C2A", "y c #4E8AC0", "z c #63B1F9", "A c #63B9FF", "B c #AFE1FF", "C c #A2D4FF", "D c #99CCF9", "E c #8DBEEC", "F c #515E6D", "G c #534F4C", "H c #555452", "I c #3E3E3D", "J c #1C1C1D", "K c #242321", "L c #BEBAAA", "M c #D6D1BF", "N c #3B342E", "O c #213950", "P c #66B1F5", "Q c #62ADF2", "R c #63B2FC", "S c #64B9FF", "T c #B0DBFF", "U c #A3CEF6", "V c #9ECCF6", "W c #A3D4FF", "X c #6987A2", "Y c #434343", "Z c #575654", "` c #484848", " . c #333333", ".. c #070708", "+. c #969286", "@. c #FFFFF9", "#. c #9F9D9D", "$. c #393638", "%. c #040A10", "&. c #5CA1E9", "*. c #61AEFC", "=. c #5DAAF4", "-. c #5BA9F1", ";. c #5FAFFD", ">. c #B9E1FF", ",. c #ABD2F7", "'. c #A8D0F6", "). c #A5D1FA", "!. c #A1CFFA", "~. c #3B4753", "{. c #454340", "]. c #565555", "^. c #454545", "/. c #363636", "(. c #090A0B", "_. c #BEB6AA", ":. c #FFFFFE", "<. c #5E595B", "[. c #0F0E14", "}. c #3D3000", "|. c #ABBC85", "1. c #8FBCC0", "2. c #6AAEE9", "3. c #5AAAF9", "4. c #57A8F6", "5. c #5BAEFF", "6. c #C3E5FF", "7. c #B5D7F7", "8. c #B0D5F7", "9. c #ACD2F8", "0. c #AED7FF", "a. c #8CB2D3", "b. c #171C21", "c. c #474543", "d. c #545454", "e. c #3B3B3B", "f. c #0D0E0F", "g. c #716B61", "h. c #DFDFDD", "i. c #C8C3C4", "j. c #9D8C68", "k. c #DDB82A", "l. c #FFE220", "m. c #FFE218", "n. c #FADA2C", "o. c #D2CA61", "p. c #AEBF8A", "q. c #7AAFCA", "r. c #5CB0FF", "s. c #CBEAFF", "t. c #BDDBF8", "u. c #B9D9F8", "v. c #B3D7F9", "w. c #B3DAFF", "x. c #6F8AA4", "y. c #0F1012", "z. c #424241", "A. c #3F3F3F", "B. c #323232", "C. c #0E0E0F", "D. c #060503", "E. c #3F3E39", "F. c #736658", "G. c #CB9850", "H. c #E2AB3E", "I. c #F1BC36", "J. c #F4BF2B", "K. c #F0B124", "L. c #F0B420", "M. c #DEBB45", "N. c #91B4B0", "O. c #5AA8F4", "P. c #60AFFC", "Q. c #D5EEFF", "R. c #C6E0F9", "S. c #C2DEF8", "T. c #BDDCF8", "U. c #B9D9F9", "V. c #BBDEFF", "W. c #A6CAE9", "X. c #29343D", "Y. c #131211", "Z. c #3C3B3B", "`. c #2F2F2F", " + c #151515", ".+ c #090909", "++ c #000000", "@+ c #634222", "#+ c #84592E", "$+ c #A07448", "%+ c #9B9FA5", "&+ c #80A4CB", "*+ c #71ACE6", "=+ c #6BAFF0", "-+ c #63ADF6", ";+ c #61ABF3", ">+ c #5FAAEF", ",+ c #62B1FC", "'+ c #DEF3FF", ")+ c #CFE5FA", "!+ c #CAE2F9", "~+ c #C6E1F9", "{+ c #C2E0F8", "]+ c #C0DFFB", "^+ c #65798C", "/+ c #0D0E0D", "(+ c #323130", "_+ c #414141", ":+ c #2B2B2B", "<+ c #0D0D0D", "[+ c #1B1C1F", "}+ c #373534", "|+ c #474C4E", "1+ c #73B9FC", "2+ c #71B5F7", "3+ c #6FB2F4", "4+ c #6CB1F1", "5+ c #63ACF0", "6+ c #5EAAF1", "7+ c #DBEBFB", "8+ c #D7E9FA", "9+ c #D2E8FA", "0+ c #CEE5FA", "a+ c #CAE2FA", "b+ c #C8E2FA", "c+ c #CAE8FF", "d+ c #A0BAD1", "e+ c #1E2021", "f+ c #2F2E2C", "g+ c #3E3E3E", "h+ c #262626", "i+ c #050505", "j+ c #9C9C9D", "k+ c #DFDFDF", "l+ c #D0D0CF", "m+ c #93AFCB", "n+ c #76B3EC", "o+ c #75B7F2", "p+ c #74B5F1", "q+ c #70B3F1", "r+ c #6CB1F0", "s+ c #68AEF0", "t+ c #62ACEF", "u+ c #60AAEF", "v+ c #5DA9EF", "w+ c #DFEDFB", "x+ c #DDECFB", "y+ c #D7EAFA", "z+ c #D3E8FA", "A+ c #CDE6FB", "B+ c #C9E1FA", "C+ c #4D5862", "D+ c #262422", "E+ c #4A4A49", "F+ c #444444", "G+ c #303030", "H+ c #0C0C0C", "I+ c #0B0B0B", "J+ c #161616", "K+ c #222222", "L+ c #959595", "M+ c #FFFFFF", "N+ c #FFFEFA", "O+ c #9CC0E0", "P+ c #77B7F3", "Q+ c #79B7F2", "R+ c #75B5F1", "S+ c #71B3F1", "T+ c #6DB1F0", "U+ c #69AEF0", "V+ c #65ACEF", "W+ c #DEEFFB", "X+ c #D8EAFA", "Y+ c #D4E8FA", "Z+ c #D3EAFF", "`+ c #BAD1E6", " @ c #30363A", ".@ c #3C3B3A", "+@ c #505050", "@@ c #464646", "#@ c #191919", "$@ c #1D1D1D", "%@ c #A0A0A0", "&@ c #EFEFEF", "*@ c #FFFEFE", "=@ c #D7DBDD", "-@ c #73AEE7", ";@ c #7CBBF6", ">@ c #78B6F4", ",@ c #ECFBFF", "'@ c #DCECFB", ")@ c #D9EAFA", "!@ c #D9EFFF", "~@ c #ACBED2", "{@ c #262B31", "]@ c #424142", "^@ c #555555", "/@ c #353535", "(@ c #1B1B1B", "_@ c #606060", ":@ c #C2C2C2", "<@ c #FEFEFE", "[@ c #F3EFEF", "}@ c #79A8D9", "|@ c #88C2F4", "1@ c #7CBAF5", "2@ c #77B8FA", "3@ c #76B6F1", "4@ c #76BCFE", "5@ c #DFEFFB", "6@ c #DEEDFD", "7@ c #CDCD9F", "8@ c #4D4B30", "9@ c #373841", "0@ c #58585A", "a@ c #3D3D3D", "b@ c #202020", "c@ c #232323", "d@ c #2C2C2C", "e@ c #8C8C8C", "f@ c #EBEBEB", "g@ c #FDFBFF", "h@ c #B2BC9A", "i@ c #FFEC23", "j@ c #BBBA4D", "k@ c #7ABDFF", "l@ c #7AB8F1", "m@ c #DFEFFD", "n@ c #DCE6EC", "o@ c #D2BB53", "p@ c #C5AB1A", "q@ c #424137", "r@ c #4E4F59", "s@ c #3D3D3F", "t@ c #212121", "u@ c #0A0A0A", "v@ c #C5C5C5", "w@ c #F6F7FF", "x@ c #BDB348", "y@ c #E8CC00", "z@ c #A09532", "A@ c #7EC0FF", "B@ c #F0FEFF", "C@ c #C9C39A", "D@ c #CFAF25", "E@ c #D7BD22", "F@ c #646146", "G@ c #3B3C44", "H@ c #2C2D2E", "I@ c #030303", "J@ c #383838", "K@ c #9F9F9F", "L@ c #828282", "M@ c #929292", "N@ c #DEDEDE", "O@ c #F0F0F0", "P@ c #FCFCFC", "Q@ c #D3D5DE", "R@ c #96833B", "S@ c #998D48", "T@ c #8CB5D0", "U@ c #C6CED3", "V@ c #99894D", "W@ c #D2B51F", "X@ c #C2AF30", "Y@ c #54533F", "Z@ c #353640", "`@ c #2D2D2E", " # c #242424", ".# c #D7D7D7", "+# c #CCCCCC", "@# c #CFCFCF", "## c #D0D0D0", "$# c #D5D5D5", "%# c #E5E5E5", "&# c #EFEFF0", "*# c #BDBBB9", "=# c #877F4A", "-# c #8FAAB0", ";# c #1B1E23", "># c #302D28", ",# c #937D25", "'# c #D8BE23", ")# c #C6B921", "!# c #454542", "~# c #282937", "{# c #141419", "]# c #1E1E1F", "^# c #E1E1E1", "/# c #D2D2D2", "(# c #D9D9D9", "_# c #DEDDDE", ":# c #99947E", "<# c #97B0B0", "[# c #12141B", "}# c #463F2B", "|# c #987F21", "1# c #EBD319", "2# c #CEC222", "3# c #3E3C17", "4# c #131301", "5# c #4E4E4F", "6# c #969696", "7# c #B5B5B5", "8# c #C0C0C1", "9# c #B7B7B9", "0# c #B7B6B5", "a# c #9D9E92", "b# c #97AEB4", "c# c #000001", "d# c #141515", "e# c #726841", "f# c #A78F1F", "g# c #D7C20D", "h# c #D5CA04", "i# c #CEC402", "j# c #8C8402", "k# c #070400", "l# c #000002", "m# c #1F1F23", "n# c #36311E", "o# c #615F46", "p# c #92A7AE", "q# c #B3AD88", "r# c #7D6A1A", "s# c #87730D", "t# c #9C890D", "u# c #A69A2C", "v# c #8F9795", "w# c #8594A6", "x# c #7E8D99", "y# c #4D4319", "z# c #493B03", "A# c #645001", "B# c #A2AD9A", "C# c #EEFFFF", "D# c #EBFDFF", "E# c #E6FAFF", "F# c #E1F8FF", "G# c #DEF5FF", "H# c #DCF4FF", "I# c #DBF5FF", "J# c #D9F6FF", "K# c #D4F4FF", "L# c #CBEEFF", "M# c #E4F0FC", "N# c #E2EEFB", "O# c #D9EBFB", "P# c #D4E8FB", "Q# c #D1E6FA", "R# c #CDE4FA", "S# c #C8E2F9", "T# c #F0FDFF", "U# c #E1EFFB", "V# c #DEEDFB", "W# c #D5E9FB", "X# c #E6F0FC", "Y# c #E2EFFC", "Z# c #DEEDFC", "`# c #DAEBFB", " $ c #E5F1FC", ".$ c #E2F0FC", " . . ", " + @ # $ ", " % & * = - $ ", " ; > , ' * = ) $ ", " ! ~ { ] ^ / ( _ : $ ", " < [ } | 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 w x y z : A ", " B C D E F G H I J K L M N O P Q R S ", " T U V W X Y Z ` ...+.@.#.$.%.&.*.=.-.;. ", " >.,.'.).!.~.{.].^./.(._.:.<.[.}.|.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.7.v.w.x.y.z.A.B.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P. ", " Q.R.S.T.U.V.W.X.Y.Z.`. +.+++++++++@+#+$+%+&+*+=+-+;+>+,+ ", " '+)+!+~+{+]+6.^+/+(+_+:+<+++++++++++[+}+|+2 1+2+3+4+' 5+6+,+ ", "7+8+9+0+a+b+c+d+e+f+Y g+h+i+++++++++ +j+k+l+m+n+o+p+q+r+s+t+u+v+", "w+x+y+z+)+A+B+C+D+E+F+A.G+H+I+J+++K+L+M+M+M+N+O+P+Q+R+S+T+U+V+u+", " W+x+X+Y+Z+`+ @.@+@@@g+#@++++$@Y %@&@M+M+*@M+=@-@;@>@1 S+T+U+ ", " ,@'@)@!@~@{@]@^@@@/@(@I+++++_@:@&@M+M+<@M+[@}@|@1@2@3@4@ ", " 5@6@5@7@8@9@0@a@b@<+$@c@++++d@e@f@M+<@M+g@h@i@j@k@l@ ", " m@n@o@p@q@r@s@t@u@H+A.B.++++G+v@M+M+M+w@x@y@z@A@ ", " B@C@D@E@F@G@H@#@++I@J@K@L@M@N@O@P@<@Q@R@S@T@ ", " U@V@W@X@Y@Z@`@I+++ #.#+#@###$#%#&#*#=#-# ", " ;#>#,#'#)#!#~#{#++]#@#^#^#$#/#(#_#:#<# ", " ++[#}#|#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#w#x#y#z#A#B# ", " C#D#E#F#G#H#I#J#K#L# ", " M#N#x+O#P#Q#R#S# ", " T#U#V#O#W#H# ", " X#Y#Z#`# ", " $.$ "}; --- NEW FILE: supertux.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ryan F. <sik...@us...> - 2004-05-13 23:16:55
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7323/data Modified Files: Makefile.am Added Files: supertux.desktop Log Message: - added freedesktop.org .desktop file from Mike Hearn - added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved) - added TODO item Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/data/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 5 May 2004 11:08:16 -0000 1.11 +++ Makefile.am 13 May 2004 23:16:45 -0000 1.12 @@ -1,12 +1,16 @@ +iconsdir=$(datadir)/pixmaps +icons_DATA = images/supertux.xpm + +desktopdir = $(datadir)/applications +desktop_DATA = supertux.desktop + EXTRA_DIST = \ supertux.strf \ intro.txt \ extro.txt \ CREDITS \ $(wildcard sounds/*.wav) \ - images/icon.xpm \ $(wildcard images/*.png) \ - $(wildcard images/*.xpm) \ $(wildcard images/background/*.png) \ $(wildcard images/background/*.jpg) \ $(wildcard images/highscore/*.png) \ --- NEW FILE: supertux.desktop --- [Desktop Entry] Encoding=UTF-8 Name=SuperTux Platform Game Comment=A Super Mario inspired penguin platform game Exec=supertux Terminal=false Type=Application Categories=Application;Game;ArcadeGame Icon=supertux.png |
|
From: Ryan F. <sik...@us...> - 2004-05-13 23:16:55
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7323/src Modified Files: setup.cpp type.h Log Message: - added freedesktop.org .desktop file from Mike Hearn - added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved) - added TODO item Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- setup.cpp 10 May 2004 16:09:49 -0000 1.79 +++ setup.cpp 13 May 2004 23:16:46 -0000 1.80 @@ -895,13 +895,13 @@ /* Load icon into a surface: */ - icon = IMG_Load((datadir + "/images/icon.xpm").c_str()); + icon = IMG_Load((datadir + "/images/supertux.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.xpm", SDL_GetError()); + "%s\n\n", datadir.c_str(), "/images/supertux.xpm", SDL_GetError()); exit(1); } Index: type.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/type.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- type.h 7 May 2004 20:48:22 -0000 1.17 +++ type.h 13 May 2004 23:16:46 -0000 1.18 @@ -65,7 +65,8 @@ scroll_x = tmp; base = btmp; }; -void move_to(float x, float y) { base.x = x; base.y = y; }; + + void move_to(float x, float y) { base.x = x; base.y = y; }; base_type base; base_type old_base; |
|
From: Ryan F. <sik...@us...> - 2004-05-13 23:16:54
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7323 Modified Files: TODO Log Message: - added freedesktop.org .desktop file from Mike Hearn - added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved) - added TODO item Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- TODO 13 May 2004 08:35:39 -0000 1.45 +++ TODO 13 May 2004 23:16:45 -0000 1.46 @@ -11,6 +11,7 @@ H: high priority L: low priority +[H] AX_CHECK_GL produces an error during configure [M] Enemies can get stuck when colliding. [M] When aborting a level, lives and score should remain the same as they were before. Solution: make more dependency between the game engine and worldmap |
|
From: Ryan F. <sik...@us...> - 2004-05-13 21:02:26
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12777/data/levels/test Modified Files: level4.stl Log Message: - made mriceblock break blocks when kicked into them Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level4.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- level4.stl 25 Apr 2004 12:50:24 -0000 1.2 +++ level4.stl 13 May 2004 21:02:15 -0000 1.3 @@ -1,39 +1,76 @@ +;SuperTux level made using the built-in leveleditor (supertux-level (version 1) - (name "Gradients Test") + (name "Gradients Test / Iceblock Test") (author "Ricardo Cruz") - (width 50) - (height 15) - (background "") (music "Mortimers_chipdisko.mod") - (bkgd_red_top 200) - (bkgd_green_top 200) - (bkgd_blue_top 60) - (bkgd_red_bottom 220) - (bkgd_green_bottom 140) - (bkgd_blue_bottom 120) - (time 500) - (gravity 10) + (background "") (particle_system "") - (theme "antarctica") - (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 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - ) - ) - - -;; EOF ;; + (bkgd_speed 50) + (bkgd_red_top 200) + (bkgd_green_top 200) + (bkgd_blue_top 60) + (bkgd_red_bottom 220) + (bkgd_green_bottom 140) + (bkgd_blue_bottom 120) + (time 500) + (width 50) + (height 15) + (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 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 104 0 0 77 0 0 0 104 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 104 0 0 77 77 77 104 77 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 104 102 77 0 0 0 104 77 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 77 104 77 77 0 0 104 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 77 77 77 0 0 77 77 104 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 +) + (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 + (mriceblock (x 420) (y 227) (stay-on-platform #f)) + (mriceblock (x 568) (y 255) (stay-on-platform #f)) +) +) |
|
From: Ryan F. <sik...@us...> - 2004-05-13 21:02:23
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12777/src Modified Files: badguy.cpp Log Message: - made mriceblock break blocks when kicked into them Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- badguy.cpp 13 May 2004 12:44:28 -0000 1.72 +++ badguy.cpp 13 May 2004 21:02:14 -0000 1.73 @@ -32,6 +32,7 @@ #include "tile.h" #include "resources.h" #include "sprite_manager.h" +#include "gameloop.h" Sprite* img_mriceblock_flat_left; Sprite* img_mriceblock_flat_right; @@ -296,12 +297,18 @@ float halfheight = base.height / 2; if (dir == LEFT && issolid( base.x, (int) base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + World::current()->trybreakbrick(base.x, (int) base.y + halfheight, false); + dir = RIGHT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; } if (dir == RIGHT && issolid( base.x + base.width, (int)base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + World::current()->trybreakbrick(base.x + base.width, (int) base.y + halfheight, false); + dir = LEFT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; |
|
From: Ricardo C. <rm...@us...> - 2004-05-13 17:51:02
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1321/src Modified Files: leveleditor.cpp Log Message: Up was moving to down and down to up - fixed. Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- leveleditor.cpp 13 May 2004 09:52:59 -0000 1.114 +++ leveleditor.cpp 13 May 2004 17:50:51 -0000 1.115 @@ -1546,11 +1546,11 @@ switch(le_move_up_bt->get_state()) { case BUTTON_PRESSED: - pos_y += 192; + pos_y -= 192; show_minimap = true; break; case BUTTON_HOVER: - pos_y += 32; + pos_y -= 32; show_minimap = true; break; case BUTTON_CLICKED: @@ -1563,11 +1563,11 @@ switch(le_move_down_bt->get_state()) { case BUTTON_PRESSED: - pos_y -= 192; + pos_y += 192; show_minimap = true; break; case BUTTON_HOVER: - pos_y -= 32; + pos_y += 32; show_minimap = true; break; case BUTTON_CLICKED: |
|
From: Ricardo C. <rm...@us...> - 2004-05-13 12:47:45
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29351/data/levels/test Modified Files: level7.stl Log Message: Added more enemies to this fire level test. Index: level7.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level7.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- level7.stl 12 May 2004 18:35:35 -0000 1.2 +++ level7.stl 13 May 2004 12:47:34 -0000 1.3 @@ -46,7 +46,7 @@ 0 0 0 102 102 102 0 0 0 140 140 140 0 0 0 0 0 0 11 11 11 11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11 11 11 11 11 11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11 11 11 11 11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 115 116 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11 11 11 11 11 11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 117 118 0 0 0 0 0 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11 11 11 11 11 11 0 0 0 0 0 0 0 0 0 36 0 0 0 0 0 0 0 117 118 0 0 0 0 0 8 8 36 8 8 8 8 8 8 8 8 8 36 8 8 8 8 8 8 8 36 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 14 14 14 14 14 14 14 14 14 14 14 14 14 14 11 11 11 11 11 11 11 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 @@ -61,17 +61,21 @@ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 76 76 76 76 76 76 76 76 76 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 75 75 75 75 75 75 75 75 75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 (snowball (x 920) (y 352) (stay-on-platform #f)) - (snowball (x 1143) (y 337) (stay-on-platform #f)) - (snowball (x 1036) (y 328) (stay-on-platform #f)) + (mrbomb (x 1160) (y 339) (stay-on-platform #f)) + (jumpy (x 1235) (y 181) (stay-on-platform #f)) + (fish (x 1611) (y 262) (stay-on-platform #f)) + (fish (x 1726) (y 243) (stay-on-platform #f)) + (spiky (x 1398) (y 315) (stay-on-platform #f)) + (flyingsnowball (x 1490) (y 267) (stay-on-platform #f)) ) ) |
|
From: Ricardo C. <rm...@us...> - 2004-05-13 12:46:39
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29199/data Modified Files: supertux.strf Log Message: Added ice enemies entries. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- supertux.strf 12 May 2004 19:00:09 -0000 1.31 +++ supertux.strf 13 May 2004 12:46:29 -0000 1.32 @@ -413,6 +413,10 @@ (x-hotspot 7) (y-hotspot 8) (images "shared/jumpy-left-middle-0.png")) + (sprite (name "jumpy-left-iced") + (x-hotspot 7) + (y-hotspot 8) + (images "shared/jumpy-iced-left-up-0.png")) (sprite (name "mrbomb-left") (fps 10.0) @@ -431,6 +435,15 @@ "shared/mrbomb-right-1.png" "shared/mrbomb-right-2.png" "shared/mrbomb-right-3.png")) + (sprite (name "mrbomb-iced-left") + (x-hotspot 3) + (y-hotspot 12) + (images "shared/mrbomb-iced-left-0.png")) + + (sprite (name "mrbomb-iced-right") + (x-hotspot 7) + (y-hotspot 12) + (images "shared/mrbomb-iced-right-0.png")) (sprite (name "mrbomb-ticking-left") @@ -479,6 +492,16 @@ (y-hotspot 11) (images "shared/fish-down-0.png")) + (sprite (name "fish-iced") + (x-hotspot 2) + (y-hotspot 3) + (images "shared/fish-iced-left-0.png")) + + (sprite (name "fish-iced-down") + (x-hotspot 2) + (y-hotspot 11) + (images "shared/fish-iced-down-0.png")) + (sprite (name "bouncingsnowball-left") (x-hotspot 1) (y-hotspot 0) @@ -527,6 +550,14 @@ (images "shared/spiky-right-0.png" "shared/spiky-right-1.png" "shared/spiky-right-2.png")) + (sprite (name "spiky-iced-left") + (x-hotspot 6) + (y-hotspot 10) + (images "shared/spiky-iced-left-0.png")) + (sprite (name "spiky-iced-right") + (x-hotspot 6) + (y-hotspot 10) + (images "shared/spiky-iced-right-0.png")) (sprite (name "snowball-left") (x-hotspot 2) |
|
From: Ricardo C. <rm...@us...> - 2004-05-13 12:46:02
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29042/data/images/shared Added Files: fish-iced-down-0.png fish-iced-left-0.png jumpy-iced-left-up-0.png mrbomb-iced-left-0.png mrbomb-iced-right-0.png spiky-iced-left-0.png spiky-iced-right-0.png Log Message: Added ice versions of enemies. By Benjamin! --- NEW FILE: spiky-iced-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fish-iced-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spiky-iced-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fish-iced-down-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mrbomb-iced-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jumpy-iced-left-up-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mrbomb-iced-right-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-05-13 12:44:48
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28762/src Modified Files: badguy.cpp badguy.h player.cpp Log Message: Improved frozen behavior. Still isn't perfect, enemies don't fall right away you kill'em. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- player.cpp 12 May 2004 17:56:33 -0000 1.93 +++ player.cpp 13 May 2004 12:44:36 -0000 1.94 @@ -673,14 +673,12 @@ kill(SHRINK); } else - { - pbad_c->dying = DYING_FALLING; - play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); - World::current()->add_score(pbad_c->base.x, - pbad_c->base.y, - 25 * player_status.score_multiplier); - } + pbad_c->kill_me(20); } + else if (pbad_c->frozen_timer.check() && (pbad_c->kind == BAD_MRBOMB + || pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FISH + || pbad_c->kind == BAD_SPIKY)) + pbad_c->kill_me(20); else { if (!invincible_timer.started()) Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- badguy.h 12 May 2004 17:56:33 -0000 1.39 +++ badguy.h 13 May 2004 12:44:35 -0000 1.40 @@ -92,11 +92,12 @@ Direction dir; + Timer frozen_timer; // gets frozen when a ice shot hits it + private: bool removable; bool seen; int squishcount; /// number of times this enemy was squiched - Timer frozen_timer; // gets frozen when a ice shot hits it Timer timer; Physic physic; Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- badguy.cpp 12 May 2004 17:56:33 -0000 1.71 +++ badguy.cpp 13 May 2004 12:44:28 -0000 1.72 @@ -42,8 +42,11 @@ Sprite* img_jumpy_left_up; Sprite* img_jumpy_left_down; Sprite* img_jumpy_left_middle; +Sprite* img_jumpy_left_iced; Sprite* img_mrbomb_left; Sprite* img_mrbomb_right; +Sprite* img_mrbomb_iced_left; +Sprite* img_mrbomb_iced_right; Sprite* img_mrbomb_ticking_left; Sprite* img_mrbomb_ticking_right; Sprite* img_mrbomb_explosion; @@ -52,6 +55,8 @@ Sprite* img_flame; Sprite* img_fish; Sprite* img_fish_down; +Sprite* img_fish_iced; +Sprite* img_fish_iced_down; Sprite* img_bouncingsnowball_left; Sprite* img_bouncingsnowball_right; Sprite* img_bouncingsnowball_squished; @@ -59,6 +64,8 @@ Sprite* img_flyingsnowball_squished; Sprite* img_spiky_left; Sprite* img_spiky_right; +Sprite* img_spiky_iced_left; +Sprite* img_spiky_iced_right; Sprite* img_snowball_left; Sprite* img_snowball_right; Sprite* img_snowball_squished_left; @@ -377,6 +384,12 @@ void BadGuy::action_jumpy(double frame_ratio) { + if(frozen_timer.check()) + { + set_sprite(img_jumpy_left_iced, img_jumpy_left_iced); + return; + } + const float vy = physic.get_velocity_y(); // XXX: These tests *should* use location from ground, not velocity @@ -420,6 +433,12 @@ void BadGuy::action_mrbomb(double frame_ratio) { + if(frozen_timer.check()) + { + set_sprite(img_mrbomb_iced_left, img_mrbomb_iced_right); + return; + } + if (dying == DYING_NOT) check_horizontal_bump(true); @@ -523,6 +542,16 @@ void BadGuy::action_fish(double frame_ratio) { + if(frozen_timer.check()) + { + if(physic.get_velocity_y() < 0) + set_sprite(img_fish_iced_down, img_fish_iced_down); + else + set_sprite(img_fish_iced, img_fish_iced); + + return; + } + static const float JUMPV = 6; static const int WAITTIME = 1000; @@ -630,6 +659,12 @@ void BadGuy::action_spiky(double frame_ratio) { + if(frozen_timer.check()) + { + set_sprite(img_spiky_iced_left, img_spiky_iced_right); + return; + } + if (dying == DYING_NOT) check_horizontal_bump(); @@ -684,9 +719,6 @@ if(!seen) return; - if(frozen_timer.check()) - return; - switch (kind) { case BAD_MRICEBLOCK: @@ -910,7 +942,7 @@ void BadGuy::kill_me(int score) { - if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME) + if(kind == BAD_BOMB) return; dying = DYING_FALLING; @@ -963,9 +995,19 @@ pbullet_c = (Bullet*) p_c_object; if(pbullet_c->kind == FIRE_BULLET) + { + if(kind == BAD_MRICEBLOCK || kind == BAD_STALACTITE || + kind == BAD_FISH || kind == BAD_BOUNCINGSNOWBALL || + kind == BAD_FLYINGSNOWBALL || kind == BAD_FLYINGSNOWBALL) kill_me(10); + } else if(pbullet_c->kind == ICE_BULLET) - frozen_timer.start(FROZEN_TIME); + { + if(kind == BAD_FLAME) + kill_me(10); + else + frozen_timer.start(FROZEN_TIME); + } break; case CO_BADGUY: @@ -1100,8 +1142,11 @@ img_jumpy_left_up = sprite_manager->load("jumpy-left-up"); img_jumpy_left_down = sprite_manager->load("jumpy-left-down"); img_jumpy_left_middle = sprite_manager->load("jumpy-left-middle"); + img_jumpy_left_iced = sprite_manager->load("jumpy-left-iced"); img_mrbomb_left = sprite_manager->load("mrbomb-left"); img_mrbomb_right = sprite_manager->load("mrbomb-right"); + img_mrbomb_iced_left = sprite_manager->load("mrbomb-iced-left"); + img_mrbomb_iced_right = sprite_manager->load("mrbomb-iced-right"); img_mrbomb_ticking_left = sprite_manager->load("mrbomb-ticking-left"); img_mrbomb_ticking_right = sprite_manager->load("mrbomb-ticking-right"); img_mrbomb_explosion = sprite_manager->load("mrbomb-explosion"); @@ -1110,6 +1155,8 @@ img_flame = sprite_manager->load("flame"); img_fish = sprite_manager->load("fish"); img_fish_down = sprite_manager->load("fish-down"); + img_fish_iced = sprite_manager->load("fish-iced"); + img_fish_iced_down = sprite_manager->load("fish-iced-down"); img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left"); img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right"); img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished"); @@ -1117,6 +1164,8 @@ img_flyingsnowball_squished = sprite_manager->load("flyingsnowball-squished"); img_spiky_left = sprite_manager->load("spiky-left"); img_spiky_right = sprite_manager->load("spiky-right"); + img_spiky_iced_left = sprite_manager->load("spiky-iced-left"); + img_spiky_iced_right = sprite_manager->load("spiky-iced-right"); img_snowball_left = sprite_manager->load("snowball-left"); img_snowball_right = sprite_manager->load("snowball-right"); img_snowball_squished_left = sprite_manager->load("snowball-squished-left"); |
248 messages has been excluded from this view by a project administrator.
