Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32524
Modified Files:
intro.cpp screen.cpp screen.h setup.cpp text.cpp
Log Message:
- added loading/fadeout screen placeholder
- cleaned up credit code a very little bit
Index: text.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/text.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- text.cpp 26 Apr 2004 15:04:22 -0000 1.13
+++ text.cpp 26 Apr 2004 17:35:08 -0000 1.14
@@ -315,13 +315,8 @@
speed = -MAX_VEL;
/* draw the credits */
-
surface->draw_bg();
- if (strcmp(file, "CREDITS") == 0)
- white_big_text->drawf("- SuperTux " VERSION " -",
- 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2);
-
y = 0;
for(int i = 0; i < length; i++)
{
@@ -336,7 +331,7 @@
y += white_text->h+ITEMS_SPACE;
break;
case '-':
- white_big_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
+ white_big_text->drawf(names.item[i]+1, 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
y += white_big_text->h+ITEMS_SPACE;
break;
default:
Index: intro.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- intro.cpp 26 Apr 2004 14:20:22 -0000 1.17
+++ intro.cpp 26 Apr 2004 17:35:08 -0000 1.18
@@ -33,6 +33,6 @@
void draw_intro()
{
-display_text_file("intro.txt", "images/background/arctis2.jpg");
+display_text_file("intro.txt", "/images/background/arctis2.jpg");
}
Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- setup.cpp 26 Apr 2004 14:20:22 -0000 1.61
+++ setup.cpp 26 Apr 2004 17:35:08 -0000 1.62
@@ -499,6 +499,7 @@
draw_intro();
}
+ fadeout();
WorldMapNS::WorldMap worldmap;
// Load the game or at least set the savegame_file variable
Index: screen.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- screen.h 20 Apr 2004 11:09:34 -0000 1.18
+++ screen.h 26 Apr 2004 17:35:08 -0000 1.19
@@ -51,5 +51,6 @@
void updatescreen(void);
void flipscreen(void);
void update_rect(SDL_Surface *scr, Sint32 x, Sint32 y, Sint32 w, Sint32 h);
+void fadeout();
#endif /*SUPERTUX_SCREEN_H*/
Index: screen.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- screen.cpp 20 Apr 2004 11:09:34 -0000 1.8
+++ screen.cpp 26 Apr 2004 17:35:08 -0000 1.9
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -314,6 +315,13 @@
SDL_Flip(screen);
}
+void fadeout()
+{
+ clearscreen(0, 0, 0);
+ white_text->draw_align("Loading...", screen->w/2, screen->h/2, A_HMIDDLE, A_TOP);
+ flipscreen();
+}
+
void update_rect(SDL_Surface *scr, Sint32 x, Sint32 y, Sint32 w, Sint32 h)
{
if(!use_gl)
|
