X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=4df8f4d97aca18b38c86cab769129e83a58fad8a;hb=13cd07af3c2a9378b6a89506ba869502a871877d;hp=30159ccf36bd7578f7e7c1641c8498de617deaea;hpb=730e92ef422a3be2315067584eaeb7dc6585b6f4;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 30159ccf..4df8f4d9 100644 --- a/src/screens.c +++ b/src/screens.c @@ -22,6 +22,7 @@ #include "network.h" #include "init.h" #include "config.h" +#include "api.h" #define DEBUG_JOYSTICKS 0 @@ -301,7 +302,7 @@ static void UnmapScreenTreeGadgets(void); static void UpdateScreenMenuGadgets(int, boolean); static void AdjustScoreInfoButtons_SelectScore(int, int, int); -static void AdjustScoreInfoButtons_PlayTape(int, int); +static void AdjustScoreInfoButtons_PlayTape(int, int, boolean); static boolean OfferUploadTapes(void); static void execOfferUploadTapes(void); @@ -311,6 +312,8 @@ static void HandleHallOfFame_SelectLevel(int, int); static char *getHallOfFameRankText(int, int); static char *getHallOfFameScoreText(int, int); +static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *); + static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; static int info_mode = INFO_MODE_MAIN; @@ -1692,6 +1695,18 @@ void DrawMainMenu(void) return; } + // needed if last screen was the playing screen, invoked from hall of fame + if (score_info_tape_play) + { + CloseDoor(DOOR_CLOSE_ALL); + + SetGameStatus(GAME_MODE_SCOREINFO); + + DrawScoreInfo(scores.last_entry_nr); + + return; + } + // leveldir_current may be invalid (level group, parent link, node copy) leveldir_current = getValidLevelSeries(leveldir_current, leveldir_last_valid); @@ -2544,6 +2559,9 @@ static void DrawInfoScreen_Main(void) info_info = info_info_main; + // use modified info screen info without info screen entries marked as hidden + info_info = getSetupInfoFinal(info_info); + // determine maximal number of info entries that can be displayed on screen num_info_info = 0; for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) @@ -3961,412 +3979,6 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) } -// ============================================================================ -// rename player API functions -// ============================================================================ - -struct ApiRenamePlayerThreadData -{ - char *player_name; - char *player_uuid; -}; - -static void *CreateThreadData_ApiRenamePlayer(void) -{ - struct ApiRenamePlayerThreadData *data = - checked_malloc(sizeof(struct ApiRenamePlayerThreadData)); - - data->player_name = getStringCopy(setup.player_name); - data->player_uuid = getStringCopy(setup.player_uuid); - - return data; -} - -static void FreeThreadData_ApiRenamePlayer(void *data_raw) -{ - struct ApiRenamePlayerThreadData *data = data_raw; - - checked_free(data->player_name); - checked_free(data->player_uuid); - checked_free(data); -} - -static boolean SetRequest_ApiRenamePlayer(struct HttpRequest *request, - void *data_raw) -{ - struct ApiRenamePlayerThreadData *data = data_raw; - char *player_name_raw = data->player_name; - char *player_uuid_raw = data->player_uuid; - - request->hostname = setup.api_server_hostname; - request->port = API_SERVER_PORT; - request->method = API_SERVER_METHOD; - request->uri = API_SERVER_URI_RENAME; - - char *player_name = getEscapedJSON(player_name_raw); - char *player_uuid = getEscapedJSON(player_uuid_raw); - - snprintf(request->body, MAX_HTTP_BODY_SIZE, - "{\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); - - checked_free(player_name); - checked_free(player_uuid); - - 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()); - - return; - } - - if (!HTTP_SUCCESS(response->status_code)) - { - Error("server failed to handle request: %d %s", - response->status_code, - response->status_text); - - return; - } - - HandleResponse_ApiRenamePlayer(response, data_raw); -} - -static void ApiRenamePlayer_HttpRequest(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) -{ - ApiRenamePlayer_HttpRequestExt(request, response, data_raw); - - FreeThreadData_ApiRenamePlayer(data_raw); -} -#endif - -static int ApiRenamePlayerThread(void *data_raw) -{ - struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest)); - struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse)); - - program.api_thread_count++; - -#if defined(PLATFORM_EMSCRIPTEN) - Emscripten_ApiRenamePlayer_HttpRequest(request, data_raw); -#else - ApiRenamePlayer_HttpRequest(request, response, data_raw); -#endif - - program.api_thread_count--; - - checked_free(request); - checked_free(response); - - return 0; -} - -static void ApiRenamePlayerAsThread(void) -{ - struct ApiRenamePlayerThreadData *data = CreateThreadData_ApiRenamePlayer(); - - ExecuteAsThread(ApiRenamePlayerThread, - "ApiRenamePlayer", data, - "rename player on server"); -} - - -// ============================================================================ -// reset player UUID API functions -// ============================================================================ - -struct ApiResetUUIDThreadData -{ - char *player_name; - char *player_uuid_old; - char *player_uuid_new; -}; - -static void *CreateThreadData_ApiResetUUID(char *uuid_new) -{ - struct ApiResetUUIDThreadData *data = - checked_malloc(sizeof(struct ApiResetUUIDThreadData)); - - data->player_name = getStringCopy(setup.player_name); - data->player_uuid_old = getStringCopy(setup.player_uuid); - data->player_uuid_new = getStringCopy(uuid_new); - - return data; -} - -static void FreeThreadData_ApiResetUUID(void *data_raw) -{ - struct ApiResetUUIDThreadData *data = data_raw; - - checked_free(data->player_name); - checked_free(data->player_uuid_old); - checked_free(data->player_uuid_new); - checked_free(data); -} - -static boolean SetRequest_ApiResetUUID(struct HttpRequest *request, - void *data_raw) -{ - struct ApiResetUUIDThreadData *data = data_raw; - char *player_name_raw = data->player_name; - char *player_uuid_old_raw = data->player_uuid_old; - char *player_uuid_new_raw = data->player_uuid_new; - - request->hostname = setup.api_server_hostname; - request->port = API_SERVER_PORT; - request->method = API_SERVER_METHOD; - request->uri = API_SERVER_URI_RESETUUID; - - char *player_name = getEscapedJSON(player_name_raw); - char *player_uuid_old = getEscapedJSON(player_uuid_old_raw); - char *player_uuid_new = getEscapedJSON(player_uuid_new_raw); - - snprintf(request->body, MAX_HTTP_BODY_SIZE, - "{\n" - "%s" - " \"game_version\": \"%s\",\n" - " \"game_platform\": \"%s\",\n" - " \"name\": \"%s\",\n" - " \"uuid_old\": \"%s\",\n" - " \"uuid_new\": \"%s\"\n" - "}\n", - getPasswordJSON(setup.api_server_password), - getProgramRealVersionString(), - getProgramPlatformString(), - player_name, - player_uuid_old, - player_uuid_new); - - checked_free(player_name); - checked_free(player_uuid_old); - checked_free(player_uuid_new); - - ConvertHttpRequestBodyToServerEncoding(request); - - return TRUE; -} - -static void HandleResponse_ApiResetUUID(struct HttpResponse *response, - void *data_raw) -{ - struct ApiResetUUIDThreadData *data = data_raw; - - // upgrade player UUID in server setup file - setup.player_uuid = getStringCopy(data->player_uuid_new); - setup.player_version = 2; - - SaveSetup_ServerSetup(); -} - -#if defined(PLATFORM_EMSCRIPTEN) -static void Emscripten_ApiResetUUID_Loaded(unsigned handle, void *data_raw, - void *buffer, unsigned int size) -{ - struct HttpResponse *response = GetHttpResponseFromBuffer(buffer, size); - - if (response != NULL) - { - HandleResponse_ApiResetUUID(response, data_raw); - - checked_free(response); - } - else - { - Error("server response too large to handle (%d bytes)", size); - } - - FreeThreadData_ApiResetUUID(data_raw); -} - -static void Emscripten_ApiResetUUID_Failed(unsigned handle, void *data_raw, - int code, const char *status) -{ - Error("server failed to handle request: %d %s", code, status); - - FreeThreadData_ApiResetUUID(data_raw); -} - -static void Emscripten_ApiResetUUID_Progress(unsigned handle, void *data_raw, - int bytes, int size) -{ - // nothing to do here -} - -static void Emscripten_ApiResetUUID_HttpRequest(struct HttpRequest *request, - void *data_raw) -{ - if (!SetRequest_ApiResetUUID(request, data_raw)) - { - FreeThreadData_ApiResetUUID(data_raw); - - return; - } - - emscripten_async_wget2_data(request->uri, - request->method, - request->body, - data_raw, - TRUE, - Emscripten_ApiResetUUID_Loaded, - Emscripten_ApiResetUUID_Failed, - Emscripten_ApiResetUUID_Progress); -} - -#else - -static void ApiResetUUID_HttpRequestExt(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) -{ - if (!SetRequest_ApiResetUUID(request, data_raw)) - return; - - if (!DoHttpRequest(request, response)) - { - Error("HTTP request failed: %s", GetHttpError()); - - return; - } - - if (!HTTP_SUCCESS(response->status_code)) - { - Error("server failed to handle request: %d %s", - response->status_code, - response->status_text); - - return; - } - - HandleResponse_ApiResetUUID(response, data_raw); -} - -static void ApiResetUUID_HttpRequest(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) -{ - ApiResetUUID_HttpRequestExt(request, response, data_raw); - - FreeThreadData_ApiResetUUID(data_raw); -} -#endif - -static int ApiResetUUIDThread(void *data_raw) -{ - struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest)); - struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse)); - - program.api_thread_count++; - -#if defined(PLATFORM_EMSCRIPTEN) - Emscripten_ApiResetUUID_HttpRequest(request, data_raw); -#else - ApiResetUUID_HttpRequest(request, response, data_raw); -#endif - - program.api_thread_count--; - - checked_free(request); - checked_free(response); - - return 0; -} - -static void ApiResetUUIDAsThread(char *uuid_new) -{ - struct ApiResetUUIDThreadData *data = CreateThreadData_ApiResetUUID(uuid_new); - - ExecuteAsThread(ApiResetUUIDThread, - "ApiResetUUID", data, - "reset UUID on server"); -} - - // ============================================================================ // type name functions // ============================================================================ @@ -5166,6 +4778,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (mx || my) // mouse input { + scores.was_just_playing = FALSE; + x = (mx - amSX) / 32; y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS; @@ -5174,6 +4788,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (dx || dy) // keyboard or scrollbar/scrollbutton input { + scores.was_just_playing = FALSE; + // move cursor instead of scrolling when already at start/end of list if (dy == -1 * SCROLL_LINE && ti->cl_first == 0) dy = -1; @@ -5442,16 +5058,16 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (game_status == GAME_MODE_SCORES) { - if (game_status_last_screen == GAME_MODE_PLAYING && - setup.auto_play_next_level && setup.increment_levels && + if (setup.auto_play_next_level && setup.increment_levels && scores.last_level_nr < leveldir_current->last_level && + scores.was_just_playing && !network_playing) { StartGameActions(network.enabled, setup.autorecord, level.random_seed); return; } - else + else if (!scores.was_just_playing) { SetGameStatus(GAME_MODE_SCOREINFO); @@ -5651,6 +5267,7 @@ static void DrawHallOfFame_setScoreEntries(void) void DrawHallOfFame(int level_nr) { scores.last_level_nr = level_nr; + scores.was_just_playing = (game_status_last_screen == GAME_MODE_PLAYING); // (this is needed when called from GameEnd() after winning a game) KeyboardAutoRepeatOn(); @@ -5704,6 +5321,28 @@ static char *getHallOfFameScoreText(int nr, int size) return getHallOfFameTimeText(nr); // show playing time } +static char *getHallOfFameTapeDateText(struct ScoreEntry *entry) +{ + static char tape_date[MAX_ISO_DATE_LEN + 1]; + int i, j; + + if (!strEqual(entry->tape_date, UNKNOWN_NAME) || + strEqual(entry->tape_basename, UNDEFINED_FILENAME)) + return entry->tape_date; + + for (i = 0, j = 0; i < 8; i++, j++) + { + tape_date[j] = entry->tape_basename[i]; + + if (i == 3 || i == 5) + tape_date[++j] = '-'; + } + + tape_date[MAX_ISO_DATE_LEN] = '\0'; + + return tape_date; +} + static void HandleHallOfFame_SelectLevel(int step, int direction) { int old_level_nr = scores.last_level_nr; @@ -5760,6 +5399,7 @@ static void DrawScoreInfo_Content(int entry_nr) { struct ScoreEntry *entry = &scores.entry[entry_nr]; char *pos_text = getHallOfFameRankText(entry_nr, 0); + char *tape_date = getHallOfFameTapeDateText(entry); int font_title = MENU_INFO_FONT_TITLE; int font_head = MENU_INFO_FONT_HEAD; int font_text = MENU_INFO_FONT_TEXT; @@ -5779,9 +5419,10 @@ static void DrawScoreInfo_Content(int entry_nr) int select_y1, select_y2; int play_x, play_y; int play_height = screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]->height; + boolean play_visible = !strEqual(tape_date, UNKNOWN_NAME); int font_width = getFontWidth(font_text); int font_height = getFontHeight(font_text); - int tape_date_width = getTextWidth(entry->tape_date, font_text); + int tape_date_width = getTextWidth(tape_date, font_text); int pad_left = xstart2; int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT; int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width; @@ -5855,7 +5496,7 @@ static void DrawScoreInfo_Content(int entry_nr) play_y = SY + ystart + (font_height - play_height) / 2; DrawTextF(xstart1, ystart, font_head, "Tape Date"); - DrawTextF(xstart2, ystart, font_text, entry->tape_date); + DrawTextF(xstart2, ystart, font_text, tape_date); ystart += ystep_line; DrawTextF(xstart1, ystart, font_head, "Platform"); @@ -5877,12 +5518,13 @@ static void DrawScoreInfo_Content(int entry_nr) DrawTextSCentered(ybottom, font_foot, "Press any key or button to go back"); AdjustScoreInfoButtons_SelectScore(select_x, select_y1, select_y2); - AdjustScoreInfoButtons_PlayTape(play_x, play_y); + AdjustScoreInfoButtons_PlayTape(play_x, play_y, play_visible); } static void DrawScoreInfo(int entry_nr) { scores.last_entry_nr = entry_nr; + score_info_tape_play = FALSE; SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO); @@ -5890,6 +5532,9 @@ static void DrawScoreInfo(int entry_nr) FadeOut(REDRAW_FIELD); + // needed if different viewport properties defined after playing score tape + ChangeViewportPropertiesIfNeeded(); + DrawScoreInfo_Content(entry_nr); // map gadgets for score info screen @@ -5920,6 +5565,12 @@ static void HandleScoreInfo_SelectScore(int step, int direction) static void HandleScoreInfo_PlayTape(void) { + if (!PlayScoreTape(scores.last_entry_nr)) + { + DrawScoreInfo_Content(scores.last_entry_nr); + + FadeIn(REDRAW_FIELD); + } } void HandleScoreInfo(int mx, int my, int dx, int dy, int button) @@ -5946,7 +5597,7 @@ void HandleScoreInfo(int mx, int my, int dx, int dy, int button) SetGameStatus(GAME_MODE_SCORES); - DrawHallOfFame(level_nr); + DrawHallOfFame(scores.last_level_nr); } else if (dx) { @@ -7538,6 +7189,15 @@ static struct { &setup.internal.menu_exit, execExitSetup }, { &setup.internal.menu_save_and_exit, execSaveAndExitSetup }, + { &setup.internal.info_title, execInfoTitleScreen }, + { &setup.internal.info_elements, execInfoElements }, + { &setup.internal.info_music, execInfoMusic }, + { &setup.internal.info_credits, execInfoCredits }, + { &setup.internal.info_program, execInfoProgram }, + { &setup.internal.info_version, execInfoVersion }, + { &setup.internal.info_levelset, execInfoLevelSet }, + { &setup.internal.info_exit, execExitInfo }, + { NULL, NULL } }; @@ -10402,13 +10062,17 @@ static void AdjustScoreInfoButtons_SelectScore(int x, int y1, int y2) ModifyGadget(gi_2, GDI_X, x, GDI_Y, y2, GDI_END); } -static void AdjustScoreInfoButtons_PlayTape(int x, int y) +static void AdjustScoreInfoButtons_PlayTape(int x, int y, boolean visible) { struct GadgetInfo *gi = screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]; struct MenuPosInfo *pos = menubutton_info[SCREEN_CTRL_ID_PLAY_TAPE].pos; - if (pos->x == -1 && pos->y == -1) - ModifyGadget(gi, GDI_X, x, GDI_Y, y, GDI_END); + // set gadget position dynamically, pre-defined or off-screen + int xx = (visible ? (pos->x == -1 ? x : pos->x) : POS_OFFSCREEN); + int yy = (visible ? (pos->y == -1 ? y : pos->y) : POS_OFFSCREEN); + + ModifyGadget(gi, GDI_X, xx, GDI_Y, yy, GDI_END); + MapGadget(gi); // (needed if deactivated on last score page) } static void HandleScreenGadgets(struct GadgetInfo *gi)