On Windows, when renaming Last to the destination filename, check if the

[neverball] / ball / st_play.c

diff --git a/ball/st_play.c b/ball/st_play.c
index b736dad..b44e38e 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
@@ -16,13 +16,13 @@
 #include "hud.h"
 #include "game.h"
 #include "demo.h"
-#include "level.h"
+#include "levels.h"
 #include "audio.h"
 #include "config.h"
+#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"
 
 /*---------------------------------------------------------------------------*/
@@ -31,6 +31,14 @@ static int view_rotate;
 
 /*---------------------------------------------------------------------------*/
 
+static int abort_play(void)
+{
+   if (curr_lg()->mode == MODE_SINGLE)
+       return 0;
+   else
+       return goto_state(&st_over);
+}
+
 static int play_ready_enter(void)
 {
     int id;
@@ -47,17 +55,6 @@ static int play_ready_enter(void)
     return id;
 }
 
-static void play_ready_leave(int id)
-{
-    gui_delete(id);
-}
-
-static void play_ready_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
 static void play_ready_timer(int id, float dt)
 {
     float t = time_state();
@@ -84,7 +81,7 @@ static int play_ready_buttn(int b, int d)
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
             return goto_state(&st_play_loop);
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-            return goto_state(&st_over);
+            return abort_play();
     }
     return 1;
 }
@@ -106,17 +103,6 @@ static int play_set_enter(void)
     return id;
 }
 
-static void play_set_leave(int id)
-{
-    gui_delete(id);
-}
-
-static void play_set_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
 static void play_set_timer(int id, float dt)
 {
     float t = time_state();
@@ -147,13 +133,15 @@ static int play_set_buttn(int b, int d)
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
             return goto_state(&st_play_loop);
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-            return goto_state(&st_over);
+            return abort_play();
     }
     return 1;
 }
 
 /*---------------------------------------------------------------------------*/
 
+static int nohud = 0;
+
 static int play_loop_enter(void)
 {
     int id;
@@ -169,18 +157,20 @@ static int play_loop_enter(void)
     game_set_fly(0.f);
     view_rotate = 0;
 
-    return id;
-}
+    hud_view_pulse(config_get_d(CONFIG_CAMERA));
 
-static void play_loop_leave(int id)
-{
-    gui_delete(id);
+    nohud = 0;
+
+    hud_update(0);
+
+    return id;
 }
 
 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);
@@ -197,22 +187,25 @@ static void play_loop_timer(int id, float dt)
 
     float g[3] = { 0.0f, -9.8f, 0.0f };
 
+    int state, state_value;
+
     at = (7 * at + dt) / 8;
 
     gui_timer(id, at);
     hud_timer(at);
     game_set_rot(view_rotate * k);
 
-    switch (game_step(g, at, 1))
-    {
-    case GAME_TIME: level_stop(GAME_TIME); goto_state(&st_time_out); break;
-    case GAME_FALL: level_stop(GAME_FALL); goto_state(&st_fall_out); break;
-    case GAME_GOAL: level_stop(GAME_GOAL); goto_state(&st_goal);     break;
-    }
+    state = game_step(g, at, &state_value);
 
     game_step_fade(dt);
     demo_play_step(at);
     audio_timer(dt);
+
+    if (state)
+    {
+        level_stop(state, state_value, curr_clock(), curr_coins());
+        goto_state(&st_play_end);
+    }
 }
 
 static void play_loop_point(int id, int x, int y, int dx, int dy)
@@ -258,6 +251,12 @@ static int play_loop_keybd(int c, int d)
             config_set_d(CONFIG_CAMERA, 2);
             hud_view_pulse(2);
         }
+        if (c == SDLK_r && curr_lg()->mode != MODE_CHALLENGE)
+        {
+            level_stop(GAME_NONE, 0, curr_clock(), curr_coins());
+            level_play_go();
+            goto_state(&st_play_set);
+        }
     }
     else
     {
@@ -269,12 +268,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);
-        return goto_state(&st_goal);
+        level_stop(GAME_GOAL, 0, curr_clock(), curr_coins());
+        return goto_state(&st_play_end);
     }
     return 1;
 }
@@ -284,10 +286,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);
-            return goto_state(&st_over);
-       }
+        {
+            level_stop(GAME_NONE, 0, curr_clock(), curr_coins());
+            return abort_play();
+        }
 
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_R, b))
             view_rotate = +1;
@@ -358,7 +360,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;
 }
@@ -366,7 +368,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;
 }
@@ -375,8 +377,8 @@ static int look_buttn(int b, int d)
 
 struct state st_play_ready = {
     play_ready_enter,
-    play_ready_leave,
-    play_ready_paint,
+    shared_leave,
+    shared_paint,
     play_ready_timer,
     NULL,
     NULL,
@@ -388,8 +390,8 @@ struct state st_play_ready = {
 
 struct state st_play_set = {
     play_set_enter,
-    play_set_leave,
-    play_set_paint,
+    shared_leave,
+    shared_paint,
     play_set_timer,
     NULL,
     NULL,
@@ -401,7 +403,7 @@ struct state st_play_set = {
 
 struct state st_play_loop = {
     play_loop_enter,
-    play_loop_leave,
+    shared_leave,
     play_loop_paint,
     play_loop_timer,
     play_loop_point,