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

reworked the whole message system

Browse source
This commit is contained in:
Magnus Auvinen 2008-03-17 21:31:46 +00:00
parent 88f2341627
commit c4e165f395
6 changed files with 439 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
scripts/netobj.py
View file

@ -14,6 +14,10 @@ class variable:
return "#line %d" % self.line return "#line %d" % self.line
def emit_secure(self): def emit_secure(self):
return [] return []
def emit_unpack(self):
return ["msg.%s = msg_unpack_int();" % self.name]
def emit_pack(self):
return ["\t\tmsg_pack_int(%s);" % self.name]
class var_any(variable): class var_any(variable):
def __init__(self, args, name): def __init__(self, args, name):
@ -37,6 +41,16 @@ class var_string(variable):
def __init__(self, args, name): def __init__(self, args, name):
variable.__init__(self, args, name) variable.__init__(self, args, name)
class var_string(variable):
def __init__(self, args, name):
variable.__init__(self, args, name)
def emit_declaration(self):
return ["\tconst char *%s;" % self.name]
def emit_unpack(self):
return ["msg.%s = msg_unpack_string();" % self.name]
def emit_pack(self):
return ["\t\tmsg_pack_string(%s, -1);" % self.name]
class object: class object:
def __init__(self, line): def __init__(self, line):
fields = line.split() fields = line.split()
@ -95,7 +109,74 @@ class object:
for m in self.members: for m in self.members:
lines += m.emit_secure() lines += m.emit_secure()
return lines return lines
class message:
def __init__(self, line):
fields = line.split()
self.name = fields[1]
self.enum_name = "NETMSGTYPE_%s" % self.name.upper()
self.struct_name = "NETMSG_%s" % self.name.upper()
self.members = []
def parse(self, lines):
global line_count
for index in xrange(0, len(lines)):
line_count += 1
line = lines[index]
if not len(line):
continue
if line == "end":
return lines[index+1:]
else:
# check for argument
fields = line.split(")", 1)
if len(fields) == 2:
names = [line.strip() for line in fields[1].split(",")]
l = fields[0].split("(", 1)
type = l[0]
args = [line.strip() for line in l[1].split(",")]
else:
l = fields[0].split(None, 1)
type = l[0]
args = []
names = [line.strip() for line in l[1].split(",")]
for name in names:
create_string = 'var_%s(%s, "%s")' % (type, args, name)
new_member = eval(create_string)
self.members += [new_member]
raise BaseException("Parse error")
def emit_declaration(self):
lines = []
lines += ["struct %s\n {" % self.struct_name]
for m in self.members:
lines += m.emit_declaration()
lines += ["\tvoid pack(int flags)"]
lines += ["\t{"]
lines += ["\t\tmsg_pack_start(%s, flags);" % self.enum_name]
for m in self.members:
lines += m.emit_pack()
lines += ["\t\tmsg_pack_end();"]
lines += ["\t}"]
lines += ["};"]
return lines
def emit_unpack(self):
lines = []
for m in self.members:
lines += m.emit_unpack()
return lines
def emit_pack(self):
lines = []
for m in self.members:
lines += m.emit_pack()
return lines
class event(object): class event(object):
def __init__(self, line): def __init__(self, line):
object.__init__(self, line) object.__init__(self, line)
@ -123,10 +204,10 @@ class raw_reader:
class proto: class proto:
def __init__(self): def __init__(self):
self.objects = [] self.objects = []
self.messages = []
self.source_raw = [] self.source_raw = []
self.header_raw = [] self.header_raw = []
def load(filename): def load(filename):
# read the file # read the file
global line_count global line_count
@ -148,10 +229,14 @@ def load(filename):
del lines[0] del lines[0]
if fields[0] == "object" or fields[0] == "msg": if fields[0] == "object":
new_obj = object(line) new_obj = object(line)
lines = new_obj.parse(lines) lines = new_obj.parse(lines)
p.objects += [new_obj] p.objects += [new_obj]
elif fields[0] == "message":
new_msg = message(line)
lines = new_msg.parse(lines)
p.messages += [new_msg]
elif fields[0] == "event": elif fields[0] == "event":
new_obj = event(line) new_obj = event(line)
lines = new_obj.parse(lines) lines = new_obj.parse(lines)
@ -173,7 +258,7 @@ def emit_header_file(f, p):
for l in p.header_raw: for l in p.header_raw:
print >>f, l print >>f, l
if 1: # emit the enum table if 1: # emit the enum table for objects
print >>f, "enum {" print >>f, "enum {"
print >>f, "\tNETOBJTYPE_INVALID=0," print >>f, "\tNETOBJTYPE_INVALID=0,"
for obj in p.objects: for obj in p.objects:
@ -182,19 +267,34 @@ def emit_header_file(f, p):
print >>f, "};" print >>f, "};"
print >>f, "" print >>f, ""
if 1: # emit the enum table for messages
print >>f, "enum {"
print >>f, "\tNETMSGTYPE_INVALID=0,"
for msg in p.messages:
print >>f, "\t%s," % msg.enum_name
print >>f, "\tNUM_NETMSGTYPES"
print >>f, "};"
print >>f, ""
print >>f, "int netobj_secure(int type, void *data, int size);" print >>f, "int netobj_secure(int type, void *data, int size);"
print >>f, "const char *netobj_get_name(int type);" print >>f, "const char *netobj_get_name(int type);"
print >>f, "int netobj_num_corrections();" print >>f, "int netobj_num_corrections();"
print >>f, "" print >>f, ""
print >>f, "void *netmsg_secure_unpack(int type);"
print >>f, "const char *netmsg_get_name(int type);"
print >>f, ""
for obj in p.objects: for obj in p.objects:
for l in obj.emit_declaration(): for l in obj.emit_declaration():
print >>f, l print >>f, l
print >>f, "" print >>f, ""
for msg in p.messages:
for l in msg.emit_declaration():
print >>f, l
print >>f, ""
def emit_source_file(f, p, protofilename): def emit_source_file(f, p, protofilename):
print >>f, "#line 1 \"%s\"" % os.path.abspath(protofilename).replace("\\", "\\\\") print >>f, "#line 1 \"%s\"" % os.path.abspath(protofilename).replace("\\", "\\\\")
for l in p.source_raw: for l in p.source_raw:
@ -220,7 +320,7 @@ def emit_source_file(f, p, protofilename):
print >>f, '\t""' print >>f, '\t""'
print >>f, "};" print >>f, "};"
print >>f, "" print >>f, ""
if 1: # secure functions if 1: # secure functions
print >>f, "static int secure_object_invalid(void *data, int size) { return 0; }" print >>f, "static int secure_object_invalid(void *data, int size) { return 0; }"
for obj in p.objects: for obj in p.objects:
@ -263,7 +363,57 @@ def emit_source_file(f, p, protofilename):
print >>f, "\treturn object_names[type];" print >>f, "\treturn object_names[type];"
print >>f, "};" print >>f, "};"
print >>f, "" print >>f, ""
if 1: # names
print >>f, "static const char *message_names[] = {"
print >>f, "\t" + '"invalid",'
for msg in p.messages:
print >>f, '\t"%s",' % msg.name
print >>f, '\t""'
print >>f, "};"
print >>f, ""
if 1: # secure functions
print >>f, "static void *secure_unpack_invalid() { return 0; }"
for msg in p.messages:
print >>f, "static void *secure_unpack_%s()" % msg.name
print >>f, "{"
print >>f, "\tstatic %s msg;" % msg.struct_name
for l in msg.emit_unpack():
print >>f, "\t" + l
print >>f, "\treturn &msg;";
print >>f, "}"
print >>f, ""
if 1: # secure function table
print >>f, "typedef void *(*SECUREUNPACKFUNC)();"
print >>f, "static SECUREUNPACKFUNC secure_unpack_funcs[] = {"
print >>f, "\t" + 'secure_unpack_invalid,'
for msg in p.messages:
print >>f, "\tsecure_unpack_%s," % msg.name
print >>f, "\t" + '0x0'
print >>f, "};"
print >>f, ""
if 1:
print >>f, "void *netmsg_secure_unpack(int type)"
print >>f, "{"
print >>f, "\tvoid *msg;"
print >>f, "\tif(type < 0 || type >= NUM_NETMSGTYPES) return 0;"
print >>f, "\tmsg = secure_unpack_funcs[type]();"
print >>f, "\tif(msg_unpack_error()) return 0;"
print >>f, "\treturn msg;"
print >>f, "};"
print >>f, ""
if 1:
print >>f, "const char *netmsg_get_name(int type)"
print >>f, "{"
print >>f, "\tif(type < 0 || type >= NUM_NETMSGTYPES) return \"(invalid)\";"
print >>f, "\treturn message_names[type];"
print >>f, "};"
print >>f, ""
if sys.argv[1] == "header": if sys.argv[1] == "header":
p = load(sys.argv[2]) p = load(sys.argv[2])
emit_header_file(file(sys.argv[3], "w"), p) emit_header_file(file(sys.argv[3], "w"), p)

