edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

added version to server browser. fixed so that you can join a server even if you have

Browse source
This commit is contained in:
Magnus Auvinen 2007-12-19 19:56:38 +00:00
parent f65e608dc9
commit 34698e13e9
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/e_interface.h
View file

@ -750,6 +750,7 @@ void mods_connected(int client_id);
const char *modc_net_version();
const char *mods_net_version();
const char *mods_version();
/* server */
int server_getclientinfo(int client_id, CLIENT_INFO *info);

2
src/engine/server/es_server.c
View file

@ -667,7 +667,7 @@ static void server_send_serverinfo(NETADDR4 *addr)
packer_reset(&p);
packer_add_raw(&p, SERVERBROWSE_INFO, sizeof(SERVERBROWSE_INFO));
packer_add_string(&p, mods_net_version(), 32);
packer_add_string(&p, mods_version(), 32);
packer_add_string(&p, config.sv_name, 64);
packer_add_string(&p, config.sv_map, 32);

9
src/game/client/gc_menu.cpp
View file

@ -926,6 +926,7 @@ static void menu2_render_serverbrowser(RECT main_view)
COL_PLAYERS,
COL_PING,
COL_PROGRESS,
COL_VERSION,
};
static column cols[] = {
@ -936,6 +937,7 @@ static void menu2_render_serverbrowser(RECT main_view)
{COL_MAP, BROWSESORT_MAP, "Map", 1, 100.0f, 0, {0}, {0}},
{COL_PLAYERS, BROWSESORT_NUMPLAYERS, "Players", 1, 60.0f, 0, {0}, {0}},
{-1, -1, " ", 1, 10.0f, 0, {0}, {0}},
{COL_VERSION, -1, "Ver", 1, 40.0f, FIXED, {0}, {0}},
{COL_PROGRESS, BROWSESORT_PROGRESSION, "%", 1, 20.0f, FIXED, {0}, {0}},
{COL_PING, BROWSESORT_PING, "Ping", 1, 40.0f, FIXED, {0}, {0}},
};
@ -1144,6 +1146,13 @@ static void menu2_render_serverbrowser(RECT main_view)
item->progression = 100;
ui2_draw_browse_icon(item->progression, &button);
}
else if(id == COL_VERSION)
{
const char *version = item->version;
if(strcmp(version, "0.3 e2d7973c6647a13c") == 0) // TODO: remove me later on
version = "0.3.0";
ui2_do_label(&button, version, 20.0f, 1);
}
else if(id == COL_GAMETYPE)
{
const char *type = "???";

2
src/game/g_version.h
View file

@ -1,4 +1,4 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
#include "generated/nethash.c"
#define TEEWARS_VERSION "0.3.0-dev"
#define TEEWARS_VERSION "0.3.1"
#define TEEWARS_NETVERSION "0.3 " TEEWARS_NETVERSION_HASH

5
src/game/server/gs_server.cpp
View file

@ -1924,11 +1924,11 @@ void mods_message(int msg, int client_id)
players[client_id].color_feet = msg_unpack_int();
// check for invalid chars
const char *p = name;
unsigned char *p = (unsigned char *)name;
while (*p)
{
if(*p < 32)
return;
*p = ' ';
p++;
}
@ -2086,3 +2086,4 @@ void mods_postsnap()
}
extern "C" const char *mods_net_version() { return TEEWARS_NETVERSION; }
extern "C" const char *mods_version() { return TEEWARS_VERSION; }