projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added also fading in/out global animations to be started/stopped
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 3bcb01c4b532ac3ee7ebb89491e15e21ad0501f1..4f7dd6f6670a41294c810cb738d26cfd09e55930 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-18,7
+18,7
@@
#include "editor.h"
#include "files.h"
#include "tape.h"
#include "editor.h"
#include "files.h"
#include "tape.h"
-#include "
cartoons
.h"
+#include "
anim
.h"
#include "network.h"
#include "init.h"
#include "config.h"
#include "network.h"
#include "init.h"
#include "config.h"
@@
-235,9
+235,6
@@
static TreeInfo *drop_distance_current = NULL;
static TreeInfo *level_number = NULL;
static TreeInfo *level_number_current = NULL;
static TreeInfo *level_number = NULL;
static TreeInfo *level_number_current = NULL;
-static unsigned int sync_frame_delay = 0;
-static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
-
static struct
{
int value;
static struct
{
int value;
@@
-281,7
+278,10
@@
static struct
{
{ STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" },
{ STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" },
{
{ STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" },
{ STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" },
+#if DEBUG
+ // this mode may work under certain conditions, but does not work on Windows
{ STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" },
{ STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" },
+#endif
{ STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" },
{ NULL, NULL },
{ STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" },
{ NULL, NULL },
@@
-725,6
+725,13
@@
static int getTitleMessageGameMode(boolean initial)
return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
}
return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
}
+static int getTitleAnimMode(struct TitleControlInfo *tci)
+{
+ int base = (tci->initial ? GAME_MODE_TITLE_INITIAL_1 : GAME_MODE_TITLE_1);
+
+ return base + tci->local_nr;
+}
+
#if 0
static int getTitleScreenBackground(boolean initial)
{
#if 0
static int getTitleScreenBackground(boolean initial)
{
@@
-1247,11
+1254,7
@@
static void drawCursorXY(int xpos, int ypos, int graphic)
static void drawChooseTreeCursor(int ypos, boolean active)
{
static void drawChooseTreeCursor(int ypos, boolean active)
{
- int last_game_status = game_status; /* save current game status */
-
drawCursorExt(0, ypos, active, -1);
drawCursorExt(0, ypos, active, -1);
-
- SetGameStatus(last_game_status); /* restore current game status */
}
void DrawHeadline()
}
void DrawHeadline()
@@
-1309,13
+1312,12
@@
void DrawTitleScreenMessage(int nr, boolean initial)
{
char *filename = getLevelSetTitleMessageFilename(nr, initial);
struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial);
{
char *filename = getLevelSetTitleMessageFilename(nr, initial);
struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial);
- int last_game_status = game_status; /* save current game status */
if (filename == NULL)
return;
/* force TITLE font on title message screen */
if (filename == NULL)
return;
/* force TITLE font on title message screen */
- Set
Game
Status(getTitleMessageGameMode(initial));
+ Set
Font
Status(getTitleMessageGameMode(initial));
/* if chars *and* width set to "-1", automatically determine width */
if (tmi->chars == -1 && tmi->width == -1)
/* if chars *and* width set to "-1", automatically determine width */
if (tmi->chars == -1 && tmi->width == -1)
@@
-1354,7
+1356,7
@@
void DrawTitleScreenMessage(int nr, boolean initial)
filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1,
tmi->autowrap, tmi->centered, tmi->parse_comments);
filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1,
tmi->autowrap, tmi->centered, tmi->parse_comments);
- SetGameStatus(last_game_status); /* restore current game status */
+ ResetFontStatus();
}
void DrawTitleScreen()
}
void DrawTitleScreen()
@@
-1362,8
+1364,6
@@
void DrawTitleScreen()
KeyboardAutoRepeatOff();
HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE);
KeyboardAutoRepeatOff();
HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE);
-
- StopAnimation();
}
boolean CheckTitleScreen(boolean levelset_has_changed)
}
boolean CheckTitleScreen(boolean levelset_has_changed)
@@
-1398,6
+1398,8
@@
void DrawMainMenu()
UnmapAllGadgets();
FadeSoundsAndMusic();
UnmapAllGadgets();
FadeSoundsAndMusic();
+ ExpireSoundLoops(FALSE);
+
KeyboardAutoRepeatOn();
ActivateJoystick();
KeyboardAutoRepeatOn();
ActivateJoystick();
@@
-1458,7
+1460,7
@@
void DrawMainMenu()
FadeOut(fade_mask);
FadeOut(fade_mask);
- SetDrawtoField(DRAW_BACKBUFFER);
+ SetDrawtoField(DRAW_
TO_
BACKBUFFER);
/* level_nr may have been set to value over handicap with level editor */
if (setup.handicap && level_nr > leveldir_current->handicap_level)
/* level_nr may have been set to value over handicap with level editor */
if (setup.handicap && level_nr > leveldir_current->handicap_level)
@@
-1520,8
+1522,6
@@
void DrawMainMenu()
SetMouseCursor(CURSOR_DEFAULT);
SetMouseCursor(CURSOR_DEFAULT);
- InitAnimation();
-
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
}
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
}
@@
-1570,6
+1570,8
@@
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
title_screen_nr = 0;
tci = &title_controls[title_screen_nr];
title_screen_nr = 0;
tci = &title_controls[title_screen_nr];
+ SetAnimStatus(getTitleAnimMode(tci));
+
last_sound = SND_UNDEFINED;
last_music = MUS_UNDEFINED;
last_sound = SND_UNDEFINED;
last_music = MUS_UNDEFINED;
@@
-1590,7
+1592,6
@@
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
-
return;
}
return;
}
@@
-1651,16
+1652,19
@@
void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
}
title_screen_nr++;
}
title_screen_nr++;
- tci = &title_controls[title_screen_nr];
if (title_screen_nr < num_title_screens)
{
if (title_screen_nr < num_title_screens)
{
+ tci = &title_controls[title_screen_nr];
+
+ SetAnimStatus(getTitleAnimMode(tci));
+
sound = getTitleSound(tci);
music = getTitleMusic(tci);
sound = getTitleSound(tci);
music = getTitleMusic(tci);
- if (
sound == SND_UNDEFINED ||
sound != last_sound)
- FadeSound
s(
);
- if (
music == MUS_UNDEFINED ||
music != last_music)
+ if (
last_sound != SND_UNDEFINED &&
sound != last_sound)
+ FadeSound
(last_sound
);
+ if (
last_music != MUS_UNDEFINED &&
music != last_music)
FadeMusic();
fading = getTitleFading(tci);
FadeMusic();
fading = getTitleFading(tci);
@@
-1843,8
+1847,6
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
{
}
else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
{
- StopAnimation();
-
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_LEVELNR);
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_LEVELNR);
@@
-1881,8
+1883,6
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
{
if (leveldir_first)
{
{
if (leveldir_first)
{
- StopAnimation();
-
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_LEVELS);
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_LEVELS);
@@
-1900,8
+1900,6
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
else if (pos == MAIN_CONTROL_SCORES)
{
}
else if (pos == MAIN_CONTROL_SCORES)
{
- StopAnimation();
-
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_SCORES);
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_SCORES);
@@
-1914,8
+1912,6
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
!strEqual(setup.player_name, "Artsoft"))
Request("This level is read only!", REQ_CONFIRM);
!strEqual(setup.player_name, "Artsoft"))
Request("This level is read only!", REQ_CONFIRM);
- StopAnimation();
-
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_EDITOR);
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_EDITOR);
@@
-1926,8
+1922,6
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
else if (pos == MAIN_CONTROL_INFO)
{
}
else if (pos == MAIN_CONTROL_INFO)
{
- StopAnimation();
-
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_INFO);
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_INFO);
@@
-1940,14
+1934,10
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
else if (pos == MAIN_CONTROL_GAME)
{
}
else if (pos == MAIN_CONTROL_GAME)
{
- StopAnimation();
-
StartGameActions(options.network, setup.autorecord, level.random_seed);
}
else if (pos == MAIN_CONTROL_SETUP)
{
StartGameActions(options.network, setup.autorecord, level.random_seed);
}
else if (pos == MAIN_CONTROL_SETUP)
{
- StopAnimation();
-
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_SETUP);
CloseDoor(DOOR_CLOSE_2);
SetGameStatus(GAME_MODE_SETUP);
@@
-2162,6
+2152,7
@@
static void DrawInfoScreen_Main()
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
+ FadeSoundsAndMusic();
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
@@
-2203,8
+2194,6
@@
static void DrawInfoScreen_Main()
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
-
- InitAnimation();
}
static void changeSetupValue(int, int, int);
}
static void changeSetupValue(int, int, int);
@@
-2702,8
+2691,6
@@
void DrawInfoScreen_Elements()
HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
FadeIn(REDRAW_FIELD);
HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
FadeIn(REDRAW_FIELD);
-
- InitAnimation();
}
void HandleInfoScreen_Elements(int button)
}
void HandleInfoScreen_Elements(int button)
@@
-3683,8
+3670,6
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
-
- InitAnimation();
}
static void drawChooseTreeList(int first_entry, int num_page_entries,
}
static void drawChooseTreeList(int first_entry, int num_page_entries,
@@
-3696,7
+3681,6
@@
static void drawChooseTreeList(int first_entry, int num_page_entries,
int yoffset_setup = 16;
int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ||
ti->type == TREE_TYPE_LEVEL_NR ? yoffset_sets : yoffset_setup);
int yoffset_setup = 16;
int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ||
ti->type == TREE_TYPE_LEVEL_NR ? yoffset_sets : yoffset_setup);
- int last_game_status = game_status; /* save current game status */
title_string = ti->infotext;
title_string = ti->infotext;
@@
-3736,8
+3720,6
@@
static void drawChooseTreeList(int first_entry, int num_page_entries,
initCursor(i, IMG_MENU_BUTTON);
}
initCursor(i, IMG_MENU_BUTTON);
}
- SetGameStatus(last_game_status); /* restore current game status */
-
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;
}
@@
-3785,7
+3767,6
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int num_entries = numTreeInfoInGroup(ti);
int num_page_entries;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int num_entries = numTreeInfoInGroup(ti);
int num_page_entries;
- int last_game_status = game_status; /* save current game status */
boolean position_set_by_scrollbar = (dx == 999);
if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
boolean position_set_by_scrollbar = (dx == 999);
if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN)
@@
-3793,8
+3774,6
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
else
num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
else
num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN;
- SetGameStatus(last_game_status); /* restore current game status */
-
if (button == MB_MENU_INITIALIZE)
{
int num_entries = numTreeInfoInGroup(ti);
if (button == MB_MENU_INITIALIZE)
{
int num_entries = numTreeInfoInGroup(ti);
@@
-3878,12
+3857,8
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
if (mx || my) /* mouse input */
{
if (mx || my) /* mouse input */
{
- int last_game_status = game_status; /* save current game status */
-
x = (mx - mSX) / 32;
y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
x = (mx - mSX) / 32;
y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS;
-
- SetGameStatus(last_game_status); /* restore current game status */
}
else if (dx || dy) /* keyboard or scrollbar/scrollbutton input */
{
}
else if (dx || dy) /* keyboard or scrollbar/scrollbutton input */
{
@@
-4077,6
+4052,8
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
void DrawChooseLevelSet()
{
void DrawChooseLevelSet()
{
+ FadeSoundsAndMusic();
+
SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
DrawChooseTree(&leveldir_current);
SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
DrawChooseTree(&leveldir_current);
@@
-4094,6
+4071,8
@@
void DrawChooseLevelNr()
{
int i;
{
int i;
+ FadeSoundsAndMusic();
+
if (level_number != NULL)
{
freeTreeInfo(level_number);
if (level_number != NULL)
{
freeTreeInfo(level_number);
@@
-4179,8
+4158,6
@@
void DrawHallOfFame(int highlight_position)
FadeOut(fade_mask);
FadeOut(fade_mask);
- InitAnimation();
-
PlayMenuSound();
PlayMenuMusic();
PlayMenuSound();
PlayMenuMusic();
@@
-4707,16
+4684,14
@@
static void execSetupGraphics_setRenderingModes()
static void execSetupGraphics()
{
static void execSetupGraphics()
{
+ // update "setup.window_scaling_percent" from list selection
+ // (in this case, window scaling was changed on setup screen)
if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
- {
- // update "setup.window_scaling_percent" from list selection
execSetupGraphics_setWindowSizes(FALSE);
execSetupGraphics_setWindowSizes(FALSE);
- }
- else
- {
- // update list selection from "setup.window_scaling_percent"
- execSetupGraphics_setWindowSizes(TRUE);
- }
+
+ // update list selection from "setup.window_scaling_percent"
+ // (window scaling may have changed by resizing the window)
+ execSetupGraphics_setWindowSizes(TRUE);
execSetupGraphics_setScalingTypes();
execSetupGraphics_setRenderingModes();
execSetupGraphics_setScalingTypes();
execSetupGraphics_setRenderingModes();
@@
-5590,10
+5565,7
@@
static Key getSetupKey()
}
}
}
}
- DoAnimation();
BackToFront();
BackToFront();
-
- WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
return key;
}
return key;
@@
-5638,7
+5610,7
@@
static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
int ypos = MENU_SCREEN_START_YPOS + screen_pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
int ypos = MENU_SCREEN_START_YPOS + screen_pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
- int font_nr, font_
width
;
+ int font_nr, font_
nr_default, font_width_default
;
int type = si->type;
void *value = si->value;
char *value_string = getSetupValue(type, value);
int type = si->type;
void *value = si->value;
char *value_string = getSetupValue(type, value);
@@
-5670,8
+5642,10
@@
static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
startx = mSX + xpos * 32;
starty = mSY + ypos * 32;
startx = mSX + xpos * 32;
starty = mSY + ypos * 32;
- font_nr = getSetupValueFont(type, value);
- font_width = getFontWidth(font_nr);
+ font_nr_default = getSetupValueFont(type, value);
+ font_width_default = getFontWidth(font_nr_default);
+
+ font_nr = font_nr_default;
// special check if right-side setup values moved left due to scrollbar
if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
// special check if right-side setup values moved left due to scrollbar
if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
@@
-5689,7
+5663,6
@@
static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
startx = mSX + xpos * 32;
font_nr = getSetupValueFontNarrow(type, font_nr);
startx = mSX + xpos * 32;
font_nr = getSetupValueFontNarrow(type, font_nr);
- font_width = getFontWidth(font_nr);
}
}
}
}
@@
-5732,7
+5705,7
@@
static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
}
for (i = 0; i <= menu_screen_max_xpos - xpos; i++)
}
for (i = 0; i <= menu_screen_max_xpos - xpos; i++)
- DrawText(startx + i * font_width
, starty, " ", font_nr
);
+ DrawText(startx + i * font_width
_default, starty, " ", font_nr_default
);
DrawText(startx, starty, value_string, font_nr);
DrawText(startx, starty, value_string, font_nr);
@@
-5789,6
+5762,7
@@
static void DrawSetupScreen_Generic()
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
+ FadeSoundsAndMusic();
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
@@
-5890,8
+5864,6
@@
static void DrawSetupScreen_Generic()
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
-
- InitAnimation();
}
void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
}
void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
@@
-5939,8
+5911,6
@@
void DrawSetupScreen_Input()
HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
FadeIn(REDRAW_FIELD);
HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
FadeIn(REDRAW_FIELD);
-
- InitAnimation();
}
static void setJoystickDeviceToNr(char *device_name, int device_nr)
}
static void setJoystickDeviceToNr(char *device_name, int device_nr)
@@
-6221,8
+6191,6
@@
void CustomizeKeyboard(int player_nr)
FadeIn(REDRAW_FIELD);
FadeIn(REDRAW_FIELD);
- InitAnimation();
-
while (!finished)
{
if (PendingEvent()) /* got event */
while (!finished)
{
if (PendingEvent()) /* got event */
@@
-6304,16
+6272,12
@@
void CustomizeKeyboard(int player_nr)
}
}
}
}
- DoAnimation();
BackToFront();
BackToFront();
-
- WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
/* write new key bindings back to player setup */
setup.input[player_nr].key = custom_key;
}
/* write new key bindings back to player setup */
setup.input[player_nr].key = custom_key;
- StopAnimation();
DrawSetupScreen_Input();
}
DrawSetupScreen_Input();
}
@@
-6377,7
+6341,6
@@
static boolean CalibrateJoystickMain(int player_nr)
FadeIn(REDRAW_FIELD);
while (Joystick(player_nr) & JOY_BUTTON); /* wait for released button */
FadeIn(REDRAW_FIELD);
while (Joystick(player_nr) & JOY_BUTTON); /* wait for released button */
- InitAnimation();
while (result < 0)
{
while (result < 0)
{
@@
-6459,10
+6422,7
@@
static boolean CalibrateJoystickMain(int player_nr)
}
}
}
}
- DoAnimation();
BackToFront();
BackToFront();
-
- WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
/* calibrated center position (joystick should now be centered) */
}
/* calibrated center position (joystick should now be centered) */
@@
-6472,8
+6432,6
@@
static boolean CalibrateJoystickMain(int player_nr)
new_joystick_xmiddle = joy_x;
new_joystick_ymiddle = joy_y;
new_joystick_xmiddle = joy_x;
new_joystick_ymiddle = joy_y;
- StopAnimation();
-
/* wait until the last pressed button was released */
while (Joystick(player_nr) & JOY_BUTTON)
{
/* wait until the last pressed button was released */
while (Joystick(player_nr) & JOY_BUTTON)
{
@@
-6484,7
+6442,7
@@
static boolean CalibrateJoystickMain(int player_nr)
NextEvent(&event);
HandleOtherEvents(&event);
NextEvent(&event);
HandleOtherEvents(&event);
-
WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value
);
+
BackToFront(
);
}
}
}
}
@@
-6935,14
+6893,10
@@
static void CreateScreenScrollbars()
void CreateScreenGadgets()
{
void CreateScreenGadgets()
{
- int last_game_status = game_status; /* save current game status */
-
CreateScreenMenubuttons();
CreateScreenScrollbuttons();
CreateScreenScrollbars();
CreateScreenMenubuttons();
CreateScreenScrollbuttons();
CreateScreenScrollbars();
-
- SetGameStatus(last_game_status); /* restore current game status */
}
void FreeScreenGadgets()
}
void FreeScreenGadgets()