X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=47777fa23d825d853309e856707f24e64023208a;hb=456850f38548906c013fb29dd03f2171021ee9ec;hp=3f64b882b8f33f328c07a385b372a86f33502438;hpb=cc3401ea96ba528d5f7d384d9f89444dbebcc432;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 3f64b882..47777fa2 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -2232,9 +2232,13 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	SaveLevelSetup_LastSeries();
 	SaveLevelSetup_SeriesInfo();
 
+#if defined(PLATFORM_EMSCRIPTEN)
+	Request("Close the browser window to quit!", REQ_CONFIRM);
+#else
 	if (!setup.ask_on_quit_program ||
 	    Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
 	  SetGameStatus(GAME_MODE_QUIT);
+#endif
       }
     }
   }
@@ -4068,9 +4072,8 @@ static void FreeThreadData_ApiRenamePlayer(void *data_raw)
   checked_free(data);
 }
 
-static void ApiRenamePlayerExt(struct HttpRequest *request,
-			       struct HttpResponse *response,
-			       void *data_raw)
+static boolean SetRequest_ApiRenamePlayer(struct HttpRequest *request,
+					  void *data_raw)
 {
   struct ApiRenamePlayerThreadData *data = data_raw;
   char *player_name_raw = data->player_name;
@@ -4103,6 +4106,78 @@ static void ApiRenamePlayerExt(struct HttpRequest *request,
 
   ConvertHttpRequestBodyToServerEncoding(request);
 
+  return TRUE;
+}
+
+static void HandleResponse_ApiRenamePlayer(struct HttpResponse *response,
+					   void *data_raw)
+{
+  // nothing to do here
+}
+
+#if defined(PLATFORM_EMSCRIPTEN)
+static void Emscripten_ApiRenamePlayer_Loaded(unsigned handle, void *data_raw,
+					      void *buffer, unsigned int size)
+{
+  struct HttpResponse *response = GetHttpResponseFromBuffer(buffer, size);
+
+  if (response != NULL)
+  {
+    HandleResponse_ApiRenamePlayer(response, data_raw);
+
+    checked_free(response);
+  }
+  else
+  {
+    Error("server response too large to handle (%d bytes)", size);
+  }
+
+  FreeThreadData_ApiRenamePlayer(data_raw);
+}
+
+static void Emscripten_ApiRenamePlayer_Failed(unsigned handle, void *data_raw,
+					      int code, const char *status)
+{
+  Error("server failed to handle request: %d %s", code, status);
+
+  FreeThreadData_ApiRenamePlayer(data_raw);
+}
+
+static void Emscripten_ApiRenamePlayer_Progress(unsigned handle, void *data_raw,
+						int bytes, int size)
+{
+  // nothing to do here
+}
+
+static void Emscripten_ApiRenamePlayer_HttpRequest(struct HttpRequest *request,
+						   void *data_raw)
+{
+  if (!SetRequest_ApiRenamePlayer(request, data_raw))
+  {
+    FreeThreadData_ApiRenamePlayer(data_raw);
+
+    return;
+  }
+
+  emscripten_async_wget2_data(request->uri,
+			      request->method,
+			      request->body,
+			      data_raw,
+			      TRUE,
+			      Emscripten_ApiRenamePlayer_Loaded,
+			      Emscripten_ApiRenamePlayer_Failed,
+			      Emscripten_ApiRenamePlayer_Progress);
+}
+
+#else
+
+static void ApiRenamePlayer_HttpRequestExt(struct HttpRequest *request,
+					   struct HttpResponse *response,
+					   void *data_raw)
+{
+  if (!SetRequest_ApiRenamePlayer(request, data_raw))
+    return;
+
   if (!DoHttpRequest(request, response))
   {
     Error("HTTP request failed: %s", GetHttpError());
@@ -4118,32 +4193,40 @@ static void ApiRenamePlayerExt(struct HttpRequest *request,
 
     return;
   }
+
+  HandleResponse_ApiRenamePlayer(response, data_raw);
 }
 
-static void ApiRenamePlayer(void *data_raw)
+static void ApiRenamePlayer_HttpRequest(struct HttpRequest *request,
+				    struct HttpResponse *response,
+				    void *data_raw)
 {
-  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
-  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
-
-  ApiRenamePlayerExt(request, response, data_raw);
+  ApiRenamePlayer_HttpRequestExt(request, response, data_raw);
 
-  checked_free(request);
-  checked_free(response);
+  FreeThreadData_ApiRenamePlayer(data_raw);
 }
+#endif
 
 static int ApiRenamePlayerThread(void *data_raw)
 {
-  ApiRenamePlayer(data_raw);
+  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
+  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  FreeThreadData_ApiRenamePlayer(data_raw);
+#if defined(PLATFORM_EMSCRIPTEN)
+  Emscripten_ApiRenamePlayer_HttpRequest(request, data_raw);
+#else
+  ApiRenamePlayer_HttpRequest(request, response, data_raw);
+#endif
+
+  checked_free(request);
+  checked_free(response);
 
   return 0;
 }
 
 static void ApiRenamePlayerAsThread(void)
 {
-  struct ApiRenamePlayerThreadData *data =
-    CreateThreadData_ApiRenamePlayer();
+  struct ApiRenamePlayerThreadData *data = CreateThreadData_ApiRenamePlayer();
 
   ExecuteAsThread(ApiRenamePlayerThread,
 		  "ApiRenamePlayer", data,
@@ -4273,10 +4356,17 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     // temporarily change active user to edited user
     user.nr = type_name_nr;
 
-    // load setup of edited user (unless creating user with current setup)
-    if (!create_user ||
-	!Request("Use current setup values for the new player?", REQ_ASK))
+    if (create_user &&
+        Request("Use current setup values for the new player?", REQ_ASK))
+    {
+      // use current setup values for new user, but create new player UUID
+      setup.player_uuid = getStringCopy(getUUID());
+    }
+    else
+    {
+      // load setup for existing user (or start with defaults for new user)
       LoadSetup();
+    }
   }
 
   char *setup_filename = getSetupFilename();
@@ -5026,6 +5116,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 	  SetGameStatus(GAME_MODE_MAIN);
 
 	  DrawMainMenu();
+
+	  // needed once to offer uploading score tapes after changing user
+	  CheckUploadTapes();
 	}
       }
     }
@@ -9897,7 +9990,19 @@ static boolean OfferUploadTapes(void)
   int num_tapes_uploaded = UploadTapes();
   char message[100];
 
-  sprintf(message, "%d tapes uploaded!", num_tapes_uploaded);
+  if (num_tapes_uploaded < 0)
+  {
+    Request("Cannot upload tapes to score server!", REQ_CONFIRM);
+
+    return FALSE;
+  }
+
+  if (num_tapes_uploaded == 0)
+    sprintf(message, "No tapes uploaded!");
+  else if (num_tapes_uploaded == 1)
+    sprintf(message, "1 tape uploaded!");
+  else
+    sprintf(message, "%d tapes uploaded!", num_tapes_uploaded);
 
   Request(message, REQ_CONFIRM);
 
@@ -9906,7 +10011,7 @@ static boolean OfferUploadTapes(void)
 
   SaveSetup();
 
-  return (num_tapes_uploaded > 0);
+  return TRUE;
 }
 
 void CheckUploadTapes(void)