X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=9c370e72497b5b1ff2657cd9c837fbf4ffa66ba3;hb=8ca1cd4ae397da6b91d425aac0b3a40d302b66c2;hp=1dd328c0f1f4fa744d28e84e7deb19865bb3881a;hpb=cbeca34e1c932720f2a3a7b6ae3614d27b774de7;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 1dd328c0..9c370e72 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3160,7 +3160,7 @@ static int LoadLevel_MicroChunk(File *file, struct LevelFileConfigInfo *conf,
 	  value = getMappedElement(value);
 
 	if (data_type == TYPE_BOOLEAN)
-	  *(boolean *)(conf[i].value) = value;
+	  *(boolean *)(conf[i].value) = (value ? TRUE : FALSE);
 	else
 	  *(int *)    (conf[i].value) = value;
 
@@ -8447,11 +8447,34 @@ void DumpTape(struct TapeInfo *tape)
   }
 
   PrintLine("-", 79);
+
   Print("Tape of Level %03d (file version %08d, game version %08d)\n",
 	tape->level_nr, tape->file_version, tape->game_version);
   Print("                  (effective engine version %08d)\n",
 	tape->engine_version);
   Print("Level series identifier: '%s'\n", tape->level_identifier);
+
+  Print("Special tape properties: ");
+  if (tape->property_bits == TAPE_PROPERTY_NONE)
+    Print("[none]");
+  if (tape->property_bits & TAPE_PROPERTY_EM_RANDOM_BUG)
+    Print("[em_random_bug]");
+  if (tape->property_bits & TAPE_PROPERTY_GAME_SPEED)
+    Print("[game_speed]");
+  if (tape->property_bits & TAPE_PROPERTY_PAUSE_MODE)
+    Print("[pause]");
+  if (tape->property_bits & TAPE_PROPERTY_SINGLE_STEP)
+    Print("[single_step]");
+  if (tape->property_bits & TAPE_PROPERTY_SNAPSHOT)
+    Print("[snapshot]");
+  if (tape->property_bits & TAPE_PROPERTY_REPLAYED)
+    Print("[replayed]");
+  if (tape->property_bits & TAPE_PROPERTY_TAS_KEYS)
+    Print("[tas_keys]");
+  if (tape->property_bits & TAPE_PROPERTY_SMALL_GRAPHICS)
+    Print("[small_graphics]");
+
+  Print("\n");
   PrintLine("-", 79);
 
   tape_frame_counter = 0;
@@ -9003,8 +9026,8 @@ void SaveScore(int nr)
   SaveScoreToFilename(filename);
 }
 
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
-			    char *error)
+void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
+		     char *error)
 {
   SDL_Thread *thread = SDL_CreateThread(function, name, data);
 
@@ -9017,7 +9040,7 @@ static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
   Delay(1);
 }
 
-static char *getPasswordJSON(char *password)
+char *getPasswordJSON(char *password)
 {
   static char password_json[MAX_FILENAME_LEN] = "";
   static boolean initialized = FALSE;
@@ -9318,6 +9341,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   char *level_name          = getEscapedJSON(level.name);
   char *level_author        = getEscapedJSON(level.author);
   char *player_name         = getEscapedJSON(score_entry->name);
+  char *player_uuid         = getEscapedJSON(setup.player_uuid);
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
 	   "{\n"
@@ -9333,6 +9357,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 	   "  \"level_author\":         \"%s\",\n"
 	   "  \"rate_time_over_score\": \"%d\",\n"
 	   "  \"player_name\":          \"%s\",\n"
+	   "  \"player_uuid\":          \"%s\",\n"
 	   "  \"score\":                \"%d\",\n"
 	   "  \"time\":                 \"%d\",\n"
 	   "  \"tape_basename\":        \"%s\",\n"
@@ -9350,6 +9375,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 	   level_author,
 	   level.rate_time_over_score,
 	   player_name,
+	   player_uuid,
 	   score_entry->score,
 	   score_entry->time,
 	   score_entry->tape_basename,
@@ -9363,6 +9389,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   checked_free(level_name);
   checked_free(level_author);
   checked_free(player_name);
+  checked_free(player_uuid);
 
   ConvertHttpRequestBodyToServerEncoding(request);
 
@@ -9486,6 +9513,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.player_name,				"player_name"
   },
+  {
+    TYPE_STRING,
+    &setup.player_uuid,				"player_uuid"
+  },
   {
     TYPE_SWITCH,
     &setup.multiple_users,			"multiple_users"
@@ -9656,7 +9687,11 @@ static struct TokenInfo global_setup_tokens[] =
   },
   {
     TYPE_SWITCH,
-    &setup.show_snapshot_buttons,		"show_snapshot_buttons"
+    &setup.show_load_save_buttons,		"show_load_save_buttons"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.show_undo_redo_buttons,		"show_undo_redo_buttons"
   },
   {
     TYPE_SWITCH,
@@ -10293,6 +10328,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   int i;
 
   si->player_name = getStringCopy(getDefaultUserName(user.nr));
+  si->player_uuid = NULL;	// (will be set later)
 
   si->multiple_users = TRUE;
 
@@ -10337,7 +10373,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->game_frame_delay = GAME_FRAME_DELAY;
   si->sp_show_border_elements = FALSE;
   si->small_game_graphics = FALSE;
-  si->show_snapshot_buttons = FALSE;
+  si->show_load_save_buttons = FALSE;
+  si->show_undo_redo_buttons = FALSE;
   si->only_show_local_scores = FALSE;
 
   si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
@@ -10838,6 +10875,14 @@ static void LoadSetup_SpecialPostProcessing(void)
   // make sure that scroll delay value stays inside valid range
   setup.scroll_delay_value =
     MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY);
+
+  if (setup.player_uuid == NULL)
+  {
+    // player UUID does not yet exist in setup file
+    setup.player_uuid = getStringCopy(getUUID());
+
+    SaveSetup();
+  }
 }
 
 void LoadSetup(void)
@@ -13160,6 +13205,11 @@ void ConvertLevels(void)
 
     Print("converting level ... ");
 
+#if 0
+    // special case: conversion of some EMC levels as requested by ACME
+    level.game_engine_type = GAME_ENGINE_TYPE_RND;
+#endif
+
     level_filename = getDefaultLevelFilename(level_nr);
     new_level = !fileExists(level_filename);