projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed custom element change page gadget events in level editor
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 3761775a80e9f430a4e6396378c32c1ea31aa9ed..47b37a34777ea812cc35ee3ff5bc94bf5aaaa31a 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-5937,7
+5937,7
@@
static void execSetupGame_setScrollDelays(void)
// set current scroll delay value to configured scroll delay value
scroll_delay_current =
// set current scroll delay value to configured scroll delay value
scroll_delay_current =
- getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
+ getTreeInfoFromIdentifier(scroll_delays,
i_to_a(setup.scroll_delay_value));
// if that fails, set current scroll delay to reliable default value
if (scroll_delay_current == NULL)
// if that fails, set current scroll delay to reliable default value
if (scroll_delay_current == NULL)
@@
-6497,7
+6497,7
@@
static void execSetupSound(void)
// set current volume value to configured volume value
volume_simple_current =
// set current volume value to configured volume value
volume_simple_current =
- getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple));
+ getTreeInfoFromIdentifier(volumes_simple,
i_to_a(setup.volume_simple));
// if that fails, set current volume to reliable default value
if (volume_simple_current == NULL)
// if that fails, set current volume to reliable default value
if (volume_simple_current == NULL)
@@
-6565,7
+6565,7
@@
static void execSetupSound(void)
// set current volume value to configured volume value
volume_loops_current =
// set current volume value to configured volume value
volume_loops_current =
- getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops));
+ getTreeInfoFromIdentifier(volumes_loops,
i_to_a(setup.volume_loops));
// if that fails, set current volume to reliable default value
if (volume_loops_current == NULL)
// if that fails, set current volume to reliable default value
if (volume_loops_current == NULL)
@@
-6633,7
+6633,7
@@
static void execSetupSound(void)
// set current volume value to configured volume value
volume_music_current =
// set current volume value to configured volume value
volume_music_current =
- getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music));
+ getTreeInfoFromIdentifier(volumes_music,
i_to_a(setup.volume_music));
// if that fails, set current volume to reliable default value
if (volume_music_current == NULL)
// if that fails, set current volume to reliable default value
if (volume_music_current == NULL)
@@
-10376,47
+10376,47
@@
static void HandleScreenGadgets(struct GadgetInfo *gi)
case SCREEN_CTRL_ID_SCROLL_UP:
if (game_status == GAME_MODE_NAMES)
case SCREEN_CTRL_ID_SCROLL_UP:
if (game_status == GAME_MODE_NAMES)
- HandleChoosePlayerName(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChoosePlayerName(0,
0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELS)
else if (game_status == GAME_MODE_LEVELS)
- HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelSet(0,
0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELNR)
else if (game_status == GAME_MODE_LEVELNR)
- HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelNr(0,
0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SETUP)
else if (game_status == GAME_MODE_SETUP)
- HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleSetupScreen(0,
0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_INFO)
else if (game_status == GAME_MODE_INFO)
- HandleInfoScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleInfoScreen(0,
0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SCORES)
else if (game_status == GAME_MODE_SCORES)
- HandleHallOfFame(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleHallOfFame(0,
0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
break;
case SCREEN_CTRL_ID_SCROLL_DOWN:
if (game_status == GAME_MODE_NAMES)
break;
case SCREEN_CTRL_ID_SCROLL_DOWN:
if (game_status == GAME_MODE_NAMES)
- HandleChoosePlayerName(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChoosePlayerName(0,
0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELS)
else if (game_status == GAME_MODE_LEVELS)
- HandleChooseLevelSet(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelSet(0,
0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELNR)
else if (game_status == GAME_MODE_LEVELNR)
- HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelNr(0,
0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SETUP)
else if (game_status == GAME_MODE_SETUP)
- HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleSetupScreen(0,
0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_INFO)
else if (game_status == GAME_MODE_INFO)
- HandleInfoScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleInfoScreen(0,
0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SCORES)
else if (game_status == GAME_MODE_SCORES)
- HandleHallOfFame(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleHallOfFame(0,
0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
break;
case SCREEN_CTRL_ID_SCROLL_VERTICAL:
if (game_status == GAME_MODE_NAMES)
break;
case SCREEN_CTRL_ID_SCROLL_VERTICAL:
if (game_status == GAME_MODE_NAMES)
- HandleChoosePlayerName(0,
0,999,gi->event.item_position,
MB_MENU_INITIALIZE);
+ HandleChoosePlayerName(0,
0, 999, gi->event.item_position,
MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_LEVELS)
else if (game_status == GAME_MODE_LEVELS)
- HandleChooseLevelSet(0,
0,999,gi->event.item_position,
MB_MENU_INITIALIZE);
+ HandleChooseLevelSet(0,
0, 999, gi->event.item_position,
MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_LEVELNR)
else if (game_status == GAME_MODE_LEVELNR)
- HandleChooseLevelNr(0,
0,999,gi->event.item_position,
MB_MENU_INITIALIZE);
+ HandleChooseLevelNr(0,
0, 999, gi->event.item_position,
MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_SETUP)
else if (game_status == GAME_MODE_SETUP)
- HandleSetupScreen(0,
0, 999,gi->event.item_position,
MB_MENU_INITIALIZE);
+ HandleSetupScreen(0,
0, 999, gi->event.item_position,
MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_INFO)
else if (game_status == GAME_MODE_INFO)
- HandleInfoScreen(0,
0, 999,gi->event.item_position,
MB_MENU_INITIALIZE);
+ HandleInfoScreen(0,
0, 999, gi->event.item_position,
MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_SCORES)
else if (game_status == GAME_MODE_SCORES)
- HandleHallOfFame(0,
0, 999,gi->event.item_position,
MB_MENU_INITIALIZE);
+ HandleHallOfFame(0,
0, 999, gi->event.item_position,
MB_MENU_INITIALIZE);
break;
case SCREEN_CTRL_ID_NETWORK_SERVER:
break;
case SCREEN_CTRL_ID_NETWORK_SERVER: