--- deliantra/server/socket/lowlevel.C 2009/10/13 18:20:08 1.72 +++ deliantra/server/socket/lowlevel.C 2012/01/03 11:25:37 1.84 @@ -1,8 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -56,9 +55,9 @@ { if (last_send + IDLE_PING <= NOW && pl && pl->active) { - // this is a bit ugly, but map1/map1a seem to be the only - // nop'able commands and they are quite small. - packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); + // this is a bit ugly, but map1a seems to be the only + // nop'able command and it is quite small. + packet sl ("map1a"); send_packet (sl); } else @@ -160,6 +159,12 @@ #define SC(cb) (void *)static_cast(cb), #define PC(cb) (void *)static_cast(cb), PF_PLAYER | +static void +NopCmd (char *, int, client *) +{ + // do nothing +} + /** * Dispatch table for the server. */ @@ -174,19 +179,20 @@ {"lock", PC(LockItem) PF_PLAYING }, {"mark", PC(MarkItem) PF_PLAYING }, {"move", PC(MoveCmd) PF_PLAYING }, - {"ext", PC(ExtCmd) 0 }, // CF+ + {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra {"mapredraw", PC(MapRedrawCmd) 0 }, - {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ + {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra {"reply", SC(ReplyCmd) 0 }, - {"exti", SC(ExtiCmd) 0 }, // CF+ + {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra {"addme", SC(AddMeCmd) 0 }, {"askface", SC(AskFaceCmd) 0 }, {"requestinfo", SC(RequestInfo) 0 }, {"setsound", SC(SetSound) 0 }, {"setup", SC(SetUp) 0 }, {"version", SC(VersionCmd) 0 }, - {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ + + {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled }; bool @@ -234,7 +240,10 @@ { //TODO: only one format if (pkt->flags & PF_PLAYER) - ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); + { + ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); + pl->need_updated_stats (); + } else ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); } @@ -279,7 +288,7 @@ datalen = 0; } - for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) + for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt) if (!strcmp ((char *)inbuf + 2, pkt->name)) { if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) @@ -521,7 +530,7 @@ packet &packet::operator <<(const ber32 v) { - enum { maxlen = 32 / 7 + 1}; + enum { maxlen = 32 / 7 + 1 }; uint8 buf[maxlen]; uint8 *p = buf + maxlen; uint32 val = v.val;