/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment *
+* (c) 1995-2006 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#if defined(TARGET_SDL)
SDLNet_TCP_Send(sfd, writbuffer, nwrite);
#else
- write(sfd, writbuffer, nwrite);
+ if (write(sfd, writbuffer, nwrite) == -1)
+ Error(ERR_WARN, "write() failed; %s", strerror(errno));
#endif
nwrite = 0;
}
static int p;
p = port;
+#if defined(TARGET_SDL2)
+ server_thread = SDL_CreateThread(NetworkServerThread,
+ "NetworkServerThread", &p);
+#else
server_thread = SDL_CreateThread(NetworkServerThread, &p);
+#endif
network_server = TRUE;
#else
void SendToServer_StartPlaying()
{
- unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
+ unsigned int new_random_seed = InitRND(level.random_seed);
int dummy = 0; /* !!! HAS NO MEANING ANYMORE !!! */
/* the name of the level must be enough */
}
else if (old_client_nr == first_player.nr) /* failed -- local player? */
{
- char *color[] = { "yellow", "red", "green", "blue" };
char request[100];
- sprintf(request, "Sorry ! %s player still exists ! You are %s player !",
- color[index_nr_wanted], color[new_index_nr]);
+ sprintf(request, "Sorry! Player %d already exists! You are player %d!",
+ index_nr_wanted + 1, new_index_nr + 1);
+
Request(request, REQ_CONFIRM);
Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
{
LevelDirTree *new_leveldir;
int new_level_nr;
- int dummy;
- unsigned long new_random_seed;
+ unsigned int new_random_seed;
char *new_leveldir_identifier;
new_level_nr = (buffer[2] << 8) + buffer[3];
- dummy = (buffer[4] << 8) + buffer[5]; /* (obsolete) */
new_random_seed =
(buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
new_leveldir_identifier = (char *)&buffer[10];
LoadTape(level_nr);
LoadLevel(level_nr);
-#if 1
StartGameActions(FALSE, setup.autorecord, new_random_seed);
-#else
- if (setup.autorecord)
- TapeStartRecording();
-
- if (tape.recording)
- tape.random_seed = new_random_seed;
-
- InitRND(new_random_seed);
-
- game_status = GAME_MODE_PLAYING;
- InitGame();
-#endif
}
static void Handle_OP_PAUSE_PLAYING()
else if (buffer[2] == NETWORK_STOP_BY_ERROR)
Request("Network game stopped due to internal error!", REQ_CONFIRM);
else
- Request("Network game stopped !", REQ_CONFIRM);
+ Request("Network game stopped!", REQ_CONFIRM);
}
game_status = GAME_MODE_MAIN;
if (server_frame_counter != FrameCounter)
{
- Error(ERR_RETURN, "client and servers frame counters out of sync");
- Error(ERR_RETURN, "frame counter of client is %d", FrameCounter);
- Error(ERR_RETURN, "frame counter of server is %d", server_frame_counter);
-
-#if 1
- Error(ERR_RETURN, "this should not happen -- please debug");
+ Error(ERR_INFO, "client and servers frame counters out of sync");
+ Error(ERR_INFO, "frame counter of client is %d", FrameCounter);
+ Error(ERR_INFO, "frame counter of server is %d", server_frame_counter);
+ Error(ERR_INFO, "this should not happen -- please debug");
stop_network_game = TRUE;
return;
-#else
- Error(ERR_EXIT, "this should not happen -- please debug");
-#endif
}
/* copy valid player actions */
nread -= 4 + message_length;
memmove(readbuffer, readbuffer + 4 + message_length, nread);
- switch(buffer[1])
+ switch (buffer[1])
{
case OP_BAD_PROTOCOL_VERSION:
Handle_OP_BAD_PROTOCOL_VERSION();