Proper ball shadow removal in poser mode. Patch from Elviz.

[neverball] / ball / set.c

diff --git a/ball/set.c b/ball/set.c
index 3ca5326..866e797 100644 (file)
--- a/ball/set.c
+++ b/ball/set.c
@@ -20,6 +20,7 @@
 #include "glext.h"
 #include "config.h"
 #include "image.h"
+#include "text.h"
 #include "set.h"
 #include "game.h"
 
@@ -152,8 +153,8 @@ static void set_load_hs(void)
     if (!res && errno != ENOENT)
     {
         fprintf(stderr,
-                _("Error while loading user high-score file '%s': %s\n"),
-                fn, errno ? strerror(errno) : _("Incorrect format"));
+                L_("Error while loading user high-score file '%s': %s\n"),
+                fn, errno ? strerror(errno) : L_("Incorrect format"));
     }
 }
 
@@ -177,7 +178,7 @@ static int set_load(struct set *s, const char *filename)
 
     if (!fin)
     {
-        fprintf(stderr, _("Cannot load the set file '%s': %s\n"),
+        fprintf(stderr, L_("Cannot load the set file '%s': %s\n"),
                 filename, strerror(errno));
         return 0;
     }
@@ -416,7 +417,6 @@ static int set_score_update(struct level_game *lg, const char *player)
     return (lg->score_rank < 3 || lg->times_rank < 3);
 }
 
-
 /* Update the player name for set and level high-score. */
 void score_change_name(struct level_game *lg, const char *player)
 {
@@ -447,8 +447,7 @@ static struct level *next_normal_level(int i)
     return NULL;
 }
 
-/* Inform the set that a level is finished.  Update next level and score
- * rank fields. */
+/*---------------------------------------------------------------------------*/
 
 void set_finish_level(struct level_game *lg, const char *player)
 {
@@ -469,7 +468,7 @@ void set_finish_level(struct level_game *lg, const char *player)
     }
 
     /* On level completed */
-    if (lg->state == GAME_GOAL)
+    if (lg->status == GAME_GOAL)
     {
         /* Update level scores */
         dirty = level_score_update(lg, player);
@@ -488,7 +487,7 @@ void set_finish_level(struct level_game *lg, const char *player)
     }
 
     /* On goal reached */
-    if (lg->state == GAME_GOAL)
+    if (lg->status == GAME_GOAL)
     {
         /* Identify the following level */
         nl = next_level(ln);
@@ -565,11 +564,6 @@ void level_snap(int i)
 
     if (game_init(&level_v[i], 0, 0))
     {
-        int shadow;
-
-        if ((shadow = config_get_d(CONFIG_SHADOW)))
-            config_set_d(CONFIG_SHADOW, 0);
-
         /* Render the level and grab the screen. */
 
         config_clear();
@@ -579,9 +573,6 @@ void level_snap(int i)
         SDL_GL_SwapBuffers();
 
         image_snap(filename);
-
-        if (shadow)
-            config_set_d(CONFIG_SHADOW, 1);
     }
 }