super-tux-commit Mailing List for Super Tux (Page 100)
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: Ingo R. <gr...@us...> - 2004-04-09 02:34:05
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4873 Added Files: smalltux-jump-left.png smalltux-jump-right.png Log Message: - added new smalltux --- NEW FILE: smalltux-jump-left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-jump-right.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-09 02:32:23
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4687 Modified Files: gameloop.cpp menu.cpp player.cpp player.h Log Message: - added new smalltux Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- player.cpp 4 Apr 2004 00:32:10 -0000 1.19 +++ player.cpp 9 Apr 2004 02:19:09 -0000 1.20 @@ -20,8 +20,13 @@ #include "screen.h" texture_type tux_life; -texture_type tux_right[3]; -texture_type tux_left[3]; +std::vector<texture_type> tux_right; +std::vector<texture_type> tux_left; +texture_type smalltux_jump_left; +texture_type smalltux_jump_right; +texture_type smalltux_stand_left; +texture_type smalltux_stand_right; + texture_type bigtux_right[3]; texture_type bigtux_left[3]; texture_type bigtux_right_jump; @@ -597,13 +602,31 @@ if (!got_coffee) { - if (dir == RIGHT) + if (physic.get_velocity_y() > 0) { - texture_draw(&tux_right[frame_], base.x- scroll_x, base.y); + if (dir == RIGHT) + texture_draw(&smalltux_jump_right, base.x - scroll_x, base.y - 10); + else + texture_draw(&smalltux_jump_left, base.x - scroll_x, base.y - 10); } else { - texture_draw(&tux_left[frame_], base.x- scroll_x, base.y); + if (fabsf(physic.get_velocity_x()) < 1.0f) // standing + { + if (dir == RIGHT) + texture_draw(&smalltux_stand_right, base.x - scroll_x, base.y - 9); + else + texture_draw(&smalltux_stand_left, base.x - scroll_x, base.y - 9); + } + else // moving + { + if (dir == RIGHT) + texture_draw(&tux_right[(global_frame_counter/2) % tux_right.size()], + base.x - scroll_x, base.y - 9); + else + texture_draw(&tux_left[(global_frame_counter/2) % tux_left.size()], + base.x - scroll_x, base.y - 9); + } } } else Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- player.h 4 Apr 2004 00:32:10 -0000 1.20 +++ player.h 9 Apr 2004 02:19:09 -0000 1.21 @@ -37,6 +37,8 @@ #define SCORE_BRICK 5 #define SCORE_DISTRO 25 +#include <vector> + struct player_keymap_type { int jump; @@ -59,8 +61,12 @@ void player_input_init(player_input_type* pplayer_input); extern texture_type tux_life; -extern texture_type tux_right[3]; -extern texture_type tux_left[3]; +extern std::vector<texture_type> tux_right; +extern std::vector<texture_type> tux_left; +extern texture_type smalltux_jump_left; +extern texture_type smalltux_jump_right; +extern texture_type smalltux_stand_left; +extern texture_type smalltux_stand_right; extern texture_type bigtux_right[3]; extern texture_type bigtux_left[3]; extern texture_type bigtux_right_jump; Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- menu.cpp 9 Apr 2004 00:49:47 -0000 1.23 +++ menu.cpp 9 Apr 2004 02:19:09 -0000 1.24 @@ -31,7 +31,7 @@ #include "high_scores.h" /* (global) menu variables */ -MenuAction menuaction; +MenuAction menuaction = MENU_ACTION_NONE; bool show_menu; bool menu_change; texture_type checkbox, checkbox_checked, back, arrow_left, arrow_right; @@ -192,6 +192,7 @@ item[active_item].list->active_item = item[active_item].list->num_items-1; } break; + case MENU_ACTION_RIGHT: if(item[active_item].kind == MN_STRINGSELECT && item[active_item].list->num_items != 0) Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- gameloop.cpp 4 Apr 2004 00:32:10 -0000 1.41 +++ gameloop.cpp 9 Apr 2004 02:19:09 -0000 1.42 @@ -822,13 +822,31 @@ int i; /* Tuxes: */ - texture_load(&tux_right[0], datadir + "/images/shared/tux-right-0.png", USE_ALPHA); - texture_load(&tux_right[1], datadir + "/images/shared/tux-right-1.png", USE_ALPHA); - texture_load(&tux_right[2], datadir + "/images/shared/tux-right-2.png", USE_ALPHA); + texture_load(&smalltux_stand_left, datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA); + texture_load(&smalltux_stand_right, datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA); - texture_load(&tux_left[0], datadir + "/images/shared/tux-left-0.png", USE_ALPHA); - texture_load(&tux_left[1], datadir + "/images/shared/tux-left-1.png", USE_ALPHA); - texture_load(&tux_left[2], datadir + "/images/shared/tux-left-2.png", USE_ALPHA); + texture_load(&smalltux_jump_left, datadir + "/images/shared/smalltux-jump-left.png", USE_ALPHA); + texture_load(&smalltux_jump_right, datadir + "/images/shared/smalltux-jump-right.png", USE_ALPHA); + + tux_right.resize(8); + texture_load(&tux_right[0], datadir + "/images/shared/smalltux-right-1.png", USE_ALPHA); + texture_load(&tux_right[1], datadir + "/images/shared/smalltux-right-2.png", USE_ALPHA); + texture_load(&tux_right[2], datadir + "/images/shared/smalltux-right-3.png", USE_ALPHA); + texture_load(&tux_right[3], datadir + "/images/shared/smalltux-right-4.png", USE_ALPHA); + texture_load(&tux_right[4], datadir + "/images/shared/smalltux-right-5.png", USE_ALPHA); + texture_load(&tux_right[5], datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA); + texture_load(&tux_right[6], datadir + "/images/shared/smalltux-right-7.png", USE_ALPHA); + texture_load(&tux_right[7], datadir + "/images/shared/smalltux-right-8.png", USE_ALPHA); + + tux_left.resize(8); + texture_load(&tux_left[0], datadir + "/images/shared/smalltux-left-1.png", USE_ALPHA); + texture_load(&tux_left[1], datadir + "/images/shared/smalltux-left-2.png", USE_ALPHA); + texture_load(&tux_left[2], datadir + "/images/shared/smalltux-left-3.png", USE_ALPHA); + texture_load(&tux_left[3], datadir + "/images/shared/smalltux-left-4.png", USE_ALPHA); + texture_load(&tux_left[4], datadir + "/images/shared/smalltux-left-5.png", USE_ALPHA); + texture_load(&tux_left[5], datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA); + texture_load(&tux_left[6], datadir + "/images/shared/smalltux-left-7.png", USE_ALPHA); + texture_load(&tux_left[7], datadir + "/images/shared/smalltux-left-8.png", USE_ALPHA); texture_load(&firetux_right[0], datadir + "/images/shared/firetux-right-0.png", USE_ALPHA); texture_load(&firetux_right[1], datadir + "/images/shared/firetux-right-1.png", USE_ALPHA); |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv900 Added Files: smalltux-left-1.png smalltux-left-2.png smalltux-left-3.png smalltux-left-4.png smalltux-left-5.png smalltux-left-6.png smalltux-left-7.png smalltux-left-8.png smalltux-right-1.png smalltux-right-2.png smalltux-right-3.png smalltux-right-4.png smalltux-right-5.png smalltux-right-6.png smalltux-right-7.png smalltux-right-8.png Log Message: - added new smalltux (still needs cleanup) --- NEW FILE: smalltux-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-right-8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-left-6.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-09 01:28:45
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26492 Modified Files: globals.h title.cpp Log Message: - moved title-demo code into its own function Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- title.cpp 9 Apr 2004 00:54:53 -0000 1.18 +++ title.cpp 9 Apr 2004 01:15:31 -0000 1.19 @@ -46,6 +46,10 @@ static texture_type logo; static texture_type img_choose_subset; +static bool walking; +static Player titletux; +static timer_type random_timer; + static SDL_Event event; static SDLKey key; static int frame, i; @@ -61,6 +65,61 @@ texture_draw_bg(&bkg_title); } +void draw_demo() +{ + /* DEMO begin */ + /* update particle systems */ + std::vector<ParticleSystem*>::iterator p; + for(p = particle_systems.begin(); p != particle_systems.end(); ++p) + { + (*p)->simulate(frame_ratio); + } + + /* Draw particle systems (background) */ + for(p = particle_systems.begin(); p != particle_systems.end(); ++p) + { + (*p)->draw(scroll_x, 0, 0); + } + + /* Draw interactive tiles: */ + + for (int y = 0; y < 15; ++y) + { + for (int x = 0; x < 21; ++x) + { + drawshape(32*x - fmodf(scroll_x, 32), y * 32, + current_level.ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]); + } + } + + global_frame_counter++; + titletux.key_event(SDLK_RIGHT,DOWN); + + if(timer_check(&random_timer)) + { + if(walking) + titletux.key_event(SDLK_UP,UP); + else + titletux.key_event(SDLK_UP,DOWN); + } + else + { + timer_start(&random_timer, rand() % 3000 + 3000); + walking = !walking; + } + + if(current_level.width * 32 - 320 < titletux.base.x) + { + titletux.base.x = 160; + scroll_x = 0; + } + + titletux.action(); + titletux.draw(); + + /* DEMO end */ +} + /* --- TITLE SCREEN --- */ int title(void) @@ -69,11 +128,11 @@ string_list_type level_subsets; st_subset subset; level_subsets = dsubdirs("/levels", "info"); - timer_type random_timer; timer_init(&random_timer, true); - bool walking = true; - Player titletux; + + walking = true; titletux.init(); + st_pause_ticks_init(); level_load(¤t_level, (datadir + "/levels/misc/menu.stl").c_str()); @@ -149,59 +208,15 @@ /* Draw the background: */ draw_background(); - - /* DEMO begin */ - /* update particle systems */ - std::vector<ParticleSystem*>::iterator p; - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->simulate(frame_ratio); - } - - /* Draw particle systems (background) */ - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->draw(scroll_x, 0, 0); - } - - /* Draw interactive tiles: */ - - for (int y = 0; y < 15; ++y) - { - for (int x = 0; x < 21; ++x) - { - drawshape(32*x - fmodf(scroll_x, 32), y * 32, - current_level.ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]); - } - } - - global_frame_counter++; - titletux.key_event(SDLK_RIGHT,DOWN); - - - if(timer_check(&random_timer)) - { - if(walking) - titletux.key_event(SDLK_UP,UP); - else - titletux.key_event(SDLK_UP,DOWN); - } - else - { - timer_start(&random_timer, rand() % 3000 + 3000); - walking = !walking; - } - - if(current_level.width * 32 - 320 < titletux.base.x) - { - titletux.base.x = 160; - scroll_x = 0; - } - - titletux.action(); - titletux.draw(); - - /* DEMO end */ + draw_demo(); + texture_draw(&logo, 160, 30); + text_draw(&white_small_text, + " SuperTux " VERSION "\n" + "Copyright (c) 2003 SuperTux Devel Team\n" + "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" + "are welcome to redistribute it under certain conditions; see the file COPYING\n" + "for details.\n", + 0, 420, 0); /* Draw the high score: */ /* @@ -320,8 +335,6 @@ process_save_load_game_menu(false); } - texture_draw(&logo, 160, 30); - mouse_cursor->draw(); flipscreen(); Index: globals.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/globals.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- globals.h 29 Mar 2004 13:24:41 -0000 1.21 +++ globals.h 9 Apr 2004 01:15:31 -0000 1.22 @@ -23,7 +23,14 @@ extern std::string datadir; extern SDL_Surface * screen; -extern text_type black_text, gold_text, white_text, white_small_text, white_big_text, blue_text, red_text, yellow_nums; +extern text_type black_text; +extern text_type gold_text; +extern text_type white_text; +extern text_type white_small_text; +extern text_type white_big_text; +extern text_type blue_text; +extern text_type red_text; +extern text_type yellow_nums; extern MouseCursor * mouse_cursor; |
|
From: Ingo R. <gr...@us...> - 2004-04-09 01:08:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23678 Modified Files: title.cpp Log Message: - fixed credits screen a bit Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- title.cpp 9 Apr 2004 00:49:47 -0000 1.17 +++ title.cpp 9 Apr 2004 00:54:53 -0000 1.18 @@ -456,9 +456,6 @@ } } - - texture_draw_part(&bkg_title, 0, 0, 0, 0, 640, 130); - flipscreen(); if(60+screen->h+(n*18)+(d*18)-scroll < 0 && 20+60+screen->h+(n*18)+(d*18)-scroll < 0) |
|
From: Ingo R. <gr...@us...> - 2004-04-09 01:03:01
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22903 Modified Files: menu.cpp setup.cpp supertux.cpp title.cpp Log Message: - cleaned up title screen a bit Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- menu.cpp 29 Mar 2004 13:24:42 -0000 1.22 +++ menu.cpp 9 Apr 2004 00:49:47 -0000 1.23 @@ -370,10 +370,10 @@ /* Draw a horizontal line with a little 3d effect */ fillrect(x, y + 6, menu_width, 4, - 210,50,50,225); + 150,200,255,225); fillrect(x, y + 6, menu_width, 2, - 0,0,0,255); + 255,255,255,255); break; } case MN_LABEL: @@ -498,7 +498,8 @@ /* Draw a transparent background */ fillrect(pos_x - menu_width/2, pos_y - 24*num_items/2, - menu_width,menu_height,150,150,150,100); + menu_width,menu_height, + 150,180,200,100); for(int i = 0; i < num_items; ++i) { Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- title.cpp 4 Apr 2004 00:32:10 -0000 1.16 +++ title.cpp 9 Apr 2004 00:49:47 -0000 1.17 @@ -42,10 +42,13 @@ void loadshared(void); void activate_particle_systems(void); -static texture_type bkg_title, img_choose_subset, anim1, anim2; +static texture_type bkg_title; +static texture_type logo; +static texture_type img_choose_subset; + static SDL_Event event; static SDLKey key; -static int frame, pict, i; +static int frame, i; static unsigned int last_update_time; static unsigned int update_time; @@ -56,17 +59,6 @@ /* Draw the title background: */ texture_draw_bg(&bkg_title); - - /* Animate title screen: */ - - pict = (frame / 5) % 3; - - if (pict == 0) - texture_draw_part(&bkg_title, 560, 270, 560, 270, 80, 75); - else if (pict == 1) - texture_draw(&anim1, 560, 270); - else if (pict == 2) - texture_draw(&anim2, 560, 270); } /* --- TITLE SCREEN --- */ @@ -74,7 +66,6 @@ int title(void) { int done; - char str[80]; string_list_type level_subsets; st_subset subset; level_subsets = dsubdirs("/levels", "info"); @@ -100,9 +91,8 @@ /* Load images: */ - texture_load(&bkg_title,datadir + "/images/title/title.png", IGNORE_ALPHA); - texture_load(&anim1,datadir + "/images/title/title-anim2.png", IGNORE_ALPHA); - texture_load(&anim2,datadir + "/images/title/title-anim1.png", IGNORE_ALPHA); + texture_load(&bkg_title,datadir + "/images/title/background.jpg", IGNORE_ALPHA); + texture_load(&logo,datadir + "/images/title/logo.png", USE_ALPHA); texture_load(&img_choose_subset,datadir + "/images/status/choose-level-subset.png", USE_ALPHA); /* --- Main title loop: --- */ @@ -214,11 +204,12 @@ /* DEMO end */ /* Draw the high score: */ + /* sprintf(str, "High score: %d", hs_score); text_drawf(&gold_text, str, 0, -40, A_HMIDDLE, A_BOTTOM, 1); sprintf(str, "by %s", hs_name); text_drawf(&gold_text, str, 0, -20, A_HMIDDLE, A_BOTTOM, 1); - + */ /* Don't draw menu, if quit is true */ if(show_menu && !quit) @@ -329,6 +320,8 @@ process_save_load_game_menu(false); } + texture_draw(&logo, 160, 30); + mouse_cursor->draw(); flipscreen(); @@ -345,8 +338,7 @@ /* Free surfaces: */ texture_free(&bkg_title); - texture_free(&anim1); - texture_free(&anim2); + texture_free(&logo); string_list_free(&level_subsets); /* Return to main! */ Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- setup.cpp 28 Mar 2004 12:41:11 -0000 1.22 +++ setup.cpp 9 Apr 2004 00:49:47 -0000 1.23 @@ -359,6 +359,7 @@ game_menu = new Menu(); highscore_menu = new Menu(); + main_menu->set_pos(screen->w/2, 350); main_menu->additem(MN_LABEL,"Main Menu",0,0); main_menu->additem(MN_HL,"",0,0); main_menu->additem(MN_ACTION,"Start Game",0,0); @@ -366,8 +367,8 @@ main_menu->additem(MN_GOTO,"Options",0,options_menu); main_menu->additem(MN_ACTION,"Level editor",0,0); main_menu->additem(MN_ACTION,"Credits",0,0); - main_menu->additem(MN_HL,"",0,0); main_menu->additem(MN_ACTION,"Quit",0,0); + main_menu->additem(MN_HL,"",0,0); options_menu->additem(MN_LABEL,"Options",0,0); options_menu->additem(MN_HL,"",0,0); Index: supertux.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- supertux.cpp 24 Mar 2004 14:35:11 -0000 1.4 +++ supertux.cpp 9 Apr 2004 00:49:47 -0000 1.5 @@ -38,8 +38,6 @@ } else { - done = intro(); - done = 0; while (!done) |
|
From: Ingo R. <gr...@us...> - 2004-04-09 01:02:44
|
Update of /cvsroot/super-tux/supertux/data/images/title In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22847 Added Files: background.jpg logo.png Log Message: - added some new title menu gfx --- NEW FILE: logo.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: background.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-04 22:46:04
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv911/data/music Modified Files: fortress-fast.mod fortress.mod Log Message: according to the author: "there was one line that caused a dissonance... i fixed that" Index: fortress-fast.mod =================================================================== RCS file: /cvsroot/super-tux/supertux/data/music/fortress-fast.mod,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvszq83Uu and /tmp/cvs5JkUiT differ Index: fortress.mod =================================================================== RCS file: /cvsroot/super-tux/supertux/data/music/fortress.mod,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsX9gJQB and /tmp/cvsMMrej0 differ |
|
From: Ricardo C. <rm...@us...> - 2004-04-04 18:12:41
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14972/data/music Added Files: fortress-fast.mod fortress.mod Log Message: 1 more song --- NEW FILE: fortress-fast.mod --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fortress.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Tobias Gl??er <to...@us...> - 2004-04-04 00:44:36
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12921/src Modified Files: badguy.cpp badguy.h button.cpp button.h collision.cpp collision.h gameloop.cpp leveleditor.cpp physic.cpp physic.h player.cpp player.h scene.cpp tile.cpp tile.h timer.cpp title.cpp Log Message: - Physic C++ rewrite (Matze Braun) - Added new badguys (Matze Braun) - Fixed minor bugs (Matze Braun) Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- tile.h 3 Apr 2004 13:31:14 -0000 1.8 +++ tile.h 4 Apr 2004 00:32:10 -0000 1.9 @@ -40,6 +40,9 @@ /** FIXME: ? */ bool ice; + /** water */ + bool water; + /** Bonusbox, content is stored in \a data */ bool fullbox; Index: scene.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- scene.cpp 29 Mar 2004 13:24:42 -0000 1.10 +++ scene.cpp 4 Apr 2004 00:32:10 -0000 1.11 @@ -121,9 +121,10 @@ void add_bad_guy(float x, float y, BadGuyKind kind) { - BadGuy new_bad_guy; + bad_guys.push_back(BadGuy()); + BadGuy& new_bad_guy = bad_guys.back(); + new_bad_guy.init(x,y,kind); - bad_guys.push_back(new_bad_guy); } void add_upgrade(float x, float y, int dir, int kind) Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- player.h 3 Apr 2004 13:31:14 -0000 1.19 +++ player.h 4 Apr 2004 00:32:10 -0000 1.20 @@ -107,8 +107,7 @@ timer_type skidding_timer; timer_type safe_timer; timer_type frame_timer; - physic_type vphysic; - physic_type hphysic; + Physic physic; public: void init(); Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- leveleditor.cpp 3 Apr 2004 13:31:14 -0000 1.27 +++ leveleditor.cpp 4 Apr 2004 00:32:10 -0000 1.28 @@ -861,20 +861,6 @@ } else if(event.button.button == SDL_BUTTON_RIGHT) { - switch(active_tm) - { - case TM_BG: - active_tm = TM_IA; - break; - case TM_IA: - active_tm = TM_FG; - break; - case TM_FG: - active_tm = TM_BG; - break; - default: - break; - } le_mouse_pressed[RIGHT] = true; } break; @@ -1066,7 +1052,7 @@ } else if(le_move_left_bt->get_state() == BUTTON_HOVER) { - pos_x -= 96; + pos_x -= 64; } if(le_move_right_bt->get_state() == BUTTON_PRESSED) @@ -1075,7 +1061,7 @@ } else if(le_move_right_bt->get_state() == BUTTON_HOVER) { - pos_x += 96; + pos_x += 64; } } @@ -1247,7 +1233,7 @@ text_drawf(&blue_text, "- Help -", 0, 30, A_HMIDDLE, A_TOP, 2); for(i = 0; i < sizeof(text)/sizeof(char *); i++) - text_draw(&white_small_text, text[i], 5, 80+(i*12), 1); + text_draw(&white_text, text[i], 5, 80+(i*18), 1); text_drawf(&gold_text, "Press Any Key to Continue", 0, 440, A_HMIDDLE, A_TOP, 1); @@ -1257,16 +1243,7 @@ while(done == 0) { - while(SDL_PollEvent(&event)) - switch(event.type) - { - case SDL_MOUSEBUTTONDOWN: // mouse pressed - case SDL_KEYDOWN: // key pressed - done = 1; - break; - default: - break; - } + done = wait_for_event(event); SDL_Delay(50); } } Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- gameloop.cpp 3 Apr 2004 13:31:14 -0000 1.40 +++ gameloop.cpp 4 Apr 2004 00:32:10 -0000 1.41 @@ -469,9 +469,7 @@ int y,x; /* Draw screen: */ - if (tux.dying && (global_frame_counter % 4) == 0) - clearscreen(255, 255, 255); - else if(timer_check(&super_bkgd_timer)) + if(timer_check(&super_bkgd_timer)) texture_draw(&img_super_bkgd, 0, 0); else { @@ -611,6 +609,7 @@ } level_load_gfx(¤t_level); + loadshared(); activate_bad_guys(¤t_level); activate_particle_systems(); level_load_song(¤t_level); @@ -620,8 +619,6 @@ if(st_gl_mode != ST_GL_TEST) load_hs(); - loadshared(); - if(st_gl_mode == ST_GL_PLAY || st_gl_mode == ST_GL_LOAD_LEVEL_FILE) levelintro(); @@ -640,6 +637,7 @@ game_pause = 0; timer_init(&fps_timer,true); timer_init(&frame_timer,true); + last_update_time = st_get_ticks(); fps_cnt = 0; /* Clear screen: */ @@ -1177,65 +1175,6 @@ } } } - - /* - if (c == 'X' || c == 'x') - texture_draw(&img_brick[0], x, y); - else if (c == 'Y' || c == 'y') - texture_draw(&img_brick[1], x, y); - else if (c == 'A' || c =='B' || c == '!') - texture_draw(&img_box_full, x, y); - else if (c == 'a') - texture_draw(&img_box_empty, x, y); - else if (c >= 'C' && c <= 'F') - texture_draw(&img_cloud[0][c - 'C'], x, y); - else if (c >= 'c' && c <= 'f') - texture_draw(&img_cloud[1][c - 'c'], x, y); - else if (c >= 'G' && c <= 'J') - texture_draw(&img_bkgd_tile[0][c - 'G'], x, y); - else if (c >= 'g' && c <= 'j') - texture_draw(&img_bkgd_tile[1][c - 'g'], x, y); - else if (c == '#') - texture_draw(&img_solid[0], x, y); - else if (c == '[') - texture_draw(&img_solid[1], x, y); - else if (c == '=') - texture_draw(&img_solid[2], x, y); - else if (c == ']') - texture_draw(&img_solid[3], x, y); - else if (c == '$') - { - z = (global_frame_counter / 2) % 6; - - if (z < 4) - texture_draw(&img_distro[z], x, y); - else if (z == 4) - texture_draw(&img_distro[2], x, y); - else if (z == 5) - texture_draw(&img_distro[1], x, y); - } - else if (c == '^') - { - z = (global_frame_counter / 3) % 3; - - texture_draw(&img_waves[z], x, y); - } - else if (c == '*') - texture_draw(&img_poletop, x, y); - else if (c == '|') - { - texture_draw(&img_pole, x, y); - - } - else if (c == '\\') - { - z = (global_frame_counter / 3) % 2; - - texture_draw(&img_flag[z], x + 16, y); - } - else if (c == '&') - texture_draw(&img_water, x, y);*/ - } @@ -1657,8 +1596,6 @@ timer_fread(&tux.frame_timer,fi); timer_fread(&time_left,fi); fread(&ui,sizeof(int),1,fi); - tux.hphysic.start_time += st_get_ticks() - ui; - tux.vphysic.start_time += st_get_ticks() - ui; fclose(fi); } Index: button.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- button.cpp 3 Apr 2004 13:31:14 -0000 1.9 +++ button.cpp 4 Apr 2004 00:32:10 -0000 1.10 @@ -17,8 +17,12 @@ #include "globals.h" #include "button.h" +timer_type Button::popup_timer; + Button::Button(std::string icon_file, std::string ninfo, SDLKey nshortcut, int x, int y, int mw, int mh) { + timer_init(&popup_timer,false); + char filename[1024]; if(!icon_file.empty()) @@ -85,6 +89,10 @@ void Button::draw() { + if(state == BUTTON_HOVER) + if(!timer_check(&popup_timer)) + show_info = true; + fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200); fillrect(rect.x+1,rect.y+1,rect.w-2,rect.h-2,175,175,175,200); if(bkgd != NULL) @@ -152,7 +160,7 @@ mouse_cursor->set_state(MC_LINK); } } - else if(event.type != SDL_KEYDOWN && event.type != SDL_KEYUP) + else if((event.type != SDL_KEYDOWN && event.type != SDL_KEYUP) || event.type == SDL_MOUSEMOTION) { state = BUTTON_NONE; if(show_info) @@ -173,12 +181,14 @@ } else if(event.type == SDL_MOUSEMOTION) { - + timer_start(&popup_timer, 1500); + if(show_info) { show_info = false; } } + } int Button::get_state() @@ -214,7 +224,7 @@ for(std::vector<Button*>::iterator it = item.begin(); it != item.end(); ++it) { (*it)->event(event); - if((*it)->state != -1) + if((*it)->state != BUTTON_NONE) return (*it); } return NULL; @@ -236,6 +246,7 @@ void ButtonPanel::draw() { + if(hidden == false) { fillrect(rect.x,rect.y,rect.w,rect.h,100,100,100,200); Index: collision.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- collision.h 26 Mar 2004 23:53:31 -0000 1.5 +++ collision.h 4 Apr 2004 00:32:10 -0000 1.6 @@ -25,7 +25,7 @@ enum CollisionType { COLLISION_NORMAL, COLLISION_BUMP, - COLLISION_SQUICH + COLLISION_SQUISH }; bool rectcollision(base_type* one, base_type* two); Index: physic.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/physic.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- physic.h 23 Mar 2004 17:25:15 -0000 1.6 +++ physic.h 4 Apr 2004 00:32:10 -0000 1.7 @@ -13,37 +13,48 @@ #ifndef SUPERTUX_PHYSIC_H #define SUPERTUX_PHYSIC_H -#include "timer.h" +/** This is a very simplistic physics engine handling accelerated and constant + * movement along with gravity. + */ +class Physic +{ +public: + Physic(); + ~Physic(); -enum { - PH_VT, /* Vertical throw.*/ - PH_HA /* Horizontal acceleration. */ -}; + /** resets all velocities and accelerations to 0 */ + void reset(); -/* Physic type: */ + /** sets velocity to a fixed value */ + void set_velocity(float vx, float vy); -struct physic_type - { - int state; - float start_vy; - float start_vx; - float acceleration; - unsigned int start_time; + float get_velocity_x(); + float get_velocity_y(); + + /** sets acceleration applied to the object. (Note that gravity is + * eventually added to the vertical acceleration) + */ + void set_acceleration(float ax, float ay); + + float get_acceleration_x(); + float get_acceleration_y(); + + /** enables or disables handling of gravity */ + void enable_gravity(bool gravity_enabled); + + /** applies the physical simulation to given x and y coordinates */ + void apply(float &x, float &y); + +private: + /// horizontal and vertical acceleration + float ax, ay; + /// horizontal and vertical velocity + float vx, vy; + /// should we respect gravity in out calculations? + bool gravity_enabled; }; /* global variables. */ extern float gravity; -void physic_init(physic_type* pphysic); -int physic_get_state(physic_type* pphysic); -void physic_set_state(physic_type* pphysic, int nstate); -void physic_set_start_vy(physic_type* pphysic, float start_vy); -void physic_set_start_vx(physic_type* pphysic, float start_vx); -void physic_set_acceleration(physic_type* pphysic, float acceleration); -int physic_is_set(physic_type* pphysic); -float physic_get_velocity(physic_type* pphysic); -float physic_get_max_distance(physic_type* pphysic); -unsigned int physic_get_max_time(physic_type* pphysic); -unsigned int physic_get_time_gone(physic_type* pphysic); - #endif /*SUPERTUX_PHYSIC_H*/ Index: physic.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/physic.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- physic.cpp 22 Mar 2004 15:47:31 -0000 1.3 +++ physic.cpp 4 Apr 2004 00:32:10 -0000 1.4 @@ -9,75 +9,86 @@ // Copyright: See COPYING file that comes with this distribution // // - #include <stdio.h> + +#include "scene.h" #include "defines.h" #include "physic.h" +#include "timer.h" float gravity; -void physic_init(physic_type* pphysic) +Physic::Physic() + : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true) { - pphysic->state = -1; - pphysic->start_time = 0; - pphysic->start_vy = 0; } -int physic_get_state(physic_type* pphysic) +Physic::~Physic() { - return pphysic->state; } -void physic_set_state(physic_type* pphysic, int nstate) +void +Physic::reset() { - pphysic->state = nstate; - pphysic->start_time = st_get_ticks(); + ax = ay = vx = vy = 0; + gravity_enabled = true; } -void physic_set_start_vy(physic_type* pphysic, float start_vy) +void +Physic::set_velocity(float nvx, float nvy) { - pphysic->start_vy = start_vy; + vx = nvx; + vy = -nvy; } -void physic_set_start_vx(physic_type* pphysic, float start_vx) +float +Physic::get_velocity_x() { - pphysic->start_vx = start_vx; + return vx; } -void physic_set_acceleration(physic_type* pphysic, float acceleration) +float +Physic::get_velocity_y() { - pphysic->acceleration = acceleration; + return -vy; } - -int physic_is_set(physic_type* pphysic) +void +Physic::set_acceleration(float nax, float nay) { - return (pphysic->state != -1); + ax = nax; + ay = -nay; } -float physic_get_velocity(physic_type* pphysic) +float +Physic::get_acceleration_x() { - if(pphysic->state == PH_VT) - return - (pphysic->start_vy - gravity* ((float)(st_get_ticks() - pphysic->start_time))/1000.); - else if(pphysic->state == PH_HA) - return - (pphysic->start_vx - pphysic->acceleration * ((float)(st_get_ticks() - pphysic->start_time))/1000.); - else - return 0; + return ax; } -float physic_get_max_distance(physic_type* pphysic) +float +Physic::get_acceleration_y() { - return (pphysic->start_vy * pphysic->start_vy / 2.*gravity); + return -ay; } -unsigned int physic_get_max_time(physic_type* pphysic) +void +Physic::enable_gravity(bool enable_gravity) { - return (unsigned int)((pphysic->start_vy / gravity) * 1000); + gravity_enabled = enable_gravity; } -unsigned int physic_get_time_gone(physic_type* pphysic) +void +Physic::apply(float &x, float &y) { - return st_get_ticks() - pphysic->start_time; -} - + float grav; + if(gravity_enabled) + grav = gravity / 100.0; + else + grav = 0; + x += vx * frame_ratio + ax * frame_ratio * frame_ratio; + y += vy * frame_ratio + (ay + grav) * frame_ratio * frame_ratio; + vx += ax * frame_ratio; + vy += (ay + grav) * frame_ratio; +} Index: collision.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/collision.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- collision.cpp 28 Mar 2004 21:42:04 -0000 1.9 +++ collision.cpp 4 Apr 2004 00:32:10 -0000 1.10 @@ -244,6 +244,8 @@ } } + if(tux.dying != DYING_NOT) return; + // CO_BADGUY & CO_PLAYER check for(unsigned int i = 0; i < bad_guys.size(); ++i) { @@ -257,7 +259,7 @@ if (tux.previous_base.y < tux.base.y && tux.previous_base.y + tux.previous_base.height < bad_guys[i].base.y + bad_guys[i].base.height/2) { - bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_SQUICH); + bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_SQUISH); } else { Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- badguy.h 29 Mar 2004 13:24:41 -0000 1.19 +++ badguy.h 4 Apr 2004 00:32:10 -0000 1.20 @@ -39,7 +39,12 @@ BOMB_EXPLODE, STALACTITE_SHAKING, - STALACTITE_FALL + STALACTITE_FALL, + + FISH_WAIT, + + FLY_UP, + FLY_DOWN }; /* Bad guy kinds: */ @@ -50,7 +55,12 @@ BAD_MRBOMB, BAD_BOMB, BAD_STALACTITE, - BAD_FLAME + BAD_FLAME, + BAD_FISH, + BAD_BOUNCINGSNOWBALL, + BAD_FLYINGSNOWBALL, + BAD_SPIKY, + BAD_SNOWBALL }; BadGuyKind badguykind_from_string(const std::string& str); @@ -76,18 +86,26 @@ /* Badguy type: */ class BadGuy { - public: - int mode; +public: DyingType dying; + base_type base; BadGuyKind kind; - bool seen; + int mode; int dir; - base_type base; + +private: + bool seen; base_type old_base; timer_type timer; - physic_type physic; + Physic physic; - public: + texture_type* texture_left; + texture_type* texture_right; + int animation_offset; + size_t animation_length; + float animation_speed; + +public: void init(float x, float y, BadGuyKind kind); void action(); @@ -95,36 +113,49 @@ void collision(void* p_c_object, int c_object, CollisionType type = COLLISION_NORMAL); - - private: - void fall(bool dojump=false); - void remove_me(); + /** this functions tries to kill the badguy and lets him fall off the + * screen. Some badguys like the flame might ignore this. + */ + void kill_me(); + +private: void action_bsod(); - void draw_bsod(); - void action_laptop(); - void draw_laptop(); - void action_money(); - void draw_money(); - void action_bomb(); - void draw_bomb(); - void action_mrbomb(); - void draw_mrbomb(); - void action_stalactite(); - void draw_stalactite(); - void action_flame(); - void draw_flame(); + void action_fish(); + void action_bouncingsnowball(); + void action_flyingsnowball(); + void action_spiky(); + void action_snowball(); + /** handles falling down. disables gravity calculation when we're back on + * ground */ + void fall(); + /** remove ourself from the list of badguys. WARNING! This function will + * invalidate all members. So don't do anything else with member after calling + * this. + */ + void remove_me(); + /** let the player jump a bit (used when you hit a badguy) */ void make_player_jump(Player* player); + /** check if we're running left or right in a wall and eventually change + * direction + */ void check_horizontal_bump(bool checkcliff = false); + /** called when we're bumped from below with a block */ void bump(); - void squich(Player* player); + /** called when a player jumped on the badguy from above */ + void squish(Player* player); + /** squish ourself, give player score and set dying to DYING_SQICHED */ + void squish_me(Player* player); + /** set image of the badguy */ + void set_texture(texture_type* left, texture_type* right, + int animlength = 1, float animspeed = 1); }; #endif /*SUPERTUX_BADGUY_H*/ Index: timer.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/timer.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- timer.cpp 24 Mar 2004 21:43:56 -0000 1.5 +++ timer.cpp 4 Apr 2004 00:32:10 -0000 1.6 @@ -19,7 +19,7 @@ unsigned int st_get_ticks(void) { if(st_pause_count != 0) - return SDL_GetTicks() - st_pause_ticks - SDL_GetTicks() + st_pause_count; + return /*SDL_GetTicks()*/ - st_pause_ticks /*- SDL_GetTicks()*/ + st_pause_count; else return SDL_GetTicks() - st_pause_ticks; } @@ -37,6 +37,9 @@ void st_pause_ticks_stop(void) { +if(st_pause_count == 0) +return; + st_pause_ticks += SDL_GetTicks() - st_pause_count; st_pause_count = 0; } Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- player.cpp 3 Apr 2004 13:31:14 -0000 1.18 +++ player.cpp 4 Apr 2004 00:32:10 -0000 1.19 @@ -9,6 +9,7 @@ // Copyright: See COPYING file that comes with this distribution // // +#include <math.h> #include "gameloop.h" #include "globals.h" @@ -66,7 +67,6 @@ // FIXME: Make the start position configurable via the levelfile base.x = 100; base.y = 240; - base.xm = 0; base.ym = 0; old_base = base; @@ -94,8 +94,7 @@ timer_init(&skidding_timer,true); timer_init(&safe_timer,true); timer_init(&frame_timer,true); - physic_init(&hphysic); - physic_init(&vphysic); + physic.reset(); } int @@ -138,6 +137,9 @@ base.xm = 0; base.ym = 0; old_base = base; + previous_base = base; + + dying = DYING_NOT; player_input_init(&input); @@ -145,8 +147,7 @@ timer_init(&skidding_timer,true); timer_init(&safe_timer,true); timer_init(&frame_timer,true); - physic_init(&hphysic); - physic_init(&vphysic); + physic.reset(); } void @@ -160,12 +161,9 @@ handle_input(); /* Move tux: */ - previous_base = base; - base.x += base.xm * frame_ratio; - base.y += base.ym * frame_ratio; - + physic.apply(base.x, base.y); if (!dying) { @@ -178,36 +176,25 @@ if( !on_ground()) { + physic.enable_gravity(true); if(under_solid()) { - physic_set_state(&vphysic,PH_VT); - physic_set_start_vy(&vphysic,0); + // fall down + physic.set_velocity(physic.get_velocity_x(), 0); jumped_in_solid = true; } - else - { - if(!physic_is_set(&vphysic)) - { - physic_set_state(&vphysic,PH_VT); - physic_set_start_vy(&vphysic,0); - } - } - base.ym = physic_get_velocity(&vphysic); } else { /* Land: */ - - if (base.ym > 0) + if (physic.get_velocity_y() < 0) { base.y = (int)(((int)base.y / 32) * 32); - base.ym = 0; + physic.set_velocity(physic.get_velocity_x(), 0); } - physic_init(&vphysic); - + physic.enable_gravity(false); /* Reset score multiplier (for multi-hits): */ - score_multiplier = 1; } @@ -253,8 +240,6 @@ } } - else - base.ym = physic_get_velocity(&vphysic); timer_check(&safe_timer); @@ -292,7 +277,7 @@ /* Handle skidding: */ - timer_check(&skidding_timer); + // timer_check(&skidding_timer); // disabled /* End of level? */ @@ -322,80 +307,105 @@ void Player::handle_horizontal_input(int newdir) { - if ((newdir ? (base.xm < -SKID_XM) : (base.xm > SKID_XM)) && !timer_started(&skidding_timer) && - dir == !newdir && on_ground()) + if(duck) + return; + + float vx = physic.get_velocity_x(); + float vy = physic.get_velocity_y(); + dir = newdir; + + // skid if we're too fast + if(dir != newdir && on_ground() && fabs(physic.get_velocity_x()) > SKID_XM + && !timer_started(&skidding_timer)) { timer_start(&skidding_timer, SKID_TIME); - play_sound(sounds[SND_SKID], SOUND_CENTER_SPEAKER); - + return; } - dir = newdir; - - if ((newdir ? (base.xm < 0) : (base.xm > 0)) && !isice(base.x, base.y + base.height) && + if ((newdir ? (vx < 0) : (vx > 0)) && !isice(base.x, base.y + base.height) && !timer_started(&skidding_timer)) { - base.xm = 0; + //vx = 0; } - if (!duck) + /* Facing the direction we're jumping? Go full-speed: */ + if (input.fire == UP) { - if (dir == newdir) - { - /* Facing the direction we're jumping? Go full-speed: */ - - if (input.fire == UP) - { - base.xm = base.xm + ( newdir ? WALK_SPEED : -WALK_SPEED) * frame_ratio; - - if(newdir) - { - if (base.xm > MAX_WALK_XM) - base.xm = MAX_WALK_XM; - } - else - { - if (base.xm < -MAX_WALK_XM) - base.xm = -MAX_WALK_XM; - } - } - else if ( input.fire == DOWN) - { - base.xm = base.xm + ( newdir ? RUN_SPEED : -RUN_SPEED) * frame_ratio; + if(vx >= MAX_WALK_XM) { + vx = MAX_WALK_XM; + physic.set_acceleration(0, 0); // enough speedup + } else if(vx <= -MAX_WALK_XM) { + vx = -MAX_WALK_XM; + physic.set_acceleration(0, 0); + } + physic.set_acceleration(newdir ? 0.02 : -0.02, 0); + if(fabs(vx) < 1) // set some basic run speed + vx = newdir ? 1 : -1; +#if 0 + vx += ( newdir ? WALK_SPEED : -WALK_SPEED) * frame_ratio; - if(newdir) - { - if (base.xm > MAX_RUN_XM) - base.xm = MAX_RUN_XM; - } - else - { - if (base.xm < -MAX_RUN_XM) - base.xm = -MAX_RUN_XM; - } - } - else - { - /* Not facing the direction we're jumping? - Go half-speed: */ + if(newdir) + { + if (vx > MAX_WALK_XM) + vx = MAX_WALK_XM; + } + else + { + if (vx < -MAX_WALK_XM) + vx = -MAX_WALK_XM; + } +#endif + } + else if ( input.fire == DOWN) + { + if(vx >= MAX_RUN_XM) { + vx = MAX_RUN_XM; + physic.set_acceleration(0, 0); // enough speedup + } else if(vx <= -MAX_RUN_XM) { + vx = -MAX_RUN_XM; + physic.set_acceleration(0, 0); + } + physic.set_acceleration(newdir ? 0.03 : -0.03, 0); + if(fabs(vx) < 1) // set some basic run speed + vx = newdir ? 1 : -1; - base.xm = base.xm + ( newdir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio; +#if 0 + vx = vx + ( newdir ? RUN_SPEED : -RUN_SPEED) * frame_ratio; - if(newdir) - { - if (base.xm > MAX_WALK_XM / 2) - base.xm = MAX_WALK_XM / 2; - } - else - { - if (base.xm < -MAX_WALK_XM / 2) - base.xm = -MAX_WALK_XM / 2; - } - } + if(newdir) + { + if (vx > MAX_RUN_XM) + vx = MAX_RUN_XM; + } + else + { + if (vx < -MAX_RUN_XM) + vx = -MAX_RUN_XM; } +#endif + } + else + { +#if 0 + /* Not facing the direction we're jumping? + Go half-speed: */ + vx = vx + ( newdir ? (WALK_SPEED / 2) : -(WALK_SPEED / 2)) * frame_ratio; + if(newdir) + { + if (vx > MAX_WALK_XM / 2) + vx = MAX_WALK_XM / 2; + } + else + { + if (vx < -MAX_WALK_XM / 2) + vx = -MAX_WALK_XM / 2; + } +#endif } + + physic.set_velocity(vx, vy); } void @@ -405,45 +415,22 @@ { if (on_ground()) { - if(!physic_is_set(&vphysic)) - { - physic_set_state(&vphysic,PH_VT); - physic_set_start_vy(&vphysic,5.5); - --base.y; - jumping = true; - if (size == SMALL) - play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER); - else - play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER); - } + // jump + physic.set_velocity(physic.get_velocity_x(), 5.5); + --base.y; + jumping = true; + if (size == SMALL) + play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER); + else + play_sound(sounds[SND_BIGJUMP], SOUND_CENTER_SPEAKER); } } else if(input.up == UP && jumping) { - if (on_ground()) - { - physic_init(&vphysic); - jumping = false; - } - else - { - jumping = false; - if(physic_is_set(&vphysic)) - { - if(physic_get_velocity(&vphysic) < 0.) - { - physic_set_state(&vphysic,PH_VT); - physic_set_start_vy(&vphysic,0); - } - } - else - { - if(!physic_is_set(&vphysic)) - { - physic_set_state(&vphysic,PH_VT); - } - } - } + jumping = false; + if(physic.get_velocity_y() > 0) { + physic.set_velocity(physic.get_velocity_x(), 0); + } } } @@ -463,18 +450,15 @@ } else { - if(base.xm > 0) - { - base.xm = (int)(base.xm - frame_ratio); - if(base.xm < 0) - base.xm = 0; - } - else if(base.xm < 0) - { - base.xm = (int)(base.xm + frame_ratio); - if(base.xm > 0) - base.xm = 0; - } + float vx = physic.get_velocity_x(); + if(fabs(vx) < 0.01) { + physic.set_velocity(0, physic.get_velocity_y()); + physic.set_acceleration(0, 0); + } else if(vx < 0) { + physic.set_acceleration(0.1, 0); + } else { + physic.set_acceleration(-0.1, 0); + } } } @@ -489,7 +473,7 @@ if (input.fire == DOWN && input.old_fire == UP && got_coffee) { - add_bullet(base.x, base.y, base.xm, dir); + add_bullet(base.x, base.y, physic.get_velocity_x(), dir); } @@ -659,7 +643,7 @@ { if (!timer_started(&skidding_timer)) { - if (!jumping || base.ym > 0) + if (!jumping || physic.get_velocity_y() > 0) { if (dir == RIGHT) { @@ -720,7 +704,7 @@ { if (!timer_started(&skidding_timer)) { - if (!jumping || base.ym > 0) + if (!jumping || physic.get_velocity_y() > 0) { if (dir == RIGHT) { @@ -775,6 +759,7 @@ } } } + if(dying) text_drawf(&gold_text,"Penguins can fly !:",0,0,A_HMIDDLE,A_VMIDDLE,1); } @@ -794,60 +779,34 @@ !timer_started(&safe_timer) && pbad_c->mode != HELD) { - if (pbad_c->mode == FLAT && input.fire != DOWN) - { - /* Kick: */ - - pbad_c->mode = KICK; - play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER); - - if (base.x < pbad_c->base.x + (pbad_c->base.width/2)) - { - pbad_c->dir = RIGHT; - pbad_c->base.x = pbad_c->base.x + 16; - } - else - { - pbad_c->dir = LEFT; - pbad_c->base.x = pbad_c->base.x - 32; - } - - timer_start(&pbad_c->timer,5000); - } - else if (pbad_c->mode == FLAT && input.fire == DOWN) + if (pbad_c->mode == FLAT && input.fire == DOWN) { pbad_c->mode = HELD; pbad_c->base.y-=8; } else if (pbad_c->mode == KICK) { - if (base.y < pbad_c->base.y - 16 && - timer_started(&pbad_c->timer)) + if (base.y < pbad_c->base.y - 16) { /* Step on (stop being kicked) */ pbad_c->mode = FLAT; play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER); - timer_start(&pbad_c->timer, 10000); } else { /* Hurt if you get hit by kicked laptop: */ - - if (timer_started(&pbad_c->timer)) + if (!timer_started(&invincible_timer)) { - if (!timer_started(&invincible_timer)) - { - kill(SHRINK); - } - else - { - pbad_c->dying = DYING_FALLING; - play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); - add_score(pbad_c->base.x - scroll_x, - pbad_c->base.y, - 25 * score_multiplier); - } + kill(SHRINK); + } + else + { + pbad_c->dying = DYING_FALLING; + play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); + add_score(pbad_c->base.x - scroll_x, + pbad_c->base.y, + 25 * score_multiplier); } } } @@ -859,11 +818,7 @@ } else { - pbad_c->dying = DYING_FALLING; - play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); - add_score(pbad_c->base.x - scroll_x, - pbad_c->base.y, - 25 * score_multiplier); + pbad_c->kill_me(); } } score_multiplier++; @@ -880,10 +835,9 @@ void Player::kill(int mode) { - play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER); - base.xm = 0; + physic.set_velocity(0, physic.get_velocity_y()); if (mode == SHRINK && size == BIG) { @@ -899,8 +853,10 @@ { if(size == BIG) duck = true; - physic_set_state(&vphysic,PH_VT); - physic_set_start_vy(&vphysic,7); + + physic.enable_gravity(true); + physic.set_acceleration(0, 0); + physic.set_velocity(0, 7); dying = DYING_SQUISHED; } } @@ -908,8 +864,6 @@ void Player::is_dying() { - base.ym = base.ym + gravity; - /* He died :^( */ --lives; Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- badguy.cpp 29 Mar 2004 13:24:41 -0000 1.18 +++ badguy.cpp 4 Apr 2004 00:32:10 -0000 1.19 @@ -16,15 +16,16 @@ #include "badguy.h" #include "scene.h" #include "screen.h" +#include "tile.h" -texture_type img_bsod_squished_left; -texture_type img_bsod_squished_right; -texture_type img_bsod_falling_left; -texture_type img_bsod_falling_right; -texture_type img_laptop_flat_left; -texture_type img_laptop_flat_right; [...1336 lines suppressed...] + } + texture_free(&img_bouncingsnowball_squished[0]); + + texture_free(&img_flyingsnowball[0]); + texture_free(&img_flyingsnowball[1]); + texture_free(&img_flyingsnowball_squished[0]); + + for(int i = 0; i<3; ++i) { + texture_free(&img_spiky_left[i]); + texture_free(&img_spiky_right[i]); + } + for(int i = 0; i<3; ++i) { + texture_free(&img_snowball_left[i]); + texture_free(&img_snowball_right[i]); + } + texture_free(&img_snowball_squished_left[0]); + texture_free(&img_snowball_squished_right[0]); } // EOF // Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- title.cpp 28 Mar 2004 01:00:16 -0000 1.15 +++ title.cpp 4 Apr 2004 00:32:10 -0000 1.16 @@ -84,13 +84,12 @@ Player titletux; titletux.init(); st_pause_ticks_init(); - st_pause_ticks_stop(); level_load(¤t_level, (datadir + "/levels/misc/menu.stl").c_str()); loadshared(); activate_particle_systems(); /* Lower the gravity that tux doesn't jump to hectically through the demo */ - gravity = 5; + //gravity = 5; /* Reset menu variables */ menu_reset(); @@ -301,6 +300,10 @@ } } } + // reset tux + scroll_x = 0; + titletux.level_begin(); + update_time = st_get_ticks(); break; case 3: update_load_save_game_menu(load_game_menu, true); Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- tile.cpp 3 Apr 2004 13:31:14 -0000 1.9 +++ tile.cpp 4 Apr 2004 00:32:10 -0000 1.10 @@ -46,6 +46,7 @@ tile->solid = false; tile->brick = false; tile->ice = false; + tile->water = false; tile->fullbox = false; tile->distro = false; tile->data = 0; @@ -57,6 +58,7 @@ reader.read_bool("solid", &tile->solid); reader.read_bool("brick", &tile->brick); reader.read_bool("ice", &tile->ice); + reader.read_bool("water", &tile->water); reader.read_bool("fullbox", &tile->fullbox); reader.read_bool("distro", &tile->distro); reader.read_int("data", &tile->data); Index: button.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/button.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- button.h 3 Apr 2004 13:31:14 -0000 1.11 +++ button.h 4 Apr 2004 00:32:10 -0000 1.12 @@ -42,6 +42,7 @@ } private: + static timer_type popup_timer; texture_type icon; texture_type* bkgd; std::string info; |
|
From: Tobias Gl??er <to...@us...> - 2004-04-03 13:43:57
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv950/data/images/tilesets Modified Files: supertux.stgt Log Message: update Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- supertux.stgt 30 Mar 2004 20:34:27 -0000 1.11 +++ supertux.stgt 3 Apr 2004 13:31:38 -0000 1.12 @@ -7,6 +7,7 @@ (tilegroup (name "Snow") (tiles 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 30 31)) (tilegroup (name "Darksnow") (tiles 32 33 34 35 36 37 38 39 40 41 42 43)) (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62)) + (tilegroup (name "Background") (tiles 24 25 63 70 71 72 73 74 106 107 108 109 110 111)) (tilegroup (name "Oldschool-Background") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101)) (tile (id 0) (images "notile.png")) |
|
From: Tobias Gl??er <to...@us...> - 2004-04-03 13:40:33
|
Update of /cvsroot/super-tux/supertux/data/images/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv395/data/images/icons Modified Files: save.png Log Message: scaled Index: save.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/icons/save.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs2v1DUF and /tmp/cvsF9cEAW differ |
|
From: Tobias Gl??er <to...@us...> - 2004-04-03 13:40:09
|
Update of /cvsroot/super-tux/supertux/data/images/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32752/data/images/icons Added Files: bkgrd.png exit.png frgrd.png intact.png tilegroup.png tilegroup.xcf Log Message: initial --- NEW FILE: intact.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tilegroup.xcf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tilegroup.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: frgrd.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bkgrd.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: exit.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-01 20:34:33
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv808 Modified Files: antarctica.stwt Added Files: road_ne.png road_nes.png road_nesw.png road_new.png road_ns.png road_nsw.png road_nw.png road_nws.png road_se.png road_sw.png road_swe.png road_we.png wood10.png wood11.png wood12.png wood13.png Log Message: - more tiles --- NEW FILE: wood11.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood10.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood13.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood12.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_we.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_ns.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_se.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_new.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_swe.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_nw.png --- (This appears to be a binary file; contents omitted.) Index: antarctica.stwt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/antarctica.stwt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- antarctica.stwt 31 Mar 2004 23:11:13 -0000 1.2 +++ antarctica.stwt 1 Apr 2004 20:22:28 -0000 1.3 @@ -107,6 +107,28 @@ (image "wood8.png")) (tile (id 32) (image "wood9.png")) + (tile (id 33) + (image "wood10.png")) + (tile (id 34) + (image "wood11.png")) + (tile (id 35) + (image "wood12.png")) + (tile (id 36) + (image "wood13.png")) + + (tile (id 37) (image "road_ne.png")) + (tile (id 38) (image "road_nsw.png")) + (tile (id 39) (image "road_sw.png")) + (tile (id 40) (image "road_we.png")) + (tile (id 41) (image "road_nes.png")) + (tile (id 42) (image "road_nw.png")) + (tile (id 43) (image "road_swe.png")) + (tile (id 44) (image "road_new.png")) + (tile (id 45) (image "road_nesw.png")) + (tile (id 46) (image "road_nws.png")) + (tile (id 47) (image "road_ns.png")) + (tile (id 48) (image "road_se.png")) + ) ;; EOF ;; --- NEW FILE: road_nes.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_nsw.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_nesw.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_nws.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_sw.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_ne.png --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30556 Modified Files: wood1.png wood2.png wood3.png wood4.png wood5.png wood6.png wood7.png wood8.png wood9.png Log Message: - improved tileability Index: wood9.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood9.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsF4xvi0 and /tmp/cvshjT2RT differ Index: wood8.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood8.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvssJOtU3 and /tmp/cvsZGGnwX differ Index: wood3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood3.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsgbuej5 and /tmp/cvsvlvzXY differ Index: wood2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood2.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsXvAV0a and /tmp/cvsQgHsH4 differ Index: wood1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsBQ9bre and /tmp/cvspuUX97 differ Index: wood7.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood7.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvscNXwu6 and /tmp/cvsqjqSf0 differ Index: wood6.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood6.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsODsmHc and /tmp/cvsGe0dv6 differ Index: wood5.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood5.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvswo2ole and /tmp/cvsJWFRb8 differ Index: wood4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/wood4.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsorjHZk and /tmp/cvsvzqvUe differ |
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28746 Modified Files: antarctica.stwt Added Files: snow1.png snow10.png snow11.png snow12.png snow13.png snow2.png snow3.png snow4.png snow5.png snow6.png snow7.png snow8.png snow9.png water.png wood1.png wood2.png wood3.png wood4.png wood5.png wood6.png wood7.png wood8.png wood9.png Log Message: - new tiles --- NEW FILE: snow13.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow10.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow12.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow9.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow8.png --- (This appears to be a binary file; contents omitted.) Index: antarctica.stwt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/antarctica.stwt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- antarctica.stwt 25 Mar 2004 16:27:28 -0000 1.1 +++ antarctica.stwt 31 Mar 2004 23:11:13 -0000 1.2 @@ -2,13 +2,7 @@ ;; (directions TOP RIGHT DOWN LEFT) ;; (supertux-worldmap-tiles - (tile (id 0) - (image "ground.png") - (north #f) - (south #f) - (east #f) - (west #f) - (stop #f)) + (tile (id 1) (image "road_h.png") (north #f) @@ -58,7 +52,61 @@ (west #f) (east #f) (stop #t)) + (tile (id 8) + (image "ground.png") + (north #f) + (south #f) + (east #f) + (west #f) + (stop #f)) + (tile (id 9) + (image "water.png")) + + (tile (id 11) + (image "snow1.png")) + (tile (id 12) + (image "snow2.png")) + (tile (id 13) + (image "snow3.png")) + (tile (id 14) + (image "snow4.png")) + (tile (id 15) + (image "snow5.png")) + (tile (id 16) + (image "snow6.png")) + (tile (id 17) + (image "snow7.png")) + (tile (id 18) + (image "snow8.png")) + (tile (id 19) + (image "snow9.png")) + (tile (id 20) + (image "snow10.png")) + (tile (id 21) + (image "snow11.png")) + (tile (id 22) + (image "snow12.png")) + (tile (id 23) + (image "snow13.png")) + (tile (id 24) + (image "wood1.png")) + (tile (id 25) + (image "wood2.png")) + (tile (id 26) + (image "wood3.png")) + (tile (id 27) + (image "wood4.png")) + (tile (id 28) + (image "wood5.png")) + (tile (id 29) + (image "wood6.png")) + (tile (id 30) + (image "wood7.png")) + (tile (id 31) + (image "wood8.png")) + (tile (id 32) + (image "wood9.png")) ) ;; EOF ;; --- NEW FILE: wood8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow11.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: water.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood9.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wood4.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-03-31 10:53:36
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2691 Modified Files: fish-left-0.png fish-left-1.png Log Message: - scaled down fish Index: fish-left-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/fish-left-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsG3Jyu3 and /tmp/cvsQMSI1P differ Index: fish-left-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/fish-left-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsM4Od0v and /tmp/cvshsLXUi differ |
|
From: Ingo R. <gr...@us...> - 2004-03-30 20:46:08
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21879 Modified Files: supertux.stgt Added Files: snowbg1.png snowbg2.png snowbg3.png snowbg4.png Log Message: - more tiles --- NEW FILE: snowbg1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowbg2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowbg3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowbg4.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- supertux.stgt 30 Mar 2004 13:23:39 -0000 1.10 +++ supertux.stgt 30 Mar 2004 20:34:27 -0000 1.11 @@ -385,4 +385,17 @@ (tile (id 121) (images "darksnow15.png") (solid #t)) + + (tile (id 122) + (images "snowbg1.png") + (solid #t)) + (tile (id 123) + (images "snowbg2.png") + (solid #t)) + (tile (id 124) + (images "snowbg3.png") + (solid #t)) + (tile (id 125) + (images "snowbg4.png") + (solid #t)) ) \ No newline at end of file |
|
From: Ingo R. <gr...@us...> - 2004-03-30 20:34:00
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18891 Added Files: mriceblock-left-0.png mriceblock-left-1.png mriceblock-left-2.png mriceblock-left-3.png mriceblock-right-0.png mriceblock-right-1.png mriceblock-right-2.png mriceblock-right-3.png Log Message: - more gfx --- NEW FILE: mriceblock-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mriceblock-right-1.png --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18714 Added Files: snowball-left-0.png snowball-left-1.png snowball-left-2.png snowball-right-0.png snowball-right-1.png snowball-right-2.png Log Message: more gfx --- NEW FILE: snowball-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowball-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowball-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowball-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowball-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snowball-left-0.png --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18005 Added Files: bouncingsnowball-left-0.png bouncingsnowball-left-1.png bouncingsnowball-left-2.png bouncingsnowball-left-3.png bouncingsnowball-left-4.png bouncingsnowball-left-5.png bouncingsnowball-right-0.png bouncingsnowball-right-1.png bouncingsnowball-right-2.png bouncingsnowball-right-3.png bouncingsnowball-right-4.png bouncingsnowball-right-5.png Log Message: - more gfx --- NEW FILE: bouncingsnowball-right-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bouncingsnowball-left-5.png --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16098 Added Files: spiky-left-0.png spiky-left-1.png spiky-left-2.png spiky-right-0.png spiky-right-1.png spiky-right-2.png Log Message: more gfx --- NEW FILE: spiky-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spiky-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spiky-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spiky-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spiky-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spiky-right-1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-03-30 20:11:12
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14146 Added Files: flyingsnowball-left-0.png flyingsnowball-left-1.png fish-left-0.png fish-left-1.png Log Message: more gfx --- NEW FILE: flyingsnowball-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: flyingsnowball-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fish-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fish-left-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-03-30 13:35:17
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24606 Modified Files: supertux.stgt Added Files: darksnow13.png darksnow14.png darksnow15.png snow20.png snow21.png snow22.png snow23.png snow24.png snow25.png Log Message: - added some more tiles --- NEW FILE: darksnow13.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow24.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow25.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow22.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow23.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow20.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: snow21.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: darksnow14.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: darksnow15.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- supertux.stgt 28 Mar 2004 21:43:29 -0000 1.9 +++ supertux.stgt 30 Mar 2004 13:23:39 -0000 1.10 @@ -356,4 +356,33 @@ (fullbox #t) (next-tile 84) (data 0)) + + (tile (id 113) + (images "snow20.png") + (solid #t)) + (tile (id 114) + (images "snow21.png") + (solid #t)) + (tile (id 115) + (images "snow22.png") + (solid #t)) + (tile (id 116) + (images "snow23.png") + (solid #t)) + (tile (id 117) + (images "snow24.png") + (solid #t)) + (tile (id 118) + (images "snow25.png") + (solid #t)) + + (tile (id 119) + (images "darksnow13.png") + (solid #t)) + (tile (id 120) + (images "darksnow14.png") + (solid #t)) + (tile (id 121) + (images "darksnow15.png") + (solid #t)) ) \ No newline at end of file |
|
From: Tobias Gl??er <to...@us...> - 2004-03-29 17:00:33
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29099 Modified Files: autogen.sh Log Message: improved to work flawless on more computers Index: autogen.sh =================================================================== RCS file: /cvsroot/super-tux/supertux/autogen.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- autogen.sh 22 Mar 2004 10:33:15 -0000 1.4 +++ autogen.sh 29 Mar 2004 16:49:03 -0000 1.5 @@ -1,7 +1,7 @@ #!/bin/sh -aclocal-1.7 -I mk/autoconf -automake-1.7 --copy --add-missing +aclocal -I mk/autoconf +automake --copy --add-missing autoconf # EOF # |
248 messages has been excluded from this view by a project administrator.