51
src/game/client/gc_client.cpp
View file

@ -99,9 +99,9 @@ void snd_play_random(int chn, int setid, float vol, vec2 pos)
void send_switch_team(int team) void send_switch_team(int team)
{ {
msg_pack_start(MSG_SETTEAM, MSGFLAG_VITAL); NETMSG_CL_SETTEAM msg;
msg_pack_int(team); msg.team = team;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
client_send_msg(); client_send_msg();
} }
@ -320,31 +320,40 @@ void clear_object_pointers()
void send_info(bool start) void send_info(bool start)
{ {
if(start) if(start)
msg_pack_start(MSG_STARTINFO, MSGFLAG_VITAL); {
NETMSG_CL_STARTINFO msg;
msg.name = config.player_name;
msg.skin = config.player_skin;
msg.use_custom_color = config.player_use_custom_color;
msg.color_body = config.player_color_body;
msg.color_feet = config.player_color_feet;
msg.pack(MSGFLAG_VITAL);
}
else else
msg_pack_start(MSG_CHANGEINFO, MSGFLAG_VITAL); {
msg_pack_string(config.player_name, 64); NETMSG_CL_CHANGEINFO msg;
msg_pack_string(config.player_skin, 64); msg.name = config.player_name;
msg_pack_int(config.player_use_custom_color); msg.skin = config.player_skin;
msg_pack_int(config.player_color_body); msg.use_custom_color = config.player_use_custom_color;
msg_pack_int(config.player_color_feet); msg.color_body = config.player_color_body;
msg_pack_end(); msg.color_feet = config.player_color_feet;
msg.pack(MSGFLAG_VITAL);
}
client_send_msg(); client_send_msg();
} }
void send_emoticon(int emoticon) void send_emoticon(int emoticon)
{ {
msg_pack_start(MSG_EMOTICON, MSGFLAG_VITAL); NETMSG_CL_EMOTICON msg;
msg_pack_int(emoticon); msg.emoticon = emoticon;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
client_send_msg(); client_send_msg();
} }
void send_kill(int client_id) void send_kill(int client_id)
{ {
msg_pack_start(MSG_KILL, MSGFLAG_VITAL); NETMSG_CL_KILL msg;
msg_pack_int(client_id); msg.pack(MSGFLAG_VITAL);
msg_pack_end();
client_send_msg(); client_send_msg();
} }
@ -714,10 +723,10 @@ static int do_input(int *v, int key)
void chat_say(int team, const char *line) void chat_say(int team, const char *line)
{ {
// send chat message // send chat message
msg_pack_start(MSG_SAY, MSGFLAG_VITAL); NETMSG_CL_SAY msg;
msg_pack_int(team); msg.team = team;
msg_pack_string(line, 512); msg.message = line;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
client_send_msg(); client_send_msg();
} }

