super-tux-commit Mailing List for Super Tux (Page 89)
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
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12896 Added Files: firetux-grab-left-0.png firetux-grab-right-0.png firetux-jump-left-0.png firetux-jump-right-0.png firetux-kick-left-0.png firetux-kick-right-0.png firetux-left-0.png.right firetux-left-1.png.right firetux-left-2.png.right firetux-skid-left.png firetux-skid-right.png firetux-stand-left.png firetux-stand-right.png firetux-walk-left-0.png firetux-walk-left-1.png firetux-walk-left-2.png firetux-walk-left-3.png firetux-walk-left-4.png firetux-walk-left-5.png firetux-walk-right-0.png firetux-walk-right-1.png firetux-walk-right-2.png firetux-walk-right-3.png firetux-walk-right-4.png firetux-walk-right-5.png Log Message: - added firetux, nothing more than a boring placeholder, but should be better than the current one --- NEW FILE: firetux-left-2.png.right --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-kick-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-skid-right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-jump-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-grab-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-left-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-kick-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-stand-right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-grab-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-jump-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-right-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-right-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-right-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-stand-left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-left-0.png.right --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-left-1.png.right --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-skid-left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-left-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-left-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-left-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-right-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-right-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firetux-walk-right-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ingo R. <gr...@us...> - 2004-04-24 19:41:04
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2942 Modified Files: worldmap.cpp Log Message: - added start/end tiles Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- worldmap.cpp 24 Apr 2004 14:49:04 -0000 1.46 +++ worldmap.cpp 24 Apr 2004 19:40:56 -0000 1.47 @@ -158,7 +158,7 @@ sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA); offset = 0; moving = false; - tile_pos.x = 5; + tile_pos.x = 4; tile_pos.y = 5; direction = NONE; input_direction = NONE; |
|
From: Ingo R. <gr...@us...> - 2004-04-24 19:40:27
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2864 Modified Files: worldmap.stwm Log Message: - added start/end tiles Index: worldmap.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/worldmap.stwm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- worldmap.stwm 24 Apr 2004 15:02:07 -0000 1.10 +++ worldmap.stwm 24 Apr 2004 19:40:18 -0000 1.11 @@ -8,8 +8,8 @@ 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 12 11 16 16 16 16 12 9 9 9 9 11 16 16 12 9 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9 9 14 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 - 9 9 11 22 19 47 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9 9 9 9 9 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9 - 9 9 15 19 48 42 20 13 9 9 15 31 35 29 29 28 19 19 19 23 16 12 9 9 9 11 22 19 24 25 26 23 12 11 16 16 12 9 9 9 + 9 9 11 22 58 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9 9 9 9 9 9 11 16 16 16 16 12 9 9 9 9 9 9 9 9 + 9 9 15 19 59 19 20 13 9 9 15 31 35 29 29 28 19 19 19 23 16 12 9 9 9 11 22 19 24 25 26 23 12 11 16 16 12 9 9 9 9 9 15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 40 39 20 18 13 9 9 11 22 19 19 30 36 34 26 23 22 19 19 23 12 9 9 9 9 15 19 47 19 23 22 19 19 19 19 24 26 47 19 19 19 47 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9 9 9 9 15 19 37 39 19 48 40 40 40 39 30 28 41 40 40 40 44 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9 9 @@ -21,15 +21,15 @@ 9 9 11 12 9 14 21 30 29 29 29 28 20 13 9 11 16 22 20 13 9 9 9 9 9 14 21 19 37 39 31 32 27 20 13 14 21 17 9 9 9 9 14 13 11 12 14 18 18 18 18 18 13 9 9 14 18 18 13 9 9 9 9 9 9 9 14 21 19 47 30 36 27 17 9 9 14 13 9 9 9 9 9 9 14 13 9 9 9 9 11 16 16 16 12 9 9 11 16 12 9 9 9 9 9 9 9 14 21 47 19 31 27 17 9 9 9 9 9 9 - 9 9 9 9 9 9 9 11 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12 9 9 9 9 9 15 47 19 30 28 17 9 9 9 9 9 9 - 9 9 9 11 16 16 16 22 19 19 19 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 9 9 9 9 9 9 - 9 9 9 15 24 25 26 19 19 19 19 19 30 29 29 28 19 30 29 29 36 34 25 26 19 19 48 40 40 42 17 9 9 9 9 9 9 9 9 9 - 9 9 9 15 31 32 27 40 40 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 19 19 47 20 18 18 13 9 9 9 9 9 9 9 9 9 - 9 9 9 15 30 36 34 26 19 47 19 47 19 19 47 19 47 19 19 47 19 19 19 48 40 40 42 23 12 9 9 9 9 11 12 9 9 9 9 9 - 9 9 9 14 21 30 29 28 19 37 40 42 19 19 47 19 47 19 19 47 19 19 19 47 19 19 24 26 17 9 9 9 9 14 13 9 9 9 9 9 - 9 9 9 9 14 18 18 18 21 19 19 19 19 19 47 19 47 19 48 42 19 19 48 42 24 25 33 27 17 9 9 9 9 9 9 9 9 9 9 9 - 9 9 9 9 9 9 9 9 14 21 19 24 25 26 37 40 42 19 47 19 19 19 47 19 30 29 36 27 17 9 9 9 9 9 9 9 9 9 9 9 - 9 9 9 11 12 9 9 9 9 14 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 9 9 11 16 16 12 9 9 9 9 9 + 9 9 9 9 9 11 16 16 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12 9 9 9 9 9 15 47 19 30 28 17 9 9 9 9 9 9 + 9 9 9 11 16 22 49 50 51 24 26 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 9 9 9 9 9 9 + 9 9 9 15 24 26 52 53 54 30 28 19 30 29 29 28 19 30 29 29 36 34 25 26 19 19 48 40 40 42 17 9 9 9 9 9 9 9 9 9 + 9 9 9 15 31 27 55 56 57 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 19 19 47 20 18 18 13 9 9 9 9 9 9 9 9 9 + 9 9 9 15 31 34 25 26 19 47 19 47 19 19 47 19 47 19 19 47 19 19 19 48 40 40 42 23 12 9 9 9 9 11 12 9 9 9 9 9 + 9 9 9 15 30 29 29 28 19 37 40 42 19 19 47 19 47 19 19 47 19 19 19 47 19 19 24 26 17 9 9 9 9 14 13 9 9 9 9 9 + 9 9 9 14 18 18 18 18 21 24 26 19 19 19 47 19 47 19 48 42 19 19 48 42 24 25 33 27 17 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 15 30 28 24 25 26 37 40 42 19 47 19 19 19 47 19 30 29 36 27 17 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 11 12 9 9 9 14 18 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 9 9 11 16 16 12 9 9 9 9 9 9 9 9 14 13 9 9 9 9 9 14 21 31 32 32 34 25 25 25 25 26 19 19 20 13 14 18 18 13 9 9 14 21 19 23 12 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 15 30 29 29 29 29 29 29 29 28 19 20 13 11 12 9 9 9 9 9 9 14 18 18 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 14 18 18 18 18 18 18 18 18 18 18 13 9 14 13 9 9 9 9 9 9 9 9 9 9 9 9 9 9 @@ -38,11 +38,11 @@ (levels (level (name "world1/level1.stl") - (x 5) - (y 4)) + (x 4) + (y 6)) (level (name "world1/level2.stl") (x 4) - (y 7)) + (y 8)) (level (name "world1/level3.stl") (x 5) (y 11)) @@ -116,5 +116,6 @@ (x 7) (y 20)) ) + ) |
|
From: Ingo R. <gr...@us...> - 2004-04-24 19:39:52
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2697 Modified Files: antarctica.stwt Added Files: castle1.png castle2.png castle3.png castle4.png castle5.png castle6.png castle7.png castle8.png castle9.png igloo1.png igloo2.png Log Message: - added start/end tiles --- NEW FILE: castle8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle9.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.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- antarctica.stwt 10 Apr 2004 18:54:27 -0000 1.4 +++ antarctica.stwt 24 Apr 2004 19:39:44 -0000 1.5 @@ -191,6 +191,81 @@ (south #t) (west #f) (east #t)) + + ;; castle + (tile (id 49) + (image "castle1.png") + (north #f) + (south #f) + (west #f) + (east #f)) + (tile (id 50) + (image "castle2.png") + (north #f) + (south #f) + (west #f) + (east #f)) + (tile (id 51) + (image "castle3.png") + (north #f) + (south #f) + (west #f) + (east #f)) + + (tile (id 52) + (image "castle4.png") + (north #f) + (south #f) + (west #f) + (east #f)) + (tile (id 53) + (image "castle5.png") + (north #f) + (south #f) + (west #f) + (east #f)) + (tile (id 54) + (image "castle6.png") + (north #f) + (south #f) + (west #f) + (east #f)) + + (tile (id 55) + (image "castle7.png") + (north #f) + (south #f) + (west #f) + (east #f)) + (tile (id 56) + (image "castle8.png") + (stop #t) + (north #f) + (south #f) + (west #f) + (east #t)) + (tile (id 57) + (image "castle9.png") + (stop #f) + (north #f) + (south #f) + (west #t) + (east #t)) + + (tile (id 58) + (image "igloo1.png") + (stop #f) + (north #f) + (south #f) + (west #f) + (east #f)) + (tile (id 59) + (image "igloo2.png") + (stop #t) + (north #f) + (south #t) + (west #f) + (east #f)) ) ;; EOF ;; --- NEW FILE: castle1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: castle7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: igloo2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: igloo1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-24 18:03:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18698/src Modified Files: menu.cpp Log Message: At least my compiler (g++ (GCC) 3.3.2) needs this include. Anyway, there is still a crash to be fixed. Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- menu.cpp 24 Apr 2004 17:48:49 -0000 1.55 +++ menu.cpp 24 Apr 2004 18:03:35 -0000 1.56 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <assert.h> #include "defines.h" #include "globals.h" |
|
From: Ingo R. <gr...@us...> - 2004-04-24 17:48:58
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15754 Modified Files: leveleditor.cpp menu.cpp menu.h resources.cpp setup.cpp sound.cpp sound.h Log Message: 'nother music patch by matzeb Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- menu.cpp 24 Apr 2004 15:27:38 -0000 1.54 +++ menu.cpp 24 Apr 2004 17:48:49 -0000 1.55 @@ -154,7 +154,7 @@ /* Set ControlField a key */ void Menu::get_controlfield_key_into_input(MenuItem *item) { -switch(*item->int_p) + switch(*item->int_p) { case SDLK_UP: strcpy(item->input, "Up cursor"); @@ -602,6 +602,25 @@ } } +MenuItem& +Menu::get_item_by_id(int id) +{ + for(std::vector<MenuItem>::iterator i = item.begin(); i != item.end(); ++i) { + if(i->id == id) + return *i; + } + + assert(false); + static MenuItem dummyitem; + return dummyitem; +} + +bool +Menu::isToggled(int id) +{ + return get_item_by_id(id).toggled; +} + /* Check for menu event */ void Menu::event(SDL_Event& event) Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- setup.cpp 24 Apr 2004 15:08:21 -0000 1.54 +++ setup.cpp 24 Apr 2004 17:48:49 -0000 1.55 @@ -50,6 +50,7 @@ #include "scene.h" #include "worldmap.h" #include "resources.h" +#include "music_manager.h" #include "player.h" @@ -394,13 +395,13 @@ options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0, MNID_FULLSCREEN); if(audio_device) { - options_menu->additem(MN_TOGGLE,"Sound ",use_sound,0, MNID_SOUND); - options_menu->additem(MN_TOGGLE,"Music ",use_music,0, MNID_MUSIC); + options_menu->additem(MN_TOGGLE,"Sound ", use_sound,0, MNID_SOUND); + options_menu->additem(MN_TOGGLE,"Music ", use_music,0, MNID_MUSIC); } else { - options_menu->additem(MN_DEACTIVE,"Sound ",use_sound,0, MNID_SOUND); - options_menu->additem(MN_DEACTIVE,"Music ",use_music,0, MNID_MUSIC); + options_menu->additem(MN_DEACTIVE,"Sound ", false,0, MNID_SOUND); + options_menu->additem(MN_DEACTIVE,"Music ", false,0, MNID_MUSIC); } options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS); options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu); @@ -517,31 +518,35 @@ { case MNID_OPENGL: #ifndef NOOPENGL - if(use_gl != options_menu->item[MNID_OPENGL].toggled) + if(use_gl != options_menu->isToggled(MNID_OPENGL)) { use_gl = !use_gl; st_video_setup(); } #else - options_menu->item[MNID_OPENGL].toggled = false; + options_menu->get_item_by_id(MNID_OPENGL).toggled = false; #endif break; case MNID_FULLSCREEN: - if(use_fullscreen != options_menu->item[MNID_FULLSCREEN].toggled) + if(use_fullscreen != options_menu->isToggled(MNID_FULLSCREEN)) { use_fullscreen = !use_fullscreen; st_video_setup(); } break; case MNID_SOUND: - if(use_sound != options_menu->item[MNID_SOUND].toggled) + if(use_sound != options_menu->isToggled(MNID_SOUND)) use_sound = !use_sound; break; case MNID_MUSIC: - music_manager->enable_music(options_menu->item[MNID_MUSIC].toggled); + if(use_music != options_menu->isToggled(MNID_MUSIC)) + { + use_music = !use_music; + music_manager->enable_music(use_music); + } break; case MNID_SHOWFPS: - if(show_fps != options_menu->item[MNID_SHOWFPS].toggled) + if(show_fps != options_menu->isToggled(MNID_SHOWFPS)) show_fps = !show_fps; break; } Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- menu.h 24 Apr 2004 15:27:38 -0000 1.48 +++ menu.h 24 Apr 2004 17:48:49 -0000 1.49 @@ -171,6 +171,9 @@ int check (); MenuItem& get_item(int index) { return item[index]; } + MenuItem& get_item_by_id(int id); + + bool isToggled(int id); void Menu::get_controlfield_key_into_input(MenuItem *item); @@ -183,6 +186,8 @@ int get_width() const; int get_height() const; + + bool is_toggled(int id) const; }; extern Surface* checkbox; Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- leveleditor.cpp 24 Apr 2004 09:32:31 -0000 1.63 +++ leveleditor.cpp 24 Apr 2004 17:48:49 -0000 1.64 @@ -41,6 +41,7 @@ #include "button.h" #include "tile.h" #include "resources.h" +#include "music_manager.h" /* definitions to aid development */ @@ -170,6 +171,8 @@ clearscreen(0, 0, 0); updatescreen(); + + music_manager->halt_music(); while (SDL_PollEvent(&event)) {} @@ -1221,6 +1224,8 @@ GameSession session("test",le_level, ST_GL_TEST); session.run(); + music_manager->halt_music(); + Menu::set_current(leveleditor_menu); le_world.arrays_free(); le_current_level->load_gfx(); Index: sound.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- sound.cpp 24 Apr 2004 14:49:04 -0000 1.13 +++ sound.cpp 24 Apr 2004 17:48:49 -0000 1.14 @@ -27,7 +27,6 @@ bool use_sound = true; /* handle sound on/off menu and command-line option */ bool use_music = true; /* handle music on/off menu and command-line option */ bool audio_device = true; /* != 0: available and initialized */ -int current_music; char * soundfilenames[NUM_SOUNDS] = { "/sounds/jump.wav", Index: sound.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- sound.h 24 Apr 2004 14:49:04 -0000 1.26 +++ sound.h 24 Apr 2004 17:48:49 -0000 1.27 @@ -28,7 +28,7 @@ /*global variable*/ extern bool use_sound; /* handle sound on/off menu and command-line option */ -extern bool use_music; /* handle music on/off menu and command-line option */ +extern bool use_music; /* handle music on/off menu and command-line */ extern bool audio_device; /* != 0: available and initialized */ /* enum of different internal music types */ Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- resources.cpp 24 Apr 2004 14:49:04 -0000 1.21 +++ resources.cpp 24 Apr 2004 17:48:49 -0000 1.22 @@ -48,6 +48,7 @@ sprite_manager = new SpriteManager(datadir + "/supertux.strf"); music_manager = new MusicManager(); + music_manager->enable_music(use_music); /* Tuxes: */ smalltux_star = sprite_manager->load("smalltux-star"); |
|
From: Ricardo C. <rm...@us...> - 2004-04-24 15:27:47
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23628/src Modified Files: menu.cpp menu.h Log Message: Ingo, that code is not buggy! You can say that it is a bad approuch, but it is not a bug! Besides, I don't think it's a bad approuch. Your code is maybe a better approuch. But in the other hand is buggy, so please let my code be there. Buggy, why, you may ask... Imagine this simple and fictional code: « #define MNID_START 1 menu->additem("Start Game", MNID_START); menu->additem("Options"); if(menu->check() == MNID_START) startgame(); » With your code, when you pressed Options, the game would also start. Have a look at it again and guess why ;-) Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- menu.cpp 24 Apr 2004 12:11:10 -0000 1.53 +++ menu.cpp 24 Apr 2004 15:27:38 -0000 1.54 @@ -223,6 +223,7 @@ pos_x = screen->w/2; pos_y = screen->h/2; has_backitem = false; + last_id = 0; arrange_left = 0; active_item = 0; effect.init(false); @@ -239,10 +240,13 @@ { if(kind_ == MN_BACK) has_backitem = true; - - if(id == -1) - id = int(item.size()); + if(id == -1 && item.size() == (unsigned)last_id) + { + id = last_id; + last_id++; + } + additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p)); } Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- menu.h 24 Apr 2004 15:08:21 -0000 1.47 +++ menu.h 24 Apr 2004 15:27:38 -0000 1.48 @@ -139,6 +139,7 @@ int pos_x; int pos_y; bool has_backitem; + int last_id; /** input event for the menu (up, down, left, right, etc.) */ MenuAction menuaction; |
|
From: Ingo R. <gr...@us...> - 2004-04-24 15:08:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20694 Modified Files: menu.h setup.cpp Log Message: - fixed option menu Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- setup.cpp 24 Apr 2004 14:49:04 -0000 1.53 +++ setup.cpp 24 Apr 2004 15:08:21 -0000 1.54 @@ -379,7 +379,7 @@ main_menu->set_pos(screen->w/2, 335); main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME); main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB); - main_menu->additem(MN_GOTO, "Options",0,options_menu); + main_menu->additem(MN_GOTO, "Options",0,options_menu, MNID_OPTIONMENU); main_menu->additem(MN_ACTION,"Level editor",0,0, MNID_LEVELEDITOR); main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS); main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU); Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- menu.h 24 Apr 2004 12:11:10 -0000 1.46 +++ menu.h 24 Apr 2004 15:08:21 -0000 1.47 @@ -32,6 +32,7 @@ enum MainMenuIDs { MNID_STARTGAME, MNID_CONTRIB, + MNID_OPTIONMENU, MNID_LEVELEDITOR, MNID_CREDITS, MNID_QUITMAINMENU |
|
From: Ricardo C. <rm...@us...> - 2004-04-24 15:02:46
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19419/data/levels/default Modified Files: worldmap.stwm Log Message: Marek levels updating. He also added two new levels for the start that are easier. Updated worldmap as well. Can someone test if level 25 and 26 are there? Index: worldmap.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/worldmap.stwm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- worldmap.stwm 17 Apr 2004 15:40:01 -0000 1.9 +++ worldmap.stwm 24 Apr 2004 15:02:07 -0000 1.10 @@ -109,10 +109,10 @@ (level (name "world1/level24.stl") (x 14) (y 20)) - (level (name "Level 25") + (level (name "world1/level25.stl") (x 10) (y 22)) - (level (name "Level 26") + (level (name "world1/level26.stl") (x 7) (y 20)) ) |
|
From: Ingo R. <gr...@us...> - 2004-04-24 14:49:18
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17682 Modified Files: Makefile.am gameloop.cpp level.cpp level.h resources.cpp resources.h setup.cpp sound.cpp sound.h title.cpp world.cpp worldmap.cpp worldmap.h Added Files: music_manager.cpp music_manager.h musicref.cpp musicref.h Log Message: - patch from MatzeB to make music handling easier and more stable Index: resources.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- resources.h 22 Apr 2004 21:24:31 -0000 1.7 +++ resources.h 24 Apr 2004 14:49:04 -0000 1.8 @@ -20,7 +20,10 @@ #ifndef SUPERTUX_RESOURCES_H #define SUPERTUX_RESOURCES_H +#include "musicref.h" + class SpriteManager; +class MusicManager; extern Surface* img_waves[3]; extern Surface* img_water; @@ -32,7 +35,10 @@ extern Surface* img_super_bkgd; extern Surface* img_red_glow; +extern MusicRef herring_song; + extern SpriteManager* sprite_manager; +extern MusicManager* music_manager; void loadshared(); void unloadshared(); Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile.am 17 Apr 2004 10:48:03 -0000 1.18 +++ Makefile.am 24 Apr 2004 14:49:03 -0000 1.19 @@ -69,6 +69,10 @@ sprite.h \ sprite.cpp \ sprite_manager.cpp \ -sprite_manager.h +sprite_manager.h \ +music_manager.cpp \ +music_manager.h \ +musicref.cpp \ +musicref.h # EOF # Index: sound.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- sound.cpp 22 Apr 2004 21:51:19 -0000 1.12 +++ sound.cpp 24 Apr 2004 14:49:04 -0000 1.13 @@ -24,9 +24,9 @@ #include "setup.h" /*global variable*/ -bool use_sound; /* handle sound on/off menu and command-line option */ -bool use_music; /* handle music on/off menu and command-line option */ -bool audio_device; /* != 0: available and initialized */ +bool use_sound = true; /* handle sound on/off menu and command-line option */ +bool use_music = true; /* handle music on/off menu and command-line option */ +bool audio_device = true; /* != 0: available and initialized */ int current_music; char * soundfilenames[NUM_SOUNDS] = { @@ -55,8 +55,6 @@ #include <SDL_mixer.h> Mix_Chunk * sounds[NUM_SOUNDS]; -Mix_Music * herring_song = 0; -Mix_Music * current_song = 0; /* --- OPEN THE AUDIO DEVICE --- */ @@ -158,47 +156,3 @@ } } -void halt_music(void) -{ - if (!use_music || !audio_device) - return; - - Mix_HaltMusic(); - current_song = 0; -} - - -void play_music(Mix_Music *music) -{ - if (!audio_device) - return; - if(music == current_song) - return; - - if (use_music && Mix_PlayMusic(music, -1) < 0) - st_abort("Couldn't play music: ", Mix_GetError()); - - current_song = music; -} - - -void free_music(Mix_Music *music) -{ - if(!audio_device) - return; - - Mix_FreeMusic( music ); -} - -void enable_music(bool enable) -{ - if(!audio_device) - return; - - use_music = enable; - if(!use_music) - Mix_HaltMusic(); - else - Mix_PlayMusic(current_song, -1); -} - Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- worldmap.cpp 24 Apr 2004 09:32:32 -0000 1.45 +++ worldmap.cpp 24 Apr 2004 14:49:04 -0000 1.46 @@ -28,6 +28,7 @@ #include "gameloop.h" #include "setup.h" #include "worldmap.h" +#include "resources.h" namespace WorldMapNS { @@ -283,7 +284,6 @@ name = "<no file>"; music = "SALCON.MOD"; - song = 0; load_map(); } @@ -555,8 +555,6 @@ level->y == tux->get_tile_pos().y) { std::cout << "Enter the current level: " << level->name << std::endl;; - halt_music(); - GameSession session(datadir + "levels/" + level->name, 1, ST_GL_LOAD_LEVEL_FILE); @@ -582,7 +580,7 @@ break; } - play_music(song); + music_manager->play_music(song); Menu::set_current(0); if (!savegame_file.empty()) savegame(savegame_file); @@ -725,11 +723,8 @@ quit = false; - song = load_song(datadir + "/music/" + music); - if(!song) - st_abort("Couldn't load song ", music.c_str()); - - play_music(song); + song = music_manager->load_music(datadir + "/music/" + music); + music_manager->play_music(song); while(!quit) { Point tux_pos = tux->get_pos(); @@ -758,9 +753,6 @@ SDL_Delay(20); } - - halt_music(); - free_music(song); } void Index: sound.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- sound.h 22 Apr 2004 21:51:19 -0000 1.25 +++ sound.h 24 Apr 2004 14:49:04 -0000 1.26 @@ -78,7 +78,6 @@ /* variables for stocking the sound and music */ extern Mix_Chunk* sounds[NUM_SOUNDS]; -extern Mix_Music* herring_song; /* functions handling the sound and music */ int open_audio(int frequency, Uint16 format, int channels, int chunksize); @@ -88,10 +87,4 @@ void free_chunk(Mix_Chunk*chunk); void play_sound(Mix_Chunk * snd, enum Sound_Speaker whichSpeaker); -Mix_Music* load_song(const std::string& file); -void free_music(Mix_Music* music); -void halt_music(void); -void enable_music(bool enable); -void play_music(Mix_Music* music); - #endif /*SUPERTUX_SOUND_H*/ --- NEW FILE: music_manager.cpp --- // $Id: music_manager.cpp,v 1.1 2004/04/24 14:49:03 grumbel Exp $ // // SuperTux // Copyright (C) 2004 Ingo Ruhnke <gr...@gm...> // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <assert.h> #include "music_manager.h" #include "musicref.h" #include "sound.h" #include "setup.h" MusicManager::MusicManager() : music_enabled(true) { } MusicManager::~MusicManager() { if(audio_device) Mix_HaltMusic(); } MusicRef MusicManager::load_music(const std::string& file) { if(!audio_device) return MusicRef(0); if(!exists_music(file)) st_abort("Couldn't load musicfile ", file.c_str()); std::map<std::string, MusicResource>::iterator i = musics.find(file); assert(i != musics.end()); return MusicRef(& (i->second)); } bool MusicManager::exists_music(const std::string& file) { if(!audio_device) return true; // song already loaded? std::map<std::string, MusicResource>::iterator i = musics.find(file); if(i != musics.end()) { return true; } Mix_Music* song = Mix_LoadMUS(file.c_str()); if(song == 0) return false; // insert into music list std::pair<std::map<std::string, MusicResource>::iterator, bool> result = musics.insert( std::make_pair<std::string, MusicResource> (file, MusicResource())); MusicResource& resource = result.first->second; resource.manager = this; resource.music = song; return true; } void MusicManager::free_music(MusicResource* ) { // TODO free music, currently we can't do this since SDL_mixer seems to have // some bugs if you load/free alot of mod files. } void MusicManager::play_music(const MusicRef& musicref) { if(!audio_device) return; if(musicref.music == 0 || current_music == musicref.music) return; if(current_music) current_music->refcount--; current_music = musicref.music; current_music->refcount++; if(music_enabled) Mix_PlayMusic(current_music->music, -1); } void MusicManager::halt_music() { if(!audio_device) return; Mix_HaltMusic(); if(current_music) { current_music->refcount--; if(current_music->refcount == 0) free_music(current_music); current_music = 0; } } void MusicManager::enable_music(bool enable) { if(!audio_device) return; if(enable == music_enabled) return; music_enabled = enable; if(music_enabled == false) { Mix_HaltMusic(); } else { Mix_PlayMusic(current_music->music, -1); } } MusicManager::MusicResource::~MusicResource() { // buggy SDL_mixer :-/ // Mix_FreeMusic(music); } Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- worldmap.h 21 Apr 2004 11:17:31 -0000 1.21 +++ worldmap.h 24 Apr 2004 14:49:04 -0000 1.22 @@ -23,7 +23,7 @@ #include <vector> #include <string> -#include <SDL_mixer.h> +#include "musicref.h" namespace WorldMapNS { @@ -153,7 +153,7 @@ typedef std::vector<Level> Levels; Levels levels; - Mix_Music* song; + MusicRef song; Direction input_direction; bool enter_level; Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- gameloop.cpp 24 Apr 2004 09:32:31 -0000 1.98 +++ gameloop.cpp 24 Apr 2004 14:49:03 -0000 1.99 @@ -53,6 +53,7 @@ #include "tile.h" #include "particlesystem.h" #include "resources.h" +#include "music_manager.h" GameSession* GameSession::current_ = 0; @@ -141,6 +142,8 @@ void GameSession::levelintro(void) { + music_manager->halt_music(); + char str[60]; /* Level Intro: */ clearscreen(0, 0, 0); @@ -380,7 +383,7 @@ { end_sequenze = true; last_x_pos = -1; - halt_music(); + music_manager->halt_music(); } else { --- NEW FILE: musicref.cpp --- // $Id: musicref.cpp,v 1.1 2004/04/24 14:49:03 grumbel Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2000 Bill Kendrick <bi...@ne...> // Copyright (C) 2004 Matthias Braun <ma...@br...> // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "musicref.h" MusicRef::MusicRef() : music(0) { } MusicRef::MusicRef(MusicManager::MusicResource* newmusic) : music(newmusic) { if(music) music->refcount++; } MusicRef::~MusicRef() { if(music) { music->refcount--; if(music->refcount == 0) music->manager->free_music(music); } } MusicRef::MusicRef(const MusicRef& other) : music(other.music) { if(music) music->refcount++; } MusicRef& MusicRef::operator =(const MusicRef& other) { MusicManager::MusicResource* oldres = music; music = other.music; if(music) music->refcount++; if(oldres) { oldres->refcount--; if(oldres->refcount == 0) music->manager->free_music(music); } return *this; } Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- setup.cpp 24 Apr 2004 09:32:32 -0000 1.52 +++ setup.cpp 24 Apr 2004 14:49:04 -0000 1.53 @@ -49,6 +49,7 @@ #include "configfile.h" #include "scene.h" #include "worldmap.h" +#include "resources.h" #include "player.h" @@ -537,10 +538,7 @@ use_sound = !use_sound; break; case MNID_MUSIC: - if(use_music != options_menu->item[MNID_MUSIC].toggled) - { - enable_music(options_menu->item[MNID_MUSIC].toggled); - } + music_manager->enable_music(options_menu->item[MNID_MUSIC].toggled); break; case MNID_SHOWFPS: if(show_fps != options_menu->item[MNID_SHOWFPS].toggled) --- NEW FILE: musicref.h --- // $Id: musicref.h,v 1.1 2004/04/24 14:49:04 grumbel Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2004 Matthias Braun <ma...@br...> // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef HEADER_MUSIC_RESOURCE_H #define HEADER_MUSIC_RESOURCE_H #include "music_manager.h" /** This class holds a reference to a music file and maintains a correct * refcount for that file. */ class MusicRef { public: MusicRef(); MusicRef(const MusicRef& other); ~MusicRef(); MusicRef& operator= (const MusicRef& other); private: friend class MusicManager; MusicRef(MusicManager::MusicResource* music); MusicManager::MusicResource* music; }; #endif Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- level.h 24 Apr 2004 12:11:10 -0000 1.36 +++ level.h 24 Apr 2004 14:49:03 -0000 1.37 @@ -25,6 +25,7 @@ #include "texture.h" #include "badguy.h" #include "lispreader.h" +#include "musicref.h" class Tile; @@ -68,8 +69,8 @@ { public: Surface* img_bkgd; - Mix_Music* level_song; - Mix_Music* level_song_fast; + MusicRef level_song; + MusicRef level_song_fast; std::string name; std::string author; @@ -119,8 +120,8 @@ void load_song(); void free_song(); - Mix_Music* get_level_music(); - Mix_Music* get_level_music_fast(); + MusicRef get_level_music(); + MusicRef get_level_music_fast(); void save(const char* subset, int level); --- NEW FILE: music_manager.h --- // $Id: music_manager.h,v 1.1 2004/04/24 14:49:03 grumbel Exp $ // // SuperTux - A Jump'n Run // Copyright (C) 2000 Bill Kendrick <bi...@ne...> // Copyright (C) 2004 Duong-Khang NGUYEN <neo...@us...> // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef HEADER_MUSIC_MANAGER_H #define HEADER_MUSIC_MANAGER_H #include <SDL_mixer.h> #include <string> #include <map> class MusicRef; /** This class manages a list of music resources and is responsible for playing * the music. */ class MusicManager { public: MusicManager(); ~MusicManager(); MusicRef load_music(const std::string& file); bool exists_music(const std::string& filename); void play_music(const MusicRef& music); void halt_music(); void enable_music(bool enable); private: friend class MusicRef; class MusicResource { public: ~MusicResource(); MusicManager* manager; Mix_Music* music; int refcount; }; void free_music(MusicResource* music); std::map<std::string, MusicResource> musics; MusicResource* current_music; bool music_enabled; }; #endif Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- title.cpp 24 Apr 2004 09:32:32 -0000 1.58 +++ title.cpp 24 Apr 2004 14:49:04 -0000 1.59 @@ -139,7 +139,6 @@ { index -= 1; // FIXME: Hack std::cout << "Sarting level: " << index << std::endl; - halt_music(); GameSession session(current_contrib_subset, index, ST_GL_PLAY); session.run(); Menu::set_current(main_menu); @@ -308,7 +307,6 @@ generate_contrib_menu(); break; case MNID_LEVELEDITOR: - halt_music(); leveleditor(1); Menu::set_current(main_menu); break; Index: world.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- world.cpp 22 Apr 2004 19:15:22 -0000 1.39 +++ world.cpp 24 Apr 2004 14:49:04 -0000 1.40 @@ -76,7 +76,6 @@ for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i) delete *i; - halt_music(); // just to be sure (because levelmusic is freed now) delete level; } @@ -428,16 +427,16 @@ currentmusic = musictype; switch(currentmusic) { case HURRYUP_MUSIC: - ::play_music(get_level()->get_level_music_fast()); + music_manager->play_music(get_level()->get_level_music_fast()); break; case LEVEL_MUSIC: - ::play_music(get_level()->get_level_music()); + music_manager->play_music(get_level()->get_level_music()); break; case HERRING_MUSIC: - ::play_music(herring_song); + music_manager->play_music(herring_song); break; default: - ::halt_music(); + music_manager->halt_music(); break; } } Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- level.cpp 24 Apr 2004 12:11:10 -0000 1.47 +++ level.cpp 24 Apr 2004 14:49:03 -0000 1.48 @@ -31,6 +31,8 @@ #include "scene.h" #include "tile.h" #include "lispreader.h" +#include "resources.h" +#include "music_manager.h" using namespace std; @@ -199,18 +201,18 @@ } Level::Level() - : img_bkgd(0), level_song(0), level_song_fast(0) + : img_bkgd(0) { } Level::Level(const std::string& subset, int level) - : img_bkgd(0), level_song(0), level_song_fast(0) + : img_bkgd(0) { load(subset, level); } Level::Level(const std::string& filename) - : img_bkgd(0), level_song(0), level_song_fast(0) + : img_bkgd(0) { load(filename); } @@ -218,7 +220,6 @@ Level::~Level() { free_gfx(); - free_song(); } void @@ -698,29 +699,13 @@ } } -void -Level::free_song(void) -{ - if(level_song_fast != level_song) { - free_music(level_song_fast); - level_song_fast = 0; - } - - free_music(level_song); - level_song = 0; -} - void Level::load_song() { - free_song(); - char* song_path; char* song_subtitle; - level_song = ::load_song(datadir + "/music/" + song_title); - if(!level_song) - st_abort("Couldn't load song: " , song_title.c_str()); + level_song = music_manager->load_music(datadir + "/music/" + song_title); song_path = (char *) malloc(sizeof(char) * datadir.length() + strlen(song_title.c_str()) + 8 + 5); @@ -728,21 +713,22 @@ strcpy(strstr(song_subtitle, "."), "\0"); sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), song_subtitle, strstr(song_title.c_str(), ".")); - level_song_fast = ::load_song(song_path); - if(!level_song_fast) { + if(!music_manager->exists_music(song_path)) { level_song_fast = level_song; + } else { + level_song_fast = music_manager->load_music(song_path); } free(song_subtitle); free(song_path); } -Mix_Music* +MusicRef Level::get_level_music() { return level_song; } -Mix_Music* +MusicRef Level::get_level_music_fast() { return level_song_fast; Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- resources.cpp 24 Apr 2004 13:12:12 -0000 1.20 +++ resources.cpp 24 Apr 2004 14:49:04 -0000 1.21 @@ -36,7 +36,10 @@ Surface* img_red_glow; +MusicRef herring_song; + SpriteManager* sprite_manager = 0; +MusicManager* music_manager = 0; /* Load graphics/sounds shared between all levels: */ void loadshared() @@ -44,6 +47,7 @@ int i; sprite_manager = new SpriteManager(datadir + "/supertux.strf"); + music_manager = new MusicManager(); /* Tuxes: */ smalltux_star = sprite_manager->load("smalltux-star"); @@ -270,17 +274,13 @@ sounds[i] = load_sound(datadir + soundfilenames[i]); /* Herring song */ - herring_song = load_song(datadir + "/music/SALCON.MOD"); - if(!herring_song) - st_abort("Couldn't load song ", "/music/SALCON.MOD"); + herring_song = music_manager->load_music(datadir + "/music/SALCON.MOD"); } /* Free shared data: */ void unloadshared(void) { - delete sprite_manager; - int i; free_special_gfx(); @@ -330,8 +330,10 @@ for (i = 0; i < NUM_SOUNDS; i++) free_chunk(sounds[i]); - /* free the herring song */ - free_music( herring_song ); + delete sprite_manager; + sprite_manager = 0; + delete music_manager; + music_manager = 0; } /* EOF */ |
|
From: Ingo R. <gr...@us...> - 2004-04-24 13:12:34
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1679 Modified Files: player.cpp player.h resources.cpp Log Message: - new star tux, still rather pure, but useable Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- player.cpp 24 Apr 2004 12:45:34 -0000 1.59 +++ player.cpp 24 Apr 2004 13:12:12 -0000 1.60 @@ -44,6 +44,9 @@ 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; @@ -72,8 +75,6 @@ Surface* skidfiretux_left; Surface* cape_right[2]; Surface* cape_left[2]; -Surface* bigcape_right[2]; -Surface* bigcape_left[2]; PlayerKeymap keymap; @@ -535,14 +536,6 @@ { if (size == SMALL) { - if (invincible_timer.started()) - { - if (dir == RIGHT) - cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); - else - cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); - } - if (!skidding_timer.started()) { if (physic.get_velocity_y() != 0) @@ -585,22 +578,12 @@ 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 (invincible_timer.started()) - { - float capex = base.x + (base.width - bigcape_right[0]->w) / 2; - capex -= scroll_x; - float capey = base.y + (base.height - bigcape_right[0]->h) / 2; - - /* Draw cape (just not in ducked mode since that looks silly): */ - if (dir == RIGHT) - bigcape_right[global_frame_counter % 2]->draw(capex, capey); - else - bigcape_left[global_frame_counter % 2]->draw(capex, capey); - } - if (!got_coffee) { if (!duck) @@ -694,6 +677,9 @@ else largetux_grab_left->draw(base.x - scroll_x, base.y); } + + if (invincible_timer.started()) + largetux_star->draw(base.x - scroll_x, base.y); } } } Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- player.h 24 Apr 2004 12:30:21 -0000 1.38 +++ player.h 24 Apr 2004 13:12:12 -0000 1.39 @@ -91,6 +91,8 @@ 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* largetux_kick_left; extern Sprite* largetux_kick_right; Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- resources.cpp 24 Apr 2004 12:11:11 -0000 1.19 +++ resources.cpp 24 Apr 2004 13:12:12 -0000 1.20 @@ -46,6 +46,9 @@ sprite_manager = new SpriteManager(datadir + "/supertux.strf"); /* Tuxes: */ + smalltux_star = sprite_manager->load("smalltux-star"); + largetux_star = sprite_manager->load("largetux-star"); + 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"); @@ -117,18 +120,6 @@ bigtux_left_jump = sprite_manager->load("largetux-jump-left"); bigtux_right_jump = sprite_manager->load("largetux-jump-right"); - bigcape_right[0] = new Surface(datadir + "/images/shared/bigcape-right-0.png", - USE_ALPHA); - - bigcape_right[1] = new Surface(datadir + "/images/shared/bigcape-right-1.png", - USE_ALPHA); - - bigcape_left[0] = new Surface(datadir + "/images/shared/bigcape-left-0.png", - USE_ALPHA); - - bigcape_left[1] = new Surface(datadir + "/images/shared/bigcape-left-1.png", - USE_ALPHA); - bigfiretux_right[0] = new Surface(datadir + "/images/shared/bigfiretux-right-0.png", USE_ALPHA); @@ -151,19 +142,6 @@ bigfiretux_left_jump = new Surface(datadir + "/images/shared/bigfiretux-left-jump.png", USE_ALPHA); - bigcape_right[0] = new Surface(datadir + "/images/shared/bigcape-right-0.png", - USE_ALPHA); - - bigcape_right[1] = new Surface(datadir + "/images/shared/bigcape-right-1.png", - USE_ALPHA); - - bigcape_left[0] = new Surface(datadir + "/images/shared/bigcape-left-0.png", - USE_ALPHA); - - bigcape_left[1] = new Surface(datadir + "/images/shared/bigcape-left-1.png", - USE_ALPHA); - - ducktux_left = sprite_manager->load("largetux-duck-left"); ducktux_right = sprite_manager->load("largetux-duck-right"); @@ -322,8 +300,6 @@ { delete cape_right[i]; delete cape_left[i]; - delete bigcape_right[i]; - delete bigcape_left[i]; } delete ducktux_left; |
|
From: Ingo R. <gr...@us...> - 2004-04-24 13:11:38
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1544 Modified Files: supertux.strf Log Message: - new star tux, still rather pure, but useable Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- supertux.strf 24 Apr 2004 10:43:15 -0000 1.18 +++ supertux.strf 24 Apr 2004 13:11:29 -0000 1.19 @@ -325,6 +325,22 @@ (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-24 13:11:23
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1448 Modified Files: largetux-grab-left-0.png largetux-grab-right-0.png Added Files: largetux-star-0.png largetux-star-1.png largetux-star-2.png smalltux-star-0.png smalltux-star-1.png smalltux-star-2.png Log Message: - new star tux, still rather pure, but useable --- NEW FILE: largetux-star-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-star-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-star-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-star-2.png --- (This appears to be a binary file; contents omitted.) Index: largetux-grab-left-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/largetux-grab-left-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsNZUrnL and /tmp/cvssgzHGq differ --- NEW FILE: smalltux-star-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-star-1.png --- (This appears to be a binary file; contents omitted.) Index: largetux-grab-right-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/largetux-grab-right-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsDOmwPU and /tmp/cvsMMXWeA differ |
|
From: Ingo R. <gr...@us...> - 2004-04-24 12:45:43
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29276 Modified Files: player.cpp Log Message: - fixed duck-jump bug Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- player.cpp 24 Apr 2004 12:30:20 -0000 1.58 +++ player.cpp 24 Apr 2004 12:45:34 -0000 1.59 @@ -482,7 +482,7 @@ // changing base size confuses collision otherwise old_base = previous_base = base; } - else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0) + else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0 && on_ground()) { duck = false; base.y -= 32; |
|
From: Ingo R. <gr...@us...> - 2004-04-24 12:30:35
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26572 Modified Files: player.cpp player.h Log Message: - added holding gfx, still looks rather stupid, but I think thats unavoidable without major changes to the current code Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- player.cpp 24 Apr 2004 12:11:10 -0000 1.57 +++ player.cpp 24 Apr 2004 12:30:20 -0000 1.58 @@ -101,6 +101,8 @@ { Level* plevel = World::current()->get_level(); + holding_something = false; + base.width = 32; base.height = 32; @@ -190,6 +192,9 @@ { bool jumped_in_solid = false; + if (input.fire == UP) + holding_something = false; + /* Move tux: */ previous_base = base; @@ -572,6 +577,14 @@ else 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); + else + smalltux_grab_left->draw(base.x - scroll_x, base.y); + } } else // Large Tux { @@ -673,8 +686,16 @@ duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); } } + + 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 (debug_mode) @@ -698,6 +719,7 @@ { if (pbad_c->mode == BadGuy::FLAT && input.fire == DOWN) { + holding_something = true; pbad_c->mode = BadGuy::HELD; pbad_c->base.y-=8; } Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- player.h 24 Apr 2004 12:11:11 -0000 1.37 +++ player.h 24 Apr 2004 12:30:21 -0000 1.38 @@ -129,6 +129,7 @@ bool got_coffee; int size; bool duck; + bool holding_something; DyingType dying; Direction dir; |
|
From: Ingo R. <gr...@us...> - 2004-04-24 12:11:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23606 Modified Files: level.cpp level.h menu.cpp menu.h player.cpp player.h resources.cpp Log Message: - fixed bug in Menu::check() - added grab/kick tux to resources - added flag to use endsequence or not Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- menu.cpp 24 Apr 2004 09:32:31 -0000 1.52 +++ menu.cpp 24 Apr 2004 12:11:10 -0000 1.53 @@ -223,7 +223,6 @@ pos_x = screen->w/2; pos_y = screen->h/2; has_backitem = false; - last_id = 0; arrange_left = 0; active_item = 0; effect.init(false); @@ -241,12 +240,9 @@ if(kind_ == MN_BACK) has_backitem = true; - if(id == -1 && item.size() == (unsigned)last_id) - { - id = last_id; - last_id++; - } - + if(id == -1) + id = int(item.size()); + additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p)); } @@ -404,30 +400,10 @@ int Menu::check() { - return item[hit_item].id; - /* - if (item.size() != 0) - { - if((item[active_item].kind == MN_ACTION - || item[active_item].kind == MN_TEXTFIELD - || item[active_item].kind == MN_NUMFIELD) - && item[active_item].toggled) - { - item[active_item].toggled = false; - Menu::set_current(0); - return active_item; - } - else if(item[active_item].kind == MN_TOGGLE - || item[active_item].kind == MN_GOTO) - { - return active_item; - } - else - return -1; - } + if (hit_item != -1) + return item[hit_item].id; else return -1; - */ } void Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- player.h 22 Apr 2004 20:14:49 -0000 1.36 +++ player.h 24 Apr 2004 12:11:11 -0000 1.37 @@ -86,6 +86,17 @@ 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* largetux_kick_left; +extern Sprite* largetux_kick_right; +extern Sprite* largetux_grab_left; +extern Sprite* largetux_grab_right; + extern Sprite* bigtux_right; extern Sprite* bigtux_left; extern Sprite* bigtux_right_jump; Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- menu.h 24 Apr 2004 09:32:31 -0000 1.45 +++ menu.h 24 Apr 2004 12:11:10 -0000 1.46 @@ -138,7 +138,6 @@ int pos_x; int pos_y; bool has_backitem; - int last_id; /** input event for the menu (up, down, left, right, etc.) */ MenuAction menuaction; Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- level.h 21 Apr 2004 23:37:40 -0000 1.35 +++ level.h 24 Apr 2004 12:11:10 -0000 1.36 @@ -87,6 +87,7 @@ int start_pos_x; int start_pos_y; int endpos; + bool use_endsequence; float gravity; std::vector<BadGuyData> badguy_data; Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- player.cpp 22 Apr 2004 20:14:49 -0000 1.56 +++ player.cpp 24 Apr 2004 12:11:10 -0000 1.57 @@ -38,6 +38,17 @@ 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* largetux_kick_left; +Sprite* largetux_kick_right; +Sprite* largetux_grab_left; +Sprite* largetux_grab_right; + Sprite* largetux_stand_left; Sprite* largetux_stand_right; Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- level.cpp 22 Apr 2004 11:17:34 -0000 1.46 +++ level.cpp 24 Apr 2004 12:11:10 -0000 1.47 @@ -241,6 +241,7 @@ bkgd_bottom.green = 255; bkgd_bottom.blue = 255; endpos = 0; + use_endsequence = false; for(int i = 0; i < 15; ++i) { @@ -305,6 +306,7 @@ { LispReader reader(lisp_cdr(root_obj)); reader.read_int("version", &version); + reader.read_bool("use-endsequence", &use_endsequence); reader.read_int("width", &width); if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100; if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170; @@ -493,7 +495,10 @@ // Mark the end position of this level! // FIXME: -10 is a rather random value, we still need some kind of // real levelend gola - endpos = 32*(width-20); + if (use_endsequence) + endpos = 32*(width-20); + else + endpos = 32*(width-15); fclose(fi); return 0; Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- resources.cpp 22 Apr 2004 21:24:29 -0000 1.18 +++ resources.cpp 24 Apr 2004 12:11:11 -0000 1.19 @@ -46,6 +46,16 @@ sprite_manager = new SpriteManager(datadir + "/supertux.strf"); /* Tuxes: */ + 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"); + largetux_stand_left = sprite_manager->load("largetux-stand-left"); largetux_stand_right = sprite_manager->load("largetux-stand-right"); |
|
From: Ingo R. <gr...@us...> - 2004-04-24 10:43:25
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030 Modified Files: supertux.strf Log Message: - added new gfx Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- supertux.strf 23 Apr 2004 12:41:10 -0000 1.17 +++ supertux.strf 24 Apr 2004 10:43:15 -0000 1.18 @@ -282,6 +282,49 @@ (x-hotspot 6) (y-hotspot 8) (images "shared/smalltux-skid-right.png")) + + + (sprite (name "smalltux-kick-left") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-kick-left-0.png")) + + (sprite (name "smalltux-kick-right") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-kick-right-0.png")) + + (sprite (name "smalltux-grab-left") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-grab-left-0.png")) + + (sprite (name "smalltux-grab-right") + (x-hotspot 5) + (y-hotspot 9) + (images "shared/smalltux-grab-right-0.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")) + ) ;; EOF ;; |
|
From: Ingo R. <gr...@us...> - 2004-04-24 10:42:39
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10912 Added Files: smalltux-kick-right-0.png Removed Files: smalltux-kick-rigth-0.png Log Message: - fixed spelling mistake in filename --- NEW FILE: smalltux-kick-right-0.png --- (This appears to be a binary file; contents omitted.) --- smalltux-kick-rigth-0.png DELETED --- |
|
From: Ingo R. <gr...@us...> - 2004-04-24 10:28:13
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8673 Added Files: largetux-grab-left-0.png largetux-grab-right-0.png largetux-kick-left-0.png largetux-kick-right-0.png smalltux-grab-left-0.png smalltux-grab-right-0.png smalltux-kick-left-0.png smalltux-kick-rigth-0.png Log Message: - added grab and kick tuxes --- NEW FILE: smalltux-grab-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-grab-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-kick-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-grab-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-kick-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: largetux-grab-right-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-kick-rigth-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: smalltux-kick-left-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-04-24 09:32:45
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv803/src Modified Files: gameloop.cpp leveleditor.cpp menu.cpp menu.h setup.cpp title.cpp worldmap.cpp Log Message: Added a new concept to the menu, the ID. Each item can have an ID that can be given, this way there won't be any more hardcoded values for the entries. Anyway, I've made it to be compatible with the current behaviour, in case any ID is given. I've already updated the mainmenu, optionsmenu, leveleditormenu, leveleditorsettingsmenu and worldmapmenu. The definitions are enumerated in the menu.h file. Should we keep each enum splited or merge them all? Feedback is appreciated :) Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- menu.cpp 23 Apr 2004 11:12:43 -0000 1.51 +++ menu.cpp 24 Apr 2004 09:32:31 -0000 1.52 @@ -98,7 +98,7 @@ /* Return a pointer to a new menu item */ MenuItem* -MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_, int* int_p_) +MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_, int id, int* int_p_) { MenuItem *pnew_item = new MenuItem; @@ -123,6 +123,7 @@ else pnew_item->list = NULL; + pnew_item->id = id; pnew_item->int_p = int_p_; return pnew_item; @@ -222,6 +223,7 @@ pos_x = screen->w/2; pos_y = screen->h/2; has_backitem = false; + last_id = 0; arrange_left = 0; active_item = 0; effect.init(false); @@ -234,12 +236,18 @@ } void -Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_, int* int_p) +Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_, int id, int* int_p) { if(kind_ == MN_BACK) has_backitem = true; - additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, int_p)); + if(id == -1 && item.size() == (unsigned)last_id) + { + id = last_id; + last_id++; + } + + additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p)); } /* Add an item to a menu */ @@ -396,7 +404,7 @@ int Menu::check() { - return hit_item; + return item[hit_item].id; /* if (item.size() != 0) { Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- setup.cpp 23 Apr 2004 11:42:18 -0000 1.51 +++ setup.cpp 24 Apr 2004 09:32:32 -0000 1.52 @@ -376,32 +376,32 @@ worldmap_menu = new Menu(); main_menu->set_pos(screen->w/2, 335); - main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu); - main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu); + main_menu->additem(MN_GOTO, "Start Game",0,load_game_menu, MNID_STARTGAME); + main_menu->additem(MN_GOTO, "Contrib Levels",0,contrib_menu, MNID_CONTRIB); 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_ACTION,"Quit",0,0); + main_menu->additem(MN_ACTION,"Level editor",0,0, MNID_LEVELEDITOR); + main_menu->additem(MN_ACTION,"Credits",0,0, MNID_CREDITS); + main_menu->additem(MN_ACTION,"Quit",0,0, MNID_QUITMAINMENU); options_menu->additem(MN_LABEL,"Options",0,0); options_menu->additem(MN_HL,"",0,0); #ifndef NOOPENGL - options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0); + options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0, MNID_OPENGL); #else - options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl,0); + options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl,MNID_OPENGL); #endif - options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0); + options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0, MNID_FULLSCREEN); if(audio_device) { - options_menu->additem(MN_TOGGLE,"Sound ",use_sound,0); - options_menu->additem(MN_TOGGLE,"Music ",use_music,0); + options_menu->additem(MN_TOGGLE,"Sound ",use_sound,0, MNID_SOUND); + options_menu->additem(MN_TOGGLE,"Music ",use_music,0, MNID_MUSIC); } else { - options_menu->additem(MN_DEACTIVE,"Sound ",use_sound,0); - options_menu->additem(MN_DEACTIVE,"Music ",use_music,0); + options_menu->additem(MN_DEACTIVE,"Sound ",use_sound,0, MNID_SOUND); + options_menu->additem(MN_DEACTIVE,"Music ",use_music,0, MNID_MUSIC); } - options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0); + options_menu->additem(MN_TOGGLE,"Show FPS ",show_fps,0, MNID_SHOWFPS); options_menu->additem(MN_GOTO,"Key Setup",0,options_keys_menu); if(use_joystick) options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu); @@ -410,11 +410,11 @@ options_keys_menu->additem(MN_LABEL,"Key Setup",0,0); options_keys_menu->additem(MN_HL,"",0,0); - options_keys_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, &keymap.left); - options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, &keymap.right); - options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, &keymap.jump); - options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, &keymap.duck); - options_keys_menu->additem(MN_CONTROLFIELD,"Power", 0,0, &keymap.fire); + options_keys_menu->additem(MN_CONTROLFIELD,"Left move", 0,0, 0,&keymap.left); + options_keys_menu->additem(MN_CONTROLFIELD,"Right move", 0,0, 0,&keymap.right); + options_keys_menu->additem(MN_CONTROLFIELD,"Jump", 0,0, 0,&keymap.jump); + options_keys_menu->additem(MN_CONTROLFIELD,"Duck", 0,0, 0,&keymap.duck); + options_keys_menu->additem(MN_CONTROLFIELD,"Power", 0,0, 0,&keymap.fire); options_keys_menu->additem(MN_HL,"",0,0); options_keys_menu->additem(MN_BACK,"Back",0,0); @@ -422,12 +422,12 @@ { options_joystick_menu->additem(MN_LABEL,"Joystick Setup",0,0); options_joystick_menu->additem(MN_HL,"",0,0); - options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, &joystick_keymap.x_axis); - options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, &joystick_keymap.y_axis); - options_joystick_menu->additem(MN_CONTROLFIELD,"A button", 0,0, &joystick_keymap.a_button); - options_joystick_menu->additem(MN_CONTROLFIELD,"B button", 0,0, &joystick_keymap.b_button); - options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, &joystick_keymap.start_button); - options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, &joystick_keymap.dead_zone); + options_joystick_menu->additem(MN_CONTROLFIELD,"X axis", 0,0, 0,&joystick_keymap.x_axis); + options_joystick_menu->additem(MN_CONTROLFIELD,"Y axis", 0,0, 0,&joystick_keymap.y_axis); + options_joystick_menu->additem(MN_CONTROLFIELD,"A button", 0,0, 0,&joystick_keymap.a_button); + options_joystick_menu->additem(MN_CONTROLFIELD,"B button", 0,0, 0,&joystick_keymap.b_button); + options_joystick_menu->additem(MN_CONTROLFIELD,"Start", 0,0, 0,&joystick_keymap.start_button); + options_joystick_menu->additem(MN_CONTROLFIELD,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone); options_joystick_menu->additem(MN_HL,"",0,0); options_joystick_menu->additem(MN_BACK,"Back",0,0); } @@ -454,18 +454,18 @@ game_menu->additem(MN_LABEL,"Pause",0,0); game_menu->additem(MN_HL,"",0,0); - game_menu->additem(MN_ACTION,"Continue",0,0); + game_menu->additem(MN_ACTION,"Continue",0,0,MNID_CONTINUE); game_menu->additem(MN_GOTO,"Options",0,options_menu); game_menu->additem(MN_HL,"",0,0); - game_menu->additem(MN_ACTION,"Abort Level",0,0); + game_menu->additem(MN_ACTION,"Abort Level",0,0,MNID_ABORTLEVEL); worldmap_menu->additem(MN_LABEL,"Pause",0,0); worldmap_menu->additem(MN_HL,"",0,0); - worldmap_menu->additem(MN_ACTION,"Continue",0,0); - worldmap_menu->additem(MN_ACTION,"Save",0,0); + worldmap_menu->additem(MN_ACTION,"Continue",0,0,MNID_RETURNWORLDMAP); + worldmap_menu->additem(MN_ACTION,"Save",0,0,MNID_SAVEGAME); worldmap_menu->additem(MN_GOTO,"Options",0,options_menu); worldmap_menu->additem(MN_HL,"",0,0); - worldmap_menu->additem(MN_ACTION,"Quit Game",0,0); + worldmap_menu->additem(MN_ACTION,"Quit Game",0,0,MNID_QUITWORLDMAP); highscore_menu->additem(MN_TEXTFIELD,"Enter your name:",0,0); } @@ -514,34 +514,36 @@ { switch (options_menu->check()) { - case 2: + case MNID_OPENGL: #ifndef NOOPENGL - if(use_gl != options_menu->item[2].toggled) + if(use_gl != options_menu->item[MNID_OPENGL].toggled) { use_gl = !use_gl; st_video_setup(); } +#else + options_menu->item[MNID_OPENGL].toggled = false; #endif break; - case 3: - if(use_fullscreen != options_menu->item[3].toggled) + case MNID_FULLSCREEN: + if(use_fullscreen != options_menu->item[MNID_FULLSCREEN].toggled) { use_fullscreen = !use_fullscreen; st_video_setup(); } break; - case 4: - if(use_sound != options_menu->item[4].toggled) + case MNID_SOUND: + if(use_sound != options_menu->item[MNID_SOUND].toggled) use_sound = !use_sound; break; - case 5: - if(use_music != options_menu->item[5].toggled) + case MNID_MUSIC: + if(use_music != options_menu->item[MNID_MUSIC].toggled) { - enable_music(options_menu->item[5].toggled); + enable_music(options_menu->item[MNID_MUSIC].toggled); } break; - case 6: - if(show_fps != options_menu->item[6].toggled) + case MNID_SHOWFPS: + if(show_fps != options_menu->item[MNID_SHOWFPS].toggled) show_fps = !show_fps; break; } Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- menu.h 23 Apr 2004 11:12:43 -0000 1.44 +++ menu.h 24 Apr 2004 09:32:31 -0000 1.45 @@ -27,6 +27,45 @@ #include "type.h" #include "mousecursor.h" +/* IDs for menus */ + +enum MainMenuIDs { + MNID_STARTGAME, + MNID_CONTRIB, + MNID_LEVELEDITOR, + MNID_CREDITS, + MNID_QUITMAINMENU + }; + +enum OptionsMenuIDs { + MNID_OPENGL, + MNID_FULLSCREEN, + MNID_SOUND, + MNID_MUSIC, + MNID_SHOWFPS + }; + +enum GameMenuIDs { + MNID_CONTINUE, + MNID_ABORTLEVEL + }; + +enum WorldMapMenuIDs { + MNID_RETURNWORLDMAP, + MNID_SAVEGAME, + MNID_QUITWORLDMAP + }; + +enum LevelEditorMainMenuIDs { + MNID_RETURNLEVELEDITOR, + MNID_SUBSETSETTINGS, + MNID_QUITLEVELEDITOR + }; + +enum LevelEditorSettingsMenuIDs { + MNID_APPLY + }; + /* Kinds of menu items */ enum MenuItemKind { MN_ACTION, @@ -52,13 +91,14 @@ char *text; char *input; int *int_p; // used for setting keys (can be used for more stuff...) + int id; // item id string_list_type* list; Menu* target_menu; void change_text (const char *text); void change_input(const char *text); - static MenuItem* create(MenuItemKind kind, const char *text, int init_toggle, Menu* target_menu, int* int_p); + static MenuItem* create(MenuItemKind kind, const char *text, int init_toggle, Menu* target_menu, int id, int* int_p); }; class Menu @@ -98,6 +138,7 @@ int pos_x; int pos_y; bool has_backitem; + int last_id; /** input event for the menu (up, down, left, right, etc.) */ MenuAction menuaction; @@ -117,7 +158,7 @@ ~Menu(); void additem(MenuItem* pmenu_item); - void additem(MenuItemKind kind, const std::string& text, int init_toggle, Menu* target_menu, int *int_p = NULL); + void additem(MenuItemKind kind, const std::string& text, int init_toggle, Menu* target_menu, int id = -1, int *int_p = NULL); void action (); Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- leveleditor.cpp 22 Apr 2004 19:15:22 -0000 1.62 +++ leveleditor.cpp 24 Apr 2004 09:32:31 -0000 1.63 @@ -219,13 +219,13 @@ { switch (leveleditor_menu->check()) { - case 2: + case MNID_RETURNLEVELEDITOR: Menu::set_current(0); break; - case 3: + case MNID_SUBSETSETTINGS: update_subset_settings_menu(); break; - case 7: + case MNID_QUITLEVELEDITOR: done = 1; break; } @@ -234,7 +234,7 @@ { switch (level_settings_menu->check()) { - case 17: + case MNID_SUBSETSETTINGS: apply_level_settings_menu(); Menu::set_current(leveleditor_menu); break; @@ -413,12 +413,12 @@ leveleditor_menu->additem(MN_LABEL,"Level Editor Menu",0,0); leveleditor_menu->additem(MN_HL,"",0,0); - leveleditor_menu->additem(MN_ACTION,"Return To Level Editor",0,0); - leveleditor_menu->additem(MN_DEACTIVE,"Level Subset Settings",0,subset_settings_menu); + leveleditor_menu->additem(MN_ACTION,"Return To Level Editor",0,0,MNID_RETURNLEVELEDITOR); + leveleditor_menu->additem(MN_DEACTIVE,"Level Subset Settings",0,subset_settings_menu,MNID_SUBSETSETTINGS); leveleditor_menu->additem(MN_GOTO,"Load Level Subset",0,subset_load_menu); leveleditor_menu->additem(MN_GOTO,"New Level Subset",0,subset_new_menu); leveleditor_menu->additem(MN_HL,"",0,0); - leveleditor_menu->additem(MN_ACTION,"Quit Level Editor",0,0); + leveleditor_menu->additem(MN_ACTION,"Quit Level Editor",0,0,MNID_QUITLEVELEDITOR); Menu::set_current(leveleditor_menu); @@ -466,7 +466,7 @@ level_settings_menu->additem(MN_NUMFIELD,"Bottom Green",0,0); level_settings_menu->additem(MN_NUMFIELD,"Bottom Blue",0,0); level_settings_menu->additem(MN_HL,"",0,0); - level_settings_menu->additem(MN_ACTION,"Apply Changes",0,0); + level_settings_menu->additem(MN_ACTION,"Apply Changes",0,0,MNID_APPLY); select_tilegroup_menu->arrange_left = true; select_tilegroup_menu->additem(MN_LABEL,"Select Tilegroup",0,0); Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- title.cpp 22 Apr 2004 11:30:53 -0000 1.57 +++ title.cpp 24 Apr 2004 09:32:32 -0000 1.58 @@ -298,25 +298,25 @@ { switch (main_menu->check()) { - case 0: + case MNID_STARTGAME: // Start Game, ie. goto the slots menu update_load_save_game_menu(load_game_menu); break; - case 1: + case MNID_CONTRIB: // Contrib Menu puts("Entering contrib menu"); generate_contrib_menu(); break; - case 3: + case MNID_LEVELEDITOR: halt_music(); leveleditor(1); Menu::set_current(main_menu); break; - case 4: + case MNID_CREDITS: display_credits(); Menu::set_current(main_menu); break; - case 6: + case MNID_QUITMAINMENU: Menu::set_current(0); break; } Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- worldmap.cpp 22 Apr 2004 20:41:40 -0000 1.44 +++ worldmap.cpp 24 Apr 2004 09:32:32 -0000 1.45 @@ -610,14 +610,14 @@ { switch (worldmap_menu->check()) { - case 2: // Return to game + case MNID_RETURNWORLDMAP: // Return to game break; - case 3: + case MNID_SAVEGAME: if (!savegame_file.empty()) savegame(savegame_file); break; - case 6: // Quit Worldmap + case MNID_QUITWORLDMAP: // Quit Worldmap quit = true; break; } Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- gameloop.cpp 24 Apr 2004 08:38:01 -0000 1.97 +++ gameloop.cpp 24 Apr 2004 09:32:31 -0000 1.98 @@ -454,10 +454,10 @@ { switch (game_menu->check()) { - case 2: + case MNID_CONTINUE: st_pause_ticks_stop(); break; - case 5: + case MNID_ABORTLEVEL: st_pause_ticks_stop(); exit_status = LEVEL_ABORT; break; |
|
From: Ricardo C. <rm...@us...> - 2004-04-24 08:38:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25588/src Modified Files: gameloop.cpp Log Message: Took st_pause_ticks_stop() out of the events loop. Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- gameloop.cpp 23 Apr 2004 16:37:38 -0000 1.96 +++ gameloop.cpp 24 Apr 2004 08:38:01 -0000 1.97 @@ -206,6 +206,9 @@ } else { + if(!Menu::current() && !game_pause) + st_pause_ticks_stop(); + SDL_Event event; while (SDL_PollEvent(&event)) { @@ -219,9 +222,6 @@ { Player& tux = *world->get_tux(); - if(!game_pause) - st_pause_ticks_stop(); - switch(event.type) { case SDL_QUIT: /* Quit event - quit: */ |
|
From: Ricardo C. <rm...@us...> - 2004-04-24 00:10:59
|
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13641/data/levels/world1 Modified Files: level10.stl Log Message: Marek bug fix for this problem: revilyo: «Antartica 10 : tux falls in the last hole, maybe it could works if I jump really high. I don't look at the sources yet...» Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level10.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level10.stl 23 Apr 2004 17:15:31 -0000 1.4 +++ level10.stl 24 Apr 2004 00:10:49 -0000 1.5 @@ -32,9 +32,9 @@ 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 51 52 51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 9 0 13 14 14 14 15 0 10 11 11 11 11 11 11 11 30 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26 0 0 26 0 0 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 9 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 27 28 28 28 28 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 0 0 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 44 44 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 50 49 50 49 50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 0 0 48 48 0 0 0 0 0 0 0 0 0 0 48 48 0 0 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 15 0 10 11 11 11 12 0 10 11 11 11 11 11 11 11 12 0 0 102 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 9 0 0 0 13 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 50 49 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57 58 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 51 52 51 52 51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 48 48 0 0 48 48 48 0 0 0 0 0 0 0 0 48 48 48 0 0 48 48 48 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 44 44 0 0 0 0 7 8 8 8 8 8 8 22 11 11 11 21 8 22 11 11 11 21 8 22 11 11 19 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 9 0 0 0 13 14 15 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 22 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 59 60 0 0 0 59 60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 - 8 8 8 8 8 8 8 8 44 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 7 9 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 48 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 50 49 50 49 50 49 50 49 50 49 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 48 48 48 48 0 0 48 48 48 48 8 8 8 8 8 8 48 48 48 48 8 8 48 48 48 48 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 29 0 0 0 0 13 14 14 14 14 14 14 23 11 11 11 20 14 23 11 11 11 20 14 23 11 11 11 11 11 11 11 21 8 8 8 8 8 8 9 0 0 0 0 48 0 0 0 0 7 8 8 8 8 8 8 8 8 8 9 0 0 0 13 14 15 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 50 49 48 0 0 50 49 0 0 48 50 49 48 0 0 0 0 0 0 0 0 0 0 7 8 8 59 60 8 8 8 59 60 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 50 49 0 0 0 50 49 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 - 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 13 15 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 113 51 52 51 52 51 52 51 52 51 52 114 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 15 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 15 0 0 0 0 48 0 0 0 0 13 14 14 14 14 14 14 14 14 14 15 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 51 52 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 48 51 52 0 0 0 51 52 0 0 0 51 52 48 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - 11 19 11 11 11 11 11 11 19 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 14 14 14 14 23 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 30 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 48 0 0 0 0 10 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 50 49 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 48 48 50 49 0 0 0 50 49 0 0 0 50 49 48 48 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 + 8 8 8 8 8 8 8 8 44 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 7 9 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 8 8 48 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 50 49 50 49 50 49 50 49 50 49 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 7 8 8 9 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 48 48 48 48 0 0 48 48 48 48 8 8 8 8 8 8 48 48 48 48 8 8 48 48 48 48 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 27 29 0 0 0 0 13 14 14 14 14 14 14 23 11 11 11 20 14 23 11 11 11 20 14 23 11 11 11 11 11 11 11 21 8 8 8 8 8 8 9 0 0 0 0 48 0 0 0 0 7 8 8 8 8 8 8 8 8 8 9 0 0 0 13 14 15 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 23 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 50 49 48 0 0 50 49 0 0 48 50 49 48 0 0 0 0 0 0 0 0 0 0 7 8 8 59 60 8 8 8 59 60 8 8 8 8 8 9 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 50 49 0 0 0 50 49 48 48 48 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 + 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 13 15 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 113 51 52 51 52 51 52 51 52 51 52 114 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 13 14 14 15 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 15 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 15 0 0 0 0 48 0 0 0 0 13 14 14 14 14 14 14 14 14 14 15 0 0 0 16 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 52 0 0 0 51 52 0 0 0 51 52 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 0 0 0 0 0 0 0 0 48 51 52 0 0 0 51 52 0 0 0 51 52 50 49 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 + 11 19 11 11 11 11 11 11 19 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 10 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 20 14 14 14 14 14 14 14 14 14 14 23 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 10 11 11 12 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 30 17 17 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 48 0 0 0 0 10 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 10 11 11 11 11 19 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 49 0 0 0 50 49 0 0 0 50 49 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 48 48 50 49 0 0 0 50 49 0 0 0 50 49 51 52 48 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ) (background-tm |
|
From: Ricardo C. <rm...@us...> - 2004-04-23 16:37:50
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15873/src Modified Files: gameloop.cpp Log Message: Just fixed two small bugs in the gameplay during pause: - don't show the menu, neither quit to level editor; - when any event happen, the timer would continue (fixed). Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- gameloop.cpp 22 Apr 2004 20:14:33 -0000 1.95 +++ gameloop.cpp 23 Apr 2004 16:37:38 -0000 1.96 @@ -173,6 +173,9 @@ void GameSession::on_escape_press() { + if(game_pause) + return; + if(st_gl_mode == ST_GL_TEST) { exit_status = LEVEL_ABORT; @@ -216,7 +219,8 @@ { Player& tux = *world->get_tux(); - st_pause_ticks_stop(); + if(!game_pause) + st_pause_ticks_stop(); switch(event.type) { |
|
From: Ricardo C. <rm...@us...> - 2004-04-23 16:30:52
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14762/data/levels/test Added Files: level4.stl Log Message: Added a test level for the gradients. Seems to work fine. --- NEW FILE: level4.stl --- (supertux-level (version 1) (name "Gradients Test") (author "Ricardo Cruz") (width 50) (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) (time 500) (gravity 10) (particle_system "") (theme "antarctica") (interactive-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ) ) ;; EOF ;; |
|
From: Ricardo C. <rm...@us...> - 2004-04-23 16:30:24
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14683/data/levels/test Added Files: level3.stl Removed Files: endseq.stl Log Message: Changed filenames from endseq.stl to level3.stl. Damn, use level*.stl or else implement a way to set the filenames! --- NEW FILE: level3.stl --- ;; Generated by Flexlay Editor (supertux-level (version 1) (author "Ingo Ruhnke") (name "End sequence") (width 100) (height 15) (start_pos_x 100) (start_pos_y 100) (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) (time 500) (gravity 10) (particle_system "") (theme "antarctica") (interactive-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 126 0 112 112 112 112 112 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 0 112 112 0 0 0 0 112 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 112 112 112 0 0 0 0 0 112 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 112 112 112 112 0 0 0 0 0 0 112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 0 0 0 0 0 0 0 0 0 0 112 0 0 0 0 0 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 48 8 8 8 0 0 0 0 8 8 8 8 8 112 8 8 8 8 8 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ) (background-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 8 0 8 8 0 8 0 8 8 0 8 0 8 8 0 8 0 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 81 80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 79 0 0 0 0 0 9 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (foreground-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (reset-points ) (objects ) ) ;; EOF ;; --- endseq.stl DELETED --- |
248 messages has been excluded from this view by a project administrator.
