projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed network protocol version from 1.2.0 to 2.0.0
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 54e27e311f8c4d0f086cb4a1e7207f2eaf291207..758e536d29a16b17e97e7bdc095e29d094ea8f6e 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1642,6
+1642,7
@@
void DrawMainMenu()
DrawCursorAndText_Main(-1, FALSE, FALSE);
DrawPreviewLevelInitial();
DrawCursorAndText_Main(-1, FALSE, FALSE);
DrawPreviewLevelInitial();
+ DrawNetworkPlayers();
HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE);
@@
-6445,26
+6446,20
@@
static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
ToggleFullscreenOrChangeWindowScalingIfNeeded();
if (si->value == &setup.network_mode &&
ToggleFullscreenOrChangeWindowScalingIfNeeded();
if (si->value == &setup.network_mode &&
- setup.network_mode &&
- !network.enabled)
+ setup.network_mode != network.enabled)
{
{
- network.enabled = TRUE;
-
- SetGameStatus(GAME_MODE_LOADING);
- SetDrawBackgroundMask(REDRAW_NONE);
+ network.enabled = setup.network_mode;
FadeOut(REDRAW_ALL);
FadeOut(REDRAW_ALL);
- Clear
Rectangle(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE
);
+ Clear
Field(
);
FadeIn(REDRAW_ALL);
FadeIn(REDRAW_ALL);
- InitNetworkServer();
-
- SetGameStatus(GAME_MODE_SETUP);
- SetDrawBackgroundMask(REDRAW_FIELD);
-
- redraw_mask = REDRAW_ALL;
+ if (network.enabled)
+ InitNetworkServer();
+ else
+ DisconnectFromNetworkServer();
DrawSetupScreen();
}
DrawSetupScreen();
}