3
src/game/client/gc_effects.cpp
View file

@ -132,10 +132,7 @@ void effect_playerdeath(vec2 pos, int cid)
{ {
const skin *s = skin_get(client_datas[cid].skin_id); const skin *s = skin_get(client_datas[cid].skin_id);
if(s) if(s)
{
dbg_msg("", "good blood color!");
blood_color = s->blood_color; blood_color = s->blood_color;
}
} }
for(int i = 0; i < 64; i++) for(int i = 0; i < 64; i++)

182
src/game/client/gc_hooks.cpp
View file

@ -283,10 +283,10 @@ extern "C" void modc_newsnapshot()
{ {
if((client_tick()%250) == 0) if((client_tick()%250) == 0)
{ {
msg_pack_start(MSG_SAY, MSGFLAG_VITAL); NETMSG_CL_SAY msg;
msg_pack_int(-1); msg.team = -1;
msg_pack_string("galenskap!!!!", 512); msg.message = "galenskap!!!!";
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
client_send_msg(); client_send_msg();
} }
} }
@ -458,26 +458,10 @@ void extraproj_reset()
char server_motd[900] = {0}; char server_motd[900] = {0};
extern "C" void modc_message(int msg) extern "C" void modc_message(int msgtype)
{ {
if(msg == MSG_CHAT) // special messages
{ if(msgtype == NETMSGTYPE_SV_EXTRA_PROJECTILE)
int cid = msg_unpack_int();
int team = msg_unpack_int();
const char *message = msg_unpack_string();
/* check for errors and invalid inputs */
if(msg_unpack_error() || cid < -1 || cid >= MAX_CLIENTS)
return;
chat_add_line(cid, team, message);
if(cid >= 0)
snd_play(CHN_GUI, data->sounds[SOUND_CHAT_CLIENT].sounds[0].id, 0);
else
snd_play(CHN_GUI, data->sounds[SOUND_CHAT_SERVER].sounds[0].id, 0);
}
else if(msg == MSG_EXTRA_PROJECTILE)
{ {
int num = msg_unpack_int(); int num = msg_unpack_int();
@ -496,17 +480,49 @@ extern "C" void modc_message(int msg)
extraproj_num++; extraproj_num++;
} }
} }
return;
} }
else if(msg == MSG_MOTD) else if(msgtype == NETMSGTYPE_SV_TUNE_PARAMS)
{ {
const char *message = msg_unpack_string(); // unpack the new tuning
tuning_params new_tuning;
int *params = (int *)&new_tuning;
for(unsigned i = 0; i < sizeof(tuning_params)/sizeof(int); i++)
params[i] = msg_unpack_int();
/* check for errors and invalid inputs */ // check for unpacking errors
if(msg_unpack_error()) if(msg_unpack_error())
return; return;
// apply new tuning
tuning = new_tuning;
}
// normal
void *rawmsg = netmsg_secure_unpack(msgtype);
if(!rawmsg)
{
dbg_msg("client", "dropped weird message '%s' (%d)", netmsg_get_name(msgtype), msgtype);
return;
}
if(msgtype == NETMSGTYPE_SV_CHAT)
{
NETMSG_SV_CHAT *msg = (NETMSG_SV_CHAT *)rawmsg;
chat_add_line(msg->cid, msg->team, msg->message);
if(msg->cid >= 0)
snd_play(CHN_GUI, data->sounds[SOUND_CHAT_CLIENT].sounds[0].id, 0);
else
snd_play(CHN_GUI, data->sounds[SOUND_CHAT_SERVER].sounds[0].id, 0);
}
else if(msgtype == NETMSGTYPE_SV_MOTD)
{
NETMSG_SV_MOTD *msg = (NETMSG_SV_MOTD *)rawmsg;
// process escaping // process escaping
str_copy(server_motd, message, sizeof(server_motd)); str_copy(server_motd, msg->message, sizeof(server_motd));
for(int i = 0; server_motd[i]; i++) for(int i = 0; server_motd[i]; i++)
{ {
if(server_motd[i] == '\\') if(server_motd[i] == '\\')
@ -522,108 +538,74 @@ extern "C" void modc_message(int msg)
dbg_msg("game", "MOTD: %s", server_motd); dbg_msg("game", "MOTD: %s", server_motd);
} }
else if(msg == MSG_SETINFO) else if(msgtype == NETMSGTYPE_SV_SETINFO)
{ {
int cid = msg_unpack_int(); NETMSG_SV_SETINFO *msg = (NETMSG_SV_SETINFO *)rawmsg;
const char *name = msg_unpack_string();
const char *skinname = msg_unpack_string();
/* check for errors and invalid inputs */ str_copy(client_datas[msg->cid].name, msg->name, 64);
if(msg_unpack_error() || cid < 0 || cid >= MAX_CLIENTS) str_copy(client_datas[msg->cid].skin_name, msg->skin, 64);
return;
str_copy(client_datas[cid].name, name, 64);
str_copy(client_datas[cid].skin_name, skinname, 64);
// make sure that we don't set a special skin on the client // make sure that we don't set a special skin on the client
if(client_datas[cid].skin_name[0] == 'x' || client_datas[cid].skin_name[1] == '_') if(client_datas[msg->cid].skin_name[0] == 'x' || client_datas[msg->cid].skin_name[1] == '_')
str_copy(client_datas[cid].skin_name, "default", 64); str_copy(client_datas[msg->cid].skin_name, "default", 64);
int use_custom_color = msg_unpack_int(); client_datas[msg->cid].skin_info.color_body = skin_get_color(msg->color_body);
client_datas[cid].skin_info.color_body = skin_get_color(msg_unpack_int()); client_datas[msg->cid].skin_info.color_feet = skin_get_color(msg->color_feet);
client_datas[cid].skin_info.color_feet = skin_get_color(msg_unpack_int()); client_datas[msg->cid].skin_info.size = 64;
client_datas[cid].skin_info.size = 64;
// find new skin // find new skin
client_datas[cid].skin_id = skin_find(client_datas[cid].skin_name); client_datas[msg->cid].skin_id = skin_find(client_datas[msg->cid].skin_name);
if(client_datas[cid].skin_id < 0) if(client_datas[msg->cid].skin_id < 0)
client_datas[cid].skin_id = 0; client_datas[msg->cid].skin_id = 0;
if(use_custom_color) if(msg->use_custom_color)
client_datas[cid].skin_info.texture = skin_get(client_datas[cid].skin_id)->color_texture; client_datas[msg->cid].skin_info.texture = skin_get(client_datas[msg->cid].skin_id)->color_texture;
else else
{ {
client_datas[cid].skin_info.texture = skin_get(client_datas[cid].skin_id)->org_texture; client_datas[msg->cid].skin_info.texture = skin_get(client_datas[msg->cid].skin_id)->org_texture;
client_datas[cid].skin_info.color_body = vec4(1,1,1,1); client_datas[msg->cid].skin_info.color_body = vec4(1,1,1,1);
client_datas[cid].skin_info.color_feet = vec4(1,1,1,1); client_datas[msg->cid].skin_info.color_feet = vec4(1,1,1,1);
} }
client_datas[cid].update_render_info(); client_datas[msg->cid].update_render_info();
} }
else if(msg == MSG_TUNE_PARAMS) else if(msgtype == NETMSGTYPE_SV_WEAPON_PICKUP)
{
// unpack the new tuning
tuning_params new_tuning;
int *params = (int *)&new_tuning;
for(unsigned i = 0; i < sizeof(tuning_params)/sizeof(int); i++)
params[i] = msg_unpack_int();
// check for unpacking errors
if(msg_unpack_error())
return;
// apply new tuning
tuning = new_tuning;
}
else if(msg == MSG_WEAPON_PICKUP)
{ {
int weapon = msg_unpack_int(); NETMSG_SV_WEAPON_PICKUP *msg = (NETMSG_SV_WEAPON_PICKUP *)rawmsg;
if(msg_unpack_error()) picked_up_weapon = msg->weapon+1;
return;
picked_up_weapon = weapon+1;
} }
else if(msg == MSG_READY_TO_ENTER) else if(msgtype == NETMSGTYPE_SV_READY_TO_ENTER)
{ {
client_entergame(); client_entergame();
} }
else if(msg == MSG_KILLMSG) else if(msgtype == NETMSGTYPE_SV_KILLMSG)
{ {
NETMSG_SV_KILLMSG *msg = (NETMSG_SV_KILLMSG *)rawmsg;
// unpack messages // unpack messages
killmsg msg; killmsg kill;
msg.killer = msg_unpack_int(); kill.killer = msg->killer;
msg.victim = msg_unpack_int(); kill.victim = msg->victim;
msg.weapon = msg_unpack_int(); kill.weapon = msg->weapon;
msg.mode_special = msg_unpack_int(); kill.mode_special = msg->mode_special;
msg.tick = client_tick(); kill.tick = client_tick();
// check for unpacking errors
if(msg_unpack_error() || msg.killer >= MAX_CLIENTS || msg.victim >= MAX_CLIENTS || msg.weapon >= NUM_WEAPONS)
return;
// add the message // add the message
killmsg_current = (killmsg_current+1)%killmsg_max; killmsg_current = (killmsg_current+1)%killmsg_max;
killmsgs[killmsg_current] = msg; killmsgs[killmsg_current] = kill;
} }
else if (msg == MSG_EMOTICON) else if (msgtype == NETMSGTYPE_SV_EMOTICON)
{ {
// unpack NETMSG_SV_EMOTICON *msg = (NETMSG_SV_EMOTICON *)rawmsg;
int cid = msg_unpack_int();
int emoticon = msg_unpack_int();
// check for errors
if(msg_unpack_error() || cid < 0 || cid >= MAX_CLIENTS)
return;
// apply // apply
client_datas[cid].emoticon = emoticon; client_datas[msg->cid].emoticon = msg->emoticon;
client_datas[cid].emoticon_start = client_tick(); client_datas[msg->cid].emoticon_start = client_tick();
} }
else if(msg == MSG_SOUND_GLOBAL) else if(msgtype == NETMSGTYPE_SV_SOUND_GLOBAL)
{ {
int soundid = msg_unpack_int(); NETMSG_SV_SOUND_GLOBAL *msg = (NETMSG_SV_SOUND_GLOBAL *)rawmsg;
if(msg_unpack_error() || soundid < 0) snd_play_random(CHN_GLOBAL, msg->soundid, 1.0f, vec2(0,0));
return;
snd_play_random(CHN_GLOBAL, soundid, 1.0f, vec2(0,0));
} }
} }

