Included supertux.h stuff into it.

[supertux.git] / src / intro.cpp

diff --git a/src/intro.cpp b/src/intro.cpp
index ae532fb..369716b 100644 (file)
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -48,7 +48,7 @@ int intro(void)
   SDL_Rect src, dest;
   int done, i, quit, j, scene;
   int * height, * height_speed;
-  timer_type timer;
+  Timer timer;
 
   /* Load sprite images: */
   texture_load(&bkgd, datadir + "/images/intro/intro.png", IGNORE_ALPHA);
@@ -80,7 +80,7 @@ int intro(void)
 
   /* Display background: */
 
-  texture_draw_bg(&bkgd, UPDATE);
+  texture_draw_bg(&bkgd, 255, UPDATE);
 
   /* Animation: */
 
@@ -89,10 +89,10 @@ int intro(void)
   scene = 0;
   i = 0;
 
-  timer_init(&timer, false);
-  timer_start(&timer,10000);
+  timer.init(false);
+  timer.start(10000);
 
-  while (timer_check(&timer) && !done && !quit)
+  while (timer.check() && !done && !quit)
     {
 
 
@@ -108,19 +108,19 @@ int intro(void)
 
       /* Draw things: */
 
-      if (timer_get_gone(&timer) < 2000 && scene == 0)
+      if (timer.get_gone() < 2000 && scene == 0)
         {
           ++scene;
           /* Gown and tux sitting: */
 
-          texture_draw(&tux_sit, 270, 400, UPDATE);
-          texture_draw(&gown_sit, 320, 400, UPDATE);
+          texture_draw(&tux_sit, 270, 400, 255, UPDATE);
+          texture_draw(&gown_sit, 320, 400, 255, UPDATE);
 
           text_drawf(&white_text, intro_text[0], 0, -8, A_HMIDDLE, A_BOTTOM, 0);
         }
 
 
-      if (timer_get_gone(&timer) >= 2000 && scene == 1)
+      if (timer.get_gone() >= 2000 && scene == 1)
         {
           ++scene;
           /* Helicopter begins to fly in: */
@@ -130,38 +130,37 @@ int intro(void)
         }
 
 
-      if (timer_get_gone(&timer) >= 2000 && timer_get_gone(&timer) < 4000)
+      if (timer.get_gone() >= 2000 && timer.get_gone() < 4000)
         {
           /* Helicopter flying in: */
           texture_draw_part(&bkgd,0,32, 0, 32, screen->w, (copter[0].h));
 
           texture_draw(&copter[i % 2],
-                       (float)(timer_get_gone(&timer) - 2000) / 5  - (copter[0].w), 32,
-                       NO_UPDATE);
+                       (float)(timer.get_gone() - 2000) / 5  - (copter[0].w), 32);
 
           update_rect(screen, 0, 32, screen->w, (copter[0].h));
         }
 
 
-      if (timer_get_gone(&timer) >= 2500 && scene == 2)
+      if (timer.get_gone() >= 2500 && scene == 2)
         {
           ++scene;
           /* Gown notices something... */
 
-          texture_draw(&gown_lookup, 320, 400, UPDATE);
+          texture_draw(&gown_lookup, 320, 400, 255, UPDATE);
         }
 
 
-      if (timer_get_gone(&timer) >= 3500 && scene == 3)
+      if (timer.get_gone() >= 3500 && scene == 3)
         {
           ++scene;
           /* Gown realizes it's bad! */
-
-          texture_draw(&gown_upset, 320, 400, UPDATE);
+         
+          texture_draw(&gown_upset, 320, 400, 255, UPDATE);
         }
 
 
-      if (timer_get_gone(&timer) >= 4000 && timer_get_gone(&timer) < 8000)
+      if (timer.get_gone() >= 4000 && timer.get_gone() < 8000)
         {
           /* Helicopter sits: */
           texture_draw_part(&bkgd,0,32, 0, 32, screen->w, (copter[0].h));
@@ -171,12 +170,12 @@ int intro(void)
         }
 
 
-      if (timer_get_gone(&timer) >= 5000 && scene == 4)
+      if (timer.get_gone() >= 5000 && scene == 4)
         {
           ++scene;
           /* Tux realizes something's happening: */
 
-          texture_draw(&tux_upset, 270, 400, UPDATE);
+          texture_draw(&tux_upset, 270, 400, 255, UPDATE);
 
 
           erasecenteredtext(&white_text, intro_text[1], 454, &bkgd, UPDATE, 1);
@@ -184,7 +183,7 @@ int intro(void)
         }
 
 
-      if (timer_get_gone(&timer) >= 5000 && timer_get_gone(&timer) <= 8000)
+      if (timer.get_gone() >= 5000 && timer.get_gone() <= 8000)
         {
           /* Beam gown up! */
 
@@ -197,8 +196,7 @@ int intro(void)
 
           for (j = 0; j < (gown_upset.sdl_surface -> w); j++)
             {
-              texture_draw(&beam, 320 + j - ((beam.w) / 2), height[j],
-                           NO_UPDATE);
+              texture_draw(&beam, 320 + j - ((beam.w) / 2), height[j]);
 
               src.x = j;
               src.y = 0;
@@ -212,7 +210,7 @@ int intro(void)
 
               texture_draw_part(&gown_upset,src.x,src.y,dest.x,dest.y,dest.w,dest.h);
 
-              height[j] = 400 + rand() % 10 - (int)(300. * ((float)(timer_get_gone(&timer) - 5000)/(float)3000.));
+              height[j] = 400 + rand() % 10 - (int)(300. * ((float)(timer.get_gone() - 5000)/(float)3000.));
               if(height[j] < 105)
                 height[j] = 105;
             }
@@ -225,7 +223,7 @@ int intro(void)
         }
 
 
-      if (timer_get_gone(&timer) >= 8000 && scene == 5)
+      if (timer.get_gone() >= 8000 && scene == 5)
         {
           texture_draw_part(&bkgd,
                             310, 32 + (copter[0].h), 310,
@@ -243,30 +241,28 @@ int intro(void)
         }
 
 
-      if (timer_get_gone(&timer) >= 8000 && timer_get_gone(&timer) <= 8250)
+      if (timer.get_gone() >= 8000 && timer.get_gone() <= 8250)
         {
           /* Helicopter starting to speed off: */
 
           texture_draw_part(&bkgd, 0, 32, 0, 32, screen->w, (copter_squish.h));
 
           texture_draw(&copter_squish,
-                       400 - (copter[0].w), 32,
-                       NO_UPDATE);
+                       400 - (copter[0].w), 32);
 
           update_rect(screen, 0, 32, screen->w, (copter_squish.h));
         }
 
 
-      if (timer_get_gone(&timer) >= 8250)
+      if (timer.get_gone() >= 8250)
         {
           /* Helicopter speeding off: */
 
           texture_draw_part(&bkgd, 0, 32, 0, 32, screen->w, (copter_stretch.h));
 
           texture_draw(&copter_stretch,
-                       (timer_get_gone(&timer) - 8250) /*(i - (8250 / FPS)) * 30*/ + 400 - (copter[0].w),
-                       32,
-                       NO_UPDATE);
+                       (timer.get_gone() - 8250) /*(i - (8250 / FPS)) * 30*/ + 400 - (copter[0].w),
+                       32);
 
           update_rect(screen, 0, 32, screen->w, (copter_stretch.h));
         }