projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added new screen fading option ".auto_delay_unit" (currently not used)
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index bf9f0a966348c1a9a9b4a82e764287ef8fed4c69..933be2a19ef4977b993f2ceb1bcaf86c3d6e9b41 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-988,6
+988,7
@@
static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
ti.fade_delay = tmi.fade_delay;
ti.post_delay = tmi.post_delay;
ti.auto_delay = tmi.auto_delay;
ti.fade_delay = tmi.fade_delay;
ti.post_delay = tmi.post_delay;
ti.auto_delay = tmi.auto_delay;
+ ti.auto_delay_unit = tmi.auto_delay_unit;
return ti;
}
return ti;
}
@@
-4530,7
+4531,7
@@
void DrawChooseLevelNr(void)
for (i = leveldir_current->first_level; i <= leveldir_current->last_level;i++)
{
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_LEVEL_NR);
for (i = leveldir_current->first_level; i <= leveldir_current->last_level;i++)
{
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_LEVEL_NR);
- char identifier[32], name[
32
];
+ char identifier[32], name[
64
];
int value = i;
// temporarily load level info to get level name
int value = i;
// temporarily load level info to get level name
@@
-4705,7
+4706,8
@@
void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
FadeSound(SND_BACKGROUND_SCORES);
FadeSound(SND_BACKGROUND_SCORES);
- if (game_status_last_screen == GAME_MODE_PLAYING &&
+ if (button == MB_MENU_CHOICE &&
+ game_status_last_screen == GAME_MODE_PLAYING &&
setup.auto_play_next_level && setup.increment_levels &&
level_nr < leveldir_current->last_level &&
!network_playing)
setup.auto_play_next_level && setup.increment_levels &&
level_nr < leveldir_current->last_level &&
!network_playing)