113
src/game/g_protocol.def
View file

@ -1,10 +1,10 @@
raw_source raw_source
#include <engine/e_common_interface.h>
#include "g_protocol.h" #include "g_protocol.h"
extern "C" { extern "C" {
#include "g_protocol_ids.h" #include "g_protocol_ids.h"
} }
#include <engine/e_common_interface.h>
#define max_int 2147483647 #define max_int 2147483647
end end
@ -35,31 +35,7 @@ raw_header
// other stuff // other stuff
INPUT_STATE_MASK=0x1f, INPUT_STATE_MASK=0x1f,
}; NUM_EMOTICONS=16,
enum
{
MSG_NULL=0,
MSG_MOTD, // server -> client, message of the day
MSG_SAY, // client -> server
MSG_CHAT, // server -> client
MSG_SETINFO, // server -> client - contains name, skin and color info
MSG_KILLMSG, // server -> client
MSG_SETTEAM,
MSG_JOIN,
MSG_QUIT,
MSG_EMOTICON,
MSG_STARTINFO, // client -> server
MSG_CHANGEINFO, // client -> server
MSG_READY_TO_ENTER, // server -> client
MSG_WEAPON_PICKUP,
MSG_SOUND_GLOBAL,
MSG_TUNE_PARAMS,
MSG_KILL,
MSG_EXTRA_PROJECTILE, // server -> client
}; };
end end
@ -211,3 +187,88 @@ event damageind
any x, y any x, y
any angle any angle
end end
message sv_motd
string message
end
message cl_say
range(0, 1) team
string message
end
message sv_chat
range(0, 1) team
clientid cid
string message
end
message sv_setinfo
clientid cid
string name
string skin
range(0,1) use_custom_color
any color_body
any color_feet
end
message sv_killmsg
clientid killer
clientid victim
range(-1,NUM_WEAPONS-1) weapon
any mode_special
end
message cl_setteam
range(-1,1) team
end
message sv_ready_to_ender
end
message sv_sound_global
range(0, NUM_SOUNDS-1) soundid
end
message cl_startinfo
clientid who
string name
string skin
range(0,1) use_custom_color
any color_body
any color_feet
end
message cl_changeinfo
clientid who
string name
string skin
range(0,1) use_custom_color
any color_body
any color_feet
end
message sv_weapon_pickup
range(0,NUM_WEAPONS-1) weapon
end
message sv_emoticon
clientid cid
range(0,NUM_EMOTICONS-1) emoticon
end
message cl_emoticon
range(0,NUM_EMOTICONS-1) emoticon
end
message cl_kill
end
message sv_tune_params
end
message sv_extra_projectile
end
message sv_ready_to_enter
end

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

