projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981216-2
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 0da69783facb5efcaa718d3191a2a785a44ed3c9..f38ab8549b031169ce65e9c66ae5fbeea78e62b6 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-58,8
+58,16
@@
void DrawMainMenu()
int i;
char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
int i;
char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
+ /* needed if last screen was the playing screen, invoked from level editor */
+ if (level_editor_test_game)
+ {
+ game_status = LEVELED;
+ DrawLevelEd();
+ return;
+ }
+
/* needed if last screen was the level editor */
/* needed if last screen was the level editor */
- UnmapLevelEditor
ControlButton
s();
+ UnmapLevelEditor
Gadget
s();
FadeSounds();
GetPlayerConfig();
FadeSounds();
GetPlayerConfig();
@@
-172,7
+180,8
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
if (new_level_nr > leveldir[leveldir_nr].levels - 1)
new_level_nr = leveldir[leveldir_nr].levels - 1;
if (new_level_nr > leveldir[leveldir_nr].levels - 1)
new_level_nr = leveldir[leveldir_nr].levels - 1;
- if (old_level_nr == new_level_nr || !DelayReached(&level_delay, 150))
+ if (old_level_nr == new_level_nr ||
+ !DelayReached(&level_delay, GADGET_FRAME_DELAY))
goto out;
level_nr = new_level_nr;
goto out;
level_nr = new_level_nr;
@@
-853,7
+862,7
@@
void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
if (x == 1 && y == 2)
{
if (first_entry > 0 &&
if (x == 1 && y == 2)
{
if (first_entry > 0 &&
- (dy || DelayReached(&choose_delay,
150
)))
+ (dy || DelayReached(&choose_delay,
GADGET_FRAME_DELAY
)))
{
#if 0
first_entry--;
{
#if 0
first_entry--;
@@
-871,7
+880,7
@@
void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
else if (x == 1 && y > num_page_entries + 2)
{
if (first_entry + num_page_entries < num_leveldirs &&
else if (x == 1 && y > num_page_entries + 2)
{
if (first_entry + num_page_entries < num_leveldirs &&
- (dy || DelayReached(&choose_delay,
150
)))
+ (dy || DelayReached(&choose_delay,
GADGET_FRAME_DELAY
)))
{
#if 0
first_entry++;
{
#if 0
first_entry++;
@@
-1413,7
+1422,7
@@
void HandleSetupInputScreen(int mx, int my, int dx, int dy, int button)
{
static unsigned long delay = 0;
{
static unsigned long delay = 0;
- if (!DelayReached(&delay,
150
))
+ if (!DelayReached(&delay,
GADGET_FRAME_DELAY
))
goto out;
player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;
goto out;
player_nr = (player_nr + (x == 11 ? -1 : +1) + MAX_PLAYERS) % MAX_PLAYERS;