X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=39c0321ac51ad81576d56661450db81803a48ed9;hb=8eab6de858ae8837b169d5b7238da426c55645e9;hp=bd4c0cc614a6b39d95708040a945d7fee66003bc;hpb=87fd32ed7c5c47b7278300d12bf67c5b46a604a6;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index bd4c0cc6..39c0321a 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1075,6 +1075,18 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] =
     &xx_ei.move_delay_random,		0,
     &yy_ei.move_delay_random
   },
+  {
+    -1,					-1,
+    TYPE_INTEGER,			CONF_VALUE_16_BIT(16),
+    &xx_ei.step_delay_fixed,		0,
+    &yy_ei.step_delay_fixed
+  },
+  {
+    -1,					-1,
+    TYPE_INTEGER,			CONF_VALUE_16_BIT(17),
+    &xx_ei.step_delay_random,		0,
+    &yy_ei.step_delay_random
+  },
 
   {
     -1,					-1,
@@ -3722,6 +3734,9 @@ static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
     if (jx != -1 && jy != -1)
       level->field[jx][jy] = EL_PLAYER_1 + nr;
   }
+
+  // time score is counted for each 10 seconds left in Emerald Mine levels
+  level->time_score_base = 10;
 }
 
 
@@ -5739,6 +5754,9 @@ static void LoadLevelFromFileStream_DC(File *file, struct LevelInfo *level,
   // Diamond Caves has the same (strange) behaviour as Emerald Mine that gems
   // can slip down from flat walls, like normal walls and steel walls
   level->em_slippery_gems = TRUE;
+
+  // time score is counted for each 10 seconds left in Diamond Caves levels
+  level->time_score_base = 10;
 }
 
 static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
@@ -6262,7 +6280,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level)
   if (level->game_version < VERSION_IDENT(3,2,0,5))
   {
     // time bonus score was given for 10 s instead of 1 s before 3.2.0-5
-    level->score[SC_TIME_BONUS] /= 10;
+    level->time_score_base = 10;
   }
 
   if (leveldir_current->latest_engine)
@@ -8539,7 +8557,11 @@ static struct TokenInfo global_setup_tokens[] =
   },
   {
     TYPE_SWITCH,
-    &setup.skip_scores_after_game,		"skip_scores_after_game"
+    &setup.count_score_after_game,		"count_score_after_game"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.show_scores_after_game,		"show_scores_after_game"
   },
   {
     TYPE_SWITCH,
@@ -8741,6 +8763,10 @@ static struct TokenInfo editor_setup_tokens[] =
     TYPE_SWITCH,
     &setup.editor.show_element_token,		"editor.show_element_token"
   },
+  {
+    TYPE_SWITCH,
+    &setup.editor.show_read_only_warning,	"editor.show_read_only_warning"
+  },
 };
 
 static struct TokenInfo editor_cascade_setup_tokens[] =
@@ -9254,7 +9280,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->skip_levels = TRUE;
   si->increment_levels = TRUE;
   si->auto_play_next_level = TRUE;
-  si->skip_scores_after_game = FALSE;
+  si->count_score_after_game = TRUE;
+  si->show_scores_after_game = TRUE;
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
   si->window_scaling_percent = STD_WINDOW_SCALING_PERCENT;
@@ -9372,6 +9399,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->editor.show_element_token		= FALSE;
 
+  si->editor.show_read_only_warning	= TRUE;
+
   si->editor.use_template_for_new_levels = TRUE;
 
   si->shortcut.save_game	= DEFAULT_KEY_SAVE_GAME;