More clean-up. Also removed the FPS lock, see

[neverball] / ball / st_play.c

diff --git a/ball/st_play.c b/ball/st_play.c
index b413f6b..c665640 100644 (file)
--- a/ball/st_play.c
+++ b/ball/st_play.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -22,8 +22,7 @@
 #include "st_shared.h"
 
 #include "st_play.h"
-#include "st_fail.h"
-#include "st_goal.h"
+#include "st_play_end.h"
 #include "st_over.h"
 
 /*---------------------------------------------------------------------------*/
@@ -141,6 +140,8 @@ static int play_set_buttn(int b, int d)
 
 /*---------------------------------------------------------------------------*/
 
+static int nohud = 0;
+
 static int play_loop_enter(void)
 {
     int id;
@@ -156,6 +157,10 @@ static int play_loop_enter(void)
     game_set_fly(0.f);
     view_rotate = 0;
 
+    hud_view_pulse(config_get_d(CONFIG_CAMERA));
+
+    nohud = 0;
+
     hud_update(0);
 
     return id;
@@ -164,7 +169,8 @@ static int play_loop_enter(void)
 static void play_loop_paint(int id, float st)
 {
     game_draw(0, st);
-    hud_paint();
+    if (!nohud)
+        hud_paint();
 
     if (time_state() < 1.f)
         gui_paint(id);
@@ -181,24 +187,19 @@ static void play_loop_timer(int id, float dt)
 
     float g[3] = { 0.0f, -9.8f, 0.0f };
 
-    int state;
-    
+    int state, state_value;
+
     at = (7 * at + dt) / 8;
 
     gui_timer(id, at);
     hud_timer(at);
     game_set_rot(view_rotate * k);
 
-    state = game_step(g, at, 1);
+    state = game_step(g, at, &state_value);
     if (state)
     {
-       level_stop(state, curr_clock(), curr_coins());
-       switch (state)
-       {
-       case GAME_TIME: goto_state(&st_time_out); break;
-       case GAME_FALL: goto_state(&st_fall_out); break;
-       case GAME_GOAL: goto_state(&st_goal);     break;
-       }
+        level_stop(state, state_value, curr_clock(), curr_coins());
+        goto_state(&st_play_end);
     }
 
     game_step_fade(dt);
@@ -260,12 +261,15 @@ static int play_loop_keybd(int c, int d)
 
     if (d && c == SDLK_F12)
         return goto_state(&st_look);
-    
+
+    if (d && c == SDLK_F6)
+        nohud = !nohud;
+
     /* Cheat */
     if (d && c == SDLK_c && config_get_d(CONFIG_CHEAT))
     {
-        level_stop(GAME_GOAL, curr_clock(), curr_coins());
-        return goto_state(&st_goal);
+        level_stop(GAME_GOAL, 0, curr_clock(), curr_coins());
+        return goto_state(&st_play_end);
     }
     return 1;
 }
@@ -275,10 +279,10 @@ static int play_loop_buttn(int b, int d)
     if (d == 1)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-       {
-           level_stop(GAME_NONE, curr_clock(), curr_coins());
+        {
+            level_stop(GAME_NONE, 0, curr_clock(), curr_coins());
             return abort_play();
-       }
+        }
 
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_R, b))
             view_rotate = +1;
@@ -349,7 +353,7 @@ static void look_point(int id, int x, int y, int dx, int dy)
 static int look_keybd(int c, int d)
 {
     if (d && c == SDLK_F12)
-       return goto_state(&st_play_loop);
+        return goto_state(&st_play_loop);
 
     return 1;
 }
@@ -357,7 +361,7 @@ static int look_keybd(int c, int d)
 static int look_buttn(int b, int d)
 {
     if (d && config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-       return goto_state(&st_play_loop);
+        return goto_state(&st_play_loop);
 
     return 1;
 }