renamed API related functions to match API names

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index dfc08900a8ddc82ea290cc69df41ea07be223741..61aff99a31f99a07bc1ee51cecde52bc81e07640 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -283,6 +283,7 @@ static void MapScreenTreeGadgets(TreeInfo *);
 static void UpdateScreenMenuGadgets(int, boolean);
 
 static boolean OfferUploadTapes(void);
+static void execOfferUploadTapes(void);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
@@ -4041,10 +4042,10 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 // change name functions
 // ============================================================================
 
-static void RenamePlayerOnServerExt(struct HttpRequest *request,
-                                   struct HttpResponse *response,
-                                   char *player_name_raw,
-                                   char *player_uuid_raw)
+static void ApiRenamePlayerExt(struct HttpRequest *request,
+                              struct HttpResponse *response,
+                              char *player_name_raw,
+                              char *player_uuid_raw)
 {
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
@@ -4058,11 +4059,13 @@ static void RenamePlayerOnServerExt(struct HttpRequest *request,
           "{\n"
           "%s"
           "  \"game_version\":         \"%s\",\n"
+          "  \"game_platform\":        \"%s\",\n"
           "  \"name\":                 \"%s\",\n"
           "  \"uuid\":                 \"%s\"\n"
           "}\n",
           getPasswordJSON(setup.api_server_password),
           getProgramRealVersionString(),
+          getProgramPlatformString(),
           player_name,
           player_uuid);
 
@@ -4088,28 +4091,28 @@ static void RenamePlayerOnServerExt(struct HttpRequest *request,
   }
 }
 
-static void RenamePlayerOnServer(char *player_name, char *player_uuid)
+static void ApiRenamePlayer(char *player_name, char *player_uuid)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  RenamePlayerOnServerExt(request, response, player_name, player_uuid);
+  ApiRenamePlayerExt(request, response, player_name, player_uuid);
 
   checked_free(request);
   checked_free(response);
 }
 
-struct RenamePlayerOnServerThreadData
+struct ApiRenamePlayerThreadData
 {
   char *player_name;
   char *player_uuid;
 };
 
-static int RenamePlayerOnServerThread(void *data_raw)
+static int ApiRenamePlayerThread(void *data_raw)
 {
-  struct RenamePlayerOnServerThreadData *data = data_raw;
+  struct ApiRenamePlayerThreadData *data = data_raw;
 
-  RenamePlayerOnServer(data->player_name, data->player_uuid);
+  ApiRenamePlayer(data->player_name, data->player_uuid);
 
   checked_free(data->player_name);
   checked_free(data->player_uuid);
@@ -4118,16 +4121,16 @@ static int RenamePlayerOnServerThread(void *data_raw)
   return 0;
 }
 
-static void RenamePlayerOnServerAsThread(void)
+static void ApiRenamePlayerAsThread(void)
 {
-  struct RenamePlayerOnServerThreadData *data =
-    checked_malloc(sizeof(struct RenamePlayerOnServerThreadData));
+  struct ApiRenamePlayerThreadData *data =
+    checked_malloc(sizeof(struct ApiRenamePlayerThreadData));
 
   data->player_name = getStringCopy(setup.player_name);
   data->player_uuid = getStringCopy(setup.player_uuid);
 
-  ExecuteAsThread(RenamePlayerOnServerThread,
-                 "RenamePlayerOnServer", data,
+  ExecuteAsThread(ApiRenamePlayerThread,
+                 "ApiRenamePlayer", data,
                  "rename player on server");
 }
 
@@ -4270,7 +4273,7 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
   SaveSetup();
 
   // change name of edited user on score server
-  RenamePlayerOnServerAsThread();
+  ApiRenamePlayerAsThread();
 
   if (game_status == GAME_MODE_PSEUDO_TYPENAMES || reset_setup)
   {
@@ -5568,6 +5571,9 @@ static void execSetupGame(void)
 
   execSetupGame_setNetworkServerText();
 
+  if (!setup.provide_uploading_tapes)
+    setHideSetupEntry(execOfferUploadTapes);
+
   setup_mode = SETUP_MODE_GAME;
 
   DrawSetupScreen();
@@ -9881,7 +9887,6 @@ static boolean OfferUploadTapes(void)
 
   // after all tapes have been uploaded, remove entry from setup menu
   setup.provide_uploading_tapes = FALSE;
-  setHideSetupEntry(execOfferUploadTapes);
 
   SaveSetup();
 
@@ -9890,9 +9895,6 @@ static boolean OfferUploadTapes(void)
 
 void CheckUploadTapes(void)
 {
-  if (!setup.provide_uploading_tapes)
-    setHideSetupEntry(execOfferUploadTapes);
-
   if (!setup.ask_for_uploading_tapes)
     return;
 
@@ -9908,7 +9910,6 @@ void CheckUploadTapes(void)
   {
     // if tapes directory does not exist yet, never offer uploading all tapes
     setup.provide_uploading_tapes = FALSE;
-    setHideSetupEntry(execOfferUploadTapes);
   }
 
   // after asking for uploading all tapes once, do not ask again