@ -28,29 +28,29 @@ class player *closest_player(vec2 pos, float radius, entity *notthis);
game_world *world; game_world *world;
void send_chat(int cid, int team, const char *msg) void send_chat(int cid, int team, const char *text)
{ {
if(cid >= 0 && cid < MAX_CLIENTS) if(cid >= 0 && cid < MAX_CLIENTS)
dbg_msg("chat", "%d:%d:%s: %s", cid, team, server_clientname(cid), msg); dbg_msg("chat", "%d:%d:%s: %s", cid, team, server_clientname(cid), text);
else else
dbg_msg("chat", "*** %s", msg); dbg_msg("chat", "*** %s", text);
if(team == -1) if(team == -1)
{ {
msg_pack_start(MSG_CHAT, MSGFLAG_VITAL); NETMSG_SV_CHAT msg;
msg_pack_int(cid); msg.team = 0;
msg_pack_int(0); msg.cid = cid;
msg_pack_string(msg, 512); msg.message = text;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
server_send_msg(-1); server_send_msg(-1);
} }
else else
{ {
msg_pack_start(MSG_CHAT, MSGFLAG_VITAL); NETMSG_SV_CHAT msg;
msg_pack_int(cid); msg.team = 1;
msg_pack_int(1); msg.cid = cid;
msg_pack_string(msg, 512); msg.message = text;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
for(int i = 0; i < MAX_CLIENTS; i++) for(int i = 0; i < MAX_CLIENTS; i++)
{ {
@ -63,7 +63,7 @@ void send_chat(int cid, int team, const char *msg)
void send_tuning_params(int cid) void send_tuning_params(int cid)
{ {
msg_pack_start(MSG_TUNE_PARAMS, MSGFLAG_VITAL); msg_pack_start(NETMSGTYPE_SV_TUNE_PARAMS, MSGFLAG_VITAL);
int *params = (int *)&tuning; int *params = (int *)&tuning;
for(unsigned i = 0; i < sizeof(tuning_params)/sizeof(int); i++) for(unsigned i = 0; i < sizeof(tuning_params)/sizeof(int); i++)
msg_pack_int(params[i]); msg_pack_int(params[i]);
@ -1022,7 +1022,7 @@ void player::fire_weapon()
NETOBJ_PROJECTILE p; NETOBJ_PROJECTILE p;
proj->fill_info(&p); proj->fill_info(&p);
msg_pack_start(MSG_EXTRA_PROJECTILE, 0); msg_pack_start(NETMSGTYPE_SV_EXTRA_PROJECTILE, 0);
msg_pack_int(1); msg_pack_int(1);
for(unsigned i = 0; i < sizeof(NETOBJ_PROJECTILE)/sizeof(int); i++) for(unsigned i = 0; i < sizeof(NETOBJ_PROJECTILE)/sizeof(int); i++)
msg_pack_int(((int *)&p)[i]); msg_pack_int(((int *)&p)[i]);
@ -1046,7 +1046,7 @@ void player::fire_weapon()
NETOBJ_PROJECTILE p; NETOBJ_PROJECTILE p;
proj->fill_info(&p); proj->fill_info(&p);
msg_pack_start(MSG_EXTRA_PROJECTILE, 0); msg_pack_start(NETMSGTYPE_SV_EXTRA_PROJECTILE, 0);
msg_pack_int(1); msg_pack_int(1);
for(unsigned i = 0; i < sizeof(NETOBJ_PROJECTILE)/sizeof(int); i++) for(unsigned i = 0; i < sizeof(NETOBJ_PROJECTILE)/sizeof(int); i++)
msg_pack_int(((int *)&p)[i]); msg_pack_int(((int *)&p)[i]);
@ -1060,7 +1060,7 @@ void player::fire_weapon()
{ {
int shotspread = 2; int shotspread = 2;
msg_pack_start(MSG_EXTRA_PROJECTILE, 0); msg_pack_start(NETMSGTYPE_SV_EXTRA_PROJECTILE, 0);
msg_pack_int(shotspread*2+1); msg_pack_int(shotspread*2+1);
for(int i = -shotspread; i <= shotspread; i++) for(int i = -shotspread; i <= shotspread; i++)
@ -1507,12 +1507,12 @@ void player::die(int killer, int weapon)
client_id, server_clientname(client_id), weapon, mode_special); client_id, server_clientname(client_id), weapon, mode_special);
// send the kill message // send the kill message
msg_pack_start(MSG_KILLMSG, MSGFLAG_VITAL); NETMSG_SV_KILLMSG msg;
msg_pack_int(killer); msg.killer = killer;
msg_pack_int(client_id); msg.victim = client_id;
msg_pack_int(weapon); msg.weapon = weapon;
msg_pack_int(mode_special); msg.mode_special = mode_special;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
server_send_msg(-1); server_send_msg(-1);
// a nice sound // a nice sound
@ -1939,8 +1939,9 @@ void create_sound_global(int sound, int target)
if (sound < 0) if (sound < 0)
return; return;
msg_pack_start(MSG_SOUND_GLOBAL, MSGFLAG_VITAL); NETMSG_SV_SOUND_GLOBAL msg;
msg_pack_int(sound); msg.soundid = sound;
msg.pack(MSGFLAG_VITAL);
server_send_msg(target); server_send_msg(target);
} }
@ -2097,31 +2098,32 @@ void mods_client_predicted_input(int client_id, void *input)
void send_info(int who, int to_who) void send_info(int who, int to_who)
{ {
msg_pack_start(MSG_SETINFO, MSGFLAG_VITAL); NETMSG_SV_SETINFO msg;
msg_pack_int(who); msg.cid = who;
msg_pack_string(server_clientname(who), 64); msg.name = server_clientname(who);
msg_pack_string(players[who].skin_name, 64); msg.skin = players[who].skin_name;
msg_pack_int(players[who].use_custom_color); msg.use_custom_color = players[who].use_custom_color;
msg_pack_int(players[who].color_body); msg.color_body = players[who].color_body;
msg_pack_int(players[who].color_feet); msg.color_feet =players[who].color_feet;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
server_send_msg(to_who); server_send_msg(to_who);
} }
void send_emoticon(int cid, int emoticon) void send_emoticon(int cid, int emoticon)
{ {
msg_pack_start(MSG_EMOTICON, MSGFLAG_VITAL); NETMSG_SV_EMOTICON msg;
msg_pack_int(cid); msg.cid = cid;
msg_pack_int(emoticon % 16); msg.emoticon = emoticon;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
server_send_msg(-1); server_send_msg(-1);
} }
void send_weapon_pickup(int cid, int weapon) void send_weapon_pickup(int cid, int weapon)
{ {
msg_pack_start(MSG_WEAPON_PICKUP, MSGFLAG_VITAL); NETMSG_SV_WEAPON_PICKUP msg;
msg_pack_int(weapon); msg.weapon = weapon;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
server_send_msg(cid); server_send_msg(cid);
} }
@ -2158,10 +2160,10 @@ void mods_connected(int client_id)
players[client_id].team = gameobj->getteam(client_id); players[client_id].team = gameobj->getteam(client_id);
} }
// send motd // send motd
msg_pack_start(MSG_MOTD, MSGFLAG_VITAL); NETMSG_SV_MOTD msg;
msg_pack_string(config.sv_motd, 900); msg.message = config.sv_motd;
msg_pack_end(); msg.pack(MSGFLAG_VITAL);
server_send_msg(client_id); server_send_msg(client_id);
} }
@ -2179,22 +2181,32 @@ void mods_client_drop(int client_id)
players[client_id].client_id = -1; players[client_id].client_id = -1;
} }
void mods_message(int msg, int client_id) void mods_message(int msgtype, int client_id)
{ {
if(msg == MSG_SAY) void *rawmsg = netmsg_secure_unpack(msgtype);
if(!rawmsg)
{ {
int team = msg_unpack_int(); dbg_msg("server", "dropped weird message '%s' (%d)", netmsg_get_name(msgtype), msgtype);
const char *text = msg_unpack_string(); return;
}
if(msgtype == NETMSGTYPE_CL_SAY)
{
NETMSG_CL_SAY *msg = (NETMSG_CL_SAY *)rawmsg;
int team = msg->team;
if(team) if(team)
team = players[client_id].team; team = players[client_id].team;
else else
team = -1; team = -1;
send_chat(client_id, team, text); send_chat(client_id, msg->team, msg->message);
} }
else if (msg == MSG_SETTEAM) else if (msgtype == NETMSGTYPE_CL_SETTEAM)
{ {
NETMSG_CL_SETTEAM *msg = (NETMSG_CL_SETTEAM *)rawmsg;
// Switch team on given client and kill/respawn him // Switch team on given client and kill/respawn him
players[client_id].set_team(msg_unpack_int()); players[client_id].set_team(msg->team);
gameobj->on_player_info_change(&players[client_id]); gameobj->on_player_info_change(&players[client_id]);
// send all info to this client // send all info to this client
@ -2204,38 +2216,38 @@ void mods_message(int msg, int client_id)
send_info(i, -1); send_info(i, -1);
} }
} }
else if (msg == MSG_CHANGEINFO || msg == MSG_STARTINFO) else if (msgtype == NETMSGTYPE_CL_CHANGEINFO || msgtype == NETMSGTYPE_CL_STARTINFO)
{ {
const char *name = msg_unpack_string(); NETMSG_CL_CHANGEINFO *msg = (NETMSG_CL_CHANGEINFO *)rawmsg;
const char *skin_name = msg_unpack_string(); players[client_id].use_custom_color = msg->use_custom_color;
players[client_id].use_custom_color = msg_unpack_int(); players[client_id].color_body = msg->color_body;
players[client_id].color_body = msg_unpack_int(); players[client_id].color_feet = msg->color_feet;
players[client_id].color_feet = msg_unpack_int();
// check for invalid chars // check for invalid chars
/*
unsigned char *p = (unsigned char *)name; unsigned char *p = (unsigned char *)name;
while (*p) while (*p)
{ {
if(*p < 32) if(*p < 32)
*p = ' '; *p = ' ';
p++; p++;
} }*/
// //
if(msg == MSG_CHANGEINFO && strcmp(name, server_clientname(client_id)) != 0) if(msgtype == NETMSGTYPE_CL_CHANGEINFO && strcmp(msg->name, server_clientname(client_id)) != 0)
{ {
char msg[256]; char chattext[256];
str_format(msg, sizeof(msg), "*** %s changed name to %s", server_clientname(client_id), name); str_format(chattext, sizeof(chattext), "*** %s changed name to %s", server_clientname(client_id), msg->name);
send_chat(-1, -1, msg); send_chat(-1, -1, chattext);
} }
//send_set_name(client_id, players[client_id].name, name); //send_set_name(client_id, players[client_id].name, name);
str_copy(players[client_id].skin_name, skin_name, sizeof(players[client_id].skin_name)); str_copy(players[client_id].skin_name, msg->skin, sizeof(players[client_id].skin_name));
server_setclientname(client_id, name); server_setclientname(client_id, msg->name);
gameobj->on_player_info_change(&players[client_id]); gameobj->on_player_info_change(&players[client_id]);
if(msg == MSG_STARTINFO) if(msgtype == NETMSGTYPE_CL_STARTINFO)
{ {
// a client that connected! // a client that connected!
@ -2250,22 +2262,20 @@ void mods_message(int msg, int client_id)
send_tuning_params(client_id); send_tuning_params(client_id);
// //
msg_pack_start(MSG_READY_TO_ENTER, MSGFLAG_VITAL); NETMSG_SV_READY_TO_ENTER m;
msg_pack_end(); m.pack(MSGFLAG_VITAL);
server_send_msg(client_id); server_send_msg(client_id);
} }
send_info(client_id, -1); send_info(client_id, -1);
} }
else if (msg == MSG_EMOTICON) else if (msgtype == NETMSGTYPE_CL_EMOTICON)
{ {
int emoteicon = msg_unpack_int(); NETMSG_CL_EMOTICON *msg = (NETMSG_CL_EMOTICON *)rawmsg;
send_emoticon(client_id, emoteicon % 16); send_emoticon(client_id, msg->emoticon);
} }
else if (msg == MSG_KILL) else if (msgtype == NETMSGTYPE_CL_KILL)
{ {
//int kill_client_id = msg_unpack_int(); // to be used to kill players from rcon? hihi
player *pplayer = get_player(client_id); player *pplayer = get_player(client_id);
pplayer->die(client_id, -1); pplayer->die(client_id, -1);
} }