projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed support for off-screen positions for request dialog buttons
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index dc28e237a19db3810867bf82440545bb782c1c41..552879f8a1f2d4c66659b412bb40175b90914e84 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-6570,7
+6570,7
@@
static boolean CustomizeKeyboardMain(int player_nr)
};
int font_nr_old = FONT_VALUE_OLD;
int font_nr_new = FONT_VALUE_1;
};
int font_nr_old = FONT_VALUE_OLD;
int font_nr_new = FONT_VALUE_1;
-
int
success = FALSE;
+
boolean
success = FALSE;
if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
{
if (SCR_FIELDX < SCR_FIELDX_DEFAULT)
{
@@
-6898,6
+6898,7
@@
static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
controller->width, controller->height,
controller_x, controller_y);
controller->width, controller->height,
controller_x, controller_y);
+ SDL_SetSurfaceBlendMode(marker->surface_masked, SDL_BLENDMODE_BLEND);
SDL_SetSurfaceAlphaMod(marker->surface_masked, alpha);
BlitBitmapMasked(marker, drawto, 0, 0,
SDL_SetSurfaceAlphaMod(marker->surface_masked, alpha);
BlitBitmapMasked(marker, drawto, 0, 0,
@@
-7002,6
+7003,8
@@
static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick)
/* leave screen */
success = FALSE;
done = TRUE;
/* leave screen */
success = FALSE;
done = TRUE;
+
+ break;
}
/* undo this step */
}
/* undo this step */