ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.87 by root, Thu Apr 19 11:12:46 2007 UTC vs.
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
145/** check for map/region change and send new map data */ 146/** check for map/region change and send new map data */
146static void 147static void
147check_map_change (player *pl) 148check_map_change (player *pl)
148{ 149{
149 client &socket = *pl->ns; 150 client &socket = *pl->ns;
150 object *ob = pl->ob; 151 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */ 152
153 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map)
155 {
156 rv_vector rv;
157
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159
160 // manhattan distance is very handy here
161 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
162 {
163 socket.current_map = ob->map;
164 socket.current_x = ob->x;
165 socket.current_y = ob->y;
166
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset ();
169 }
170 }
152 171
153 if (socket.current_map != ob->map || socket.force_newmap) 172 if (socket.current_map != ob->map || socket.force_newmap)
154 { 173 {
155 clear_map (pl); 174 clear_map (pl);
156 socket.current_map = ob->map; 175 socket.current_map = ob->map;
… …
159 { 178 {
160 if (ob->map && ob->map->path[0]) 179 if (ob->map && ob->map->path[0])
161 { 180 {
162 int flags = 0; 181 int flags = 0;
163 182
164 if (ob->map->tile_path[0]) 183 if (ob->map->tile_path[0]) flags |= 1;
165 flags |= 1;
166 if (ob->map->tile_path[1]) 184 if (ob->map->tile_path[1]) flags |= 2;
167 flags |= 2;
168 if (ob->map->tile_path[2]) 185 if (ob->map->tile_path[2]) flags |= 4;
169 flags |= 4;
170 if (ob->map->tile_path[3]) 186 if (ob->map->tile_path[3]) flags |= 8;
171 flags |= 8;
172 187
173 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 188 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
174 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 189 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
190 ob->map->width, ob->map->height, &ob->map->path);
175 } 191 }
176 else 192 else
177 snprintf (buf, MAX_BUF, "mapinfo current");
178
179 socket.send_packet (buf); 193 socket.send_packet ("mapinfo current");
180 } 194 }
181 } 195 }
182 else if (socket.current_x != ob->x || socket.current_y != ob->y) 196 else if (socket.current_x != ob->x || socket.current_y != ob->y)
183 { 197 {
184 int dx = ob->x - socket.current_x; 198 int dx = ob->x - socket.current_x;
… …
197 socket.current_y = ob->y; 211 socket.current_y = ob->y;
198 212
199 region *reg = ob->region (); 213 region *reg = ob->region ();
200 if (socket.current_region != reg) 214 if (socket.current_region != reg)
201 { 215 {
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
202 socket.current_region = reg; 217 socket.current_region = reg;
203 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
204 } 218 }
205} 219}
206 220
207/** 221/**
208 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
210 * that information. 224 * that information.
211 */ 225 */
212void 226void
213RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
214{ 228{
215 char *params = NULL, *cp; 229 char *params;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227 230
228 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
229 * params pointer. 232 * params pointer.
230 */ 233 */
231 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
232 if (*cp == ' ') 235 if (*params == ' ')
233 { 236 {
234 *cp = '\0';
235 params = cp + 1; 237 *params++ = 0;
236 break; 238 break;
237 } 239 }
238 240
239 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 246 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
247 else 249 else
248 ns->send_packet (bigbuf, len); 250 {
251 // undo tokenisation above and send replyinfo with the request unchanged
252 if (*params)
253 *--params = ' ';
254
255 ns->send_packet_printf ("replyinfo %s", buf);
256 }
249} 257}
250 258
251void 259void
252ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
253{ 261{
… …
256 264
257void 265void
258ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
259{ 267{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
298 if (!map->tile_path [dir])
299 map = 0;
300 else if (map->tile_available (dir, false))
301 {
302 maptile *neigh = map->tile_map [dir];
303
304 switch (dir)
305 {
306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
317 }
318 else
319 max_distance = 0;
320 }
321
322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
352 }
353 else
354 ++i;
261} 355}
262 356
263void 357void
264MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
265{ 359{
266 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
268 362
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 363 char *token = buf;
272 // copy token 364
273 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
274 return; 366 return;
275 367
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
279 { 369 {
280 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
281 372
282 // initial map and its origin 373#if 0
283 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = map->xy_find (dx, dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = map->xy_find (dx, dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 }
341 else 377 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
343 } 380 }
344 else 381 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 383}
349 384
350/** This is the Setup cmd */ 385/** This is the Setup cmd */
351void 386void
352SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
… …
481 516
482 ns->send_packet (cmdback); 517 ns->send_packet (cmdback);
483} 518}
484 519
485/** 520/**
486 * client requested an image. send it rate-limited
487 * before flushing.
488 */
489void
490AskFaceCmd (char *buf, int len, client *ns)
491{
492 ns->askface.push_back (atoi (buf));
493}
494
495/**
496 * Tells client the picture it has to use
497 * to smooth a picture number given as argument.
498 */
499void
500AskSmooth (char *buf, int len, client *ns)
501{
502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
504}
505
506/**
507 * This handles the general commands from the client (ie, north, fire, cast, 521 * This handles the general commands from the client (ie, north, fire, cast,
508 * etc.) 522 * etc.)
509 */ 523 */
510void 524void
511PlayerCmd (char *buf, int len, player *pl) 525PlayerCmd (char *buf, int len, player *pl)
… …
532 * commands. 546 * commands.
533 */ 547 */
534 pl->count = 0; 548 pl->count = 0;
535} 549}
536 550
537
538/** 551/**
539 * This handles the general commands from the client (ie, north, fire, cast, 552 * This handles the general commands from the client (ie, north, fire, cast,
540 * etc.). It is a lot like PlayerCmd above, but is called with the 553 * etc.). It is a lot like PlayerCmd above, but is called with the
541 * 'ncom' method which gives more information back to the client so it 554 * 'ncom' method which gives more information back to the client so it
542 * can throttle. 555 * can throttle.
… …
544void 557void
545NewPlayerCmd (char *buf, int len, player *pl) 558NewPlayerCmd (char *buf, int len, player *pl)
546{ 559{
547 if (len <= 6) 560 if (len <= 6)
548 { 561 {
549 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 562 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
550 return; 563 return;
551 } 564 }
552 565
553 uint16 cmdid = net_uint16 ((uint8 *)buf); 566 uint16 cmdid = net_uint16 ((uint8 *)buf);
554 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 567 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
611 { 624 {
612 case ST_PLAYING: 625 case ST_PLAYING:
613 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 626 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
614 break; 627 break;
615 628
616 case ST_CHANGE_CLASS:
617 key_change_class (pl->ob, buf[0]);
618 break;
619
620 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 629 case ST_GET_PARTY_PASSWORD: /* Get password for party */
621 receive_party_password (pl->ob, 13); 630 receive_party_password (pl->ob, 13);
622 break; 631 break;
623 632
624 default: 633 default:
… …
663 672
664 cp = strchr (cp + 1, ' '); 673 cp = strchr (cp + 1, ' ');
665 674
666 if (cp) 675 if (cp)
667 { 676 {
668 assign (ns->version, cp + 1); 677 ns->version = cp + 1;
669 678
670 if (ns->sc_version < 1026) 679 if (ns->sc_version < 1026)
671 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 680 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
672 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 681 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
673 } 682 }
… …
696 * syntax is: move (to) (tag) (nrof) 705 * syntax is: move (to) (tag) (nrof)
697 */ 706 */
698void 707void
699MoveCmd (char *buf, int len, player *pl) 708MoveCmd (char *buf, int len, player *pl)
700{ 709{
701 int vals[3], i; 710 int to, tag, nrof;
702 711
703 /* A little funky here. We only cycle for 2 records, because 712 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
704 * we obviously are not going to find a space after the third
705 * record. Perhaps we should just replace this with a
706 * sscanf?
707 */
708 for (i = 0; i < 2; i++)
709 { 713 {
710 vals[i] = atoi (buf);
711
712 if (!(buf = strchr (buf, ' ')))
713 {
714 LOG (llevError, "Incomplete move command: %s\n", buf); 714 LOG (llevError, "Incomplete move command: %s\n", buf);
715 return; 715 return;
716 }
717
718 buf++;
719 } 716 }
720 717
721 vals[2] = atoi (buf); 718 esrv_move_object (pl->ob, to, tag, nrof);
722
723/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
724 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
725} 719}
726 720
727/****************************************************************************** 721/******************************************************************************
728 * 722 *
729 * Start of commands the server sends to the client. 723 * Start of commands the server sends to the client.
… …
738send_query (client *ns, uint8 flags, const char *text) 732send_query (client *ns, uint8 flags, const char *text)
739{ 733{
740 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 734 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
741} 735}
742 736
737/**
738 * Get player's current range attack in obuf.
739 */
740static void
741rangetostring (player *pl, char *obuf)
742{
743 dynbuf_text buf;
744
745 if (pl->ranged_ob)
746 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747
748 if (pl->combat_ob)
749 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
750
751#if 0
752 //TODO: remove this when slot system is working, this is only for debugging
753 if (pl->ob->chosen_skill)
754 buf << " Skill*: " << pl->ob->chosen_skill->name;
755#endif
756
757 //TODO: maybe golem should become the current_weapon, quite simply?
758 if (pl->golem)
759 buf << " Golem*: " << pl->golem->name;
760
761 buf << '\0';
762 buf.linearise (obuf);
763}
764
743#define AddIfInt64(Old,New,Type) if (Old != New) {\ 765#define AddIfInt64(Old,New,Type) if (Old != New) {\
744 Old = New; \ 766 Old = New; \
745 sl << uint8 (Type) << uint64 (New); \ 767 sl << uint8 (Type) << uint64 (New); \
746 } 768 }
747 769
… …
753#define AddIfShort(Old,New,Type) if (Old != New) {\ 775#define AddIfShort(Old,New,Type) if (Old != New) {\
754 Old = New; \ 776 Old = New; \
755 sl << uint8 (Type) << uint16 (New); \ 777 sl << uint8 (Type) << uint16 (New); \
756 } 778 }
757 779
758#define AddIfFloat(Old,New,Type) if (Old != New) {\ 780#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
759 Old = New; \ 781 Old = New; \
760 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 782 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
761 } 783 }
762 784
763#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 785#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
764 free(Old); Old = strdup (New);\ 786 free(Old); Old = strdup (New);\
765 sl << uint8 (Type) << data8 (New); \ 787 sl << uint8 (Type) << data8 (New); \
… …
779 801
780 client *ns = pl->ns; 802 client *ns = pl->ns;
781 if (!ns) 803 if (!ns)
782 return; 804 return;
783 805
784 object *ob = pl->ob; 806 object *ob = pl->observe;
785 if (!ob) 807 if (!ob)
786 return; 808 return;
809
810 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
787 811
788 packet sl ("stats"); 812 packet sl ("stats");
789 813
790 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 814 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
791 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 815 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
800 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
801 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
802 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
803 827
804 for (int s = 0; s < NUM_SKILLS; s++) 828 for (int s = 0; s < NUM_SKILLS; s++)
805 if (object *skill = pl->last_skill_ob[s]) 829 if (object *skill = opl->last_skill_ob[s])
806 if (skill->stats.exp != ns->last_skill_exp [s]) 830 if (skill->stats.exp != ns->last_skill_exp [s])
807 { 831 {
808 ns->last_skill_exp [s] = skill->stats.exp; 832 ns->last_skill_exp [s] = skill->stats.exp;
809 833
810 /* Always send along the level if exp changes. This is only 834 /* Always send along the level if exp changes. This is only
… …
818 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 842 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
819 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 843 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
820 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 844 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
821 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 845 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
822 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 846 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
823 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 847 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
824 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 848 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
825 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 849 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
826 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 850 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
827 851
828 flags = 0; 852 flags = 0;
829 853
830 if (pl->fire_on) 854 if (opl->fire_on)
831 flags |= SF_FIREON; 855 flags |= SF_FIREON;
832 856
833 if (pl->run_on) 857 if (opl->run_on)
834 flags |= SF_RUNON; 858 flags |= SF_RUNON;
835 859
836 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 860 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
837 861
838 if (ns->sc_version < 1025) 862 if (ns->sc_version < 1025)
… …
852 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 876 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
853 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 877 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
854 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 878 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
855 } 879 }
856 880
857 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 881 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
858 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 882 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
859 set_title (ob, buf); 883 set_title (ob, buf);
860 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 884 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
861 885
862 /* Only send it away if we have some actual data */ 886 /* Only send it away if we have some actual data */
… …
866 890
867/** 891/**
868 * Tells the client that here is a player it should start using. 892 * Tells the client that here is a player it should start using.
869 */ 893 */
870void 894void
871esrv_new_player (player *pl, uint32 weight) 895esrv_new_player (player *pl)
872{ 896{
897 sint32 weight = pl->ob->client_weight ();
898
873 packet sl ("player"); 899 packet sl ("player");
874 900
875 sl << uint32 (pl->ob->count) 901 sl << uint32 (pl->ob->count)
876 << uint32 (weight) 902 << uint32 (weight)
877 << uint32 (pl->ob->face) 903 << uint32 (pl->ob->face)
… …
944 970
945 if (!ns.faces_sent[face_num]) 971 if (!ns.faces_sent[face_num])
946 if (ob) 972 if (ob)
947 ns.send_faces (ob); 973 ns.send_faces (ob);
948 else 974 else
949 ns.send_face (face_num); 975 ns.send_face (face_num, 10);
950 976
951 sl << uint16 (face_num); 977 sl << uint16 (face_num);
952 return 1; 978 return 1;
953 } 979 }
954 980
… …
996{ 1022{
997 prefetch_surrounding_maps (op->map, 3); 1023 prefetch_surrounding_maps (op->map, 3);
998} 1024}
999 1025
1000/** 1026/**
1001 * This function uses the new map1 protocol command to send the map 1027 * Draws client map.
1002 * to the client. It is necessary because the old map command supports
1003 * a maximum map size of 15x15.
1004 * This function is much simpler than the old one. This is because
1005 * the old function optimized to send as few face identifiers as possible,
1006 * at the expense of sending more coordinate location (coordinates were
1007 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1008 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1009 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1010 * and use the other 4 bits for other informatiion. For full documentation
1011 * of what we send, see the doc/Protocol file.
1012 * I will describe internally what we do:
1013 * the ns->lastmap shows how the map last looked when sent to the client.
1014 * in the lastmap structure, there is a cells array, which is set to the
1015 * maximum viewable size (As set in config.h).
1016 * in the cells, there are faces and a count value.
1017 * we use the count value to hold the darkness value. If -1, then this space
1018 * is not viewable.
1019 * we use faces[0] faces[1] faces[2] to hold what the three layers
1020 * look like.
1021 */ 1028 */
1022void 1029void
1023draw_client_map1 (object *pl) 1030draw_client_map (player *pl)
1024{ 1031{
1032 object *ob = pl->observe;
1033 if (!ob->active)
1034 return;
1035
1036 maptile *plmap = ob->map;
1037
1038 /* If player is just joining the game, he isn't here yet, so the map
1039 * can get swapped out. If so, don't try to send them a map. All will
1040 * be OK once they really log in.
1041 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1043 return;
1044
1025 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1026 sint16 nx, ny;
1027 int estartlen, eoldlen; 1046 int estartlen, eoldlen;
1028 uint8 eentrysize; 1047 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag; 1048 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos; 1049 uint8 extendedinfos;
1031 maptile *m;
1032 1050
1033 client &socket = *pl->contr->ns;
1034
1035 if (!pl->active)
1036 return;
1037
1038 check_map_change (pl->contr); 1051 check_map_change (pl);
1039 prefetch_surrounding_maps (pl); 1052 prefetch_surrounding_maps (pl->ob);
1053
1054 /* do LOS after calls to update_position */
1055 if (ob != pl->ob)
1056 clear_los (pl);
1057 else if (pl->do_los)
1058 {
1059 update_los (ob);
1060 pl->do_los = 0;
1061 }
1062
1063 /**
1064 * This function uses the new map1 protocol command to send the map
1065 * to the client. It is necessary because the old map command supports
1066 * a maximum map size of 15x15.
1067 * This function is much simpler than the old one. This is because
1068 * the old function optimized to send as few face identifiers as possible,
1069 * at the expense of sending more coordinate location (coordinates were
1070 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1071 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1072 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1073 * and use the other 4 bits for other informatiion. For full documentation
1074 * of what we send, see the doc/Protocol file.
1075 * I will describe internally what we do:
1076 * the ns->lastmap shows how the map last looked when sent to the client.
1077 * in the lastmap structure, there is a cells array, which is set to the
1078 * maximum viewable size (As set in config.h).
1079 * in the cells, there are faces and a count value.
1080 * we use the count value to hold the darkness value. If -1, then this space
1081 * is not viewable.
1082 * we use faces[0] faces[1] faces[2] to hold what the three layers
1083 * look like.
1084 */
1085
1086 client &socket = *pl->ns;
1040 1087
1041 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1042 packet esl; 1089 packet esl;
1043 1090
1044 startlen = sl.length (); 1091 startlen = sl.length ();
… …
1068 ay = 0; 1115 ay = 0;
1069 1116
1070 /* We could do this logic as conditionals in the if statement, 1117 /* We could do this logic as conditionals in the if statement,
1071 * but that started to get a bit messy to look at. 1118 * but that started to get a bit messy to look at.
1072 */ 1119 */
1073 max_x = pl->x + (socket.mapx + 1) / 2; 1120 max_x = ob->x + (socket.mapx + 1) / 2;
1074 max_y = pl->y + (socket.mapy + 1) / 2; 1121 max_y = ob->y + (socket.mapy + 1) / 2;
1075 1122
1076 maptile *plmap = pl->map;
1077
1078 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1123 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1079 { 1124 {
1125 sint16 nx, ny;
1126 maptile *m = 0;
1127
1080 ax = 0; 1128 ax = 0;
1081 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1082 { 1130 {
1131 // check to see if we can simply go one right quickly
1132 ++nx;
1133 if (m && nx >= m->width)
1134 m = 0;
1135
1136 if (!m)
1137 {
1138 nx = x; ny = y; m = plmap;
1139
1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1143 m = 0;
1144 }
1145
1083 int emask, mask; 1146 int emask, mask;
1084 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1085 1148
1086 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1149 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1087 1150
1088 /* If the coordinates are not valid, or it is too dark to see, 1151 /* If the coordinates are not valid, or it is too dark to see,
1089 * we tell the client as such 1152 * we tell the client as such
1090 */ 1153 */
1091 nx = x;
1092 ny = y;
1093 m = get_map_from_coord (plmap, &nx, &ny);
1094
1095 if (!m) 1154 if (!m)
1096 { 1155 {
1097 /* space is out of map. Update space and clear values 1156 /* space is out of map. Update space and clear values
1098 * if this hasn't already been done. If the space is out 1157 * if this hasn't already been done. If the space is out
1099 * of the map, it shouldn't have a head 1158 * of the map, it shouldn't have a head
… …
1105 } 1164 }
1106 1165
1107 continue; 1166 continue;
1108 } 1167 }
1109 1168
1110 m->touch ();
1111
1112 int d = pl->contr->blocked_los[ax][ay]; 1169 int d = pl->blocked_los[ax][ay];
1113 1170
1114 if (d > 3) 1171 if (d > 3)
1115 { 1172 {
1116 1173
1117 int need_send = 0, count; 1174 int need_send = 0, count;
… …
1180 } 1237 }
1181 1238
1182 lastcell.count = d; 1239 lastcell.count = d;
1183 1240
1184 mapspace &ms = m->at (nx, ny); 1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1185 1243
1186 if (socket.extmap) 1244 if (socket.extmap)
1187 { 1245 {
1188 uint8 stat_hp = 0; 1246 uint8 stat_hp = 0;
1189 uint8 stat_width = 0; 1247 uint8 stat_width = 0;
1190 uint8 flags = 0; 1248 uint8 flags = 0;
1191 tag_t player = 0; 1249 tag_t player = 0;
1192 1250
1193 // send hp information, if applicable 1251 // send hp information, if applicable
1194 if (object *op = ms.faces_obj [0]) 1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1195 { 1254 {
1196 if (op->head || op->invisible) 1255 if (op->stats.maxhp > op->stats.hp
1197 ; // do not show 1256 && op->stats.maxhp > 0
1198 else if (op->type == PLAYER 1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1199 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1259 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1200 {
1201 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1202 { 1260 {
1203 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1204 stat_width = op->arch->tail_x; 1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1205 } 1263 }
1206 }
1207 1264
1208 if (op->msg && op->msg[0] == '@') 1265 if (op->msg && op->msg[0] == '@')
1209 flags |= 1; 1266 flags |= 1;
1210 1267
1211 if (op->type == PLAYER && op != pl) 1268 if (op->type == PLAYER && op != ob)
1212 player = op->count; 1269 player = op->count;
1213 } 1270 }
1214 1271
1215 if (lastcell.stat_hp != stat_hp) 1272 if (lastcell.stat_hp != stat_hp)
1216 { 1273 {
1217 lastcell.stat_hp = stat_hp; 1274 lastcell.stat_hp = stat_hp;
1218 1275
… …
1260 1317
1261 /* Middle face */ 1318 /* Middle face */
1262 if (update_space (sl, socket, ms, lastcell, 1)) 1319 if (update_space (sl, socket, ms, lastcell, 1))
1263 mask |= 0x2; 1320 mask |= 0x2;
1264 1321
1265 if (ms.player () == pl 1322 if (ms.player () == ob
1266 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1267 { 1324 {
1268 // force player to be visible to himself if invisible 1325 // force player to be visible to himself if invisible
1269 if (lastcell.faces[0] != pl->face) 1326 if (lastcell.faces[0] != ob->face)
1270 { 1327 {
1271 lastcell.faces[0] = pl->face; 1328 lastcell.faces[0] = ob->face;
1272 1329
1273 mask |= 0x1; 1330 mask |= 0x1;
1274 sl << uint16 (pl->face); 1331 sl << uint16 (ob->face);
1275 1332
1276 socket.send_faces (pl); 1333 socket.send_faces (ob);
1277 } 1334 }
1278 } 1335 }
1279 /* Top face */ 1336 /* Top face */
1280 else if (update_space (sl, socket, ms, lastcell, 0)) 1337 else if (update_space (sl, socket, ms, lastcell, 0))
1281 mask |= 0x1; 1338 mask |= 0x1;
1282
1283 1339
1284 /* Check to see if we are in fact sending anything for this 1340 /* Check to see if we are in fact sending anything for this
1285 * space by checking the mask. If so, update the mask. 1341 * space by checking the mask. If so, update the mask.
1286 * if not, reset the len to that from before adding the mask 1342 * if not, reset the len to that from before adding the mask
1287 * value, so we don't send those bits. 1343 * value, so we don't send those bits.
… …
1346 socket.send_packet (sl); 1402 socket.send_packet (sl);
1347 socket.sent_scroll = 0; 1403 socket.sent_scroll = 0;
1348 } 1404 }
1349} 1405}
1350 1406
1351/**
1352 * Draws client map.
1353 */
1354void
1355draw_client_map (object *pl)
1356{
1357 int i, j;
1358 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1359 int mflags;
1360 struct Map newmap;
1361 maptile *m, *pm;
1362
1363 if (pl->type != PLAYER)
1364 {
1365 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1366 return;
1367 }
1368
1369 pm = pl->map;
1370
1371 /* If player is just joining the game, he isn't here yet, so the map
1372 * can get swapped out. If so, don't try to send them a map. All will
1373 * be OK once they really log in.
1374 */
1375 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1376 return;
1377
1378 memset (&newmap, 0, sizeof (struct Map));
1379
1380 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1381 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1382 {
1383 ax = i;
1384 ay = j;
1385 m = pm;
1386 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1387
1388 if (mflags & P_OUT_OF_MAP)
1389 continue;
1390
1391 /* If a map is visible to the player, we don't want to swap it out
1392 * just to reload it. This should really call something like
1393 * swap_map, but this is much more efficient and 'good enough'
1394 */
1395 if (mflags & P_NEW_MAP)
1396 m->timeout = 50;
1397 }
1398
1399 /* do LOS after calls to update_position */
1400 if (pl->contr->do_los)
1401 {
1402 update_los (pl);
1403 pl->contr->do_los = 0;
1404 }
1405
1406 /* Big maps need a different drawing mechanism to work */
1407 draw_client_map1 (pl);
1408}
1409
1410
1411/*****************************************************************************/ 1407/*****************************************************************************/
1412
1413/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1408/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1414
1415/* a player. Of course, the client need to know the command to be able to */ 1409/* a player. Of course, the client need to know the command to be able to */
1416
1417/* manage it ! */ 1410/* manage it ! */
1418
1419/*****************************************************************************/ 1411/*****************************************************************************/
1420void 1412void
1421send_plugin_custom_message (object *pl, char *buf) 1413send_plugin_custom_message (object *pl, char *buf)
1422{ 1414{
1423 pl->contr->ns->send_packet (buf); 1415 pl->contr->ns->send_packet (buf);
… …
1434 sl << "replyinfo skill_info\n"; 1426 sl << "replyinfo skill_info\n";
1435 1427
1436 for (int i = 1; i < NUM_SKILLS; i++) 1428 for (int i = 1; i < NUM_SKILLS; i++)
1437 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1438 1430
1439 if (sl.length () >= MAXSOCKBUF) 1431 if (sl.length () > MAXSOCKBUF)
1440 { 1432 {
1441 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1442 fatal (0); 1434 fatal (0);
1443 } 1435 }
1444 1436
… …
1457 sl << "replyinfo spell_paths\n"; 1449 sl << "replyinfo spell_paths\n";
1458 1450
1459 for (int i = 0; i < NRSPELLPATHS; i++) 1451 for (int i = 0; i < NRSPELLPATHS; i++)
1460 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1461 1453
1462 if (sl.length () >= MAXSOCKBUF) 1454 if (sl.length () > MAXSOCKBUF)
1463 { 1455 {
1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465 fatal (0); 1457 fatal (0);
1466 } 1458 }
1467 1459
… …
1575 if (!spell->face) 1567 if (!spell->face)
1576 { 1568 {
1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1578 spell->face = face_find ("burnout.x11", blank_face); 1570 spell->face = face_find ("burnout.x11", blank_face);
1579 } 1571 }
1572
1573 pl->ns->send_face (spell->face);
1580 1574
1581 /* send the current values */ 1575 /* send the current values */
1582 sl << uint32 (spell->count) 1576 sl << uint32 (spell->count)
1583 << uint16 (spell->level) 1577 << uint16 (spell->level)
1584 << uint16 (spell->casting_time) 1578 << uint16 (spell->casting_time)
… …
1620 * bytes and 3 strings (because that is the spec) so we need to 1614 * bytes and 3 strings (because that is the spec) so we need to
1621 * check that the length of those 3 strings, plus the 23 bytes, 1615 * check that the length of those 3 strings, plus the 23 bytes,
1622 * won't take us over the length limit for the socket, if it does, 1616 * won't take us over the length limit for the socket, if it does,
1623 * we need to send what we already have, and restart packet formation 1617 * we need to send what we already have, and restart packet formation
1624 */ 1618 */
1619 if (spell->type != SPELL)
1620 continue;
1621
1625 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1622 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1626 * to show add_spell is 26 bytes + 2 strings. However, the overun 1623 * to show add_spell is 26 bytes + 2 strings. However, the overun
1627 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1624 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1628 * like it will fix this 1625 * like it will fix this
1629 */ 1626 */
1630 if (spell->type != SPELL)
1631 continue;
1632
1633 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1627 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1634 { 1628 {
1629 pl->ns->flush_fx ();
1635 pl->ns->send_packet (sl); 1630 pl->ns->send_packet (sl);
1636 1631
1637 sl.reset (); 1632 sl.reset ();
1638 sl << "addspell "; 1633 sl << "addspell ";
1639 } 1634 }
… …
1647 return; 1642 return;
1648 } 1643 }
1649 else 1644 else
1650 append_spell (pl, sl, spell); 1645 append_spell (pl, sl, spell);
1651 1646
1652 if (sl.length () >= MAXSOCKBUF) 1647 if (sl.length () > MAXSOCKBUF)
1653 { 1648 {
1654 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1649 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1655 fatal (0); 1650 fatal (0);
1656 } 1651 }
1657 1652
1658 /* finally, we can send the packet */ 1653 /* finally, we can send the packet */
1654 pl->ns->flush_fx ();
1659 pl->ns->send_packet (sl); 1655 pl->ns->send_packet (sl);
1660} 1656}
1661 1657

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines