X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=42d74dbf80c45bb7bb3ff4d3fb393905c3aaa053;hb=f0bec2935a69513658571cd766150be5476b0849;hp=612d09422e2733604c2815456f84ca30f269d033;hpb=77eea34405c119f20f461acae08cd77ec5c21dd6;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 612d0942..42d74dbf 100644
--- a/src/files.c
+++ b/src/files.c
@@ -266,6 +266,12 @@ static struct LevelFileConfigInfo chunk_config_INFO[] =
     &li.time_score_base,		1
   },
 
+  {
+    -1,					-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(13),
+    &li.rate_time_over_score,		FALSE
+  },
+
   {
     -1,					-1,
     -1,					-1,
@@ -3932,12 +3938,11 @@ static void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
   level->time_wheel = 0;
   level->amoeba_content = EL_EMPTY;
 
-#if 1
-  // original Supaplex does not use score values -- use default values
-#else
+  // original Supaplex does not use score values -- rate by playing time
   for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++)
     level->score[i] = 0;
-#endif
+
+  level->rate_time_over_score = TRUE;
 
   // there are no yamyams in supaplex levels
   for (i = 0; i < level->num_yamyam_contents; i++)
@@ -6605,6 +6610,27 @@ static void LoadLevel_InitCustomElements(struct LevelInfo *level)
       element_info[element].ignition_delay = 8;
     }
   }
+
+  // set mouse click change events to work for left/middle/right mouse button
+  if (level->game_version < VERSION_IDENT(4,2,3,0))
+  {
+    for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
+    {
+      int element = EL_CUSTOM_START + i;
+      struct ElementInfo *ei = &element_info[element];
+
+      for (j = 0; j < ei->num_change_pages; j++)
+      {
+	struct ElementChangeInfo *change = &ei->change_page[j];
+
+	if (change->has_event[CE_CLICKED_BY_MOUSE] ||
+	    change->has_event[CE_PRESSED_BY_MOUSE] ||
+	    change->has_event[CE_MOUSE_CLICKED_ON_X] ||
+	    change->has_event[CE_MOUSE_PRESSED_ON_X])
+	  change->trigger_side = CH_SIDE_ANY;
+      }
+    }
+  }
 }
 
 static void LoadLevel_InitElements(struct LevelInfo *level)
@@ -8390,6 +8416,7 @@ static void setScoreInfoToDefaults(void)
   {
     strcpy(scores.entry[i].name, EMPTY_PLAYER_NAME);
     scores.entry[i].score = 0;
+    scores.entry[i].time = 0;
   }
 }
 
@@ -8445,6 +8472,25 @@ static void LoadScore_OLD(int nr)
   fclose(file);
 }
 
+static void ConvertScore_OLD(void)
+{
+  // only convert score to time for levels that rate playing time over score
+  if (!level.rate_time_over_score)
+    return;
+
+  // convert old score to playing time for score-less levels (like Supaplex)
+  int time_final_max = 999;
+  int i;
+
+  for (i = 0; i < MAX_SCORE_ENTRIES; i++)
+  {
+    int score = scores.entry[i].score;
+
+    if (score > 0 && score < time_final_max)
+      scores.entry[i].time = (time_final_max - score - 1) * FRAMES_PER_SECOND;
+  }
+}
+
 static int LoadScore_VERS(File *file, int chunk_size, struct ScoreInfo *scores)
 {
   scores->file_version = getFileVersion(file);
@@ -8508,6 +8554,18 @@ static int LoadScore_SCOR(File *file, int chunk_size, struct ScoreInfo *scores)
   return chunk_size;
 }
 
+static int LoadScore_TIME(File *file, int chunk_size, struct ScoreInfo *scores)
+{
+  int i;
+
+  for (i = 0; i < scores->num_entries; i++)
+    scores->entry[i].time = getFile32BitBE(file);
+
+  chunk_size = scores->num_entries * 4;
+
+  return chunk_size;
+}
+
 void LoadScore(int nr)
 {
   char *filename = getScoreFilename(nr);
@@ -8562,6 +8620,9 @@ void LoadScore(int nr)
   {
     // score files from versions before 4.2.4.0 without chunk structure
     LoadScore_OLD(nr);
+
+    // convert score to time, if possible (mainly for Supaplex levels)
+    ConvertScore_OLD();
   }
   else
   {
@@ -8577,6 +8638,7 @@ void LoadScore(int nr)
       { "INFO", -1,			LoadScore_INFO },
       { "NAME", -1,			LoadScore_NAME },
       { "SCOR", -1,			LoadScore_SCOR },
+      { "TIME", -1,			LoadScore_TIME },
 
       {  NULL,  0,			NULL }
     };
@@ -8695,6 +8757,14 @@ static void SaveScore_SCOR(FILE *file, struct ScoreInfo *scores)
     putFile16BitBE(file, scores->entry[i].score);
 }
 
+static void SaveScore_TIME(FILE *file, struct ScoreInfo *scores)
+{
+  int i;
+
+  for (i = 0; i < scores->num_entries; i++)
+    putFile32BitBE(file, scores->entry[i].time);
+}
+
 static void SaveScoreToFilename(char *filename)
 {
   FILE *file;
@@ -8702,6 +8772,7 @@ static void SaveScoreToFilename(char *filename)
   int info_chunk_size;
   int name_chunk_size;
   int scor_chunk_size;
+  int time_chunk_size;
 
   if (!(file = fopen(filename, MODE_WRITE)))
   {
@@ -8713,6 +8784,7 @@ static void SaveScoreToFilename(char *filename)
   info_chunk_size = 2 + (strlen(scores.level_identifier) + 1) + 2 + 2;
   name_chunk_size = scores.num_entries * MAX_PLAYER_NAME_LEN;
   scor_chunk_size = scores.num_entries * 2;
+  time_chunk_size = scores.num_entries * 4;
 
   putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
   putFileChunkBE(file, "SCOR", CHUNK_SIZE_NONE);
@@ -8729,6 +8801,9 @@ static void SaveScoreToFilename(char *filename)
   putFileChunkBE(file, "SCOR", scor_chunk_size);
   SaveScore_SCOR(file, &scores);
 
+  putFileChunkBE(file, "TIME", time_chunk_size);
+  SaveScore_TIME(file, &scores);
+
   fclose(file);
 
   SetFilePermissions(filename, permissions);
@@ -8751,6 +8826,7 @@ void SaveScore(int nr)
 
   for (i = 0; i < MAX_SCORE_ENTRIES; i++)
     if (scores.entry[i].score == 0 &&
+        scores.entry[i].time == 0 &&
         strEqual(scores.entry[i].name, EMPTY_PLAYER_NAME))
       break;