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.83 by root, Mon Apr 2 18:04:47 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 152
153 if (socket.force_newmap) 153 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map)
154 { 155 {
155 // force newmap is used for clients that do not redraw their map 156 rv_vector rv;
156 // after image uploads. 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 {
157 socket.current_map = ob->map; 163 socket.current_map = ob->map;
158 clear_map (pl); 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 }
159 } 170 }
160 else if (socket.current_map != ob->map) 171
172 if (socket.current_map != ob->map || socket.force_newmap)
161 { 173 {
162 clear_map (pl); 174 clear_map (pl);
163 socket.current_map = ob->map; 175 socket.current_map = ob->map;
164 176
165 if (socket.mapinfocmd) 177 if (socket.mapinfocmd)
166 { 178 {
167 if (ob->map && ob->map->path[0]) 179 if (ob->map && ob->map->path[0])
168 { 180 {
169 int flags = 0; 181 int flags = 0;
170 182
171 if (ob->map->tile_path[0]) 183 if (ob->map->tile_path[0]) flags |= 1;
172 flags |= 1;
173 if (ob->map->tile_path[1]) 184 if (ob->map->tile_path[1]) flags |= 2;
174 flags |= 2;
175 if (ob->map->tile_path[2]) 185 if (ob->map->tile_path[2]) flags |= 4;
176 flags |= 4;
177 if (ob->map->tile_path[3]) 186 if (ob->map->tile_path[3]) flags |= 8;
178 flags |= 8;
179 187
180 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",
181 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);
182 } 191 }
183 else 192 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf); 193 socket.send_packet ("mapinfo current");
187 } 194 }
188 } 195 }
189 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)
190 { 197 {
191 int dx = ob->x - socket.current_x; 198 int dx = ob->x - socket.current_x;
… …
204 socket.current_y = ob->y; 211 socket.current_y = ob->y;
205 212
206 region *reg = ob->region (); 213 region *reg = ob->region ();
207 if (socket.current_region != reg) 214 if (socket.current_region != reg)
208 { 215 {
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
209 socket.current_region = reg; 217 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 } 218 }
212} 219}
213 220
214/** 221/**
215 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
217 * that information. 224 * that information.
218 */ 225 */
219void 226void
220RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
221{ 228{
222 char *params = NULL, *cp; 229 char *params;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234 230
235 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
236 * params pointer. 232 * params pointer.
237 */ 233 */
238 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
239 if (*cp == ' ') 235 if (*params == ' ')
240 { 236 {
241 *cp = '\0';
242 params = cp + 1; 237 *params++ = 0;
243 break; 238 break;
244 } 239 }
245 240
246 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
250 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 246 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
254 else 249 else
255 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 }
256} 257}
257 258
258void 259void
259ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
260{ 261{
… …
263 264
264void 265void
265ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
266{ 267{
267 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;
268} 355}
269 356
270void 357void
271MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
272{ 359{
273 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
274 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
275 362
276 char bigbuf[MAX_BUF], *token;
277
278 token = buf; 363 char *token = buf;
279 // copy token 364
280 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
281 return; 366 return;
282 367
283 *buf++ = 0;
284
285 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
286 { 369 {
287 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
288 372
289 // initial map and its origin 373#if 0
290 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
291 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
292 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
294 int max_distance = 8; // limit maximum path length to something generous
295
296 while (*buf && map && max_distance)
297 {
298 int dir = *buf++;
299
300 switch (dir)
301 {
302 case '1':
303 dx = 0;
304 dy = -1;
305 map = map->xy_find (dx, dy);
306 map && (mapy -= map->height);
307 break;
308 case '2':
309 mapx += map->width;
310 dx = map->width;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 break;
314 case '3':
315 mapy += map->height;
316 dx = 0;
317 dy = map->height;
318 map = map->xy_find (dx, dy);
319 break;
320 case '4':
321 dx = -1;
322 dy = 0;
323 map = map->xy_find (dx, dy);
324 map && (mapx -= map->width);
325 break;
326 }
327
328 --max_distance;
329 }
330
331 if (!max_distance)
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333 else if (map && map->path[0])
334 {
335 int flags = 0;
336
337 if (map->tile_path[0])
338 flags |= 1;
339 if (map->tile_path[1])
340 flags |= 2;
341 if (map->tile_path[2])
342 flags |= 4;
343 if (map->tile_path[3])
344 flags |= 8;
345
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347 }
348 else 377 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
350 } 380 }
351 else 381 else
352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354 pl->ns->send_packet (bigbuf);
355} 383}
356 384
357/** This is the Setup cmd */ 385/** This is the Setup cmd */
358void 386void
359SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
… …
488 516
489 ns->send_packet (cmdback); 517 ns->send_packet (cmdback);
490} 518}
491 519
492/** 520/**
493 * client requested an image. send it rate-limited
494 * before flushing.
495 */
496void
497AskFaceCmd (char *buf, int len, client *ns)
498{
499 ns->askface.push_back (atoi (buf));
500}
501
502/**
503 * Tells client the picture it has to use
504 * to smooth a picture number given as argument.
505 */
506void
507AskSmooth (char *buf, int len, client *ns)
508{
509 ns->send_face (atoi (buf));
510}
511
512/**
513 * 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,
514 * etc.) 522 * etc.)
515 */ 523 */
516void 524void
517PlayerCmd (char *buf, int len, player *pl) 525PlayerCmd (char *buf, int len, player *pl)
… …
538 * commands. 546 * commands.
539 */ 547 */
540 pl->count = 0; 548 pl->count = 0;
541} 549}
542 550
543
544/** 551/**
545 * 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,
546 * 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
547 * '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
548 * can throttle. 555 * can throttle.
… …
550void 557void
551NewPlayerCmd (char *buf, int len, player *pl) 558NewPlayerCmd (char *buf, int len, player *pl)
552{ 559{
553 if (len <= 6) 560 if (len <= 6)
554 { 561 {
555 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);
556 return; 563 return;
557 } 564 }
558 565
559 uint16 cmdid = net_uint16 ((uint8 *)buf); 566 uint16 cmdid = net_uint16 ((uint8 *)buf);
560 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 567 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
617 { 624 {
618 case ST_PLAYING: 625 case ST_PLAYING:
619 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 626 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
620 break; 627 break;
621 628
622 case ST_CHANGE_CLASS:
623 key_change_class (pl->ob, buf[0]);
624 break;
625
626 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 629 case ST_GET_PARTY_PASSWORD: /* Get password for party */
627 receive_party_password (pl->ob, 13); 630 receive_party_password (pl->ob, 13);
628 break; 631 break;
629 632
630 default: 633 default:
… …
669 672
670 cp = strchr (cp + 1, ' '); 673 cp = strchr (cp + 1, ' ');
671 674
672 if (cp) 675 if (cp)
673 { 676 {
674 assign (ns->version, cp + 1); 677 ns->version = cp + 1;
675 678
676 if (ns->sc_version < 1026) 679 if (ns->sc_version < 1026)
677 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 680 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
678 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 681 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
679 } 682 }
… …
702 * syntax is: move (to) (tag) (nrof) 705 * syntax is: move (to) (tag) (nrof)
703 */ 706 */
704void 707void
705MoveCmd (char *buf, int len, player *pl) 708MoveCmd (char *buf, int len, player *pl)
706{ 709{
707 int vals[3], i; 710 int to, tag, nrof;
708 711
709 /* A little funky here. We only cycle for 2 records, because 712 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
710 * we obviously are not going to find a space after the third
711 * record. Perhaps we should just replace this with a
712 * sscanf?
713 */
714 for (i = 0; i < 2; i++)
715 { 713 {
716 vals[i] = atoi (buf);
717
718 if (!(buf = strchr (buf, ' ')))
719 {
720 LOG (llevError, "Incomplete move command: %s\n", buf); 714 LOG (llevError, "Incomplete move command: %s\n", buf);
721 return; 715 return;
722 }
723
724 buf++;
725 } 716 }
726 717
727 vals[2] = atoi (buf); 718 esrv_move_object (pl->ob, to, tag, nrof);
728
729/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
730 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
731} 719}
732 720
733/****************************************************************************** 721/******************************************************************************
734 * 722 *
735 * Start of commands the server sends to the client. 723 * Start of commands the server sends to the client.
… …
744send_query (client *ns, uint8 flags, const char *text) 732send_query (client *ns, uint8 flags, const char *text)
745{ 733{
746 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 734 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
747} 735}
748 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
749#define AddIfInt64(Old,New,Type) if (Old != New) {\ 765#define AddIfInt64(Old,New,Type) if (Old != New) {\
750 Old = New; \ 766 Old = New; \
751 sl << uint8 (Type) << uint64 (New); \ 767 sl << uint8 (Type) << uint64 (New); \
752 } 768 }
753 769
… …
759#define AddIfShort(Old,New,Type) if (Old != New) {\ 775#define AddIfShort(Old,New,Type) if (Old != New) {\
760 Old = New; \ 776 Old = New; \
761 sl << uint8 (Type) << uint16 (New); \ 777 sl << uint8 (Type) << uint16 (New); \
762 } 778 }
763 779
764#define AddIfFloat(Old,New,Type) if (Old != New) {\ 780#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
765 Old = New; \ 781 Old = New; \
766 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 782 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
767 } 783 }
768 784
769#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 785#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
770 free(Old); Old = strdup (New);\ 786 free(Old); Old = strdup (New);\
771 sl << uint8 (Type) << data8 (New); \ 787 sl << uint8 (Type) << data8 (New); \
… …
785 801
786 client *ns = pl->ns; 802 client *ns = pl->ns;
787 if (!ns) 803 if (!ns)
788 return; 804 return;
789 805
790 object *ob = pl->ob; 806 object *ob = pl->observe;
791 if (!ob) 807 if (!ob)
792 return; 808 return;
809
810 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
793 811
794 packet sl ("stats"); 812 packet sl ("stats");
795 813
796 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 814 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
797 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 815 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
806 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
807 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
808 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
809 827
810 for (int s = 0; s < NUM_SKILLS; s++) 828 for (int s = 0; s < NUM_SKILLS; s++)
811 if (object *skill = pl->last_skill_ob[s]) 829 if (object *skill = opl->last_skill_ob[s])
812 if (skill->stats.exp != ns->last_skill_exp [s]) 830 if (skill->stats.exp != ns->last_skill_exp [s])
813 { 831 {
814 ns->last_skill_exp [s] = skill->stats.exp; 832 ns->last_skill_exp [s] = skill->stats.exp;
815 833
816 /* Always send along the level if exp changes. This is only 834 /* Always send along the level if exp changes. This is only
… …
824 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 842 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
825 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 843 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
826 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 844 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
827 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 845 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
828 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 846 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
829 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 847 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
830 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 848 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
831 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);
832 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);
833 851
834 flags = 0; 852 flags = 0;
835 853
836 if (pl->fire_on) 854 if (opl->fire_on)
837 flags |= SF_FIREON; 855 flags |= SF_FIREON;
838 856
839 if (pl->run_on) 857 if (opl->run_on)
840 flags |= SF_RUNON; 858 flags |= SF_RUNON;
841 859
842 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 860 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
843 861
844 if (ns->sc_version < 1025) 862 if (ns->sc_version < 1025)
… …
858 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);
859 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);
860 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);
861 } 879 }
862 880
863 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 */
864 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 882 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
865 set_title (ob, buf); 883 set_title (ob, buf);
866 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 884 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
867 885
868 /* Only send it away if we have some actual data */ 886 /* Only send it away if we have some actual data */
… …
872 890
873/** 891/**
874 * 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.
875 */ 893 */
876void 894void
877esrv_new_player (player *pl, uint32 weight) 895esrv_new_player (player *pl)
878{ 896{
897 sint32 weight = pl->ob->client_weight ();
898
879 packet sl ("player"); 899 packet sl ("player");
880 900
881 sl << uint32 (pl->ob->count) 901 sl << uint32 (pl->ob->count)
882 << uint32 (weight) 902 << uint32 (weight)
883 << uint32 (pl->ob->face) 903 << uint32 (pl->ob->face)
… …
950 970
951 if (!ns.faces_sent[face_num]) 971 if (!ns.faces_sent[face_num])
952 if (ob) 972 if (ob)
953 ns.send_faces (ob); 973 ns.send_faces (ob);
954 else 974 else
955 ns.send_face (face_num); 975 ns.send_face (face_num, 10);
956 976
957 sl << uint16 (face_num); 977 sl << uint16 (face_num);
958 return 1; 978 return 1;
959 } 979 }
960 980
… …
1002{ 1022{
1003 prefetch_surrounding_maps (op->map, 3); 1023 prefetch_surrounding_maps (op->map, 3);
1004} 1024}
1005 1025
1006/** 1026/**
1007 * This function uses the new map1 protocol command to send the map 1027 * Draws client map.
1008 * to the client. It is necessary because the old map command supports
1009 * a maximum map size of 15x15.
1010 * This function is much simpler than the old one. This is because
1011 * the old function optimized to send as few face identifiers as possible,
1012 * at the expense of sending more coordinate location (coordinates were
1013 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1014 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1015 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1016 * and use the other 4 bits for other informatiion. For full documentation
1017 * of what we send, see the doc/Protocol file.
1018 * I will describe internally what we do:
1019 * the ns->lastmap shows how the map last looked when sent to the client.
1020 * in the lastmap structure, there is a cells array, which is set to the
1021 * maximum viewable size (As set in config.h).
1022 * in the cells, there are faces and a count value.
1023 * we use the count value to hold the darkness value. If -1, then this space
1024 * is not viewable.
1025 * we use faces[0] faces[1] faces[2] to hold what the three layers
1026 * look like.
1027 */ 1028 */
1028void 1029void
1029draw_client_map1 (object *pl) 1030draw_client_map (player *pl)
1030{ 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
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen; 1046 int estartlen, eoldlen;
1034 uint8 eentrysize; 1047 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag; 1048 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos; 1049 uint8 extendedinfos;
1037 maptile *m;
1038 1050
1039 client &socket = *pl->contr->ns;
1040
1041 if (!pl->active)
1042 return;
1043
1044 check_map_change (pl->contr); 1051 check_map_change (pl);
1045 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;
1046 1087
1047 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1048 packet esl; 1089 packet esl;
1049 1090
1050 startlen = sl.length (); 1091 startlen = sl.length ();
… …
1074 ay = 0; 1115 ay = 0;
1075 1116
1076 /* We could do this logic as conditionals in the if statement, 1117 /* We could do this logic as conditionals in the if statement,
1077 * but that started to get a bit messy to look at. 1118 * but that started to get a bit messy to look at.
1078 */ 1119 */
1079 max_x = pl->x + (socket.mapx + 1) / 2; 1120 max_x = ob->x + (socket.mapx + 1) / 2;
1080 max_y = pl->y + (socket.mapy + 1) / 2; 1121 max_y = ob->y + (socket.mapy + 1) / 2;
1081 1122
1082 maptile *plmap = pl->map;
1083
1084 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++)
1085 { 1124 {
1125 sint16 nx, ny;
1126 maptile *m = 0;
1127
1086 ax = 0; 1128 ax = 0;
1087 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++)
1088 { 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
1089 int emask, mask; 1146 int emask, mask;
1090 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1091 1148
1092 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1149 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1093 1150
1094 /* 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,
1095 * we tell the client as such 1152 * we tell the client as such
1096 */ 1153 */
1097 nx = x;
1098 ny = y;
1099 m = get_map_from_coord (plmap, &nx, &ny);
1100
1101 if (!m) 1154 if (!m)
1102 { 1155 {
1103 /* space is out of map. Update space and clear values 1156 /* space is out of map. Update space and clear values
1104 * 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
1105 * of the map, it shouldn't have a head 1158 * of the map, it shouldn't have a head
… …
1111 } 1164 }
1112 1165
1113 continue; 1166 continue;
1114 } 1167 }
1115 1168
1116 m->touch ();
1117
1118 int d = pl->contr->blocked_los[ax][ay]; 1169 int d = pl->blocked_los[ax][ay];
1119 1170
1120 if (d > 3) 1171 if (d > 3)
1121 { 1172 {
1122 1173
1123 int need_send = 0, count; 1174 int need_send = 0, count;
… …
1186 } 1237 }
1187 1238
1188 lastcell.count = d; 1239 lastcell.count = d;
1189 1240
1190 mapspace &ms = m->at (nx, ny); 1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1191 1243
1192 if (socket.extmap) 1244 if (socket.extmap)
1193 { 1245 {
1194 uint8 stat_hp = 0; 1246 uint8 stat_hp = 0;
1195 uint8 stat_width = 0; 1247 uint8 stat_width = 0;
1196 uint8 flags = 0; 1248 uint8 flags = 0;
1197 UUID player = 0; 1249 tag_t player = 0;
1198 1250
1199 // send hp information, if applicable 1251 // send hp information, if applicable
1200 if (object *op = ms.faces_obj [0]) 1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1201 { 1254 {
1202 if (op->head || op->invisible) 1255 if (op->stats.maxhp > op->stats.hp
1203 ; // do not show 1256 && op->stats.maxhp > 0
1204 else if (op->type == PLAYER 1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1205 || 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)))
1206 {
1207 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1208 { 1260 {
1209 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1210 stat_width = op->arch->tail_x; 1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1211 } 1263 }
1212 }
1213 1264
1214 if (op->msg && op->msg[0] == '@') 1265 if (op->msg && op->msg[0] == '@')
1215 flags |= 1; 1266 flags |= 1;
1216 1267
1217 if (op->type == PLAYER && op != pl) 1268 if (op->type == PLAYER && op != ob)
1218 player = op->count; 1269 player = op->count;
1219 } 1270 }
1220 1271
1221 if (lastcell.stat_hp != stat_hp) 1272 if (lastcell.stat_hp != stat_hp)
1222 { 1273 {
1223 lastcell.stat_hp = stat_hp; 1274 lastcell.stat_hp = stat_hp;
1224 1275
… …
1243 1294
1244 mask |= 0x8; 1295 mask |= 0x8;
1245 *last_ext |= 0x80; 1296 *last_ext |= 0x80;
1246 last_ext = &sl[sl.length ()]; 1297 last_ext = &sl[sl.length ()];
1247 1298
1248 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1299 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1249 } 1300 }
1250 1301
1251 if (lastcell.flags != flags) 1302 if (lastcell.flags != flags)
1252 { 1303 {
1253 lastcell.flags = flags; 1304 lastcell.flags = flags;
… …
1266 1317
1267 /* Middle face */ 1318 /* Middle face */
1268 if (update_space (sl, socket, ms, lastcell, 1)) 1319 if (update_space (sl, socket, ms, lastcell, 1))
1269 mask |= 0x2; 1320 mask |= 0x2;
1270 1321
1271 if (ms.player () == pl 1322 if (ms.player () == ob
1272 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1273 { 1324 {
1274 // force player to be visible to himself if invisible 1325 // force player to be visible to himself if invisible
1275 if (lastcell.faces[0] != pl->face) 1326 if (lastcell.faces[0] != ob->face)
1276 { 1327 {
1277 lastcell.faces[0] = pl->face; 1328 lastcell.faces[0] = ob->face;
1278 1329
1279 mask |= 0x1; 1330 mask |= 0x1;
1280 sl << uint16 (pl->face); 1331 sl << uint16 (ob->face);
1281 1332
1282 socket.send_faces (pl); 1333 socket.send_faces (ob);
1283 } 1334 }
1284 } 1335 }
1285 /* Top face */ 1336 /* Top face */
1286 else if (update_space (sl, socket, ms, lastcell, 0)) 1337 else if (update_space (sl, socket, ms, lastcell, 0))
1287 mask |= 0x1; 1338 mask |= 0x1;
1288
1289 1339
1290 /* 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
1291 * space by checking the mask. If so, update the mask. 1341 * space by checking the mask. If so, update the mask.
1292 * 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
1293 * value, so we don't send those bits. 1343 * value, so we don't send those bits.
… …
1327 } 1377 }
1328 } /* else this is a viewable space */ 1378 } /* else this is a viewable space */
1329 } /* for x loop */ 1379 } /* for x loop */
1330 } /* for y loop */ 1380 } /* for y loop */
1331 1381
1382 socket.flush_fx ();
1383
1332 /* Verify that we in fact do need to send this */ 1384 /* Verify that we in fact do need to send this */
1333 if (socket.ext_mapinfos) 1385 if (socket.ext_mapinfos)
1334 { 1386 {
1335 if (!(sl.length () > startlen || socket.sent_scroll)) 1387 if (!(sl.length () > startlen || socket.sent_scroll))
1336 { 1388 {
… …
1350 socket.send_packet (sl); 1402 socket.send_packet (sl);
1351 socket.sent_scroll = 0; 1403 socket.sent_scroll = 0;
1352 } 1404 }
1353} 1405}
1354 1406
1355/**
1356 * Draws client map.
1357 */
1358void
1359draw_client_map (object *pl)
1360{
1361 int i, j;
1362 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1363 int mflags;
1364 struct Map newmap;
1365 maptile *m, *pm;
1366
1367 if (pl->type != PLAYER)
1368 {
1369 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1370 return;
1371 }
1372
1373 pm = pl->map;
1374
1375 /* If player is just joining the game, he isn't here yet, so the map
1376 * can get swapped out. If so, don't try to send them a map. All will
1377 * be OK once they really log in.
1378 */
1379 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1380 return;
1381
1382 memset (&newmap, 0, sizeof (struct Map));
1383
1384 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1385 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1386 {
1387 ax = i;
1388 ay = j;
1389 m = pm;
1390 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1391
1392 if (mflags & P_OUT_OF_MAP)
1393 continue;
1394
1395 /* If a map is visible to the player, we don't want to swap it out
1396 * just to reload it. This should really call something like
1397 * swap_map, but this is much more efficient and 'good enough'
1398 */
1399 if (mflags & P_NEW_MAP)
1400 m->timeout = 50;
1401 }
1402
1403 /* do LOS after calls to update_position */
1404 if (pl->contr->do_los)
1405 {
1406 update_los (pl);
1407 pl->contr->do_los = 0;
1408 }
1409
1410 /* Big maps need a different drawing mechanism to work */
1411 draw_client_map1 (pl);
1412}
1413
1414
1415/*****************************************************************************/ 1407/*****************************************************************************/
1416
1417/* 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*/
1418
1419/* 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 */
1420
1421/* manage it ! */ 1410/* manage it ! */
1422
1423/*****************************************************************************/ 1411/*****************************************************************************/
1424void 1412void
1425send_plugin_custom_message (object *pl, char *buf) 1413send_plugin_custom_message (object *pl, char *buf)
1426{ 1414{
1427 pl->contr->ns->send_packet (buf); 1415 pl->contr->ns->send_packet (buf);
… …
1438 sl << "replyinfo skill_info\n"; 1426 sl << "replyinfo skill_info\n";
1439 1427
1440 for (int i = 1; i < NUM_SKILLS; i++) 1428 for (int i = 1; i < NUM_SKILLS; i++)
1441 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]);
1442 1430
1443 if (sl.length () >= MAXSOCKBUF) 1431 if (sl.length () > MAXSOCKBUF)
1444 { 1432 {
1445 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446 fatal (0); 1434 fatal (0);
1447 } 1435 }
1448 1436
… …
1461 sl << "replyinfo spell_paths\n"; 1449 sl << "replyinfo spell_paths\n";
1462 1450
1463 for (int i = 0; i < NRSPELLPATHS; i++) 1451 for (int i = 0; i < NRSPELLPATHS; i++)
1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465 1453
1466 if (sl.length () >= MAXSOCKBUF) 1454 if (sl.length () > MAXSOCKBUF)
1467 { 1455 {
1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469 fatal (0); 1457 fatal (0);
1470 } 1458 }
1471 1459
… …
1579 if (!spell->face) 1567 if (!spell->face)
1580 { 1568 {
1581 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);
1582 spell->face = face_find ("burnout.x11", blank_face); 1570 spell->face = face_find ("burnout.x11", blank_face);
1583 } 1571 }
1572
1573 pl->ns->send_face (spell->face);
1584 1574
1585 /* send the current values */ 1575 /* send the current values */
1586 sl << uint32 (spell->count) 1576 sl << uint32 (spell->count)
1587 << uint16 (spell->level) 1577 << uint16 (spell->level)
1588 << uint16 (spell->casting_time) 1578 << uint16 (spell->casting_time)
… …
1624 * 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
1625 * 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,
1626 * 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,
1627 * 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
1628 */ 1618 */
1619 if (spell->type != SPELL)
1620 continue;
1621
1629 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1622 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1630 * 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
1631 * 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
1632 * like it will fix this 1625 * like it will fix this
1633 */ 1626 */
1634 if (spell->type != SPELL)
1635 continue;
1636
1637 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))))
1638 { 1628 {
1629 pl->ns->flush_fx ();
1639 pl->ns->send_packet (sl); 1630 pl->ns->send_packet (sl);
1640 1631
1641 sl.reset (); 1632 sl.reset ();
1642 sl << "addspell "; 1633 sl << "addspell ";
1643 } 1634 }
… …
1651 return; 1642 return;
1652 } 1643 }
1653 else 1644 else
1654 append_spell (pl, sl, spell); 1645 append_spell (pl, sl, spell);
1655 1646
1656 if (sl.length () >= MAXSOCKBUF) 1647 if (sl.length () > MAXSOCKBUF)
1657 { 1648 {
1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1649 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1659 fatal (0); 1650 fatal (0);
1660 } 1651 }
1661 1652
1662 /* finally, we can send the packet */ 1653 /* finally, we can send the packet */
1654 pl->ns->flush_fx ();
1663 pl->ns->send_packet (sl); 1655 pl->ns->send_packet (sl);
1664} 1656}
1665 1657

Diff Legend

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