projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed some remaining unused X11 stuff
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 9113105623bb2c561b841b6445cba65e6266b5d0..0bd9af8403d35c5a2de0cbdc3fb445a98d603b0b 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-420,6
+420,9
@@
static struct
#define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \
2 * MAX_NUM_TITLE_MESSAGES)
#define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \
2 * MAX_NUM_TITLE_MESSAGES)
+#define NO_DIRECT_LEVEL_SELECT (-1)
+
+
static int num_title_screens = 0;
struct TitleControlInfo
static int num_title_screens = 0;
struct TitleControlInfo
@@
-1221,10
+1224,7
@@
void DrawTitleScreenImage(int nr, boolean initial)
ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
if (DrawingOnBackground(dst_x, dst_y))
ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
if (DrawingOnBackground(dst_x, dst_y))
- {
- SetClipOrigin(bitmap, bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y);
BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
- }
else
BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
else
BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
@@
-1632,12
+1632,16
@@
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
}
}
}
}
-void HandleMainMenu_SelectLevel(int step, int direction)
+void HandleMainMenu_SelectLevel(int step, int direction
, int selected_level_nr
)
{
int old_level_nr = level_nr;
int new_level_nr;
{
int old_level_nr = level_nr;
int new_level_nr;
- new_level_nr = old_level_nr + step * direction;
+ if (selected_level_nr != NO_DIRECT_LEVEL_SELECT)
+ new_level_nr = selected_level_nr;
+ else
+ new_level_nr = old_level_nr + step * direction;
+
if (new_level_nr < leveldir_current->first_level)
new_level_nr = leveldir_current->first_level;
if (new_level_nr > leveldir_current->last_level)
if (new_level_nr < leveldir_current->first_level)
new_level_nr = leveldir_current->first_level;
if (new_level_nr > leveldir_current->last_level)
@@
-1646,7
+1650,7
@@
void HandleMainMenu_SelectLevel(int step, int direction)
if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
{
/* skipping levels is only allowed when trying to skip single level */
if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
{
/* skipping levels is only allowed when trying to skip single level */
- if (setup.skip_levels &&
step ==
1 &&
+ if (setup.skip_levels &&
new_level_nr == old_level_nr +
1 &&
Request("Level still unsolved! Skip despite handicap?", REQ_ASK))
{
leveldir_current->handicap_level++;
Request("Level still unsolved! Skip despite handicap?", REQ_ASK))
{
leveldir_current->handicap_level++;
@@
-1677,7
+1681,7
@@
void HandleMainMenu_SelectLevel(int step, int direction)
/* needed because DrawPreviewLevelInitial() takes some time */
BackToFront();
/* needed because DrawPreviewLevelInitial() takes some time */
BackToFront();
- SyncDisplay();
+ /* SyncDisplay(); */
}
}
}
}
@@
-1721,15
+1725,15
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
if (pos == MAIN_CONTROL_LEVELS && dx != 0 && button)
{
if (pos == MAIN_CONTROL_LEVELS && dx != 0 && button)
{
- HandleMainMenu_SelectLevel(1,
dx < 0 ? -1 : +1
);
+ HandleMainMenu_SelectLevel(1,
(dx < 0 ? -1 : +1), NO_DIRECT_LEVEL_SELECT
);
}
else if (pos == MAIN_CONTROL_FIRST_LEVEL && !button)
{
}
else if (pos == MAIN_CONTROL_FIRST_LEVEL && !button)
{
- HandleMainMenu_SelectLevel(MAX_LEVELS, -1);
+ HandleMainMenu_SelectLevel(MAX_LEVELS, -1
, NO_DIRECT_LEVEL_SELECT
);
}
else if (pos == MAIN_CONTROL_LAST_LEVEL && !button)
{
}
else if (pos == MAIN_CONTROL_LAST_LEVEL && !button)
{
- HandleMainMenu_SelectLevel(MAX_LEVELS, +1);
+ HandleMainMenu_SelectLevel(MAX_LEVELS, +1
, NO_DIRECT_LEVEL_SELECT
);
}
else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
{
}
else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
{
@@
-3450,7
+3454,11
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
else
{
if (game_status == GAME_MODE_LEVELNR)
else
{
if (game_status == GAME_MODE_LEVELNR)
- level_nr = atoi(level_number_current->identifier);
+ {
+ int new_level_nr = atoi(level_number_current->identifier);
+
+ HandleMainMenu_SelectLevel(0, 0, new_level_nr);
+ }
game_status = GAME_MODE_MAIN;
game_status = GAME_MODE_MAIN;
@@
-3644,7
+3652,11
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
else
{
if (game_status == GAME_MODE_LEVELNR)
else
{
if (game_status == GAME_MODE_LEVELNR)
- level_nr = atoi(level_number_current->identifier);
+ {
+ int new_level_nr = atoi(level_number_current->identifier);
+
+ HandleMainMenu_SelectLevel(0, 0, new_level_nr);
+ }
game_status = GAME_MODE_MAIN;
game_status = GAME_MODE_MAIN;
@@
-6732,11
+6744,11
@@
static void HandleScreenGadgets(struct GadgetInfo *gi)
switch (id)
{
case SCREEN_CTRL_ID_PREV_LEVEL:
switch (id)
{
case SCREEN_CTRL_ID_PREV_LEVEL:
- HandleMainMenu_SelectLevel(step, -1);
+ HandleMainMenu_SelectLevel(step, -1
, NO_DIRECT_LEVEL_SELECT
);
break;
case SCREEN_CTRL_ID_NEXT_LEVEL:
break;
case SCREEN_CTRL_ID_NEXT_LEVEL:
- HandleMainMenu_SelectLevel(step, +1);
+ HandleMainMenu_SelectLevel(step, +1
, NO_DIRECT_LEVEL_SELECT
);
break;
case SCREEN_CTRL_ID_PREV_PLAYER:
break;
case SCREEN_CTRL_ID_PREV_PLAYER: