X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=0a0f1f25b7a22a8092be8511a199641347d6e98c;hb=88a1829af8ca41b6e581f209002022b2483b86df;hp=b13890a1c380161681c9c8f1a387035a83cfd94f;hpb=e02c111162d5d8a13715de71d93494120380ec9b;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index b13890a1..0a0f1f25 100644 --- a/src/screens.c +++ b/src/screens.c @@ -23,6 +23,10 @@ #include "init.h" #include "config.h" + +#define DEBUG_JOYSTICKS 0 + + /* screens on the info screen */ #define INFO_MODE_MAIN 0 #define INFO_MODE_TITLE 1 @@ -1478,6 +1482,8 @@ void DrawMainMenu() LoadLevel(level_nr); LoadScore(level_nr); + SaveLevelSetup_SeriesInfo(); + // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it) SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_FIELD); @@ -1781,6 +1787,8 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr) LoadTape(level_nr); DrawCompleteVideoDisplay(); + SaveLevelSetup_SeriesInfo(); + /* needed because DrawPreviewLevelInitial() takes some time */ BackToFront(); /* SyncDisplay(); */ @@ -3304,6 +3312,13 @@ void DrawInfoScreen_Version() DrawTextF(xstart1, ystart2, font_header, "Version"); DrawTextF(xstart2, ystart2, font_text, getProgramVersionString()); + if (!strEqual(getProgramVersionString(), getProgramRealVersionString())) + { + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Version (real)"); + DrawTextF(xstart2, ystart2, font_text, getProgramRealVersionString()); + } + ystart2 += ystep; DrawTextF(xstart1, ystart2, font_header, "Platform"); DrawTextF(xstart2, ystart2, font_text, PLATFORM_STRING); @@ -5593,7 +5608,7 @@ static Key getSetupKey() { Event event; - NextEvent(&event); + WaitEvent(&event); switch (event.type) { @@ -5627,7 +5642,9 @@ static Key getSetupKey() static int getSetupValueFont(int type, void *value) { - if (type & TYPE_KEY) + if (type & TYPE_GHOSTED) + return FONT_OPTION_OFF; + else if (type & TYPE_KEY) return (type & TYPE_QUERY ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1); else if (type & TYPE_STRING) return FONT_VALUE_2; @@ -5805,6 +5822,28 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) ToggleFullscreenOrChangeWindowScalingIfNeeded(); } +static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) +{ + static struct TokenInfo *setup_info_hide = NULL; + int list_size = 0; + int list_pos = 0; + int i; + + /* determine maximum list size of target list */ + while (setup_info_orig[list_size++].type != 0); + + /* free, allocate and clear memory for target list */ + checked_free(setup_info_hide); + setup_info_hide = checked_calloc(list_size * sizeof(struct TokenInfo)); + + /* copy setup info list without setup entries marked as hidden */ + for (i = 0; setup_info_orig[i].type != 0; i++) + if (!hideSetupEntry(setup_info_orig[i].value)) + setup_info_hide[list_pos++] = setup_info_orig[i]; + + return setup_info_hide; +} + static void DrawSetupScreen_Generic() { int fade_mask = REDRAW_FIELD; @@ -5904,6 +5943,9 @@ static void DrawSetupScreen_Generic() title_string = "Setup Shortcuts"; } + /* use modified setup info without setup entries marked as hidden */ + setup_info = getSetupInfoFinal(setup_info); + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); // determine maximal number of setup entries that can be displayed on screen @@ -6252,7 +6294,7 @@ void CustomizeKeyboard(int player_nr) { Event event; - NextEvent(&event); + WaitEvent(&event); switch (event.type) { @@ -6336,180 +6378,6 @@ void CustomizeKeyboard(int player_nr) DrawSetupScreen_Input(); } -#if 0 -static boolean OLD_CalibrateJoystickMain(int player_nr) -{ - int new_joystick_xleft = JOYSTICK_XMIDDLE; - int new_joystick_xright = JOYSTICK_XMIDDLE; - int new_joystick_yupper = JOYSTICK_YMIDDLE; - int new_joystick_ylower = JOYSTICK_YMIDDLE; - int new_joystick_xmiddle, new_joystick_ymiddle; - - char *device_name = setup.input[player_nr].joy.device_name; - int joystick_nr = getJoystickNrFromDeviceName(device_name); - boolean joystick_active = CheckJoystickOpened(joystick_nr); - - int x, y, last_x, last_y, xpos = 8, ypos = 3; - boolean check[3][3]; - int check_remaining = 3 * 3; - int joy_x, joy_y; - int joy_value; - int result = -1; - - if (joystick.status == JOYSTICK_NOT_AVAILABLE) - return FALSE; - - if (!joystick_active || !setup.input[player_nr].use_joystick) - return FALSE; - - FadeSetEnterMenu(); - FadeOut(REDRAW_FIELD); - - ClearField(); - - for (y = 0; y < 3; y++) - { - for (x = 0; x < 3; x++) - { - DrawFixedGraphic(xpos + x - 1, ypos + y - 1, IMG_MENU_CALIBRATE_BLUE, 0); - check[x][y] = FALSE; - } - } - - DrawTextSCentered(mSY - SY + 6 * 32, FONT_TITLE_1, "Rotate joystick"); - DrawTextSCentered(mSY - SY + 7 * 32, FONT_TITLE_1, "in all directions"); - DrawTextSCentered(mSY - SY + 9 * 32, FONT_TITLE_1, "if all balls"); - DrawTextSCentered(mSY - SY + 10 * 32, FONT_TITLE_1, "are marked,"); - DrawTextSCentered(mSY - SY + 11 * 32, FONT_TITLE_1, "center joystick"); - DrawTextSCentered(mSY - SY + 12 * 32, FONT_TITLE_1, "and"); - DrawTextSCentered(mSY - SY + 13 * 32, FONT_TITLE_1, "press any button!"); - - joy_value = JoystickExt(joystick_nr, TRUE); - last_x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); - last_y = (joy_value & JOY_UP ? -1 : joy_value & JOY_DOWN ? +1 : 0); - - /* eventually uncalibrated center position (joystick could be uncentered) */ - if (!ReadJoystick(joystick_nr, &joy_x, &joy_y, NULL, NULL)) - return FALSE; - - new_joystick_xmiddle = joy_x; - new_joystick_ymiddle = joy_y; - - DrawFixedGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0); - - FadeIn(REDRAW_FIELD); - - /* wait for potentially still pressed button to be released */ - while (JoystickExt(joystick_nr, TRUE) & JOY_BUTTON); - - while (result < 0) - { - while (PendingEvent()) /* got event */ - { - Event event; - - NextEvent(&event); - - switch (event.type) - { - case EVENT_KEYPRESS: - switch (GetEventKey((KeyEvent *)&event, TRUE)) - { - case KSYM_Return: - if (check_remaining == 0) - result = 1; - break; - - case KSYM_Escape: - FadeSkipNextFadeIn(); - result = 0; - break; - - default: - break; - } - break; - - case EVENT_KEYRELEASE: - key_joystick_mapping = 0; - break; - - default: - HandleOtherEvents(&event); - break; - } - } - - if (!ReadJoystick(joystick_nr, &joy_x, &joy_y, NULL, NULL)) - return FALSE; - - new_joystick_xleft = MIN(new_joystick_xleft, joy_x); - new_joystick_xright = MAX(new_joystick_xright, joy_x); - new_joystick_yupper = MIN(new_joystick_yupper, joy_y); - new_joystick_ylower = MAX(new_joystick_ylower, joy_y); - - setup.input[player_nr].joy.xleft = new_joystick_xleft; - setup.input[player_nr].joy.yupper = new_joystick_yupper; - setup.input[player_nr].joy.xright = new_joystick_xright; - setup.input[player_nr].joy.ylower = new_joystick_ylower; - setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle; - setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle; - - CheckJoystickData(); - - joy_value = JoystickExt(joystick_nr, TRUE); - - if (joy_value & JOY_BUTTON && check_remaining == 0) - result = 1; - - x = (joy_value & JOY_LEFT ? -1 : joy_value & JOY_RIGHT ? +1 : 0); - y = (joy_value & JOY_UP ? -1 : joy_value & JOY_DOWN ? +1 : 0); - - if (x != last_x || y != last_y) - { - DrawFixedGraphic(xpos + last_x, ypos + last_y, - IMG_MENU_CALIBRATE_YELLOW, 0); - DrawFixedGraphic(xpos + x, ypos + y, - IMG_MENU_CALIBRATE_RED, 0); - - last_x = x; - last_y = y; - - if (check_remaining > 0 && !check[x+1][y+1]) - { - check[x+1][y+1] = TRUE; - check_remaining--; - } - } - - BackToFront(); - } - - /* calibrated center position (joystick should now be centered) */ - if (!ReadJoystick(joystick_nr, &joy_x, &joy_y, NULL, NULL)) - return FALSE; - - new_joystick_xmiddle = joy_x; - new_joystick_ymiddle = joy_y; - - /* wait until the last pressed button was released */ - while (JoystickExt(joystick_nr, TRUE) & JOY_BUTTON) - { - if (PendingEvent()) /* got event */ - { - Event event; - - NextEvent(&event); - HandleOtherEvents(&event); - - BackToFront(); - } - } - - return TRUE; -} -#endif - /* game controller mapping generator by Gabriel Jacobo */ #define MARKER_BUTTON 1 @@ -6522,7 +6390,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) static boolean bitmaps_initialized = FALSE; boolean screen_initialized = FALSE; static Bitmap *controller, *button, *axis_x, *axis_y; - Bitmap *marker; char *name; boolean success = TRUE; boolean done = FALSE, next = FALSE; @@ -6586,12 +6453,14 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) name = getFormattedJoystickName(SDL_JoystickName(joystick)); +#if DEBUG_JOYSTICKS /* print info about the joystick we are watching */ Error(ERR_DEBUG, "watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick), name); Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n", SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick), SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick)); +#endif /* initialize mapping with GUID and name */ SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp)); @@ -6602,6 +6471,8 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) /* loop through all steps (buttons and axes), getting joystick events */ for (i = 0; i < SDL_arraysize(steps) && !done;) { + Bitmap *marker = button; /* initialize with reliable default value */ + step = &steps[i]; strcpy(step->mapping, mapping); step->axis = -1; @@ -6777,14 +6648,19 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (event.key.keysym.sym == KSYM_BackSpace || event.key.keysym.sym == KSYM_Back) { - /* undo this step */ - if (i > 0) + if (i == 0) { - prev_step = &steps[--i]; - strcpy(mapping, prev_step->mapping); - next = TRUE; + /* leave screen */ + success = FALSE; + done = TRUE; } + /* undo this step */ + prev_step = &steps[i - 1]; + strcpy(mapping, prev_step->mapping); + i--; + next = TRUE; + break; } @@ -6801,6 +6677,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (event.key.keysym.sym == KSYM_Escape) { + /* leave screen */ success = FALSE; done = TRUE; } @@ -6824,7 +6701,9 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (success) { +#if DEBUG_JOYSTICKS Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping); +#endif // activate mapping for this game SDL_GameControllerAddMapping(mapping);