diff options
| author | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-09-03 09:58:41 +0000 |
|---|---|---|
| committer | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-09-03 09:58:41 +0000 |
| commit | 24bb721b3c1dc0b15d74ccecda03744357af558d (patch) | |
| tree | e4af6ea2eedb649b55689f141fb8bf343875165f /src/base/proto.c | |
| parent | 85c0f71d6e90a451f64cd032a3e58157d57dc226 (diff) | |
- opravene regresnie, kotre vznikli, pri prepise naciatavania aren z *.zip
( a odstranene prebytocne subory z adresarovej struktury -- tie ktore su uz zabalene v zip )
git-svn-id: http://opensvn.csie.org/tuxanci_ng@265 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src/base/proto.c')
| -rw-r--r-- | src/base/proto.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/base/proto.c b/src/base/proto.c index 9c9163e..5097146 100644 --- a/src/base/proto.c +++ b/src/base/proto.c @@ -228,8 +228,7 @@ void proto_send_status_server(int type, client_t *client) clients = getCurrentArena()->spaceTux->listIndex->count; maxclients = getServerMaxClients(); uptime = (unsigned int)getUpdateServer(); - //arena = getArenaNetName( getChoiceArenaId() ); - //TODO + arena = getArenaNetName( getChoiceArena() ); snprintf(msg, STR_PROTO_SIZE, "name: %s\n" @@ -347,12 +346,10 @@ void proto_send_init_server(int type, client_t *client, client_t *client2) #endif check_id = getNewIDcount(0); -/* + snprintf(msg, STR_PROTO_SIZE, "init %d %d %d %d %s %d\n", client2->tux->id, client2->tux->x, client2->tux->y, - count, getArenaNetName( getChoiceArenaId() ), check_id); -*/ - //TODO + count, getArenaNetName( getChoiceArena() ), check_id); //proto_send(type, client, msg); protoSendClient(type, client, msg, CHECK_FRONT_TYPE_CHECK, check_id); @@ -388,10 +385,9 @@ void proto_recv_init_client(char *msg) return; } - //setWorldArena( getArenaIdFormNetName(arena_name) ); - //TODO - arena = getCurrentArena(); + setWorldArena( getArenaFileFormNetName(arena_name) ); + arena = getCurrentArena(); arena->max_countRound = n; tux = newTux(); |