super-tux-commit Mailing List for Super Tux (Page 54)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Marek M. <wa...@us...> - 2004-06-11 22:56:06
|
Update of /cvsroot/super-tux/supertux/data/music In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17445/data/music Added Files: fortress2-fast.mod fortress2.mod Log Message: Added new music - a remix of the fortress tune we can use for boss levels in world 2. It's work in progress; I think it sounds strangely bizarre, but somehow cool. I'd really appreciate feedback on this one, so please listen in and tell me what you think. --- NEW FILE: fortress2-fast.mod --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fortress2.mod --- (This appears to be a binary file; contents omitted.) |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-11 20:01:41
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5372/data/images/tilesets Modified Files: jungle1.png jungle3.png jungle2.png Added Files: jungle10.png jungle11.png Log Message: - added 2 new "temporary jungle" tiles and changed jungle{1..3}.png --- NEW FILE: jungle11.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle10.png --- (This appears to be a binary file; contents omitted.) Index: jungle1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/jungle1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsj6dNlD and /tmp/cvs3jTN5Z differ Index: jungle3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/jungle3.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsDNI0oZ and /tmp/cvs6KWTom differ Index: jungle2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/jungle2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvslbtAN5 and /tmp/cvsQIv9Ps differ |
|
From: Ricardo C. <rm...@us...> - 2004-06-10 18:28:21
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/po Modified Files: es.po Log Message: Fixed translation. Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- es.po 10 Jun 2004 16:03:17 -0000 1.8 +++ es.po 10 Jun 2004 18:28:11 -0000 1.9 @@ -27,9 +27,8 @@ msgstr "PAUSA - Pulsa 'P' para continuar" #: src/gameloop.cpp:528 -#, fuzzy, c-format msgid "Playing: " -msgstr "Jugando: %s" +msgstr "Jugando: " #: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" |
|
From: Ricardo C. <ri...@ae...> - 2004-06-10 18:24:13
|
That's because Sprite doesn't honor frame order. We can either implement it the same way as Tux grows, or implement frames order in Sprite. Ricardo Cruz Em Quinta, 10 de Junho de 2004 17:03, o Marek Moeckel escreveu: > Update of /cvsroot/super-tux/supertux/src > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835/src > > Modified Files: > door.cpp door.h > Log Message: > Door animation implemented - doors now open when activated > It still has bugs and it's coded rather dirty. Someone please have a look > at it - see door.cpp for details. > > > Index: door.cpp > =================================================================== > RCS file: /cvsroot/super-tux/supertux/src/door.cpp,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- door.cpp 9 Jun 2004 05:23:19 -0000 1.2 > +++ door.cpp 10 Jun 2004 16:03:17 -0000 1.3 > @@ -37,6 +37,8 @@ > reader.read_string("spawnpoint", target_spawnpoint); > > sprite = sprite_manager->load("door"); > + animation_timer.init(true); > + door_activated = false; > } > > void > @@ -68,13 +70,27 @@ > Door::draw(DrawingContext& context) > { > sprite->draw(context, Vector(area.x, area.y), LAYER_TILES); > + > + //Check if door animation is complete > + //TODO: Move this out of the "draw" method as this is extremely dirty :) > + if ((!animation_timer.check()) && (door_activated)) { > + door_activated = false; > + sprite = sprite_manager->load("door"); > + GameSession::current()->respawn(target_sector, target_spawnpoint); > + } > } > > void > Door::interaction(InteractionType type) > { > + //Animate the door on activation > + //TODO: Resetting the animation doesn't work correctly > + // Tux and badguys should stop moving while the door is opening > if(type == INTERACTION_ACTIVATE) { > - GameSession::current()->respawn(target_sector, target_spawnpoint); > + sprite = sprite_manager->load("openingdoor"); > + sprite->reset(); > + animation_timer.start(ANIM_TIME); > + door_activated = true; > } > } > > > Index: door.h > =================================================================== > RCS file: /cvsroot/super-tux/supertux/src/door.h,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- door.h 9 Jun 2004 05:23:20 -0000 1.2 > +++ door.h 10 Jun 2004 16:03:17 -0000 1.3 > @@ -24,6 +24,9 @@ > > #include "interactive_object.h" > #include "serializable.h" > +#include "timer.h" > + > +#define ANIM_TIME 1500 > > class Sprite; > > @@ -45,6 +48,8 @@ > Sprite* sprite; > std::string target_sector; > std::string target_spawnpoint; > + Timer animation_timer; //Used for door animation > + bool door_activated; > }; > > #endif /*SUPERTUX_DOOR_H*/ > > > > ------------------------------------------------------- > This SF.Net email is sponsored by the new InstallShield X. > From Windows to Linux, servers to mobile, InstallShield X is the > one installation-authoring solution that does it all. Learn more and > evaluate today! http://www.installshield.com/Dev2Dev/0504 > _______________________________________________ > Super-tux-commit mailing list > Sup...@li... > https://lists.sourceforge.net/lists/listinfo/super-tux-commit -- Life exists for no known purpose. |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-10 18:14:58
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307/data/images/tilesets Modified Files: jungle3.png jungle2.png Log Message: - fixed the size of jungle2.png and jungle3.png (it's now 32*32px as supposed to!) Index: jungle3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/jungle3.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsvRMY2k and /tmp/cvs55K9Ku differ Index: jungle2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/jungle2.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsSIHsxn and /tmp/cvsVr3fhx differ |
|
From: Benjamin P. J. <lit...@us...> - 2004-06-10 17:58:19
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26159/data/images/tilesets Modified Files: main.stgt supertux.stgt Added Files: jungle5.png jungle4.png jungle1.png jungle3.png jungle6.png jungle9.png jungle7.png jungle2.png jungle.stgt jungle8.png Log Message: - Added (temporary) jungle tiles --- NEW FILE: jungle5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle9.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jungle.stgt --- ;SuperTux-Tile-Definition (supertux-tiles (properties (id 6)) (tile (id 1) (images "jungle1.png")) (solid #f) (tile (id 2) (images "jungle2.png")) (solid #f) (tile (id 3) (images "jungle.png")) (solid #f) (tile (id 4) (images "jungle.png") (solid #t)) (tile (id 5) (images "jungle.png") (solid #t)) (tile (id 6) (images "jungle.png") (solid #t)) (tile (id 7) (images "jungle.png") (solid #t)) (tile (id 8) (images "jungle.png") (solid #t)) (tile (id 9) (images "jungle.png") (solid #t)) ) Index: main.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/main.stgt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- main.stgt 24 Mar 2004 22:29:08 -0000 1.1 +++ main.stgt 10 Jun 2004 17:58:09 -0000 1.2 @@ -11,6 +11,8 @@ (tileset (file "grey.stgt")) (tileset - (file "snow.stgt")) + (file "snow.stgt")) + (tileset + (file "jungle.stgt")) ) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- supertux.stgt 17 May 2004 06:00:25 -0000 1.35 +++ supertux.stgt 10 Jun 2004 17:58:09 -0000 1.36 @@ -17,6 +17,7 @@ (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) (tilegroup (name "Signs") (tiles 136 137 138 139 141 142 143 144)) (tilegroup (name "Grasslands") (tiles 145 146 147 148)) + (tilegroup (name "Jungle") (tiles 301 302 303 304 305 306 307 308 309)) (tile (id 0) (images "notile.png")) @@ -530,6 +531,36 @@ (tile (id 148) (images "grasslands4.png")) +; Jungle + + (tile (id 301) + (solid #f) + (images "jungle1.png")) + (tile (id 302) + (solid #f) + (images "jungle2.png")) + (tile (id 303) + (solid #f) + (images "jungle3.png")) + (tile (id 304) + (solid #t) + (images "jungle4.png")) + (tile (id 305) + (solid #t) + (images "jungle5.png")) + (tile (id 306) + (solid #t) + (images "jungle6.png")) + (tile (id 307) + (solid #t) + (images "jungle7.png")) + (tile (id 308) + (solid #t) + (images "jungle8.png")) + (tile (id 309) + (solid #t) + (images "jungle9.png")) + ; Spike (tile (id 200) (spike #t) |
|
From: Marek M. <wa...@us...> - 2004-06-10 16:04:17
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835/po Modified Files: es.po Log Message: Door animation implemented - doors now open when activated It still has bugs and it's coded rather dirty. Someone please have a look at it - see door.cpp for details. Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- es.po 9 Jun 2004 21:36:03 -0000 1.7 +++ es.po 10 Jun 2004 16:03:17 -0000 1.8 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SuperTux-CVS\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-09 23:10+0200\n" "Last-Translator: Javier Beaumont <dem...@us...>\n" "Language-Team: Spanish Team <sup...@li...>\n" @@ -26,56 +26,56 @@ msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Pulsa 'P' para continuar" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, fuzzy, c-format +msgid "Playing: " +msgstr "Jugando: %s" + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "PUNTOS" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "Pulsa ESC para volver" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "FUERA DE TIEMPO" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "TIEMPO" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "MONEDAS" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "Jugando: %s" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "PUNTOS: %d" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "MONEDAS: %d" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Juego salvado" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Libre" @@ -376,4 +376,3 @@ #: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "FIN DEL JUEGO" - |
|
From: Marek M. <wa...@us...> - 2004-06-10 16:04:04
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835/data Modified Files: supertux.strf Log Message: Door animation implemented - doors now open when activated It still has bugs and it's coded rather dirty. Someone please have a look at it - see door.cpp for details. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- supertux.strf 9 Jun 2004 17:04:11 -0000 1.43 +++ supertux.strf 10 Jun 2004 16:03:16 -0000 1.44 @@ -697,7 +697,15 @@ "shared/door-5.png" "shared/door-6.png" "shared/door-7.png" - "shared/door-8.png") + "shared/door-8.png" + "shared/door-8.png" + "shared/door-7.png" + "shared/door-6.png" + "shared/door-5.png" + "shared/door-4.png" + "shared/door-3.png" + "shared/door-2.png" + "shared/door-1.png") ) ; Stomp |
|
From: Marek M. <wa...@us...> - 2004-06-10 16:03:57
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835 Modified Files: TODO Log Message: Door animation implemented - doors now open when activated It still has bugs and it's coded rather dirty. Someone please have a look at it - see door.cpp for details. Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- TODO 9 Jun 2004 17:04:11 -0000 1.69 +++ TODO 10 Jun 2004 16:03:16 -0000 1.70 @@ -76,6 +76,7 @@ [L] we only have a global counter for multiple coin blocks. This should be handled per block. [L] Show level number on top of the screen when playing the level +[L] fix the door animation Beyond Milestone2 ----------------- |
|
From: Marek M. <wa...@us...> - 2004-06-10 16:03:34
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835/src Modified Files: door.cpp door.h Log Message: Door animation implemented - doors now open when activated It still has bugs and it's coded rather dirty. Someone please have a look at it - see door.cpp for details. Index: door.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/door.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- door.cpp 9 Jun 2004 05:23:19 -0000 1.2 +++ door.cpp 10 Jun 2004 16:03:17 -0000 1.3 @@ -37,6 +37,8 @@ reader.read_string("spawnpoint", target_spawnpoint); sprite = sprite_manager->load("door"); + animation_timer.init(true); + door_activated = false; } void @@ -68,13 +70,27 @@ Door::draw(DrawingContext& context) { sprite->draw(context, Vector(area.x, area.y), LAYER_TILES); + + //Check if door animation is complete + //TODO: Move this out of the "draw" method as this is extremely dirty :) + if ((!animation_timer.check()) && (door_activated)) { + door_activated = false; + sprite = sprite_manager->load("door"); + GameSession::current()->respawn(target_sector, target_spawnpoint); + } } void Door::interaction(InteractionType type) { + //Animate the door on activation + //TODO: Resetting the animation doesn't work correctly + // Tux and badguys should stop moving while the door is opening if(type == INTERACTION_ACTIVATE) { - GameSession::current()->respawn(target_sector, target_spawnpoint); + sprite = sprite_manager->load("openingdoor"); + sprite->reset(); + animation_timer.start(ANIM_TIME); + door_activated = true; } } Index: door.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/door.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- door.h 9 Jun 2004 05:23:20 -0000 1.2 +++ door.h 10 Jun 2004 16:03:17 -0000 1.3 @@ -24,6 +24,9 @@ #include "interactive_object.h" #include "serializable.h" +#include "timer.h" + +#define ANIM_TIME 1500 class Sprite; @@ -45,6 +48,8 @@ Sprite* sprite; std::string target_sector; std::string target_spawnpoint; + Timer animation_timer; //Used for door animation + bool door_activated; }; #endif /*SUPERTUX_DOOR_H*/ |
|
From: Ricardo C. <rm...@us...> - 2004-06-10 15:50:13
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25394/src Modified Files: background.cpp Log Message: Ignore the gradient Surface (cache) when in OpenGL (as asked by Ryan). Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- background.cpp 10 Jun 2004 14:09:49 -0000 1.7 +++ background.cpp 10 Jun 2004 15:50:01 -0000 1.8 @@ -104,8 +104,12 @@ Background::draw(DrawingContext& context) { if(type == GRADIENT) { - context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0); -// context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0); + /* In case we are using OpenGL just draw the gradient, else (software mode) + use the cache. */ + if(use_gl) + context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0); + else + context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0); } else if(type == IMAGE) { int sx = int(-context.get_translation().x * speed) % image->w - image->w; |
|
From: Ricardo C. <rm...@us...> - 2004-06-10 14:10:05
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16091/src/screen Modified Files: drawing_context.h screen.h texture.cpp texture.h Log Message: This is an implementation that creates a gradient Surface, in order to speed up the gradient drawing. But it is working even slower in SDL, and doesn't work at all in OpenGL. Just committed, in the hope that someone finds the problem. Index: drawing_context.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- drawing_context.h 9 Jun 2004 04:43:15 -0000 1.6 +++ drawing_context.h 10 Jun 2004 14:09:49 -0000 1.7 @@ -43,24 +43,6 @@ LAYER_GUI = 500 }; -class Color -{ -public: - Color() - : red(0), green(0), blue(0), alpha(0) - {} - - Color(Uint8 red_, Uint8 green_, Uint8 blue_, Uint8 alpha_ = 0) - : red(red_), green(green_), blue(blue_), alpha(alpha_) - {} - - Color(const Color& o) - : red(o.red), green(o.green), blue(o.blue), alpha(o.alpha) - { } - - Uint8 red, green, blue, alpha; -}; - /** * This class provides functions for drawing things on screen. It also * maintains a stack of transforms that are applied to graphics. Index: screen.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/screen.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- screen.h 31 May 2004 14:08:10 -0000 1.2 +++ screen.h 10 Jun 2004 14:09:49 -0000 1.3 @@ -24,6 +24,25 @@ #ifndef NOOPENGL #include <SDL_opengl.h> #endif + +class Color +{ +public: + Color() + : red(0), green(0), blue(0), alpha(0) + {} + + Color(Uint8 red_, Uint8 green_, Uint8 blue_, Uint8 alpha_ = 0) + : red(red_), green(green_), blue(blue_), alpha(alpha_) + {} + + Color(const Color& o) + : red(o.red), green(o.green), blue(o.blue), alpha(o.alpha) + { } + + Uint8 red, green, blue, alpha; +}; + #include "texture.h" class Vector; Index: texture.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- texture.h 9 Jun 2004 04:43:15 -0000 1.5 +++ texture.h 10 Jun 2004 14:09:49 -0000 1.6 @@ -34,6 +34,7 @@ #include "vector.h" SDL_Surface* sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, int use_alpha); +SDL_Surface* sdl_surface_from_nothing(); class SurfaceImpl; class SurfaceSDL; @@ -42,7 +43,7 @@ /// bitset for drawing effects enum { - /** Draw the Surface upside down */ + /** Don't apply anything */ NONE_EFFECT = 0x0000, /** Draw the Surface upside down */ VERTICAL_FLIP = 0x0001, @@ -54,7 +55,7 @@ class SurfaceData { public: - enum ConstructorType { LOAD, LOAD_PART, SURFACE }; + enum ConstructorType { LOAD, LOAD_PART, SURFACE, GRADIENT }; ConstructorType type; SDL_Surface* surface; std::string file; @@ -63,10 +64,13 @@ int y; int w; int h; + Color top_gradient; + Color bottom_gradient; SurfaceData(SDL_Surface* surf, int use_alpha_); SurfaceData(const std::string& file_, int use_alpha_); SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_); + SurfaceData(Color top_gradient_, Color bottom_gradient_, int w_, int h_); ~SurfaceData(); SurfaceSDL* create_SurfaceSDL(); @@ -93,6 +97,7 @@ Surface(SDL_Surface* surf, int use_alpha); Surface(const std::string& file, int use_alpha); Surface(const std::string& file, int x, int y, int w, int h, int use_alpha); + Surface(Color top_gradient, Color bottom_gradient, int w, int h); ~Surface(); /** Reload the surface, which is necesarry in case of a mode swich */ @@ -133,6 +138,7 @@ SurfaceSDL(SDL_Surface* surf, int use_alpha); SurfaceSDL(const std::string& file, int use_alpha); SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha); + SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h); virtual ~SurfaceSDL(); int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT); @@ -152,6 +158,8 @@ SurfaceOpenGL(SDL_Surface* surf, int use_alpha); SurfaceOpenGL(const std::string& file, int use_alpha); SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha); + SurfaceOpenGL(Color top_gradient, Color bottom_gradient, int w, int h); + virtual ~SurfaceOpenGL(); int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT); Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- texture.cpp 9 Jun 2004 04:43:15 -0000 1.4 +++ texture.cpp 10 Jun 2004 14:09:49 -0000 1.5 @@ -58,6 +58,14 @@ x(x_), y(y_), w(w_), h(h_) {} +SurfaceData::SurfaceData(Color top_gradient_, Color bottom_gradient_, int w_, int h_) + : type(GRADIENT), surface(0), use_alpha(false), w(w_), h(h_) +{ +top_gradient = top_gradient_; +bottom_gradient = bottom_gradient_; +} + + SurfaceData::~SurfaceData() { SDL_FreeSurface(surface); @@ -87,6 +95,8 @@ return new SurfaceSDL(file, x, y, w, h, use_alpha); case SURFACE: return new SurfaceSDL(surface, use_alpha); + case GRADIENT: + return new SurfaceSDL(top_gradient, bottom_gradient, w, h); } assert(0); } @@ -103,6 +113,8 @@ return new SurfaceOpenGL(file, x, y, w, h, use_alpha); case SURFACE: return new SurfaceOpenGL(surface, use_alpha); + case GRADIENT: + return new SurfaceOpenGL(top_gradient, bottom_gradient, w, h); } #endif assert(0); @@ -158,6 +170,18 @@ surfaces.push_back(this); } +Surface::Surface(Color top_background, Color bottom_background, int w, int h) + : data(top_background, bottom_background, w, h), w(0), h(0) +{ + impl = data.create(); + if (impl) + { + w = impl->w; + h = impl->h; + } + surfaces.push_back(this); +} + void Surface::reload() { @@ -337,6 +361,53 @@ return sdl_surface; } +SDL_Surface* +sdl_surface_from_gradient(Color top, Color bottom, int w, int h) +{ + SDL_Surface* sdl_surface; + + Uint32 rmask, gmask, bmask, amask; + + /* SDL interprets each pixel as a 32-bit number, so our masks must depend + on the endianness (byte order) of the machine */ +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + rmask = 0xff000000; + gmask = 0x00ff0000; + bmask = 0x0000ff00; + amask = 0x000000ff; +#else + rmask = 0x000000ff; + gmask = 0x0000ff00; + bmask = 0x00ff0000; + amask = 0xff000000; +#endif + + sdl_surface = SDL_CreateRGBSurface(screen->flags, w, h, + screen->format->BitsPerPixel, rmask, gmask, bmask, amask); + + if(sdl_surface == NULL) + st_abort("Cannot create surface for the gradient", "SURFACE"); + + float redstep = (float(bottom.red)-float(top.red)) / float(h); + float greenstep = (float(bottom.green)-float(top.green)) / float(h); + float bluestep = (float(bottom.blue) - float(top.blue)) / float(h); + + SDL_Rect rect; + rect.x = 0; + rect.w = w; + rect.h = 1; + for(float y = 0; y < h; y++) + { + rect.y = (int)y; + SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format, + int(float(top.red) + redstep * y), + int(float(top.green) + greenstep * y), + int(float(top.blue) + bluestep * y))); + } + + return sdl_surface; +} + //--------------------------------------------------------------------------- SurfaceImpl::SurfaceImpl() @@ -394,6 +465,15 @@ h = sdl_surface->h; } +SurfaceOpenGL::SurfaceOpenGL(Color top_gradient, Color bottom_gradient, int w, int h) +{ + sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient, w, h); + create_gl(sdl_surface, &gl_texture); + + w = sdl_surface->w; + h = sdl_surface->h; +} + SurfaceOpenGL::~SurfaceOpenGL() { glDeleteTextures(1, &gl_texture); @@ -620,6 +700,13 @@ h = sdl_surface->h; } +SurfaceSDL::SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h) +{ + sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient, w, h); + w = sdl_surface->w; + h = sdl_surface->h; +} + int SurfaceSDL::draw(float x, float y, Uint8 alpha, Uint32 effect) { |
|
From: Ricardo C. <rm...@us...> - 2004-06-10 14:09:58
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16091/src Modified Files: background.cpp Log Message: This is an implementation that creates a gradient Surface, in order to speed up the gradient drawing. But it is working even slower in SDL, and doesn't work at all in OpenGL. Just committed, in the hope that someone finds the problem. Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- background.cpp 9 Jun 2004 05:23:19 -0000 1.6 +++ background.cpp 10 Jun 2004 14:09:49 -0000 1.7 @@ -95,13 +95,17 @@ type = GRADIENT; gradient_top = top; gradient_bottom = bottom; + + delete image; + image = new Surface(top, bottom, screen->w, screen->h); } void Background::draw(DrawingContext& context) { if(type == GRADIENT) { - context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0); + context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0); +// context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0); } else if(type == IMAGE) { int sx = int(-context.get_translation().x * speed) % image->w - image->w; |
|
From: Ricardo C. <rm...@us...> - 2004-06-10 13:54:46
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/po Modified Files: de.po pt.po supertux.pot Log Message: Tweaked pause level name text. Would be neat if the draw_text() at DrawingContext would allow formatted text. Would just need a parser, and would avoid all these hacks. Index: pt.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/pt.po,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pt.po 9 Jun 2004 17:32:48 -0000 1.8 +++ pt.po 10 Jun 2004 13:54:20 -0000 1.9 @@ -1,6 +1,7 @@ # translation of pt.po to # translation of pt.po to # translation of pt.po to +# translation of pt.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR SuperTux Development Team. # Ricardo Cruz <ri...@ae...>, 2004. @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: pt\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" -"PO-Revision-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" +"PO-Revision-Date: 2004-06-10 14:53+0100\n" "Last-Translator: Ricardo Cruz <ri...@ae...>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,56 +27,56 @@ msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Carrega no 'P' para continuar" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, c-format +msgid "Playing: " +msgstr "Jogando: " + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "PONTOS" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "Carrega no ESC para sair" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "PASSOU O TEMPO" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "TEMPO" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "MOEDAS" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "Jogando: %s" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "PONTOS: %d" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "MOEDAS: %d" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Jogo gravado" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Livre" Index: supertux.pot =================================================================== RCS file: /cvsroot/super-tux/supertux/po/supertux.pot,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- supertux.pot 9 Jun 2004 17:32:49 -0000 1.5 +++ supertux.pot 10 Jun 2004 13:54:20 -0000 1.6 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -24,56 +24,56 @@ msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, c-format +msgid "Playing: " +msgstr "" + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "" Index: de.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/de.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- de.po 9 Jun 2004 17:32:48 -0000 1.6 +++ de.po 10 Jun 2004 13:54:20 -0000 1.7 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: <ma...@br...>\n" "Language-Team: German <de...@li...>\n" @@ -25,56 +25,56 @@ msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, c-format +msgid "Playing: " +msgstr "" + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "" |
|
From: Ricardo C. <rm...@us...> - 2004-06-10 13:54:44
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/src Modified Files: gameloop.cpp Log Message: Tweaked pause level name text. Would be neat if the draw_text() at DrawingContext would allow formatted text. Would just need a parser, and would avoid all these hacks. Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -r1.151 -r1.152 --- gameloop.cpp 9 Jun 2004 17:32:49 -0000 1.151 +++ gameloop.cpp 10 Jun 2004 13:54:20 -0000 1.152 @@ -522,6 +522,18 @@ Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1); context->draw_text_center(blue_text, _("PAUSE - Press 'P' To Play"), Vector(0, 230), LAYER_FOREGROUND1+2); + + char str1[60]; + char str2[124]; + sprintf(str1, _("Playing: ")); + sprintf(str2, level->name.c_str()); + + context->draw_text(blue_text, str1, + Vector((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2, 340), + LAYER_FOREGROUND1+2); + context->draw_text(white_text, str2, + Vector(((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2)+blue_text->get_text_width(str1), 340), + LAYER_FOREGROUND1+2); } if(Menu::current()) @@ -746,14 +758,6 @@ Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 20), LAYER_FOREGROUND1); - if(game_pause) - { - sprintf(str, _("Playing: %s"), level->name.c_str()); - - context.draw_text(white_text, str, Vector(0,20), - LAYER_FOREGROUND1); - } - if(show_fps) { sprintf(str, "%2.1f", fps_fps); |
|
From: Ryan F. <sik...@us...> - 2004-06-09 21:36:11
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27004 Modified Files: es.po Log Message: - updated es.po Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- es.po 9 Jun 2004 17:32:48 -0000 1.6 +++ es.po 9 Jun 2004 21:36:03 -0000 1.7 @@ -9,7 +9,7 @@ "Project-Id-Version: SuperTux-CVS\n" "Report-Msgid-Bugs-To: sup...@li...\n" "POT-Creation-Date: 2004-06-09 18:34+0100\n" -"PO-Revision-Date: 2004-06-08 21:03+0200\n" +"PO-Revision-Date: 2004-06-09 23:10+0200\n" "Last-Translator: Javier Beaumont <dem...@us...>\n" "Language-Team: Spanish Team <sup...@li...>\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ #: src/gameloop.cpp:751 #, c-format msgid "Playing: %s" -msgstr "" +msgstr "Jugando: %s" #: src/gameloop.cpp:776 msgid "Result:" @@ -376,3 +376,4 @@ #: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "FIN DEL JUEGO" + |
|
From: Ryan F. <sik...@us...> - 2004-06-09 19:56:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10915 Modified Files: level.cpp Log Message: - fixed memory leak Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- level.cpp 9 Jun 2004 05:23:19 -0000 1.91 +++ level.cpp 9 Jun 2004 19:56:00 -0000 1.92 @@ -235,6 +235,7 @@ level->read_int("version", version); if(version == 1) { load_old_format(*level); + delete level; return; } |
|
From: Ryan F. <sik...@us...> - 2004-06-09 19:15:31
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4858 Modified Files: tile.cpp Log Message: - fixed memory leak Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- tile.cpp 9 Jun 2004 05:23:20 -0000 1.27 +++ tile.cpp 9 Jun 2004 19:15:22 -0000 1.28 @@ -114,6 +114,8 @@ for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) { delete *i; } + + delete tilegroups_; } void TileManager::load_tileset(std::string filename) |
|
From: Ricardo C. <rm...@us...> - 2004-06-09 17:33:01
|
Update of /cvsroot/super-tux/supertux/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31406/po Modified Files: de.po es.po pt.po supertux.pot Log Message: Added level's name when in pause. Index: pt.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/pt.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- pt.po 7 Jun 2004 22:43:23 -0000 1.7 +++ pt.po 9 Jun 2004 17:32:48 -0000 1.8 @@ -1,5 +1,6 @@ # translation of pt.po to # translation of pt.po to +# translation of pt.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR SuperTux Development Team. # Ricardo Cruz <ri...@ae...>, 2004. @@ -8,8 +9,8 @@ msgstr "" "Project-Id-Version: pt\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-07 23:38+0100\n" -"PO-Revision-Date: 2004-06-07 23:39+0100\n" +"POT-Creation-Date: 2004-06-09 18:34+0100\n" +"PO-Revision-Date: 2004-06-09 18:34+0100\n" "Last-Translator: Ricardo Cruz <ri...@ae...>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -25,7 +26,7 @@ msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Carrega no 'P' para continuar" -#: src/gameloop.cpp:702 src/worldmap.cpp:850 +#: src/gameloop.cpp:702 src/worldmap.cpp:849 msgid "SCORE" msgstr "PONTOS" @@ -41,35 +42,40 @@ msgid "TIME" msgstr "TEMPO" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854 +#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 msgid "COINS" msgstr "MOEDAS" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 -#: src/worldmap.cpp:876 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/worldmap.cpp:875 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:768 +#: src/gameloop.cpp:751 +#, c-format +msgid "Playing: %s" +msgstr "Jogando: %s" + +#: src/gameloop.cpp:776 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:771 src/worldmap.cpp:727 +#: src/gameloop.cpp:779 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "PONTOS: %d" -#: src/gameloop.cpp:774 src/worldmap.cpp:731 +#: src/gameloop.cpp:782 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "MOEDAS: %d" -#: src/gameloop.cpp:803 +#: src/gameloop.cpp:811 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Jogo gravado" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:814 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Livre" @@ -130,136 +136,136 @@ msgid "Left Alt" msgstr "Alt esquerdo" -#: src/setup.cpp:388 src/setup.cpp:448 +#: src/setup.cpp:390 src/setup.cpp:450 msgid "Start Game" msgstr "Começar o Jogo" -#: src/setup.cpp:389 src/title.cpp:91 +#: src/setup.cpp:391 src/title.cpp:91 msgid "Contrib Levels" msgstr "Contribuições" -#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478 +#: src/setup.cpp:392 src/setup.cpp:397 src/setup.cpp:473 src/setup.cpp:480 msgid "Options" msgstr "Opções" -#: src/setup.cpp:391 +#: src/setup.cpp:393 msgid "Level Editor" msgstr "Editor de NÃveis" -#: src/setup.cpp:392 +#: src/setup.cpp:394 msgid "Credits" msgstr "Méritos" -#: src/setup.cpp:393 +#: src/setup.cpp:395 msgid "Quit" msgstr "Sair" -#: src/setup.cpp:398 +#: src/setup.cpp:400 msgid "OpenGL " msgstr "OpenGL " -#: src/setup.cpp:400 +#: src/setup.cpp:402 msgid "OpenGL (not supported)" msgstr "OpenGL (não suportado)" -#: src/setup.cpp:402 +#: src/setup.cpp:404 msgid "Fullscreen" msgstr "Fullscreen" -#: src/setup.cpp:405 src/setup.cpp:410 +#: src/setup.cpp:407 src/setup.cpp:412 msgid "Sound " msgstr "Som " -#: src/setup.cpp:406 src/setup.cpp:411 +#: src/setup.cpp:408 src/setup.cpp:413 msgid "Music " msgstr "Música " -#: src/setup.cpp:413 +#: src/setup.cpp:415 msgid "Show FPS " msgstr "Mostrar FPS" -#: src/setup.cpp:414 +#: src/setup.cpp:416 msgid "Setup Keys" msgstr "Configurar Teclas" -#: src/setup.cpp:417 +#: src/setup.cpp:419 msgid "Setup Joystick" msgstr "Configurar Joystick" -#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456 +#: src/setup.cpp:422 src/setup.cpp:434 src/setup.cpp:447 src/setup.cpp:458 #: src/title.cpp:104 src/title.cpp:141 msgid "Back" msgstr "Recuar" -#: src/setup.cpp:422 +#: src/setup.cpp:424 msgid "Keyboard Setup" msgstr "Configuração do Teclado" -#: src/setup.cpp:424 +#: src/setup.cpp:426 msgid "Left move" msgstr "Para a Esquerda" -#: src/setup.cpp:425 +#: src/setup.cpp:427 msgid "Right move" msgstr "Para a Direita" -#: src/setup.cpp:426 +#: src/setup.cpp:428 msgid "Jump" msgstr "Saltar" -#: src/setup.cpp:427 +#: src/setup.cpp:429 msgid "Duck" msgstr "Abaixar" -#: src/setup.cpp:428 +#: src/setup.cpp:430 msgid "Activate" msgstr "Activado" -#: src/setup.cpp:430 +#: src/setup.cpp:432 msgid "Power/Run" msgstr "Poder/Correr" -#: src/setup.cpp:436 +#: src/setup.cpp:438 msgid "Joystick Setup" msgstr "Configuração do Joystick" -#: src/setup.cpp:440 +#: src/setup.cpp:442 msgid "A button" msgstr "Butão A" -#: src/setup.cpp:441 +#: src/setup.cpp:443 msgid "B button" msgstr "Butão B" -#: src/setup.cpp:458 +#: src/setup.cpp:460 msgid "Save Game" msgstr "Gravar o Jogo" -#: src/setup.cpp:468 src/setup.cpp:475 +#: src/setup.cpp:470 src/setup.cpp:477 msgid "Pause" msgstr "Pausa" -#: src/setup.cpp:470 src/setup.cpp:477 +#: src/setup.cpp:472 src/setup.cpp:479 msgid "Continue" msgstr "Continuar" -#: src/setup.cpp:473 +#: src/setup.cpp:475 msgid "Abort Level" msgstr "Abortar NÃvel" -#: src/setup.cpp:480 +#: src/setup.cpp:482 msgid "Quit Game" msgstr "Sair do Jogo" -#: src/setup.cpp:482 +#: src/setup.cpp:484 msgid "Enter your name:" msgstr "Insira o seu nome:" -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid " SuperTux " msgstr " SuperTux " -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid "" "\n" " Please see the file \"README.txt\" for more details.\n" @@ -267,7 +273,7 @@ "\n" " Dá uma olhadela no ficheiro \"README.txt\" para mais detalhes.\n" -#: src/setup.cpp:1038 +#: src/setup.cpp:1045 #, c-format msgid "" "Usage: %s [OPTIONS] FILENAME\n" @@ -276,7 +282,7 @@ "Uso: %s [OPÃÃES] NOME_DO_FICHEIRO\n" "\n" -#: src/setup.cpp:1039 +#: src/setup.cpp:1046 msgid "" "Display Options:\n" " --fullscreen Run in fullscreen mode.\n" @@ -335,7 +341,7 @@ " --version Mostra a versão do SuperTux que está a correr.\n" "\n" -#: src/setup.cpp:1095 +#: src/setup.cpp:1102 #, c-format msgid "" "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" @@ -364,7 +370,7 @@ msgid "Are you sure you want to delete slot %d?" msgstr "Tens a certeza que queres remover o slot %d?" -#: src/worldmap.cpp:724 +#: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "FIM DO JOGO" Index: es.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/es.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- es.po 8 Jun 2004 20:18:17 -0000 1.5 +++ es.po 9 Jun 2004 17:32:48 -0000 1.6 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SuperTux-CVS\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-07 23:38+0100\n" +"POT-Creation-Date: 2004-06-09 18:34+0100\n" "PO-Revision-Date: 2004-06-08 21:03+0200\n" "Last-Translator: Javier Beaumont <dem...@us...>\n" "Language-Team: Spanish Team <sup...@li...>\n" @@ -26,7 +26,7 @@ msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Pulsa 'P' para continuar" -#: src/gameloop.cpp:702 src/worldmap.cpp:850 +#: src/gameloop.cpp:702 src/worldmap.cpp:849 msgid "SCORE" msgstr "PUNTOS" @@ -42,35 +42,40 @@ msgid "TIME" msgstr "TIEMPO" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854 +#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 msgid "COINS" msgstr "MONEDAS" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 -#: src/worldmap.cpp:876 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/worldmap.cpp:875 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:768 +#: src/gameloop.cpp:751 +#, c-format +msgid "Playing: %s" +msgstr "" + +#: src/gameloop.cpp:776 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:771 src/worldmap.cpp:727 +#: src/gameloop.cpp:779 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "PUNTOS: %d" -#: src/gameloop.cpp:774 src/worldmap.cpp:731 +#: src/gameloop.cpp:782 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "MONEDAS: %d" -#: src/gameloop.cpp:803 +#: src/gameloop.cpp:811 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Juego salvado" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:814 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Libre" @@ -131,145 +136,144 @@ msgid "Left Alt" msgstr "Alt izquierdo" -#: src/setup.cpp:388 src/setup.cpp:448 +#: src/setup.cpp:390 src/setup.cpp:450 msgid "Start Game" msgstr "Comenzar el juego" -#: src/setup.cpp:389 src/title.cpp:91 +#: src/setup.cpp:391 src/title.cpp:91 msgid "Contrib Levels" msgstr "Niveles de contribuciones" -#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478 +#: src/setup.cpp:392 src/setup.cpp:397 src/setup.cpp:473 src/setup.cpp:480 msgid "Options" msgstr "Opciones" -#: src/setup.cpp:391 +#: src/setup.cpp:393 msgid "Level Editor" msgstr "Editor de niveles" -#: src/setup.cpp:392 +#: src/setup.cpp:394 msgid "Credits" msgstr "Creditos" -#: src/setup.cpp:393 +#: src/setup.cpp:395 msgid "Quit" msgstr "Salir" -#: src/setup.cpp:398 +#: src/setup.cpp:400 msgid "OpenGL " msgstr "OpenGL " -#: src/setup.cpp:400 +#: src/setup.cpp:402 msgid "OpenGL (not supported)" msgstr "OpenGL (no soportado)" -#: src/setup.cpp:402 +#: src/setup.cpp:404 msgid "Fullscreen" msgstr "Pantalla completa" -#: src/setup.cpp:405 src/setup.cpp:410 +#: src/setup.cpp:407 src/setup.cpp:412 msgid "Sound " msgstr "Sonido " -#: src/setup.cpp:406 src/setup.cpp:411 +#: src/setup.cpp:408 src/setup.cpp:413 msgid "Music " msgstr "Música " -#: src/setup.cpp:413 +#: src/setup.cpp:415 msgid "Show FPS " msgstr "Mostrar FPS " -#: src/setup.cpp:414 +#: src/setup.cpp:416 msgid "Setup Keys" msgstr "Configurar las teclas" -#: src/setup.cpp:417 +#: src/setup.cpp:419 msgid "Setup Joystick" msgstr "Configurar el Joystick" -#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456 +#: src/setup.cpp:422 src/setup.cpp:434 src/setup.cpp:447 src/setup.cpp:458 #: src/title.cpp:104 src/title.cpp:141 msgid "Back" msgstr "Volver" -#: src/setup.cpp:422 +#: src/setup.cpp:424 msgid "Keyboard Setup" msgstr "Configurar el teclado" -#: src/setup.cpp:424 +#: src/setup.cpp:426 msgid "Left move" msgstr "Para la izquierda" -#: src/setup.cpp:425 +#: src/setup.cpp:427 msgid "Right move" msgstr "Para la derecha" -#: src/setup.cpp:426 +#: src/setup.cpp:428 msgid "Jump" msgstr "Saltar" -#: src/setup.cpp:427 +#: src/setup.cpp:429 msgid "Duck" msgstr "Agacharse" -#: src/setup.cpp:428 +#: src/setup.cpp:430 msgid "Activate" msgstr "Activado" -#: src/setup.cpp:430 +#: src/setup.cpp:432 msgid "Power/Run" msgstr "Poder/Correr" -#: src/setup.cpp:436 +#: src/setup.cpp:438 msgid "Joystick Setup" msgstr "Configurar el Joystick" -#: src/setup.cpp:440 +#: src/setup.cpp:442 msgid "A button" msgstr "Botón A" -#: src/setup.cpp:441 +#: src/setup.cpp:443 msgid "B button" msgstr "Botón B" -#: src/setup.cpp:458 +#: src/setup.cpp:460 msgid "Save Game" msgstr "Salvar el juego" -#: src/setup.cpp:468 src/setup.cpp:475 +#: src/setup.cpp:470 src/setup.cpp:477 msgid "Pause" msgstr "Pausa" -#: src/setup.cpp:470 src/setup.cpp:477 +#: src/setup.cpp:472 src/setup.cpp:479 msgid "Continue" msgstr "Continuar" -#: src/setup.cpp:473 +#: src/setup.cpp:475 msgid "Abort Level" msgstr "Abortar el nivel" -#: src/setup.cpp:480 +#: src/setup.cpp:482 msgid "Quit Game" msgstr "Salir del juego" -#: src/setup.cpp:482 +#: src/setup.cpp:484 msgid "Enter your name:" msgstr "Introduce tu nombre:" -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid " SuperTux " msgstr " SuperTux " -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid "" "\n" " Please see the file \"README.txt\" for more details.\n" msgstr "" "\n" -" Por favor mira el fichero \"README.txt\" para más detalles." -"\n" +" Por favor mira el fichero \"README.txt\" para más detalles.\n" -#: src/setup.cpp:1038 +#: src/setup.cpp:1045 #, c-format msgid "" "Usage: %s [OPTIONS] FILENAME\n" @@ -278,7 +282,7 @@ "Uso: %s [OPCIONES] NOMBRE_DEL_FICHERO\n" "\n" -#: src/setup.cpp:1039 +#: src/setup.cpp:1046 msgid "" "Display Options:\n" " --fullscreen Run in fullscreen mode.\n" @@ -309,36 +313,45 @@ msgstr "" "Opciones de pantalla:\n" " --fullscreen Funciona a pantalla completa.\n" -" --opengl En el caso de que se haya compilado con soporte para OpenGL, esto lo activara\n" +" --opengl En el caso de que se haya compilado con soporte para " +"OpenGL, esto lo activara\n" " y SuperTux hará uso de ello.\n" " --sdl Usar SDL como render gráfico (software)\n" "\n" "Opciones de sonido:\n" -" --disable-sound En el caso de que se haya compilado con soporte para sonido, esto\n" +" --disable-sound En el caso de que se haya compilado con soporte para " +"sonido, esto\n" " desactivará el sonido para esta sesión de juego.\n" " --disable-music Igual que el anterior, pero esto desactiva la música.\n" "\n" "Opciones varias:\n" " -j, --joystick NUM Usa el joystick NUM (por defecto: 0)\n" " --joymap XAXIS:YAXIS:A:B:START\n" -" Define como deben estar mapeados los botones y el eje del joystick\n" -" --leveleditor Abre el editor de niveles en un fichero. (Solo funciona cuando se le pasa el nombre de un fichero.)\n" -" -d, --datadir DIR Carga los datos del juego desde DIR (Por defecto: automático)\n" -" --debug-mode Activa el modo de depuración, que es útil para desarrolladores.\n" -" --help Muestra un mensaje de ayuda con una lista de los comandos de linea\n" +" Define como deben estar mapeados los botones y el eje " +"del joystick\n" +" --leveleditor Abre el editor de niveles en un fichero. (Solo " +"funciona cuando se le pasa el nombre de un fichero.)\n" +" -d, --datadir DIR Carga los datos del juego desde DIR (Por defecto: " +"automático)\n" +" --debug-mode Activa el modo de depuración, que es útil para " +"desarrolladores.\n" +" --help Muestra un mensaje de ayuda con una lista de los " +"comandos de linea\n" " opciones, licencia y controles del juego.\n" -" --usage Muestra un breve mensaje listando las opciones de los comandos de linea.\n" +" --usage Muestra un breve mensaje listando las opciones de los " +"comandos de linea.\n" " --version Muestra la versión de SuperTux que estás ejecutando.\n" "\n" -#: src/setup.cpp:1095 +#: src/setup.cpp:1102 #, c-format msgid "" "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" "debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n" msgstr "" "Uso: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" -"debug-mode] | [--usage | --help | --version] [--leveleditor] NOMBRE_DEL_FICHERO\n" +"debug-mode] | [--usage | --help | --version] [--leveleditor] " +"NOMBRE_DEL_FICHERO\n" #: src/title.cpp:277 msgid "" @@ -360,7 +373,6 @@ msgid "Are you sure you want to delete slot %d?" msgstr "¿Estás seguro de que quieres borrar el slot %d?" -#: src/worldmap.cpp:724 +#: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "FIN DEL JUEGO" - Index: supertux.pot =================================================================== RCS file: /cvsroot/super-tux/supertux/po/supertux.pot,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- supertux.pot 7 Jun 2004 22:43:23 -0000 1.4 +++ supertux.pot 9 Jun 2004 17:32:49 -0000 1.5 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-07 23:38+0100\n" +"POT-Creation-Date: 2004-06-09 18:34+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -24,7 +24,7 @@ msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:702 src/worldmap.cpp:850 +#: src/gameloop.cpp:702 src/worldmap.cpp:849 msgid "SCORE" msgstr "" @@ -40,35 +40,40 @@ msgid "TIME" msgstr "" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854 +#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 msgid "COINS" msgstr "" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 -#: src/worldmap.cpp:876 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/worldmap.cpp:875 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:768 +#: src/gameloop.cpp:751 +#, c-format +msgid "Playing: %s" +msgstr "" + +#: src/gameloop.cpp:776 msgid "Result:" msgstr "" -#: src/gameloop.cpp:771 src/worldmap.cpp:727 +#: src/gameloop.cpp:779 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:774 src/worldmap.cpp:731 +#: src/gameloop.cpp:782 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:803 +#: src/gameloop.cpp:811 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:814 #, c-format msgid "Slot %d - Free" msgstr "" @@ -129,149 +134,149 @@ msgid "Left Alt" msgstr "" -#: src/setup.cpp:388 src/setup.cpp:448 +#: src/setup.cpp:390 src/setup.cpp:450 msgid "Start Game" msgstr "" -#: src/setup.cpp:389 src/title.cpp:91 +#: src/setup.cpp:391 src/title.cpp:91 msgid "Contrib Levels" msgstr "" -#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478 +#: src/setup.cpp:392 src/setup.cpp:397 src/setup.cpp:473 src/setup.cpp:480 msgid "Options" msgstr "" -#: src/setup.cpp:391 +#: src/setup.cpp:393 msgid "Level Editor" msgstr "" -#: src/setup.cpp:392 +#: src/setup.cpp:394 msgid "Credits" msgstr "" -#: src/setup.cpp:393 +#: src/setup.cpp:395 msgid "Quit" msgstr "" -#: src/setup.cpp:398 +#: src/setup.cpp:400 msgid "OpenGL " msgstr "" -#: src/setup.cpp:400 +#: src/setup.cpp:402 msgid "OpenGL (not supported)" msgstr "" -#: src/setup.cpp:402 +#: src/setup.cpp:404 msgid "Fullscreen" msgstr "" -#: src/setup.cpp:405 src/setup.cpp:410 +#: src/setup.cpp:407 src/setup.cpp:412 msgid "Sound " msgstr "" -#: src/setup.cpp:406 src/setup.cpp:411 +#: src/setup.cpp:408 src/setup.cpp:413 msgid "Music " msgstr "" -#: src/setup.cpp:413 +#: src/setup.cpp:415 msgid "Show FPS " msgstr "" -#: src/setup.cpp:414 +#: src/setup.cpp:416 msgid "Setup Keys" msgstr "" -#: src/setup.cpp:417 +#: src/setup.cpp:419 msgid "Setup Joystick" msgstr "" -#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456 +#: src/setup.cpp:422 src/setup.cpp:434 src/setup.cpp:447 src/setup.cpp:458 #: src/title.cpp:104 src/title.cpp:141 msgid "Back" msgstr "" -#: src/setup.cpp:422 +#: src/setup.cpp:424 msgid "Keyboard Setup" msgstr "" -#: src/setup.cpp:424 +#: src/setup.cpp:426 msgid "Left move" msgstr "" -#: src/setup.cpp:425 +#: src/setup.cpp:427 msgid "Right move" msgstr "" -#: src/setup.cpp:426 +#: src/setup.cpp:428 msgid "Jump" msgstr "" -#: src/setup.cpp:427 +#: src/setup.cpp:429 msgid "Duck" msgstr "" -#: src/setup.cpp:428 +#: src/setup.cpp:430 msgid "Activate" msgstr "" -#: src/setup.cpp:430 +#: src/setup.cpp:432 msgid "Power/Run" msgstr "" -#: src/setup.cpp:436 +#: src/setup.cpp:438 msgid "Joystick Setup" msgstr "" -#: src/setup.cpp:440 +#: src/setup.cpp:442 msgid "A button" msgstr "" -#: src/setup.cpp:441 +#: src/setup.cpp:443 msgid "B button" msgstr "" -#: src/setup.cpp:458 +#: src/setup.cpp:460 msgid "Save Game" msgstr "" -#: src/setup.cpp:468 src/setup.cpp:475 +#: src/setup.cpp:470 src/setup.cpp:477 msgid "Pause" msgstr "" -#: src/setup.cpp:470 src/setup.cpp:477 +#: src/setup.cpp:472 src/setup.cpp:479 msgid "Continue" msgstr "" -#: src/setup.cpp:473 +#: src/setup.cpp:475 msgid "Abort Level" msgstr "" -#: src/setup.cpp:480 +#: src/setup.cpp:482 msgid "Quit Game" msgstr "" -#: src/setup.cpp:482 +#: src/setup.cpp:484 msgid "Enter your name:" msgstr "" -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid " SuperTux " msgstr "" -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid "" "\n" " Please see the file \"README.txt\" for more details.\n" msgstr "" -#: src/setup.cpp:1038 +#: src/setup.cpp:1045 #, c-format msgid "" "Usage: %s [OPTIONS] FILENAME\n" "\n" msgstr "" -#: src/setup.cpp:1039 +#: src/setup.cpp:1046 msgid "" "Display Options:\n" " --fullscreen Run in fullscreen mode.\n" @@ -301,7 +306,7 @@ "\n" msgstr "" -#: src/setup.cpp:1095 +#: src/setup.cpp:1102 #, c-format msgid "" "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" @@ -322,6 +327,6 @@ msgid "Are you sure you want to delete slot %d?" msgstr "" -#: src/worldmap.cpp:724 +#: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "" Index: de.po =================================================================== RCS file: /cvsroot/super-tux/supertux/po/de.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- de.po 7 Jun 2004 22:43:23 -0000 1.5 +++ de.po 9 Jun 2004 17:32:48 -0000 1.6 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" "Report-Msgid-Bugs-To: sup...@li...\n" -"POT-Creation-Date: 2004-06-07 23:38+0100\n" +"POT-Creation-Date: 2004-06-09 18:34+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: <ma...@br...>\n" "Language-Team: German <de...@li...>\n" @@ -25,7 +25,7 @@ msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:702 src/worldmap.cpp:850 +#: src/gameloop.cpp:702 src/worldmap.cpp:849 msgid "SCORE" msgstr "" @@ -41,35 +41,40 @@ msgid "TIME" msgstr "" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854 +#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 msgid "COINS" msgstr "" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:875 -#: src/worldmap.cpp:876 +#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/worldmap.cpp:875 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:768 +#: src/gameloop.cpp:751 +#, c-format +msgid "Playing: %s" +msgstr "" + +#: src/gameloop.cpp:776 msgid "Result:" msgstr "" -#: src/gameloop.cpp:771 src/worldmap.cpp:727 +#: src/gameloop.cpp:779 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:774 src/worldmap.cpp:731 +#: src/gameloop.cpp:782 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:803 +#: src/gameloop.cpp:811 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:806 +#: src/gameloop.cpp:814 #, c-format msgid "Slot %d - Free" msgstr "" @@ -130,152 +135,152 @@ msgid "Left Alt" msgstr "" -#: src/setup.cpp:388 src/setup.cpp:448 +#: src/setup.cpp:390 src/setup.cpp:450 msgid "Start Game" msgstr "Spiel Beginnen" -#: src/setup.cpp:389 src/title.cpp:91 +#: src/setup.cpp:391 src/title.cpp:91 msgid "Contrib Levels" msgstr "Zusatzlevel" -#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478 +#: src/setup.cpp:392 src/setup.cpp:397 src/setup.cpp:473 src/setup.cpp:480 msgid "Options" msgstr "Einstellungen" -#: src/setup.cpp:391 +#: src/setup.cpp:393 msgid "Level Editor" msgstr "Level Editor" -#: src/setup.cpp:392 +#: src/setup.cpp:394 msgid "Credits" msgstr "Mitwirkende" -#: src/setup.cpp:393 +#: src/setup.cpp:395 msgid "Quit" msgstr "Beenden" -#: src/setup.cpp:398 +#: src/setup.cpp:400 msgid "OpenGL " msgstr "" -#: src/setup.cpp:400 +#: src/setup.cpp:402 msgid "OpenGL (not supported)" msgstr "" -#: src/setup.cpp:402 +#: src/setup.cpp:404 msgid "Fullscreen" msgstr "" -#: src/setup.cpp:405 src/setup.cpp:410 +#: src/setup.cpp:407 src/setup.cpp:412 msgid "Sound " msgstr "" -#: src/setup.cpp:406 src/setup.cpp:411 +#: src/setup.cpp:408 src/setup.cpp:413 msgid "Music " msgstr "" -#: src/setup.cpp:413 +#: src/setup.cpp:415 msgid "Show FPS " msgstr "" -#: src/setup.cpp:414 +#: src/setup.cpp:416 msgid "Setup Keys" msgstr "" -#: src/setup.cpp:417 +#: src/setup.cpp:419 msgid "Setup Joystick" msgstr "" -#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456 +#: src/setup.cpp:422 src/setup.cpp:434 src/setup.cpp:447 src/setup.cpp:458 #: src/title.cpp:104 src/title.cpp:141 msgid "Back" msgstr "" -#: src/setup.cpp:422 +#: src/setup.cpp:424 msgid "Keyboard Setup" msgstr "" -#: src/setup.cpp:424 +#: src/setup.cpp:426 msgid "Left move" msgstr "" -#: src/setup.cpp:425 +#: src/setup.cpp:427 msgid "Right move" msgstr "" -#: src/setup.cpp:426 +#: src/setup.cpp:428 msgid "Jump" msgstr "" -#: src/setup.cpp:427 +#: src/setup.cpp:429 msgid "Duck" msgstr "" -#: src/setup.cpp:428 +#: src/setup.cpp:430 msgid "Activate" msgstr "" -#: src/setup.cpp:430 +#: src/setup.cpp:432 msgid "Power/Run" msgstr "" -#: src/setup.cpp:436 +#: src/setup.cpp:438 msgid "Joystick Setup" msgstr "" -#: src/setup.cpp:440 +#: src/setup.cpp:442 msgid "A button" msgstr "" -#: src/setup.cpp:441 +#: src/setup.cpp:443 msgid "B button" msgstr "" -#: src/setup.cpp:458 +#: src/setup.cpp:460 #, fuzzy msgid "Save Game" msgstr "Spiel Beginnen" -#: src/setup.cpp:468 src/setup.cpp:475 +#: src/setup.cpp:470 src/setup.cpp:477 msgid "Pause" msgstr "" -#: src/setup.cpp:470 src/setup.cpp:477 +#: src/setup.cpp:472 src/setup.cpp:479 msgid "Continue" msgstr "" -#: src/setup.cpp:473 +#: src/setup.cpp:475 #, fuzzy msgid "Abort Level" msgstr "Zusatzlevel" -#: src/setup.cpp:480 +#: src/setup.cpp:482 #, fuzzy msgid "Quit Game" msgstr "Spiel Beginnen" -#: src/setup.cpp:482 +#: src/setup.cpp:484 msgid "Enter your name:" msgstr "" -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid " SuperTux " msgstr "" -#: src/setup.cpp:1036 +#: src/setup.cpp:1043 msgid "" "\n" " Please see the file \"README.txt\" for more details.\n" msgstr "" -#: src/setup.cpp:1038 +#: src/setup.cpp:1045 #, c-format msgid "" "Usage: %s [OPTIONS] FILENAME\n" "\n" msgstr "" -#: src/setup.cpp:1039 +#: src/setup.cpp:1046 msgid "" "Display Options:\n" " --fullscreen Run in fullscreen mode.\n" @@ -305,7 +310,7 @@ "\n" msgstr "" -#: src/setup.cpp:1095 +#: src/setup.cpp:1102 #, c-format msgid "" "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--" @@ -326,6 +331,6 @@ msgid "Are you sure you want to delete slot %d?" msgstr "" -#: src/worldmap.cpp:724 +#: src/worldmap.cpp:723 msgid "GAMEOVER" msgstr "" |
|
From: Ricardo C. <rm...@us...> - 2004-06-09 17:33:01
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31406/src Modified Files: gameloop.cpp Log Message: Added level's name when in pause. Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- gameloop.cpp 9 Jun 2004 11:41:50 -0000 1.150 +++ gameloop.cpp 9 Jun 2004 17:32:49 -0000 1.151 @@ -746,6 +746,14 @@ Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 20), LAYER_FOREGROUND1); + if(game_pause) + { + sprintf(str, _("Playing: %s"), level->name.c_str()); + + context.draw_text(white_text, str, Vector(0,20), + LAYER_FOREGROUND1); + } + if(show_fps) { sprintf(str, "%2.1f", fps_fps); |
|
From: Marek M. <wa...@us...> - 2004-06-09 17:04:23
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv739/data/levels/test Modified Files: level10.stl level11.stl Log Message: Improved the door tile (see test/level11 for demo) added an animated door (sprite name is "openingdoor"), needs to be added to the code Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level10.stl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- level10.stl 8 Jun 2004 13:23:16 -0000 1.11 +++ level10.stl 9 Jun 2004 17:04:12 -0000 1.12 @@ -26,7 +26,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 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 140 0 0 0 0 0 0 0 0 0 0 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 102 0 140 0 0 0 0 0 0 0 0 0 0 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 9 0 0 0 0 0 0 0 0 0 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/level11.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- level11.stl 31 May 2004 13:43:25 -0000 1.4 +++ level11.stl 9 Jun 2004 17:04:13 -0000 1.5 @@ -44,8 +44,8 @@ (speed 0.5) ) (door - (x 800) - (y 256) + (x 832) + (y 320) (sector "another_world") (spawnpoint "main") ) @@ -85,7 +85,7 @@ (spawnpoint "main") ) (door - (x 2550) + (x 2582) (y 1280) (sector "main") (spawnpoint "main") |
|
From: Marek M. <wa...@us...> - 2004-06-09 17:04:21
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv739/data Modified Files: supertux.strf Log Message: Improved the door tile (see test/level11 for demo) added an animated door (sprite name is "openingdoor"), needs to be added to the code Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.strf,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- supertux.strf 8 Jun 2004 20:30:54 -0000 1.42 +++ supertux.strf 9 Jun 2004 17:04:11 -0000 1.43 @@ -684,8 +684,20 @@ ; Door (sprite (name "door") (x-hotspot 0) - (y-hotspot 0) - (images "shared/door.png") + (y-hotspot 64) + (images "shared/door-1.png") + ) + (sprite (name "openingdoor") + (x-hotspot 0) + (y-hotspot 64) + (images "shared/door-1.png" + "shared/door-2.png" + "shared/door-3.png" + "shared/door-4.png" + "shared/door-5.png" + "shared/door-6.png" + "shared/door-7.png" + "shared/door-8.png") ) ; Stomp |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv739/data/images/shared Added Files: door-1.png door-2.png door-3.png door-4.png door-5.png door-6.png door-7.png door-8.png Removed Files: door.png Log Message: Improved the door tile (see test/level11 for demo) added an animated door (sprite name is "openingdoor"), needs to be added to the code --- NEW FILE: door-8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: door-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: door-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: door-3.png --- (This appears to be a binary file; contents omitted.) --- door.png DELETED --- --- NEW FILE: door-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: door-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: door-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: door-5.png --- (This appears to be a binary file; contents omitted.) |
|
From: Marek M. <wa...@us...> - 2004-06-09 17:04:20
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv739 Modified Files: TODO Log Message: Improved the door tile (see test/level11 for demo) added an animated door (sprite name is "openingdoor"), needs to be added to the code Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- TODO 8 Jun 2004 22:08:41 -0000 1.68 +++ TODO 9 Jun 2004 17:04:11 -0000 1.69 @@ -75,6 +75,7 @@ [L] fadein/out for intro/extro would be nice [L] we only have a global counter for multiple coin blocks. This should be handled per block. +[L] Show level number on top of the screen when playing the level Beyond Milestone2 ----------------- |
|
From: Ricardo C. <rm...@us...> - 2004-06-09 11:41:59
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31922/src Modified Files: gameloop.cpp Log Message: Fixed aligment of Coins with Lives. Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.149 retrieving revision 1.150 diff -u -d -r1.149 -r1.150 --- gameloop.cpp 9 Jun 2004 05:23:19 -0000 1.149 +++ gameloop.cpp 9 Jun 2004 11:41:50 -0000 1.150 @@ -721,7 +721,7 @@ sprintf(str, " %d", player_status.distros); context.draw_text(white_text, _("COINS"), - Vector(screen->w - white_text->get_text_width(_("COINS"))-white_text->get_text_width(str), 0), + Vector(screen->w - white_text->get_text_width(_("COINS"))-white_text->get_text_width(" 99"), 0), LAYER_FOREGROUND1); context.draw_text(gold_text, str, Vector(screen->w - gold_text->get_text_width(" 99"), 0),LAYER_FOREGROUND1); |
248 messages has been excluded from this view by a project administrator.
