super-tux-commit Mailing List for Super Tux (Page 88)
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-25 19:13:33
|
Update of /cvsroot/super-tux/supertux/data/images/status In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18771 Modified Files: letters-white-big.png Log Message: - removed blurriness Index: letters-white-big.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/status/letters-white-big.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvs3Gftbe and /tmp/cvsmI1dQe differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:11:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15837/src Modified Files: worldmap.cpp Log Message: - added new worldmap tux Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- worldmap.cpp 24 Apr 2004 19:40:56 -0000 1.47 +++ worldmap.cpp 25 Apr 2004 12:29:23 -0000 1.48 @@ -169,7 +169,7 @@ { Point pos = get_pos(); sprite->draw(pos.x + offset.x, - pos.y + offset.y); + pos.y + offset.y - 10); } |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:11:02
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31036/src Modified Files: player.cpp player.h resources.cpp setup.cpp Log Message: - rewrote tux drawing code, added firetux Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- player.cpp 25 Apr 2004 16:17:18 -0000 1.63 +++ player.cpp 25 Apr 2004 16:46:55 -0000 1.64 @@ -36,17 +36,7 @@ PlayerSprite smalltux; PlayerSprite largetux; - -Surface* firetux_right[3]; -Surface* firetux_left[3]; -Surface* bigfiretux_right[3]; -Surface* bigfiretux_left[3]; -Surface* bigfiretux_right_jump; -Surface* bigfiretux_left_jump; -Surface* duckfiretux_right; -Surface* duckfiretux_left; -Surface* skidfiretux_right; -Surface* skidfiretux_left; +PlayerSprite firetux; PlayerKeymap keymap; @@ -506,158 +496,80 @@ } else { + PlayerSprite* sprite; + if (size == SMALL) + sprite = &smalltux; + else if (got_coffee) + sprite = &firetux; + else + sprite = &largetux; + + if (skidding_timer.started()) { - if (!skidding_timer.started()) - { - if (physic.get_velocity_y() != 0) - { - if (dir == RIGHT) - smalltux.jump_right->draw(base.x - scroll_x, base.y); - else - smalltux.jump_left->draw(base.x - scroll_x, base.y); - } - else - { - if (fabsf(physic.get_velocity_x()) < 1.0f) // standing - { - if (dir == RIGHT) - smalltux.stand_right->draw( base.x - scroll_x, base.y - 9); - else - smalltux.stand_left->draw( base.x - scroll_x, base.y - 9); - } - else // moving - { - if (dir == RIGHT) - smalltux.walk_right->draw(base.x - scroll_x, base.y); - else - smalltux.walk_left->draw(base.x - scroll_x, base.y); - } - } - } + if (dir == RIGHT) + sprite->skid_right->draw(base.x - scroll_x, base.y); else + sprite->skid_left->draw(base.x - scroll_x, base.y); + } + else + { + if (duck) { if (dir == RIGHT) - smalltux.skid_right->draw(base.x - scroll_x, base.y); - else - smalltux.skid_left->draw(base.x - scroll_x, base.y); - } - - if (holding_something && physic.get_velocity_y() == 0) + sprite->duck_right->draw(base.x - scroll_x, base.y); + else + sprite->duck_left->draw(base.x - scroll_x, base.y); + } + else if (physic.get_velocity_y() != 0) { if (dir == RIGHT) - smalltux.grab_right->draw(base.x - scroll_x, base.y); - else - smalltux.grab_left->draw(base.x - scroll_x, base.y); - } - - if (invincible_timer.started()) - smalltux_star->draw(base.x - scroll_x, base.y); - } - else // Large Tux - { - if (!got_coffee) - { - if (!duck) - { - if (!skidding_timer.started()) - { - if (physic.get_velocity_y() == 0) - { - if (fabsf(physic.get_velocity_x()) < 1.0f) // standing - { - if (dir == RIGHT) - largetux.stand_right->draw(base.x - scroll_x, base.y); - else - largetux.stand_left->draw(base.x - scroll_x, base.y); - } - else // walking - { - if (dir == RIGHT) - largetux.walk_right->draw(base.x - scroll_x, base.y); - else - largetux.walk_left->draw(base.x - scroll_x, base.y); - } - } - else - { - if (dir == RIGHT) - largetux.jump_right->draw(base.x - scroll_x, base.y); - else - largetux.jump_left->draw(base.x - scroll_x, base.y); - } - } - else - { - if (dir == RIGHT) - largetux.skid_right->draw(base.x - scroll_x - 8, base.y); - else - largetux.skid_left->draw(base.x - scroll_x - 8, base.y); - } - } + sprite->jump_right->draw(base.x - scroll_x, base.y); else - { - if (dir == RIGHT) - largetux.duck_right->draw(base.x - scroll_x, base.y); - else - largetux.duck_left->draw(base.x - scroll_x, base.y); - } + sprite->jump_left->draw(base.x - scroll_x, base.y); } else { - /* Tux has coffee! */ - if (!duck) + if (fabsf(physic.get_velocity_x()) < 1.0f) // standing { - if (!skidding_timer.started()) - { - if (!jumping || physic.get_velocity_y() > 0) - { - if (dir == RIGHT) - bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y); - else - bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y); - } - else - { - if (dir == RIGHT) - bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y); - else - bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y); - } - } + if (dir == RIGHT) + sprite->stand_right->draw( base.x - scroll_x, base.y); else - { - if (dir == RIGHT) - skidfiretux_right->draw(base.x- scroll_x - 8, base.y); - else - skidfiretux_left->draw(base.x- scroll_x - 8, base.y); - } + sprite->stand_left->draw( base.x - scroll_x, base.y); } - else + else // moving { if (dir == RIGHT) - duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); + sprite->walk_right->draw(base.x - scroll_x, base.y); else - duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); + sprite->walk_left->draw(base.x - scroll_x, base.y); } } + } + + // Draw arm overlay graphics when Tux is holding something + if (holding_something && physic.get_velocity_y() == 0) + { + if (dir == RIGHT) + sprite->grab_right->draw(base.x - scroll_x, base.y); + else + sprite->grab_left->draw(base.x - scroll_x, base.y); + } - if (holding_something && !duck && physic.get_velocity_y() == 0) - { - if (dir == RIGHT) - largetux.grab_right->draw(base.x - scroll_x, base.y); - else - largetux.grab_left->draw(base.x - scroll_x, base.y); - } - - if (invincible_timer.started()) + // Draw blinking star overlay + if (invincible_timer.started()) + { + if (size == SMALL || duck) + smalltux_star->draw(base.x - scroll_x, base.y); + else largetux_star->draw(base.x - scroll_x, base.y); } - } - } - + } + } + if (debug_mode) - fillrect(base.x - scroll_x, base.y, 32, 32, 75,75,75, 150); + fillrect(base.x - scroll_x, base.y, + base.width, base.height, 75,75,75, 150); } void Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- player.h 25 Apr 2004 16:17:18 -0000 1.41 +++ player.h 25 Apr 2004 16:46:55 -0000 1.42 @@ -100,17 +100,7 @@ extern PlayerSprite smalltux; extern PlayerSprite largetux; - -extern Surface* firetux_right[3]; -extern Surface* firetux_left[3]; -extern Surface* bigfiretux_right[3]; -extern Surface* bigfiretux_left[3]; -extern Surface* bigfiretux_right_jump; -extern Surface* bigfiretux_left_jump; -extern Surface* duckfiretux_right; -extern Surface* duckfiretux_left; -extern Surface* skidfiretux_right; -extern Surface* skidfiretux_left; +extern PlayerSprite firetux; class Player { Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- setup.cpp 25 Apr 2004 14:27:49 -0000 1.56 +++ setup.cpp 25 Apr 2004 16:46:55 -0000 1.57 @@ -496,10 +496,8 @@ if (access(slotfile, F_OK) != 0) { - std::cout << "Draw intro" << std::endl; draw_intro(); } - std::cout << "XXXDraw intro" << std::endl; WorldMapNS::WorldMap worldmap; Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- resources.cpp 25 Apr 2004 16:17:18 -0000 1.25 +++ resources.cpp 25 Apr 2004 16:46:55 -0000 1.26 @@ -83,56 +83,22 @@ largetux.duck_left = sprite_manager->load("largetux-duck-left"); largetux.duck_right = sprite_manager->load("largetux-duck-right"); - duckfiretux_right = new Surface(datadir + - "/images/shared/duckfiretux-right.png", - USE_ALPHA); - - duckfiretux_left = new Surface(datadir + - "/images/shared/duckfiretux-left.png", - USE_ALPHA); - - firetux_right[0] = new Surface(datadir + "/images/shared/firetux-right-0.png", USE_ALPHA); - firetux_right[1] = new Surface(datadir + "/images/shared/firetux-right-1.png", USE_ALPHA); - firetux_right[2] = new Surface(datadir + "/images/shared/firetux-right-2.png", USE_ALPHA); - - firetux_left[0] = new Surface(datadir + "/images/shared/firetux-left-0.png", USE_ALPHA); - firetux_left[1] = new Surface(datadir + "/images/shared/firetux-left-1.png", USE_ALPHA); - firetux_left[2] = new Surface(datadir + "/images/shared/firetux-left-2.png", USE_ALPHA); - - bigfiretux_right[0] = new Surface(datadir + "/images/shared/bigfiretux-right-0.png", - USE_ALPHA); - - bigfiretux_right[1] = new Surface(datadir + "/images/shared/bigfiretux-right-1.png", - USE_ALPHA); - - bigfiretux_right[2] = new Surface(datadir + "/images/shared/bigfiretux-right-2.png", - USE_ALPHA); - - bigfiretux_right_jump = new Surface(datadir + "/images/shared/bigfiretux-right-jump.png", USE_ALPHA); - - bigfiretux_left[0] = new Surface(datadir + "/images/shared/bigfiretux-left-0.png", - USE_ALPHA); - - bigfiretux_left[1] = new Surface(datadir + "/images/shared/bigfiretux-left-1.png", - USE_ALPHA); - - bigfiretux_left[2] = new Surface(datadir + "/images/shared/bigfiretux-left-2.png", - USE_ALPHA); - - bigfiretux_left_jump = new Surface(datadir + "/images/shared/bigfiretux-left-jump.png", USE_ALPHA); - - skidfiretux_right = new Surface(datadir + - "/images/shared/skidfiretux-right.png", - USE_ALPHA); - - skidfiretux_left = new Surface(datadir + - "/images/shared/skidfiretux-left.png", - USE_ALPHA); - + firetux.stand_left = sprite_manager->load("firetux-stand-left"); + firetux.stand_right = sprite_manager->load("firetux-stand-right"); + firetux.walk_left = sprite_manager->load("firetux-walk-left"); + firetux.walk_right = sprite_manager->load("firetux-walk-right"); + firetux.jump_left = sprite_manager->load("firetux-jump-left"); + firetux.jump_right = sprite_manager->load("firetux-jump-right"); + firetux.kick_left = sprite_manager->load("firetux-kick-left"); + firetux.kick_right = sprite_manager->load("firetux-kick-right"); + firetux.skid_right = sprite_manager->load("firetux-skid-right"); + firetux.skid_left = sprite_manager->load("firetux-skid-left"); + firetux.grab_left = sprite_manager->load("firetux-grab-left"); + firetux.grab_right = sprite_manager->load("firetux-grab-right"); + firetux.duck_left = sprite_manager->load("firetux-duck-left"); + firetux.duck_right = sprite_manager->load("firetux-duck-right"); /* Water: */ - - img_water = new Surface(datadir + "/images/shared/water.png", IGNORE_ALPHA); img_waves[0] = new Surface(datadir + "/images/shared/waves-0.png", |
|
From: Ingo R. <gr...@us...> - 2004-04-25 19:10:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22466 Modified Files: Makefile.am Log Message: - fixed makefile a bit Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile.am 25 Apr 2004 14:27:49 -0000 1.20 +++ Makefile.am 25 Apr 2004 18:38:03 -0000 1.21 @@ -45,7 +45,6 @@ special.cpp \ special.h \ supertux.cpp \ -supertux.h \ text.cpp \ text.h \ texture.cpp \ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 18:46:18
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22634 Modified Files: configure.ac Log Message: - release preparations Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure.ac 28 Mar 2004 23:23:20 -0000 1.17 +++ configure.ac 25 Apr 2004 18:38:49 -0000 1.18 @@ -8,7 +8,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) -AC_INIT(SuperTux, 0.0.7-cvs) +AC_INIT(SuperTux, 0.1.0pre1) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE |
|
From: Ingo R. <gr...@us...> - 2004-04-25 18:34:32
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4882 Modified Files: Makefile.am intro.cpp intro.h music_manager.cpp player.cpp setup.cpp Log Message: - added intro text Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile.am 24 Apr 2004 14:49:03 -0000 1.19 +++ Makefile.am 25 Apr 2004 14:27:49 -0000 1.20 @@ -11,6 +11,8 @@ collision.h \ configfile.cpp \ configfile.h \ +intro.cpp \ +intro.h \ defines.h \ gameloop.cpp \ gameloop.h \ Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- setup.cpp 24 Apr 2004 17:48:49 -0000 1.55 +++ setup.cpp 25 Apr 2004 14:27:49 -0000 1.56 @@ -50,6 +50,7 @@ #include "scene.h" #include "worldmap.h" #include "resources.h" +#include "intro.h" #include "music_manager.h" #include "player.h" @@ -490,10 +491,17 @@ if(slot != -1 && load_game_menu->get_item(slot).kind == MN_ACTION) { - WorldMapNS::WorldMap worldmap; - char slotfile[1024]; snprintf(slotfile, 1024, "%s/slot%d.stsg", st_save_dir, slot-1); + + if (access(slotfile, F_OK) != 0) + { + std::cout << "Draw intro" << std::endl; + draw_intro(); + } + std::cout << "XXXDraw intro" << std::endl; + + WorldMapNS::WorldMap worldmap; // Load the game or at least set the savegame_file variable worldmap.loadgame(slotfile); Index: intro.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- intro.cpp 20 Apr 2004 11:09:33 -0000 1.15 +++ intro.cpp 25 Apr 2004 14:27:49 -0000 1.16 @@ -17,6 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include <iostream> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -32,6 +33,7 @@ #include "globals.h" #include "intro.h" #include "screen.h" +#include "text.h" #include "texture.h" #include "timer.h" @@ -43,268 +45,47 @@ }; -/* --- INTRO --- */ - -int intro(void) +void draw_intro() { - SDL_Event event; - texture_type bkgd, copter_squish, copter_stretch, beam, - gown_sit, gown_lookup, gown_upset, - tux_sit, tux_upset, tux_mad; - texture_type copter[2]; - SDL_Rect src, dest; - int done, i, quit, j, scene; - int * height, * height_speed; - Timer timer; - - /* Load sprite images: */ - texture_load(&bkgd, datadir + "/images/intro/intro.png", IGNORE_ALPHA); - texture_load(&gown_sit, datadir + "/images/intro/gown-sit.png", USE_ALPHA); - texture_load(&gown_lookup, datadir + "/images/intro/gown-lookup.png", USE_ALPHA); - texture_load(&gown_upset, datadir + "/images/intro/gown-upset.png", USE_ALPHA); - texture_load(&tux_sit, datadir + "/images/intro/tux-sit.png", USE_ALPHA); - texture_load(&tux_upset, datadir + "/images/intro/tux-upset.png", USE_ALPHA); - texture_load(&tux_mad, datadir + "/images/intro/tux-mad.png", USE_ALPHA); - texture_load(&copter[0], datadir + "/images/intro/copter1.png", USE_ALPHA); - texture_load(&copter[1], datadir + "/images/intro/copter2.png", USE_ALPHA); - texture_load(&copter_squish, datadir + "/images/intro/copter-squish.png", USE_ALPHA); - texture_load(&copter_stretch, datadir + "/images/intro/copter-stretch.png", USE_ALPHA); - texture_load(&beam, datadir + "/images/intro/beam.png", USE_ALPHA); - - /* Allocate buffer for height array: */ - - height = (int*) malloc(sizeof(int) * (gown_upset.w)); - height_speed = (int*) malloc(sizeof(int) * (gown_upset.w)); - - - /* Initialize height arrays: */ - - for (j = 0; j < (gown_upset.w); j++) - { - height[j] = 400; - height_speed[j] = (rand() % 10) + 1; - } - - /* Display background: */ - - texture_draw_bg(&bkgd, 255, UPDATE); - - /* Animation: */ - - done = 0; - quit = 0; - scene = 0; - i = 0; - - timer.init(false); - timer.start(10000); + bool done = false; - while (timer.check() && !done && !quit) + while (!done) { + SDL_Event event; + drawgradient(Color(155, 200, 255), Color(255, 255, 255)); + gold_text->draw_align("Gwen gets captured!", screen->w/2, 15, A_HMIDDLE, A_TOP); - done = wait_for_event(event,0); - if(done == 2) - { - quit = 1; - done = 0; - } - - - /* Display background: */ - - /* Draw things: */ - - if (timer.get_gone() < 2000 && scene == 0) - { - ++scene; - /* Gown and tux sitting: */ - - texture_draw(&tux_sit, 270, 400, 255, UPDATE); - texture_draw(&gown_sit, 320, 400, 255, UPDATE); - - text_drawf(&white_text, intro_text[0], 0, -8, A_HMIDDLE, A_BOTTOM, 0); - } - - - if (timer.get_gone() >= 2000 && scene == 1) - { - ++scene; - /* Helicopter begins to fly in: */ - - erasecenteredtext(&white_text, intro_text[0], 454, &bkgd, NO_UPDATE, 1); - text_drawf(&white_text, intro_text[1], 0,-8, A_HMIDDLE, A_BOTTOM, 0); - } - - - if (timer.get_gone() >= 2000 && timer.get_gone() < 4000) - { - /* Helicopter flying in: */ - texture_draw_part(&bkgd,0,32, 0, 32, screen->w, (copter[0].h)); - - texture_draw(&copter[i % 2], - (float)(timer.get_gone() - 2000) / 5 - (copter[0].w), 32); - - update_rect(screen, 0, 32, screen->w, (copter[0].h)); - } - - - if (timer.get_gone() >= 2500 && scene == 2) - { - ++scene; - /* Gown notices something... */ - - texture_draw(&gown_lookup, 320, 400, 255, UPDATE); - } - - - if (timer.get_gone() >= 3500 && scene == 3) - { - ++scene; - /* Gown realizes it's bad! */ - - texture_draw(&gown_upset, 320, 400, 255, UPDATE); - } - - - if (timer.get_gone() >= 4000 && timer.get_gone() < 8000) - { - /* Helicopter sits: */ - texture_draw_part(&bkgd,0,32, 0, 32, screen->w, (copter[0].h)); - - texture_draw(&copter[i % 2], 400 - (copter[0].w), 32); - update_rect(screen, 0, 32, screen->w, (copter[0].h)); - } - - - if (timer.get_gone() >= 5000 && scene == 4) - { - ++scene; - /* Tux realizes something's happening: */ - - texture_draw(&tux_upset, 270, 400, 255, UPDATE); - - - erasecenteredtext(&white_text, intro_text[1], 454, &bkgd, UPDATE, 1); - text_drawf(&white_text, intro_text[2], 0,-8, A_HMIDDLE, A_BOTTOM, 0); - } - - - if (timer.get_gone() >= 5000 && timer.get_gone() <= 8000) - { - /* Beam gown up! */ - - texture_draw_part(&bkgd, - 310, 32 + (copter[0].h), 310, - 32 + (copter[0].h), - (gown_upset.w) + 20, - 376 + (gown_upset.h) - (copter[0].h)); - - - for (j = 0; j < (gown_upset.sdl_surface -> w); j++) - { - texture_draw(&beam, 320 + j - ((beam.w) / 2), height[j]); - - src.x = j; - src.y = 0; - src.w = 1; - src.h = (gown_upset.h); - - dest.x = 320 + j; - dest.y = height[j]; - dest.w = src.w; - dest.h = src.h; - - texture_draw_part(&gown_upset,src.x,src.y,dest.x,dest.y,dest.w,dest.h); - - height[j] = 400 + rand() % 10 - (int)(300. * ((float)(timer.get_gone() - 5000)/(float)3000.)); - if(height[j] < 105) - height[j] = 105; - } - - update_rect(screen, - 310, - 32 + (copter[0].h), - (gown_upset.w) + 20, - 400 + (gown_upset.h) - (copter[0].h)); - } - - - if (timer.get_gone() >= 8000 && scene == 5) - { - texture_draw_part(&bkgd, - 310, 32 + (copter[0].h), 310, - 32 + (copter[0].h), - (gown_upset.w) + 20, - 368 + (gown_upset.h) - (copter[0].h)); - - ++scene; - /* Tux gets mad! */ - - texture_draw(&tux_mad, 270, 400, UPDATE); - - erasecenteredtext(&white_text, intro_text[2], 454, &bkgd, UPDATE, 1); - text_drawf(&white_text, intro_text[3], 0,-8, A_HMIDDLE, A_BOTTOM, 0); - } - - - if (timer.get_gone() >= 8000 && timer.get_gone() <= 8250) - { - /* Helicopter starting to speed off: */ - - texture_draw_part(&bkgd, 0, 32, 0, 32, screen->w, (copter_squish.h)); - - texture_draw(&copter_squish, - 400 - (copter[0].w), 32); - - update_rect(screen, 0, 32, screen->w, (copter_squish.h)); - } - - - if (timer.get_gone() >= 8250) - { - /* Helicopter speeding off: */ - - texture_draw_part(&bkgd, 0, 32, 0, 32, screen->w, (copter_stretch.h)); - - texture_draw(&copter_stretch, - (timer.get_gone() - 8250) /*(i - (8250 / FPS)) * 30*/ + 400 - (copter[0].w), - 32); + white_text->draw + ("\n" // + "Tux and Gwen were out having a nice\n" + "picnic on the ice fields of Antarctica.\n" + "Suddenly, a creature jumped from\n" + "behind an ice bush, there was a flash,\n" + "and Tux fell asleep!\n" + "\n" // + "When Tux wakes up, he finds that Gwen\n" + "is missing. Where she lay before now\n" + "lies a letter. \"Tux, my arch enemy!\"\n" + "says the letter. \"I have captured\n" + "your beautiful Gwen and have taken her\n" + "to my fortress. The path to my fortress\n" + "is littered with my minions. Give up on the\n" + "thought of trying to reclaim her, you\n" + "haven't a chance! -Nolok\"\n" + "\n" + "Tux looks and see Nolok's fortress in\n" + "the distance. Determined to save his\n" + "beloved Gwen, he begins his journey.", + -5, 30); - update_rect(screen, 0, 32, screen->w, (copter_stretch.h)); - } + white_small_text->draw_align("Press any button to continue!", + screen->w/2, screen->h - 20, A_HMIDDLE, A_TOP); flipscreen(); + SDL_Delay(100); - ++i; - /* Pause: */ - SDL_Delay(20); + done = wait_for_event(event,0); } - - - /* Free surfaces: */ - - delete bkgd; - delete gown_sit; - delete gown_lookup; - delete gown_upset; - delete tux_sit; - delete tux_upset; - delete tux_mad; - delete copter[0]; - delete copter[1]; - delete copter_squish; - delete copter_stretch; - delete beam; - - - /* Free array buffers: */ - - free(height); - free(height_speed); - - - /* Return to main! */ - - return(quit); } + Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- player.cpp 24 Apr 2004 13:12:12 -0000 1.60 +++ player.cpp 25 Apr 2004 14:27:49 -0000 1.61 @@ -31,6 +31,7 @@ Surface* tux_life; std::vector<Surface*> tux_right; std::vector<Surface*> tux_left; + Surface* smalltux_jump_left; Surface* smalltux_jump_right; Surface* smalltux_stand_left; @@ -38,33 +39,31 @@ Sprite* smalltux_gameover; Sprite* smalltux_skid_left; Sprite* smalltux_skid_right; - Sprite* smalltux_kick_left; Sprite* smalltux_kick_right; Sprite* smalltux_grab_left; Sprite* smalltux_grab_right; - Sprite* smalltux_star; -Sprite* largetux_star; - -Sprite* largetux_kick_left; -Sprite* largetux_kick_right; -Sprite* largetux_grab_left; -Sprite* largetux_grab_right; - -Sprite* largetux_stand_left; -Sprite* largetux_stand_right; +Sprite* largetux_star; +Sprite* largetux_kick_left; +Sprite* largetux_kick_right; +Sprite* largetux_grab_left; +Sprite* largetux_grab_right; +Sprite* largetux_stand_left; +Sprite* largetux_stand_right; Sprite* bigtux_right; Sprite* bigtux_left; Sprite* bigtux_right_jump; Sprite* bigtux_left_jump; Sprite* ducktux_right; Sprite* ducktux_left; + Surface* skidtux_right; Surface* skidtux_left; Surface* firetux_right[3]; Surface* firetux_left[3]; + Surface* bigfiretux_right[3]; Surface* bigfiretux_left[3]; Surface* bigfiretux_right_jump; @@ -73,6 +72,7 @@ Surface* duckfiretux_left; Surface* skidfiretux_right; Surface* skidfiretux_left; + Surface* cape_right[2]; Surface* cape_left[2]; Index: intro.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/intro.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- intro.h 20 Apr 2004 11:09:33 -0000 1.3 +++ intro.h 25 Apr 2004 14:27:49 -0000 1.4 @@ -17,7 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -int intro(void); +void draw_intro(); /* Local Variables: */ /* mode:c++ */ Index: music_manager.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/music_manager.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- music_manager.cpp 24 Apr 2004 14:49:03 -0000 1.1 +++ music_manager.cpp 25 Apr 2004 14:27:49 -0000 1.2 @@ -24,7 +24,7 @@ #include "setup.h" MusicManager::MusicManager() - : music_enabled(true) + : current_music(0), music_enabled(true) { } MusicManager::~MusicManager() |
|
From: Ingo R. <gr...@us...> - 2004-04-25 17:58:41
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10261/shared Modified Files: stalactite-broken.png stalactite.png Log Message: - smoothed water a little bit - added new cloud - fixed stalactit look a bit Index: stalactite-broken.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/stalactite-broken.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsWprr4E and /tmp/cvsBWduCZ differ Index: stalactite.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/stalactite.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvszb4ylH and /tmp/cvsJqi6U1 differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 17:32:49
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154 Modified Files: leveleditor.cpp player.cpp player.h resources.cpp Log Message: - moved tux gfx into a struct Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- player.cpp 25 Apr 2004 16:07:50 -0000 1.62 +++ player.cpp 25 Apr 2004 16:17:18 -0000 1.63 @@ -34,33 +34,8 @@ Sprite* smalltux_star; Sprite* largetux_star; -Sprite* smalltux_stand_left; -Sprite* smalltux_stand_right; -Sprite* smalltux_walk_right; -Sprite* smalltux_walk_left; -Sprite* smalltux_jump_left; -Sprite* smalltux_jump_right; -Sprite* smalltux_kick_left; -Sprite* smalltux_kick_right; -Sprite* smalltux_skid_left; -Sprite* smalltux_skid_right; -Sprite* smalltux_grab_left; -Sprite* smalltux_grab_right; - -Sprite* largetux_stand_left; -Sprite* largetux_stand_right; -Sprite* largetux_walk_right; -Sprite* largetux_walk_left; -Sprite* largetux_jump_right; -Sprite* largetux_jump_left; -Sprite* largetux_kick_left; -Sprite* largetux_kick_right; -Sprite* largetux_skid_right; -Sprite* largetux_skid_left; -Sprite* largetux_grab_left; -Sprite* largetux_grab_right; -Sprite* largetux_duck_right; -Sprite* largetux_duck_left; +PlayerSprite smalltux; +PlayerSprite largetux; Surface* firetux_right[3]; Surface* firetux_left[3]; @@ -538,42 +513,42 @@ if (physic.get_velocity_y() != 0) { if (dir == RIGHT) - smalltux_jump_right->draw(base.x - scroll_x, base.y); + smalltux.jump_right->draw(base.x - scroll_x, base.y); else - smalltux_jump_left->draw(base.x - scroll_x, base.y); + smalltux.jump_left->draw(base.x - scroll_x, base.y); } else { if (fabsf(physic.get_velocity_x()) < 1.0f) // standing { if (dir == RIGHT) - smalltux_stand_right->draw( base.x - scroll_x, base.y - 9); + smalltux.stand_right->draw( base.x - scroll_x, base.y - 9); else - smalltux_stand_left->draw( base.x - scroll_x, base.y - 9); + smalltux.stand_left->draw( base.x - scroll_x, base.y - 9); } else // moving { if (dir == RIGHT) - smalltux_walk_right->draw(base.x - scroll_x, base.y); + smalltux.walk_right->draw(base.x - scroll_x, base.y); else - smalltux_walk_left->draw(base.x - scroll_x, base.y); + smalltux.walk_left->draw(base.x - scroll_x, base.y); } } } else { if (dir == RIGHT) - smalltux_skid_right->draw(base.x - scroll_x, base.y); + smalltux.skid_right->draw(base.x - scroll_x, base.y); else - smalltux_skid_left->draw(base.x - scroll_x, base.y); + smalltux.skid_left->draw(base.x - scroll_x, base.y); } if (holding_something && physic.get_velocity_y() == 0) { if (dir == RIGHT) - smalltux_grab_right->draw(base.x - scroll_x, base.y); + smalltux.grab_right->draw(base.x - scroll_x, base.y); else - smalltux_grab_left->draw(base.x - scroll_x, base.y); + smalltux.grab_left->draw(base.x - scroll_x, base.y); } if (invincible_timer.started()) @@ -592,40 +567,40 @@ if (fabsf(physic.get_velocity_x()) < 1.0f) // standing { if (dir == RIGHT) - largetux_stand_right->draw(base.x - scroll_x, base.y); + largetux.stand_right->draw(base.x - scroll_x, base.y); else - largetux_stand_left->draw(base.x - scroll_x, base.y); + largetux.stand_left->draw(base.x - scroll_x, base.y); } else // walking { if (dir == RIGHT) - largetux_walk_right->draw(base.x - scroll_x, base.y); + largetux.walk_right->draw(base.x - scroll_x, base.y); else - largetux_walk_left->draw(base.x - scroll_x, base.y); + largetux.walk_left->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - largetux_jump_right->draw(base.x - scroll_x, base.y); + largetux.jump_right->draw(base.x - scroll_x, base.y); else - largetux_jump_left->draw(base.x - scroll_x, base.y); + largetux.jump_left->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - largetux_skid_right->draw(base.x - scroll_x - 8, base.y); + largetux.skid_right->draw(base.x - scroll_x - 8, base.y); else - largetux_skid_left->draw(base.x - scroll_x - 8, base.y); + largetux.skid_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - largetux_duck_right->draw(base.x - scroll_x, base.y); + largetux.duck_right->draw(base.x - scroll_x, base.y); else - largetux_duck_left->draw(base.x - scroll_x, base.y); + largetux.duck_left->draw(base.x - scroll_x, base.y); } } else @@ -670,9 +645,9 @@ if (holding_something && !duck && physic.get_velocity_y() == 0) { if (dir == RIGHT) - largetux_grab_right->draw(base.x - scroll_x, base.y); + largetux.grab_right->draw(base.x - scroll_x, base.y); else - largetux_grab_left->draw(base.x - scroll_x, base.y); + largetux.grab_left->draw(base.x - scroll_x, base.y); } if (invincible_timer.started()) Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- player.h 25 Apr 2004 16:08:00 -0000 1.40 +++ player.h 25 Apr 2004 16:17:18 -0000 1.41 @@ -80,33 +80,26 @@ extern Sprite* smalltux_star; extern Sprite* largetux_star; -extern Sprite* smalltux_stand_left; -extern Sprite* smalltux_stand_right; -extern Sprite* smalltux_walk_right; -extern Sprite* smalltux_walk_left; -extern Sprite* smalltux_jump_left; -extern Sprite* smalltux_jump_right; -extern Sprite* smalltux_kick_left; -extern Sprite* smalltux_kick_right; -extern Sprite* smalltux_skid_left; -extern Sprite* smalltux_skid_right; -extern Sprite* smalltux_grab_left; -extern Sprite* smalltux_grab_right; +struct PlayerSprite +{ + Sprite* stand_left; + Sprite* stand_right; + Sprite* walk_right; + Sprite* walk_left; + Sprite* jump_right; + Sprite* jump_left; + Sprite* kick_left; + Sprite* kick_right; + Sprite* skid_right; + Sprite* skid_left; + Sprite* grab_left; + Sprite* grab_right; + Sprite* duck_right; + Sprite* duck_left; +}; -extern Sprite* largetux_stand_left; -extern Sprite* largetux_stand_right; -extern Sprite* largetux_walk_right; -extern Sprite* largetux_walk_left; -extern Sprite* largetux_jump_right; -extern Sprite* largetux_jump_left; -extern Sprite* largetux_kick_left; -extern Sprite* largetux_kick_right; -extern Sprite* largetux_skid_right; -extern Sprite* largetux_skid_left; -extern Sprite* largetux_grab_left; -extern Sprite* largetux_grab_right; -extern Sprite* largetux_duck_right; -extern Sprite* largetux_duck_left; +extern PlayerSprite smalltux; +extern PlayerSprite largetux; extern Surface* firetux_right[3]; extern Surface* firetux_left[3]; Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- leveleditor.cpp 25 Apr 2004 16:07:49 -0000 1.65 +++ leveleditor.cpp 25 Apr 2004 16:17:17 -0000 1.66 @@ -779,7 +779,7 @@ /* Draw the player: */ /* for now, the position is fixed at (100, 240) */ - largetux_walk_right->draw( 100 - pos_x, 240); + largetux.walk_right->draw( 100 - pos_x, 240); } void le_checkevents() Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- resources.cpp 25 Apr 2004 16:08:00 -0000 1.24 +++ resources.cpp 25 Apr 2004 16:17:18 -0000 1.25 @@ -55,33 +55,33 @@ largetux_star = sprite_manager->load("largetux-star"); smalltux_gameover = sprite_manager->load("smalltux-gameover"); - smalltux_stand_left = sprite_manager->load("smalltux-stand-left"); - smalltux_stand_right = sprite_manager->load("smalltux-stand-right"); - smalltux_walk_left = sprite_manager->load("smalltux-walk-left"); - smalltux_walk_right = sprite_manager->load("smalltux-walk-right"); - smalltux_jump_left = sprite_manager->load("smalltux-jump-left"); - smalltux_jump_right = sprite_manager->load("smalltux-jump-right"); - smalltux_kick_left = sprite_manager->load("smalltux-kick-left"); - smalltux_kick_right = sprite_manager->load("smalltux-kick-right"); - smalltux_skid_left = sprite_manager->load("smalltux-skid-left"); - smalltux_skid_right = sprite_manager->load("smalltux-skid-right"); - smalltux_grab_left = sprite_manager->load("smalltux-grab-left"); - smalltux_grab_right = sprite_manager->load("smalltux-grab-right"); + smalltux.stand_left = sprite_manager->load("smalltux-stand-left"); + smalltux.stand_right = sprite_manager->load("smalltux-stand-right"); + smalltux.walk_left = sprite_manager->load("smalltux-walk-left"); + smalltux.walk_right = sprite_manager->load("smalltux-walk-right"); + smalltux.jump_left = sprite_manager->load("smalltux-jump-left"); + smalltux.jump_right = sprite_manager->load("smalltux-jump-right"); + smalltux.kick_left = sprite_manager->load("smalltux-kick-left"); + smalltux.kick_right = sprite_manager->load("smalltux-kick-right"); + smalltux.skid_left = sprite_manager->load("smalltux-skid-left"); + smalltux.skid_right = sprite_manager->load("smalltux-skid-right"); + smalltux.grab_left = sprite_manager->load("smalltux-grab-left"); + smalltux.grab_right = sprite_manager->load("smalltux-grab-right"); - largetux_stand_left = sprite_manager->load("largetux-stand-left"); - largetux_stand_right = sprite_manager->load("largetux-stand-right"); - largetux_walk_left = sprite_manager->load("largetux-walk-left"); - largetux_walk_right = sprite_manager->load("largetux-walk-right"); - largetux_jump_left = sprite_manager->load("largetux-jump-left"); - largetux_jump_right = sprite_manager->load("largetux-jump-right"); - largetux_kick_left = sprite_manager->load("largetux-kick-left"); - largetux_kick_right = sprite_manager->load("largetux-kick-right"); - largetux_skid_right = sprite_manager->load("largetux-skid-right"); - largetux_skid_left = sprite_manager->load("largetux-skid-left"); - largetux_grab_left = sprite_manager->load("largetux-grab-left"); - largetux_grab_right = sprite_manager->load("largetux-grab-right"); - largetux_duck_left = sprite_manager->load("largetux-duck-left"); - largetux_duck_right = sprite_manager->load("largetux-duck-right"); + largetux.stand_left = sprite_manager->load("largetux-stand-left"); + largetux.stand_right = sprite_manager->load("largetux-stand-right"); + largetux.walk_left = sprite_manager->load("largetux-walk-left"); + largetux.walk_right = sprite_manager->load("largetux-walk-right"); + largetux.jump_left = sprite_manager->load("largetux-jump-left"); + largetux.jump_right = sprite_manager->load("largetux-jump-right"); + largetux.kick_left = sprite_manager->load("largetux-kick-left"); + largetux.kick_right = sprite_manager->load("largetux-kick-right"); + largetux.skid_right = sprite_manager->load("largetux-skid-right"); + largetux.skid_left = sprite_manager->load("largetux-skid-left"); + largetux.grab_left = sprite_manager->load("largetux-grab-left"); + largetux.grab_right = sprite_manager->load("largetux-grab-right"); + largetux.duck_left = sprite_manager->load("largetux-duck-left"); + largetux.duck_right = sprite_manager->load("largetux-duck-right"); duckfiretux_right = new Surface(datadir + "/images/shared/duckfiretux-right.png", |
|
From: Ricardo C. <rm...@us...> - 2004-04-25 17:30:57
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17488/data/images/shared Removed Files: distro-0.png distro-1.png distro-2.png distro-3.png Log Message: Changed the distros images to the old dir. Finally possible thanks to Ingo. --- distro-1.png DELETED --- --- distro-0.png DELETED --- --- distro-3.png DELETED --- --- distro-2.png DELETED --- |
|
From: Ingo R. <gr...@us...> - 2004-04-25 16:51:01
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31036/data Modified Files: supertux.strf Log Message: - rewrote tux drawing code, added firetux Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- supertux.strf 25 Apr 2004 16:07:49 -0000 1.20 +++ supertux.strf 25 Apr 2004 16:46:54 -0000 1.21 @@ -30,14 +30,14 @@ (sprite (name "smalltux-stand-left") (fps 15.0) (x-hotspot 0) - (y-hotspot 0) + (y-hotspot 9) (images "shared/smalltux-left-6.png" )) (sprite (name "smalltux-stand-right") (fps 15.0) (x-hotspot 0) - (y-hotspot 0) + (y-hotspot 9) (images "shared/smalltux-right-6.png")) ;; Small Tux Jump @@ -89,6 +89,14 @@ (y-hotspot 9) (images "shared/smalltux-grab-right-0.png")) + (sprite (name "smalltux-star") + (x-hotspot 5) + (y-hotspot 15) + (images "shared/smalltux-star-0.png" + "shared/smalltux-star-1.png" + "shared/smalltux-star-2.png" + )) + ;; Large Tux Walk (sprite (name "largetux-walk-left") (x-hotspot 6) @@ -111,12 +119,12 @@ "shared/largetux-walk-right-5.png")) (sprite (name "largetux-skid-right") - (x-hotspot 2) + (x-hotspot 8) (y-hotspot 3) (images "shared/largetux-skid-right.png")) (sprite (name "largetux-skid-left") - (x-hotspot 2) + (x-hotspot 8) (y-hotspot 3) (images "shared/largetux-skid-left.png")) @@ -148,6 +156,115 @@ (y-hotspot 6) (images "shared/tux-duck-right.png")) + + (sprite (name "largetux-kick-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-kick-left-0.png")) + + (sprite (name "largetux-kick-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-kick-right-0.png")) + + (sprite (name "largetux-grab-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-grab-left-0.png")) + + (sprite (name "largetux-grab-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/largetux-grab-right-0.png")) + + (sprite (name "largetux-star") + (x-hotspot 8) + (y-hotspot 8) + (images "shared/largetux-star-0.png" + "shared/largetux-star-1.png" + "shared/largetux-star-2.png" + )) + + ;; Firetux + (sprite (name "firetux-walk-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/firetux-walk-left-0.png" + "shared/firetux-walk-left-1.png" + "shared/firetux-walk-left-2.png" + "shared/firetux-walk-left-3.png" + "shared/firetux-walk-left-4.png" + "shared/firetux-walk-left-5.png")) + + (sprite (name "firetux-walk-right") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/firetux-walk-right-0.png" + "shared/firetux-walk-right-1.png" + "shared/firetux-walk-right-2.png" + "shared/firetux-walk-right-3.png" + "shared/firetux-walk-right-4.png" + "shared/firetux-walk-right-5.png")) + + (sprite (name "firetux-skid-right") + (x-hotspot 8) + (y-hotspot 3) + (images "shared/firetux-skid-right.png")) + + (sprite (name "firetux-skid-left") + (x-hotspot 8) + (y-hotspot 3) + (images "shared/firetux-skid-left.png")) + + (sprite (name "firetux-stand-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/firetux-stand-left.png")) + + (sprite (name "firetux-stand-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/firetux-stand-right.png")) + + (sprite (name "firetux-jump-left") + (x-hotspot 9) + (y-hotspot 2) + (images "shared/firetux-jump-left-0.png")) + (sprite (name "firetux-jump-right") + (x-hotspot 9) + (y-hotspot 2) + (images "shared/firetux-jump-right-0.png")) + + (sprite (name "firetux-duck-left") + (x-hotspot 6) + (y-hotspot 2) + (images "shared/tux-duck-left.png")) + (sprite (name "firetux-duck-right") + (x-hotspot 6) + (y-hotspot 6) + (images "shared/tux-duck-right.png")) + + + (sprite (name "firetux-kick-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/firetux-kick-left-0.png")) + + (sprite (name "firetux-kick-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/firetux-kick-right-0.png")) + + (sprite (name "firetux-grab-left") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/firetux-grab-left-0.png")) + + (sprite (name "firetux-grab-right") + (x-hotspot 5) + (y-hotspot 1) + (images "shared/firetux-grab-right-0.png")) + ;; Laptop (sprite (name "laptop-left") (x-hotspot 2) @@ -354,43 +471,6 @@ "shared/iceflower-3.png" "shared/iceflower-2.png" "shared/iceflower-1.png")) - - (sprite (name "largetux-kick-left") - (x-hotspot 5) - (y-hotspot 1) - (images "shared/largetux-kick-left-0.png")) - - (sprite (name "largetux-kick-right") - (x-hotspot 5) - (y-hotspot 1) - (images "shared/largetux-kick-right-0.png")) - - (sprite (name "largetux-grab-left") - (x-hotspot 5) - (y-hotspot 1) - (images "shared/largetux-grab-left-0.png")) - - (sprite (name "largetux-grab-right") - (x-hotspot 5) - (y-hotspot 1) - (images "shared/largetux-grab-right-0.png")) - - (sprite (name "largetux-star") - (x-hotspot 8) - (y-hotspot 8) - (images "shared/largetux-star-0.png" - "shared/largetux-star-1.png" - "shared/largetux-star-2.png" - )) - - (sprite (name "smalltux-star") - (x-hotspot 5) - (y-hotspot 15) - (images "shared/smalltux-star-0.png" - "shared/smalltux-star-1.png" - "shared/smalltux-star-2.png" - )) - ) ;; EOF ;; |
|
From: Ingo R. <gr...@us...> - 2004-04-25 16:13:31
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23156/src Modified Files: leveleditor.cpp player.cpp player.h resources.cpp Log Message: - moved tux completly to sprites Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- player.cpp 25 Apr 2004 14:27:49 -0000 1.61 +++ player.cpp 25 Apr 2004 16:07:50 -0000 1.62 @@ -29,41 +29,41 @@ #include "screen.h" Surface* tux_life; -std::vector<Surface*> tux_right; -std::vector<Surface*> tux_left; - -Surface* smalltux_jump_left; -Surface* smalltux_jump_right; -Surface* smalltux_stand_left; -Surface* smalltux_stand_right; -Sprite* smalltux_gameover; -Sprite* smalltux_skid_left; -Sprite* smalltux_skid_right; -Sprite* smalltux_kick_left; -Sprite* smalltux_kick_right; -Sprite* smalltux_grab_left; -Sprite* smalltux_grab_right; -Sprite* smalltux_star; +Sprite* smalltux_gameover; +Sprite* smalltux_star; Sprite* largetux_star; + +Sprite* smalltux_stand_left; +Sprite* smalltux_stand_right; +Sprite* smalltux_walk_right; +Sprite* smalltux_walk_left; +Sprite* smalltux_jump_left; +Sprite* smalltux_jump_right; +Sprite* smalltux_kick_left; +Sprite* smalltux_kick_right; +Sprite* smalltux_skid_left; +Sprite* smalltux_skid_right; +Sprite* smalltux_grab_left; +Sprite* smalltux_grab_right; + +Sprite* largetux_stand_left; +Sprite* largetux_stand_right; +Sprite* largetux_walk_right; +Sprite* largetux_walk_left; +Sprite* largetux_jump_right; +Sprite* largetux_jump_left; Sprite* largetux_kick_left; Sprite* largetux_kick_right; +Sprite* largetux_skid_right; +Sprite* largetux_skid_left; Sprite* largetux_grab_left; Sprite* largetux_grab_right; -Sprite* largetux_stand_left; -Sprite* largetux_stand_right; -Sprite* bigtux_right; -Sprite* bigtux_left; -Sprite* bigtux_right_jump; -Sprite* bigtux_left_jump; -Sprite* ducktux_right; -Sprite* ducktux_left; +Sprite* largetux_duck_right; +Sprite* largetux_duck_left; -Surface* skidtux_right; -Surface* skidtux_left; Surface* firetux_right[3]; Surface* firetux_left[3]; - Surface* bigfiretux_right[3]; Surface* bigfiretux_left[3]; Surface* bigfiretux_right_jump; @@ -73,9 +73,6 @@ Surface* skidfiretux_right; Surface* skidfiretux_left; -Surface* cape_right[2]; -Surface* cape_left[2]; - PlayerKeymap keymap; PlayerKeymap::PlayerKeymap() @@ -541,9 +538,9 @@ if (physic.get_velocity_y() != 0) { if (dir == RIGHT) - smalltux_jump_right->draw( base.x - scroll_x, base.y - 10); + smalltux_jump_right->draw(base.x - scroll_x, base.y); else - smalltux_jump_left->draw( base.x - scroll_x, base.y - 10); + smalltux_jump_left->draw(base.x - scroll_x, base.y); } else { @@ -557,9 +554,9 @@ else // moving { if (dir == RIGHT) - tux_right[(global_frame_counter/2) % tux_right.size()]->draw(base.x - scroll_x, base.y - 9); + smalltux_walk_right->draw(base.x - scroll_x, base.y); else - tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9); + smalltux_walk_left->draw(base.x - scroll_x, base.y); } } } @@ -602,33 +599,33 @@ else // walking { if (dir == RIGHT) - bigtux_right->draw(base.x - scroll_x, base.y); + largetux_walk_right->draw(base.x - scroll_x, base.y); else - bigtux_left->draw(base.x - scroll_x, base.y); + largetux_walk_left->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - bigtux_right_jump->draw(base.x - scroll_x, base.y); + largetux_jump_right->draw(base.x - scroll_x, base.y); else - bigtux_left_jump->draw(base.x - scroll_x, base.y); + largetux_jump_left->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - skidtux_right->draw(base.x - scroll_x - 8, base.y); + largetux_skid_right->draw(base.x - scroll_x - 8, base.y); else - skidtux_left->draw(base.x - scroll_x - 8, base.y); + largetux_skid_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - ducktux_right->draw(base.x - scroll_x, base.y); + largetux_duck_right->draw(base.x - scroll_x, base.y); else - ducktux_left->draw(base.x - scroll_x, base.y); + largetux_duck_left->draw(base.x - scroll_x, base.y); } } else Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- player.h 24 Apr 2004 13:12:12 -0000 1.39 +++ player.h 25 Apr 2004 16:08:00 -0000 1.40 @@ -75,38 +75,39 @@ class Sprite; extern Surface* tux_life; -extern std::vector<Surface*> tux_right; -extern std::vector<Surface*> tux_left; -extern Surface* smalltux_jump_left; -extern Surface* smalltux_jump_right; -extern Surface* smalltux_stand_left; -extern Surface* smalltux_stand_right; -extern Sprite* smalltux_skid_left; -extern Sprite* smalltux_skid_right; -extern Sprite* smalltux_gameover; -extern Sprite* largetux_stand_left; -extern Sprite* largetux_stand_right; -extern Sprite* smalltux_kick_left; -extern Sprite* smalltux_kick_right; -extern Sprite* smalltux_grab_left; -extern Sprite* smalltux_grab_right; -extern Sprite* smalltux_star; -extern Sprite* largetux_star; +extern Sprite* smalltux_gameover; +extern Sprite* smalltux_star; +extern Sprite* largetux_star; -extern Sprite* largetux_kick_left; -extern Sprite* largetux_kick_right; -extern Sprite* largetux_grab_left; -extern Sprite* largetux_grab_right; +extern Sprite* smalltux_stand_left; +extern Sprite* smalltux_stand_right; +extern Sprite* smalltux_walk_right; +extern Sprite* smalltux_walk_left; +extern Sprite* smalltux_jump_left; +extern Sprite* smalltux_jump_right; +extern Sprite* smalltux_kick_left; +extern Sprite* smalltux_kick_right; +extern Sprite* smalltux_skid_left; +extern Sprite* smalltux_skid_right; +extern Sprite* smalltux_grab_left; +extern Sprite* smalltux_grab_right; + +extern Sprite* largetux_stand_left; +extern Sprite* largetux_stand_right; +extern Sprite* largetux_walk_right; +extern Sprite* largetux_walk_left; +extern Sprite* largetux_jump_right; +extern Sprite* largetux_jump_left; +extern Sprite* largetux_kick_left; +extern Sprite* largetux_kick_right; +extern Sprite* largetux_skid_right; +extern Sprite* largetux_skid_left; +extern Sprite* largetux_grab_left; +extern Sprite* largetux_grab_right; +extern Sprite* largetux_duck_right; +extern Sprite* largetux_duck_left; -extern Sprite* bigtux_right; -extern Sprite* bigtux_left; -extern Sprite* bigtux_right_jump; -extern Sprite* bigtux_left_jump; -extern Sprite* ducktux_right; -extern Sprite* ducktux_left; -extern Surface* skidtux_right; -extern Surface* skidtux_left; extern Surface* firetux_right[3]; extern Surface* firetux_left[3]; extern Surface* bigfiretux_right[3]; @@ -117,10 +118,6 @@ extern Surface* duckfiretux_left; extern Surface* skidfiretux_right; extern Surface* skidfiretux_left; -extern Surface* cape_right[2]; -extern Surface* cape_left[2]; -extern Surface* bigcape_right[2]; -extern Surface* bigcape_left[2]; class Player { Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- leveleditor.cpp 24 Apr 2004 17:48:49 -0000 1.64 +++ leveleditor.cpp 25 Apr 2004 16:07:49 -0000 1.65 @@ -779,7 +779,7 @@ /* Draw the player: */ /* for now, the position is fixed at (100, 240) */ - tux_right[(global_frame_counter / 5) % 3]->draw( 100 - pos_x, 240); + largetux_walk_right->draw( 100 - pos_x, 240); } void le_checkevents() Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- resources.cpp 25 Apr 2004 11:55:39 -0000 1.23 +++ resources.cpp 25 Apr 2004 16:08:00 -0000 1.24 @@ -53,50 +53,43 @@ /* Tuxes: */ smalltux_star = sprite_manager->load("smalltux-star"); largetux_star = sprite_manager->load("largetux-star"); + smalltux_gameover = sprite_manager->load("smalltux-gameover"); - smalltux_kick_left = sprite_manager->load("smalltux-kick-left"); - smalltux_kick_right = sprite_manager->load("smalltux-kick-right"); - smalltux_grab_left = sprite_manager->load("smalltux-grab-left"); - smalltux_grab_right = sprite_manager->load("smalltux-grab-right"); - - largetux_kick_left = sprite_manager->load("largetux-kick-left"); - largetux_kick_right = sprite_manager->load("largetux-kick-right"); - largetux_grab_left = sprite_manager->load("largetux-grab-left"); - largetux_grab_right = sprite_manager->load("largetux-grab-right"); + smalltux_stand_left = sprite_manager->load("smalltux-stand-left"); + smalltux_stand_right = sprite_manager->load("smalltux-stand-right"); + smalltux_walk_left = sprite_manager->load("smalltux-walk-left"); + smalltux_walk_right = sprite_manager->load("smalltux-walk-right"); + smalltux_jump_left = sprite_manager->load("smalltux-jump-left"); + smalltux_jump_right = sprite_manager->load("smalltux-jump-right"); + smalltux_kick_left = sprite_manager->load("smalltux-kick-left"); + smalltux_kick_right = sprite_manager->load("smalltux-kick-right"); + smalltux_skid_left = sprite_manager->load("smalltux-skid-left"); + smalltux_skid_right = sprite_manager->load("smalltux-skid-right"); + smalltux_grab_left = sprite_manager->load("smalltux-grab-left"); + smalltux_grab_right = sprite_manager->load("smalltux-grab-right"); largetux_stand_left = sprite_manager->load("largetux-stand-left"); largetux_stand_right = sprite_manager->load("largetux-stand-right"); + largetux_walk_left = sprite_manager->load("largetux-walk-left"); + largetux_walk_right = sprite_manager->load("largetux-walk-right"); + largetux_jump_left = sprite_manager->load("largetux-jump-left"); + largetux_jump_right = sprite_manager->load("largetux-jump-right"); + largetux_kick_left = sprite_manager->load("largetux-kick-left"); + largetux_kick_right = sprite_manager->load("largetux-kick-right"); + largetux_skid_right = sprite_manager->load("largetux-skid-right"); + largetux_skid_left = sprite_manager->load("largetux-skid-left"); + largetux_grab_left = sprite_manager->load("largetux-grab-left"); + largetux_grab_right = sprite_manager->load("largetux-grab-right"); + largetux_duck_left = sprite_manager->load("largetux-duck-left"); + largetux_duck_right = sprite_manager->load("largetux-duck-right"); - smalltux_gameover = sprite_manager->load("smalltux-gameover"); - - smalltux_skid_left = sprite_manager->load("smalltux-skid-left"); - smalltux_skid_right = sprite_manager->load("smalltux-skid-right"); - - smalltux_stand_left = new Surface(datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA); - smalltux_stand_right = new Surface(datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA); - - smalltux_jump_left = new Surface(datadir + "/images/shared/smalltux-jump-left.png", USE_ALPHA); - smalltux_jump_right = new Surface(datadir + "/images/shared/smalltux-jump-right.png", USE_ALPHA); - - tux_right.resize(8); - tux_right[0] = new Surface(datadir + "/images/shared/smalltux-right-1.png", USE_ALPHA); - tux_right[1] = new Surface(datadir + "/images/shared/smalltux-right-2.png", USE_ALPHA); - tux_right[2] = new Surface(datadir + "/images/shared/smalltux-right-3.png", USE_ALPHA); - tux_right[3] = new Surface(datadir + "/images/shared/smalltux-right-4.png", USE_ALPHA); - tux_right[4] = new Surface(datadir + "/images/shared/smalltux-right-5.png", USE_ALPHA); - tux_right[5] = new Surface(datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA); - tux_right[6] = new Surface(datadir + "/images/shared/smalltux-right-7.png", USE_ALPHA); - tux_right[7] = new Surface(datadir + "/images/shared/smalltux-right-8.png", USE_ALPHA); + duckfiretux_right = new Surface(datadir + + "/images/shared/duckfiretux-right.png", + USE_ALPHA); - tux_left.resize(8); - tux_left[0] = new Surface(datadir + "/images/shared/smalltux-left-1.png", USE_ALPHA); - tux_left[1] = new Surface(datadir + "/images/shared/smalltux-left-2.png", USE_ALPHA); - tux_left[2] = new Surface(datadir + "/images/shared/smalltux-left-3.png", USE_ALPHA); - tux_left[3] = new Surface(datadir + "/images/shared/smalltux-left-4.png", USE_ALPHA); - tux_left[4] = new Surface(datadir + "/images/shared/smalltux-left-5.png", USE_ALPHA); - tux_left[5] = new Surface(datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA); - tux_left[6] = new Surface(datadir + "/images/shared/smalltux-left-7.png", USE_ALPHA); - tux_left[7] = new Surface(datadir + "/images/shared/smalltux-left-8.png", USE_ALPHA); + duckfiretux_left = new Surface(datadir + + "/images/shared/duckfiretux-left.png", + USE_ALPHA); firetux_right[0] = new Surface(datadir + "/images/shared/firetux-right-0.png", USE_ALPHA); firetux_right[1] = new Surface(datadir + "/images/shared/firetux-right-1.png", USE_ALPHA); @@ -106,25 +99,6 @@ firetux_left[1] = new Surface(datadir + "/images/shared/firetux-left-1.png", USE_ALPHA); firetux_left[2] = new Surface(datadir + "/images/shared/firetux-left-2.png", USE_ALPHA); - - cape_right[0] = new Surface(datadir + "/images/shared/cape-right-0.png", - USE_ALPHA); - - cape_right[1] = new Surface(datadir + "/images/shared/cape-right-1.png", - USE_ALPHA); - - cape_left[0] = new Surface(datadir + "/images/shared/cape-left-0.png", - USE_ALPHA); - - cape_left[1] = new Surface(datadir + "/images/shared/cape-left-1.png", - USE_ALPHA); - - bigtux_right = sprite_manager->load("largetux-walk-right"); - bigtux_left = sprite_manager->load("largetux-walk-left"); - - bigtux_left_jump = sprite_manager->load("largetux-jump-left"); - bigtux_right_jump = sprite_manager->load("largetux-jump-right"); - bigfiretux_right[0] = new Surface(datadir + "/images/shared/bigfiretux-right-0.png", USE_ALPHA); @@ -147,25 +121,6 @@ bigfiretux_left_jump = new Surface(datadir + "/images/shared/bigfiretux-left-jump.png", USE_ALPHA); - ducktux_left = sprite_manager->load("largetux-duck-left"); - ducktux_right = sprite_manager->load("largetux-duck-right"); - - skidtux_right = new Surface(datadir + - "/images/shared/largetux-skid-right.png", - USE_ALPHA); - - skidtux_left = new Surface(datadir + - "/images/shared/largetux-skid-left.png", - USE_ALPHA); - - duckfiretux_right = new Surface(datadir + - "/images/shared/duckfiretux-right.png", - USE_ALPHA); - - duckfiretux_left = new Surface(datadir + - "/images/shared/duckfiretux-left.png", - USE_ALPHA); - skidfiretux_right = new Surface(datadir + "/images/shared/skidfiretux-right.png", USE_ALPHA); @@ -285,32 +240,10 @@ int i; free_special_gfx(); + free_badguy_gfx(); delete smalltux_gameover; - for (i = 0; i < 3; i++) - { - delete tux_right[i]; - delete tux_left[i]; - } - - delete bigtux_right_jump; - delete bigtux_left_jump; - - for (i = 0; i < 2; i++) - { - delete cape_right[i]; - delete cape_left[i]; - } - - delete ducktux_left; - delete ducktux_right; - - delete skidtux_left; - delete skidtux_right; - - free_badguy_gfx(); - delete img_water; for (i = 0; i < 3; i++) delete img_waves[i]; |
|
From: Ricardo C. <rm...@us...> - 2004-04-25 15:24:17
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14884/src Modified Files: title.cpp Log Message: Turned the display_credits() function more flexible by getting the file to open. Ingo, what do you think if we used this for the intro text? Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- title.cpp 24 Apr 2004 14:49:04 -0000 1.59 +++ title.cpp 25 Apr 2004 15:21:06 -0000 1.60 @@ -62,7 +62,7 @@ static unsigned int last_update_time; static unsigned int update_time; -void display_credits(); +void display_text_file(char *filename); std::vector<st_subset> contrib_subsets; std::string current_contrib_subset; @@ -311,7 +311,7 @@ Menu::set_current(main_menu); break; case MNID_CREDITS: - display_credits(); + display_text_file("CREDITS"); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: @@ -367,7 +367,7 @@ #define SCROLL 60 #define ITEMS_SPACE 4 -void display_credits() +void display_text_file(char *file) { int done; int scroll, speed; @@ -379,7 +379,7 @@ string_list_type names; char filename[1024]; string_list_init(&names); - sprintf(filename,"%s/CREDITS", datadir.c_str()); + sprintf(filename,"%s/%s", datadir.c_str(), file); if((fi = fopen(filename,"r")) != NULL) { while(fgets(temp, sizeof(temp), fi) != NULL) |
|
From: Ricardo C. <rm...@us...> - 2004-04-25 15:04:05
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20173/data/levels/test Modified Files: level4.stl Log Message: Just updated the gradients test to use the new color entries. Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level4.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- level4.stl 23 Apr 2004 16:30:43 -0000 1.1 +++ level4.stl 25 Apr 2004 12:50:24 -0000 1.2 @@ -1,4 +1,3 @@ - (supertux-level (version 1) (name "Gradients Test") @@ -7,12 +6,12 @@ (height 15) (background "") (music "Mortimers_chipdisko.mod") - (bkgd_top_red 200) - (bkgd_top_green 200) - (bkgd_top_blue 60) - (bkgd_bottom_red 220) - (bkgd_bottom_green 140) - (bkgd_bottom_blue 120) + (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) (particle_system "") |
|
From: Ingo R. <gr...@us...> - 2004-04-25 15:03:53
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24953 Modified Files: gameloop.cpp Log Message: - improved look of start/gameover screens Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- gameloop.cpp 25 Apr 2004 11:55:38 -0000 1.100 +++ gameloop.cpp 25 Apr 2004 13:16:43 -0000 1.101 @@ -145,8 +145,11 @@ music_manager->halt_music(); char str[60]; - /* Level Intro: */ - clearscreen(0, 0, 0); + + if (get_level()->img_bkgd) + get_level()->img_bkgd->draw(0, 0); + else + clearscreen(0, 0, 0); sprintf(str, "%s", world->get_level()->name.c_str()); gold_text->drawf(str, 0, 200, A_HMIDDLE, A_TOP, 1); @@ -657,7 +660,10 @@ { char str[80]; - clearscreen(0, 0, 0); + if (get_level()->img_bkgd) + get_level()->img_bkgd->draw(0, 0); + else + clearscreen(0, 0, 0); blue_text->drawf("GAMEOVER", 0, 200, A_HMIDDLE, A_TOP, 1); @@ -678,7 +684,10 @@ { char str[80]; - clearscreen(0, 0, 0); + if (get_level()->img_bkgd) + get_level()->img_bkgd->draw(0, 0); + else + clearscreen(0, 0, 0); blue_text->drawf("Result:", 0, 200, A_HMIDDLE, A_TOP, 1); |
|
From: Ingo R. <gr...@us...> - 2004-04-25 14:37:33
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6041/data/images/shared Modified Files: cloud.png Log Message: - some minor improvements in the gfx Index: cloud.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/cloud.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsf8EAHh and /tmp/cvs9jMG1r differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 14:37:28
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6041/data/levels/world1 Modified Files: level1.stl level2.stl Log Message: - some minor improvements in the gfx Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level1.stl 25 Apr 2004 12:34:41 -0000 1.6 +++ level1.stl 25 Apr 2004 14:34:01 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 100) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level2.stl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- level2.stl 25 Apr 2004 12:34:41 -0000 1.6 +++ level2.stl 25 Apr 2004 14:34:17 -0000 1.7 @@ -7,7 +7,7 @@ (height 15) (start_pos_x 100) (start_pos_y 100) - (background "arctis.png") + (background "arctis2.jpg") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) (bkgd_green_top 150) |
|
From: Ricardo C. <rm...@us...> - 2004-04-25 14:21:17
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2923/src Modified Files: lispreader.cpp Log Message: Ooops, did a mistake. Fixed by Arkadiusz Miskiewicz. Aparentaly, fclose(NULL) causes a segfault. Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- lispreader.cpp 25 Apr 2004 10:02:14 -0000 1.13 +++ lispreader.cpp 25 Apr 2004 14:16:10 -0000 1.14 @@ -1339,11 +1339,11 @@ { lisp_stream_init_file(&stream, in); obj = lisp_read(&stream); + fclose(in); } else std::cerr << "LispReader: File not found: " << filename << endl; - fclose(in); return obj; } |
|
From: Ingo R. <gr...@us...> - 2004-04-25 13:56:48
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31236 Modified Files: gameloop.cpp level.cpp Log Message: -added gradient support for start screens Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- level.cpp 25 Apr 2004 12:11:25 -0000 1.49 +++ level.cpp 25 Apr 2004 13:51:19 -0000 1.50 @@ -635,8 +635,7 @@ } else { - /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */ - load_image(&img_bkgd, theme,"solid0.png", IGNORE_ALPHA); + img_bkgd = 0; } } Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- gameloop.cpp 25 Apr 2004 13:16:43 -0000 1.101 +++ gameloop.cpp 25 Apr 2004 13:51:19 -0000 1.102 @@ -149,7 +149,7 @@ if (get_level()->img_bkgd) get_level()->img_bkgd->draw(0, 0); else - clearscreen(0, 0, 0); + drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom); sprintf(str, "%s", world->get_level()->name.c_str()); gold_text->drawf(str, 0, 200, A_HMIDDLE, A_TOP, 1); @@ -663,7 +663,7 @@ if (get_level()->img_bkgd) get_level()->img_bkgd->draw(0, 0); else - clearscreen(0, 0, 0); + drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom); blue_text->drawf("GAMEOVER", 0, 200, A_HMIDDLE, A_TOP, 1); @@ -687,7 +687,7 @@ if (get_level()->img_bkgd) get_level()->img_bkgd->draw(0, 0); else - clearscreen(0, 0, 0); + drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom); blue_text->drawf("Result:", 0, 200, A_HMIDDLE, A_TOP, 1); |
|
From: Ingo R. <gr...@us...> - 2004-04-25 13:51:00
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30150/data/levels/world1 Modified Files: level13.stl Log Message: - added background gradient Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level13.stl 24 Apr 2004 15:02:08 -0000 1.4 +++ level13.stl 25 Apr 2004 13:45:21 -0000 1.5 @@ -10,11 +10,11 @@ (background "") (music "Mortimers_chipdisko.mod") (bkgd_red_top 150) - (bkgd_green_top 150) - (bkgd_blue_top 150) - (bkgd_red_bottom 150) - (bkgd_green_bottom 150) - (bkgd_blue_bottom 150) + (bkgd_green_top 200) + (bkgd_blue_top 255) + (bkgd_red_bottom 255) + (bkgd_green_bottom 255) + (bkgd_blue_bottom 255) (time 200) (gravity 10.0) (particle_system "clouds") |
|
From: Ricardo C. <rm...@us...> - 2004-04-25 12:42:13
|
Update of /cvsroot/super-tux/supertux/data/images/shared/old In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17488/data/images/shared/old Added Files: distro2-0.png distro2-1.png distro2-2.png distro2-3.png Log Message: Changed the distros images to the old dir. Finally possible thanks to Ingo. --- NEW FILE: distro2-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: distro2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: distro2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: distro2-3.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 12:36:34
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15837/data/images/worldmap Modified Files: tux.png Log Message: - added new worldmap tux Index: tux.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/tux.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsksLb45 and /tmp/cvs7WfmDq differ |
|
From: Ingo R. <gr...@us...> - 2004-04-25 12:19:21
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12409 Modified Files: level.cpp Log Message: - fixed/changed gradient tags to match with the one used in the current level files Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- level.cpp 24 Apr 2004 14:49:03 -0000 1.48 +++ level.cpp 25 Apr 2004 12:11:25 -0000 1.49 @@ -313,13 +313,13 @@ if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170; reader.read_int("time", &time_left); - reader.read_int("bkgd_top_red", &bkgd_top.red); - reader.read_int("bkgd_top_green", &bkgd_top.green); - reader.read_int("bkgd_top_blue", &bkgd_top.blue); + reader.read_int("bkgd_red_top", &bkgd_top.red); + reader.read_int("bkgd_green_top", &bkgd_top.green); + reader.read_int("bkgd_blue_top", &bkgd_top.blue); - reader.read_int("bkgd_bottom_red", &bkgd_bottom.red); - reader.read_int("bkgd_bottom_green", &bkgd_bottom.green); - reader.read_int("bkgd_bottom_blue", &bkgd_bottom.blue); + reader.read_int("bkgd_red_bottom", &bkgd_bottom.red); + reader.read_int("bkgd_green_bottom", &bkgd_bottom.green); + reader.read_int("bkgd_blue_bottom", &bkgd_bottom.blue); reader.read_float("gravity", &gravity); reader.read_string("name", &name); @@ -540,12 +540,12 @@ fprintf(fi," (music \"%s\")\n", song_title.c_str()); fprintf(fi," (background \"%s\")\n", bkgd_image.c_str()); fprintf(fi," (particle_system \"%s\")\n", particle_system.c_str()); - fprintf(fi," (bkgd_top_red %d)\n", bkgd_top.red); - fprintf(fi," (bkgd_top_green %d)\n", bkgd_top.green); - fprintf(fi," (bkgd_top_blue %d)\n", bkgd_top.blue); - fprintf(fi," (bkgd_bottom_red %d)\n", bkgd_bottom.red); - fprintf(fi," (bkgd_bottom_green %d)\n", bkgd_bottom.green); - fprintf(fi," (bkgd_bottom_blue %d)\n", bkgd_bottom.blue); + fprintf(fi," (bkgd_red_top %d)\n", bkgd_top.red); + fprintf(fi," (bkgd_green_top %d)\n", bkgd_top.green); + fprintf(fi," (bkgd_blue_top %d)\n", bkgd_top.blue); + fprintf(fi," (bkgd_red_bottom %d)\n", bkgd_bottom.red); + fprintf(fi," (bkgd_green_bottom %d)\n", bkgd_bottom.green); + fprintf(fi," (bkgd_blue_bottom %d)\n", bkgd_bottom.blue); fprintf(fi," (time %d)\n", time_left); fprintf(fi," (width %d)\n", width); fprintf(fi," (gravity %2.1f)\n", gravity); |
|
From: Ingo R. <gr...@us...> - 2004-04-25 12:00:52
|
Update of /cvsroot/super-tux/supertux/data/images/background In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10261/background Added Files: arctis2.jpg Log Message: - smoothed water a little bit - added new cloud - fixed stalactit look a bit --- NEW FILE: arctis2.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-25 11:59:21
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10035 Modified Files: gameloop.cpp resources.cpp Log Message: replaced distros with coins Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- gameloop.cpp 24 Apr 2004 14:49:03 -0000 1.99 +++ gameloop.cpp 25 Apr 2004 11:55:38 -0000 1.100 @@ -634,7 +634,7 @@ } sprintf(str, "%d", player_status.distros); - white_text->draw("DISTROS", screen->h, 0, 1); + white_text->draw("COINS", screen->h, 0, 1); gold_text->draw(str, 608, 0, 1); white_text->draw("LIVES", screen->h, 20, 1); @@ -685,7 +685,7 @@ sprintf(str, "SCORE: %d", player_status.score); gold_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1); - sprintf(str, "DISTROS: %d", player_status.distros); + sprintf(str, "COINS: %d", player_status.distros); gold_text->drawf(str, 0, 256, A_HMIDDLE, A_TOP, 1); flipscreen(); Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- resources.cpp 24 Apr 2004 17:48:49 -0000 1.22 +++ resources.cpp 25 Apr 2004 11:55:39 -0000 1.23 @@ -244,16 +244,16 @@ USE_ALPHA); /* Distros: */ - img_distro[0] = new Surface(datadir + "/images/shared/distro-0.png", + img_distro[0] = new Surface(datadir + "/images/tilesets/coin1.png", USE_ALPHA); - img_distro[1] = new Surface(datadir + "/images/shared/distro-1.png", + img_distro[1] = new Surface(datadir + "/images/tilesets/coin2.png", USE_ALPHA); - img_distro[2] = new Surface(datadir + "/images/shared/distro-2.png", + img_distro[2] = new Surface(datadir + "/images/tilesets/coin3.png", USE_ALPHA); - img_distro[3] = new Surface(datadir + "/images/shared/distro-3.png", + img_distro[3] = new Surface(datadir + "/images/tilesets/coin2.png", USE_ALPHA); |
|
From: Ricardo C. <rm...@us...> - 2004-04-25 10:06:45
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16629/src Modified Files: lispreader.cpp Log Message: Just made lispreader to send an error message to stderr when the file could not be open, as suggested by Arkadiusz Miskiewicz. Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- lispreader.cpp 3 Apr 2004 13:31:14 -0000 1.12 +++ lispreader.cpp 25 Apr 2004 10:02:14 -0000 1.13 @@ -21,6 +21,7 @@ * Boston, MA 02111-1307, USA. */ +#include <iostream> #include <string> #include <assert.h> #include <ctype.h> @@ -1338,8 +1339,11 @@ { lisp_stream_init_file(&stream, in); obj = lisp_read(&stream); - fclose(in); } + else + std::cerr << "LispReader: File not found: " << filename << endl; + + fclose(in); return obj; } |
248 messages has been excluded from this view by a project administrator.
