projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with displaying the wrong level number in the game panel
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 7413cd52e53f5b9695e02e3697c8f57a46d4ccde..6db427ff5333ec44191426f5346ee4c32258df1e 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-5051,6
+5051,9
@@
void Execute_Command(char *command)
{
Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
}
{
Error(ERR_EXIT_HELP, "unrecognized command '%s'", command);
}
+
+ /* disable networking if any valid command was recognized */
+ options.network = setup.network_mode = FALSE;
}
static void InitSetup()
}
static void InitSetup()
@@
-5087,7
+5090,6
@@
static void InitPlayerInfo()
}
local_player->connected_locally = TRUE;
}
local_player->connected_locally = TRUE;
- local_player->connected_network = TRUE;
}
static void InitArtworkInfo()
}
static void InitArtworkInfo()
@@
-5487,6
+5489,8
@@
static void InitLevelInfo()
if (leveldir_current == NULL)
leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
}
if (leveldir_current == NULL)
leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
}
+
+ SetLevelSetInfo(leveldir_current->identifier, level_nr);
}
static void InitLevelArtworkInfo()
}
static void InitLevelArtworkInfo()
@@
-5619,22
+5623,25
@@
void InitNetworkServer()
if (!network.enabled || network.connected)
return;
if (!network.enabled || network.connected)
return;
+ LimitScreenUpdates(FALSE);
+
if (!ConnectToServer(network.server_host, network.server_port))
{
if (!ConnectToServer(network.server_host, network.server_port))
{
- Request("Cannot connect to network server!", REQ_CONFIRM);
-
network.enabled = FALSE;
setup.network_mode = FALSE;
network.enabled = FALSE;
setup.network_mode = FALSE;
-
- return;
}
}
+ else
+ {
+ SendToServer_ProtocolVersion();
+ SendToServer_PlayerName(setup.player_name);
+ SendToServer_NrWanted(setup.network_player_nr + 1);
- SendToServer_PlayerName(setup.player_name);
- SendToServer_ProtocolVersion();
- SendToServer_NrWanted(setup.network_player_nr + 1);
+ network.connected = TRUE;
+ }
- network.connected = TRUE;
+ /* short time to recognize result of network initialization */
+ Delay_WithScreenUpdates(1000);
}
static boolean CheckArtworkConfigForCustomElements(char *filename)
}
static boolean CheckArtworkConfigForCustomElements(char *filename)
@@
-6097,6
+6104,8
@@
void OpenAll()
return;
}
return;
}
+ InitNetworkServer();
+
SetGameStatus(GAME_MODE_MAIN);
FadeSetEnterScreen();
SetGameStatus(GAME_MODE_MAIN);
FadeSetEnterScreen();
@@
-6109,8
+6118,6
@@
void OpenAll()
DrawMainMenu();
DrawMainMenu();
- InitNetworkServer();
-
#if 0
Error(ERR_DEBUG, "::: SDL_GetBasePath() == '%s'",
SDL_GetBasePath());
#if 0
Error(ERR_DEBUG, "::: SDL_GetBasePath() == '%s'",
SDL_GetBasePath());