projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030312-1-src
[rocksndiamonds.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index 5534c56f5b42a9e42893e577eedb5aa901f653ee..fba7b48c05431289c2cbebbfbb4453e13835ea2f 100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-1,17
+1,19
@@
/***********************************************************
/***********************************************************
-*
Rocks'n'Diamonds -- McDuffin Strikes Back!
*
+*
Rocks'n'Diamonds -- McDuffin Strikes Back!
*
*----------------------------------------------------------*
*----------------------------------------------------------*
-*
(c) 1995-98 Artsoft Entertainment
*
-*
Holger Schemel
*
-*
Oststrasse 11a
*
-*
33604 Bielefeld
*
-*
phone: ++49 +521 290471
*
-*
email: aeglos@valinor.owl.de
*
+*
(c) 1995-2002 Artsoft Entertainment
*
+*
Holger Schemel
*
+*
Detmolder Strasse 189
*
+*
33604 Bielefeld
*
+*
Germany
*
+*
e-mail: info@artsoft.org
*
*----------------------------------------------------------*
*----------------------------------------------------------*
-*
network.c
*
+*
network.c
*
***********************************************************/
***********************************************************/
-#ifndef MSDOS
+#include "libgame/platform.h"
+
+#if defined(PLATFORM_UNIX)
#include <signal.h>
#include <sys/time.h>
#include <signal.h>
#include <sys/time.h>
@@
-22,15
+24,15
@@
#include <arpa/inet.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include "libgame/libgame.h"
+
#include "network.h"
#include "netserv.h"
#include "game.h"
#include "tape.h"
#include "files.h"
#include "tools.h"
#include "network.h"
#include "netserv.h"
#include "game.h"
#include "tape.h"
#include "files.h"
#include "tools.h"
-#include "buttons.h"
#include "screens.h"
#include "screens.h"
-#include "misc.h"
struct NetworkClientPlayerInfo
{
struct NetworkClientPlayerInfo
{
@@
-236,9
+238,9
@@
void SendToServer_StartPlaying()
buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff);
buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff);
buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff);
buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff);
- strcpy((char *)&buffer[10], leveldir_current->
name
);
+ strcpy((char *)&buffer[10], leveldir_current->
identifier
);
- SendBufferToServer(10 + strlen(leveldir_current->
name
) + 1);
+ SendBufferToServer(10 + strlen(leveldir_current->
identifier
) + 1);
}
void SendToServer_PausePlaying()
}
void SendToServer_PausePlaying()
@@
-411,31
+413,32
@@
static void Handle_OP_PLAYER_DISCONNECTED()
static void Handle_OP_START_PLAYING()
{
static void Handle_OP_START_PLAYING()
{
-
struct LevelDirInfo
*new_leveldir;
+
LevelDirTree
*new_leveldir;
int new_level_nr;
int dummy; /* !!! HAS NO MEANING ANYMORE !!! */
unsigned long new_random_seed;
int new_level_nr;
int dummy; /* !!! HAS NO MEANING ANYMORE !!! */
unsigned long new_random_seed;
- char *new_leveldir_
name
;
+ char *new_leveldir_
identifier
;
new_level_nr = (buffer[2] << 8) + buffer[3];
dummy = (buffer[4] << 8) + buffer[5];
new_random_seed =
(buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
new_level_nr = (buffer[2] << 8) + buffer[3];
dummy = (buffer[4] << 8) + buffer[5];
new_random_seed =
(buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
- new_leveldir_
name
= (char *)&buffer[10];
+ new_leveldir_
identifier
= (char *)&buffer[10];
- new_leveldir = getLevelDirInfoFromFilename(new_leveldir_name);
+ new_leveldir = getTreeInfoFromIdentifier(leveldir_first,
+ new_leveldir_identifier);
if (new_leveldir == NULL)
{
if (new_leveldir == NULL)
{
- Error(ERR_WARN, "no such level
directory: '%s'", new_leveldir_name
);
+ Error(ERR_WARN, "no such level
identifier: '%s'", new_leveldir_identifier
);
new_leveldir = leveldir_first;
new_leveldir = leveldir_first;
- Error(ERR_WARN, "using default level
directory: '%s'", new_leveldir->name
);
+ Error(ERR_WARN, "using default level
set: '%s'", new_leveldir->identifier
);
}
printf("OP_START_PLAYING: %d\n", buffer[0]);
Error(ERR_NETWORK_CLIENT,
}
printf("OP_START_PLAYING: %d\n", buffer[0]);
Error(ERR_NETWORK_CLIENT,
- "client %d starts game [level %d from level
di
r '%s']\n",
- buffer[0], new_level_nr, new_leveldir->
name
);
+ "client %d starts game [level %d from level
identifie
r '%s']\n",
+ buffer[0], new_level_nr, new_leveldir->
identifier
);
leveldir_current = new_leveldir;
level_nr = new_level_nr;
leveldir_current = new_leveldir;
level_nr = new_level_nr;
@@
-615,4
+618,4
@@
void HandleNetworking()
}
}
}
}
-#endif /*
!MSDOS
*/
+#endif /*
PLATFORM_UNIX
*/