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.142 by root, Sat Dec 20 02:32:31 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)
140 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
141 142
142 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
144}
145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
143} 170}
144 171
145/** check for map/region change and send new map data */ 172/** check for map/region change and send new map data */
146static void 173static void
147check_map_change (player *pl) 174check_map_change (player *pl)
148{ 175{
149 client &socket = *pl->ns; 176 client &socket = *pl->ns;
150 object *ob = pl->ob; 177 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */ 178
179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
184 }
185
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
152 205
153 if (socket.current_map != ob->map || socket.force_newmap) 206 if (socket.current_map != ob->map || socket.force_newmap)
154 { 207 {
155 clear_map (pl); 208 clear_map (pl);
156 socket.current_map = ob->map; 209 socket.current_map = ob->map;
157 210 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0])
165 flags |= 1;
166 if (ob->map->tile_path[1])
167 flags |= 2;
168 if (ob->map->tile_path[2])
169 flags |= 4;
170 if (ob->map->tile_path[3])
171 flags |= 8;
172
173 snprintf (buf, MAX_BUF, "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);
175 }
176 else
177 snprintf (buf, MAX_BUF, "mapinfo current");
178
179 socket.send_packet (buf);
180 }
181 } 211 }
182 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
183 { 213 {
184 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
185 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
193 } 223 }
194 } 224 }
195 225
196 socket.current_x = ob->x; 226 socket.current_x = ob->x;
197 socket.current_y = ob->y; 227 socket.current_y = ob->y;
198
199 region *reg = ob->region ();
200 if (socket.current_region != reg)
201 {
202 socket.current_region = reg;
203 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
204 }
205} 228}
206 229
207/** 230/**
208 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
210 * that information. 233 * that information.
211 */ 234 */
212void 235void
213RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
214{ 237{
215 char *params = NULL, *cp; 238 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 239
228 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
229 * params pointer. 241 * params pointer.
230 */ 242 */
231 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
232 if (*cp == ' ') 244 if (*params == ' ')
233 { 245 {
234 *cp = '\0';
235 params = cp + 1; 246 *params++ = 0;
236 break; 247 break;
237 } 248 }
238 249
239 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 255 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
247 else 258 else
248 ns->send_packet (bigbuf, len); 259 {
260 // undo tokenisation above and send replyinfo with the request unchanged
261 if (*params)
262 *--params = ' ';
263
264 ns->send_packet_printf ("replyinfo %s", buf);
265 }
249} 266}
250 267
251void 268void
252ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
253{ 270{
… …
256 273
257void 274void
258ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
259{ 276{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278}
279
280void
281client::mapinfo_queue_clear ()
282{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i);
285
286 mapinfo_queue.clear ();
287}
288
289bool
290client::mapinfo_try (char *buf)
291{
292 char *token = buf;
293 buf += strlen (buf) + 9;
294
295 // initial map and its origin
296 maptile *map = pl->observe->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y;
299 int max_distance = 8; // limit maximum path length to something generous
300
301 while (*buf && map && max_distance)
302 {
303 int dir = *buf++ - '1';
304
305 if (dir >= 0 && dir <= 3)
306 {
307 if (!map->tile_path [dir])
308 map = 0;
309 else if (map->tile_available (dir, false))
310 {
311 maptile *neigh = map->tile_map [dir];
312
313 switch (dir)
314 {
315 case 0: mapy -= neigh->height; break;
316 case 2: mapy += map ->height; break;
317 case 3: mapx -= neigh->width ; break;
318 case 1: mapx += map ->width ; break;
319 }
320
321 map = neigh;
322 --max_distance;
323 }
324 else
325 return 0;
326 }
327 else
328 max_distance = 0;
329 }
330
331 if (!max_distance)
332 send_packet_printf ("mapinfo %s error", token);
333 else if (!map || !map->path)
334 send_packet_printf ("mapinfo %s nomap", token);
335 else
336 {
337 int flags = 0;
338
339 if (map->tile_path[0]) flags |= 1;
340 if (map->tile_path[1]) flags |= 2;
341 if (map->tile_path[2]) flags |= 4;
342 if (map->tile_path[3]) flags |= 8;
343
344 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346
347 return 1;
348}
349
350void
351client::mapinfo_queue_run ()
352{
353 if (mapinfo_queue.empty () || !pl)
354 return;
355
356 for (int i = 0; i < mapinfo_queue.size (); ++i)
357 if (mapinfo_try (mapinfo_queue [i]))
358 {
359 free (mapinfo_queue [i]);
360 mapinfo_queue.erase (i);
361 }
362 else
363 ++i;
261} 364}
262 365
263void 366void
264MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
265{ 368{
266 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
268 371
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 372 char *token = buf;
272 // copy token 373
273 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
274 return; 375 return;
275 376
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
279 { 378 {
280 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
281 381
282 // initial map and its origin 382#if 0
283 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 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 386 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
343 } 389 }
344 else 390 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 392}
349 393
350/** This is the Setup cmd */ 394/** This is the Setup cmd */
351void 395void
352SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
… …
481 525
482 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
483} 527}
484 528
485/** 529/**
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, 530 * This handles the general commands from the client (ie, north, fire, cast,
508 * etc.) 531 * etc.)
509 */ 532 */
510void 533void
511PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
… …
532 * commands. 555 * commands.
533 */ 556 */
534 pl->count = 0; 557 pl->count = 0;
535} 558}
536 559
537
538/** 560/**
539 * This handles the general commands from the client (ie, north, fire, cast, 561 * 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 562 * 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 563 * 'ncom' method which gives more information back to the client so it
542 * can throttle. 564 * can throttle.
… …
544void 566void
545NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
546{ 568{
547 if (len <= 6) 569 if (len <= 6)
548 { 570 {
549 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 571 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
550 return; 572 return;
551 } 573 }
552 574
553 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
554 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
611 { 633 {
612 case ST_PLAYING: 634 case ST_PLAYING:
613 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 635 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
614 break; 636 break;
615 637
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 */ 638 case ST_GET_PARTY_PASSWORD: /* Get password for party */
621 receive_party_password (pl->ob, 13); 639 receive_party_password (pl->ob, 13);
622 break; 640 break;
623 641
624 default: 642 default:
… …
663 681
664 cp = strchr (cp + 1, ' '); 682 cp = strchr (cp + 1, ' ');
665 683
666 if (cp) 684 if (cp)
667 { 685 {
668 assign (ns->version, cp + 1); 686 ns->version = cp + 1;
669 687
670 if (ns->sc_version < 1026) 688 if (ns->sc_version < 1026)
671 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 689 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
672 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 690 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
673 } 691 }
… …
696 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
697 */ 715 */
698void 716void
699MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
700{ 718{
701 int vals[3], i; 719 int to, tag, nrof;
702 720
703 /* A little funky here. We only cycle for 2 records, because 721 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 { 722 {
710 vals[i] = atoi (buf);
711
712 if (!(buf = strchr (buf, ' ')))
713 {
714 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
715 return; 724 return;
716 }
717
718 buf++;
719 } 725 }
720 726
721 vals[2] = atoi (buf); 727 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} 728}
726 729
727/****************************************************************************** 730/******************************************************************************
728 * 731 *
729 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
738send_query (client *ns, uint8 flags, const char *text) 741send_query (client *ns, uint8 flags, const char *text)
739{ 742{
740 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 743 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
741} 744}
742 745
746/**
747 * Get player's current range attack in obuf.
748 */
749static void
750rangetostring (player *pl, char *obuf)
751{
752 dynbuf_text buf;
753
754 if (pl->ranged_ob)
755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756
757 if (pl->combat_ob)
758 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
759
760#if 0
761 //TODO: remove this when slot system is working, this is only for debugging
762 if (pl->ob->chosen_skill)
763 buf << " Skill*: " << pl->ob->chosen_skill->name;
764#endif
765
766 //TODO: maybe golem should become the current_weapon, quite simply?
767 if (pl->golem)
768 buf << " Golem*: " << pl->golem->name;
769
770 buf << '\0';
771 buf.linearise (obuf);
772}
773
743#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
744 Old = New; \ 775 Old = New; \
745 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
746 } 777 }
747 778
… …
753#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
754 Old = New; \ 785 Old = New; \
755 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
756 } 787 }
757 788
758#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
759 Old = New; \ 790 Old = New; \
760 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
761 } 792 }
762 793
763#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
764 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
765 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
779 810
780 client *ns = pl->ns; 811 client *ns = pl->ns;
781 if (!ns) 812 if (!ns)
782 return; 813 return;
783 814
784 object *ob = pl->ob; 815 object *ob = pl->observe;
785 if (!ob) 816 if (!ob)
786 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
787 820
788 packet sl ("stats"); 821 packet sl ("stats");
789 822
790 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
791 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
800 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
801 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
802 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
803 836
804 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
805 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob [s])
806 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
807 { 840 {
808 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
809 842
810 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
818 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
819 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
820 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
821 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
822 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
823 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
824 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
825 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 858 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); 859 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
827 860
828 flags = 0; 861 flags = 0;
829 862
830 if (pl->fire_on) 863 if (opl->fire_on)
831 flags |= SF_FIREON; 864 flags |= SF_FIREON;
832 865
833 if (pl->run_on) 866 if (opl->run_on)
834 flags |= SF_RUNON; 867 flags |= SF_RUNON;
835 868
836 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
837 870
838 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
852 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 885 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); 886 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); 887 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
855 } 888 }
856 889
857 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 890 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
858 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
859 set_title (ob, buf); 892 set_title (ob, buf);
860 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
861 894
862 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
866 899
867/** 900/**
868 * Tells the client that here is a player it should start using. 901 * Tells the client that here is a player it should start using.
869 */ 902 */
870void 903void
871esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
872{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
873 packet sl ("player"); 908 packet sl ("player");
874 909
875 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
876 << uint32 (weight) 911 << uint32 (weight)
877 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
878 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
879 914
880 pl->ns->last_weight = weight; 915 pl->ns->last_weight = weight;
881 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
882 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
883} 917}
884 918
885/****************************************************************************** 919/******************************************************************************
886 * 920 *
887 * Start of map related commands. 921 * Start of map related commands.
… …
944 978
945 if (!ns.faces_sent[face_num]) 979 if (!ns.faces_sent[face_num])
946 if (ob) 980 if (ob)
947 ns.send_faces (ob); 981 ns.send_faces (ob);
948 else 982 else
949 ns.send_face (face_num); 983 ns.send_face (face_num, 10);
950 984
951 sl << uint16 (face_num); 985 sl << uint16 (face_num);
952 return 1; 986 return 1;
953 } 987 }
954 988
… …
996{ 1030{
997 prefetch_surrounding_maps (op->map, 3); 1031 prefetch_surrounding_maps (op->map, 3);
998} 1032}
999 1033
1000/** 1034/**
1001 * This function uses the new map1 protocol command to send the map 1035 * 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 */ 1036 */
1022void 1037void
1023draw_client_map1 (object *pl) 1038draw_client_map (player *pl)
1024{ 1039{
1025 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1040 object *ob = pl->observe;
1026 sint16 nx, ny; 1041 if (!ob->active)
1042 return;
1043
1044 /* If player is just joining the game, he isn't here yet, so the map
1045 * can get swapped out. If so, don't try to send them a map. All will
1046 * be OK once they really log in.
1047 */
1048 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1049 return;
1050
1051 int startlen, oldlen;
1027 int estartlen, eoldlen; 1052 int estartlen, eoldlen;
1028 uint8 eentrysize; 1053 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag; 1054 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos; 1055 uint8 extendedinfos;
1031 maptile *m;
1032 1056
1033 client &socket = *pl->contr->ns;
1034
1035 if (!pl->active)
1036 return;
1037
1038 check_map_change (pl->contr); 1057 check_map_change (pl);
1039 prefetch_surrounding_maps (pl); 1058 prefetch_surrounding_maps (pl->ob);
1059
1060 /* do LOS after calls to update_position */
1061 if (ob != pl->ob)
1062 pl->clear_los (0);
1063 else if (pl->do_los)
1064 {
1065 update_los (ob);
1066 pl->do_los = 0;
1067 }
1068
1069 /**
1070 * This function uses the new map1 protocol command to send the map
1071 * to the client. It is necessary because the old map command supports
1072 * a maximum map size of 15x15.
1073 * This function is much simpler than the old one. This is because
1074 * the old function optimized to send as few face identifiers as possible,
1075 * at the expense of sending more coordinate location (coordinates were
1076 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1077 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1078 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1079 * and use the other 4 bits for other informatiion. For full documentation
1080 * of what we send, see the doc/Protocol file.
1081 * I will describe internally what we do:
1082 * the ns->lastmap shows how the map last looked when sent to the client.
1083 * in the lastmap structure, there is a cells array, which is set to the
1084 * maximum viewable size (As set in config.h).
1085 * in the cells, there are faces and a count value.
1086 * we use the count value to hold the darkness value. If -1, then this space
1087 * is not viewable.
1088 * we use faces[0] faces[1] faces[2] to hold what the three layers
1089 * look like.
1090 */
1091
1092 client &socket = *pl->ns;
1040 1093
1041 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1094 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1042 packet esl; 1095 packet esl;
1043 1096
1044 startlen = sl.length (); 1097 startlen = sl.length ();
… …
1060 << uint8 (eentrysize); 1113 << uint8 (eentrysize);
1061 1114
1062 estartlen = esl.length (); 1115 estartlen = esl.length ();
1063 } 1116 }
1064 1117
1065 /* x,y are the real map locations. ax, ay are viewport relative
1066 * locations.
1067 */
1068 ay = 0;
1069
1070 /* We could do this logic as conditionals in the if statement, 1118 /* We could do this logic as conditionals in the if statement,
1071 * but that started to get a bit messy to look at. 1119 * but that started to get a bit messy to look at.
1072 */ 1120 */
1073 max_x = pl->x + (socket.mapx + 1) / 2; 1121 int hx = socket.mapx / 2;
1074 max_y = pl->y + (socket.mapy + 1) / 2; 1122 int hy = socket.mapy / 2;
1075 1123
1076 maptile *plmap = pl->map; 1124 for (int dx = -hx; dx <= hx; dx++)
1077
1078 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1079 { 1125 {
1080 ax = 0; 1126 sint16 nx, ny;
1081 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1127 maptile *m = 0;
1128
1129 for (int dy = -hy; dy <= hy; dy++)
1082 { 1130 {
1131 // check to see if we can simply go one down quickly
1132 if (m && ++ny >= m->height)
1133 m = 0;
1134
1135 // no, so do it the slow way
1136 if (!m)
1137 {
1138 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1139
1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1143 m = 0;
1144 }
1145
1146 int ax = dx + hx;
1147 int ay = dy + hy;
1148
1083 int emask, mask; 1149 int emask, mask;
1084 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1150 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1085 1151
1086 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1152 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1087 1153
1088 /* If the coordinates are not valid, or it is too dark to see, 1154 /* If the coordinates are not valid, or it is too dark to see,
1089 * we tell the client as such 1155 * we tell the client as such
1090 */ 1156 */
1091 nx = x;
1092 ny = y;
1093 m = get_map_from_coord (plmap, &nx, &ny);
1094
1095 if (!m) 1157 if (!m)
1096 { 1158 {
1097 /* space is out of map. Update space and clear values 1159 /* space is out of map. Update space and clear values
1098 * if this hasn't already been done. If the space is out 1160 * if this hasn't already been done. If the space is out
1099 * of the map, it shouldn't have a head 1161 * of the map, it shouldn't have a head.
1100 */ 1162 */
1101 if (lastcell.count != -1) 1163 if (lastcell.count != -1)
1102 { 1164 {
1103 sl << uint16 (mask); 1165 sl << uint16 (mask);
1104 map_clearcell (&lastcell, -1); 1166 map_clearcell (&lastcell, -1);
1105 } 1167 }
1106 1168
1107 continue; 1169 continue;
1108 } 1170 }
1109 1171
1110 m->touch ();
1111
1112 int d = pl->contr->blocked_los[ax][ay]; 1172 int d = pl->blocked_los_uc (dx, dy);
1113 1173
1114 if (d > 3) 1174 if (d > 3)
1115 { 1175 {
1116
1117 int need_send = 0, count; 1176 int need_send = 0, count;
1118 1177
1119 /* This block deals with spaces that are not visible for whatever 1178 /* This block deals with spaces that are not visible for whatever
1120 * reason. Still may need to send the head for this space. 1179 * reason. Still may need to send the head for this space.
1121 */ 1180 */
… …
1127 if (lastcell.count != -1) 1186 if (lastcell.count != -1)
1128 need_send = 1; 1187 need_send = 1;
1129 1188
1130 count = -1; 1189 count = -1;
1131 1190
1132 /* properly clear a previously sent big face */
1133 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1191 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1134 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1192 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1135 need_send = 1; 1193 need_send = 1;
1136 1194
1195 /* properly clear a previously sent big face */
1137 map_clearcell (&lastcell, count); 1196 map_clearcell (&lastcell, count);
1138 1197
1139 if ((mask & 0xf) || need_send) 1198 if ((mask & 0xf) || need_send)
1140 sl[oldlen + 1] = mask & 0xff; 1199 sl[oldlen + 1] = mask & 0xff;
1141 else 1200 else
… …
1180 } 1239 }
1181 1240
1182 lastcell.count = d; 1241 lastcell.count = d;
1183 1242
1184 mapspace &ms = m->at (nx, ny); 1243 mapspace &ms = m->at (nx, ny);
1244 ms.update ();
1185 1245
1186 if (socket.extmap) 1246 if (socket.extmap)
1187 { 1247 {
1188 uint8 stat_hp = 0; 1248 uint8 stat_hp = 0;
1189 uint8 stat_width = 0; 1249 uint8 stat_width = 0;
1190 uint8 flags = 0; 1250 uint8 flags = 0;
1191 tag_t player = 0; 1251 tag_t player = 0;
1192 1252
1193 // send hp information, if applicable 1253 // send hp information, if applicable
1194 if (object *op = ms.faces_obj [0]) 1254 if (object *op = ms.faces_obj [0])
1195 {
1196 if (op->head || op->invisible) 1255 if (op->is_head () && !op->invisible)
1197 ; // do not show
1198 else if (op->type == PLAYER
1199 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1200 { 1256 {
1201 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1257 if (op->stats.maxhp > op->stats.hp
1258 && op->stats.maxhp > 0
1259 && (op->type == PLAYER
1260 || op->type == DOOR // does not work, have maxhp 0
1261 || QUERY_FLAG (op, FLAG_MONSTER)
1262 || QUERY_FLAG (op, FLAG_ALIVE)
1263 || QUERY_FLAG (op, FLAG_GENERATOR)))
1202 { 1264 {
1203 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1265 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1204 stat_width = op->arch->tail_x; 1266 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1205 } 1267 }
1206 }
1207 1268
1208 if (op->msg && op->msg[0] == '@') 1269 if (op->has_dialogue ())
1209 flags |= 1; 1270 flags |= 1;
1210 1271
1211 if (op->type == PLAYER && op != pl) 1272 if (op->type == PLAYER)
1212 player = op->count; 1273 player = op == ob ? pl->ob->count
1274 : op == pl->ob ? ob->count
1275 : op->count;
1213 } 1276 }
1214 1277
1215 if (lastcell.stat_hp != stat_hp) 1278 if (lastcell.stat_hp != stat_hp)
1216 { 1279 {
1217 lastcell.stat_hp = stat_hp; 1280 lastcell.stat_hp = stat_hp;
1218 1281
… …
1260 1323
1261 /* Middle face */ 1324 /* Middle face */
1262 if (update_space (sl, socket, ms, lastcell, 1)) 1325 if (update_space (sl, socket, ms, lastcell, 1))
1263 mask |= 0x2; 1326 mask |= 0x2;
1264 1327
1265 if (ms.player () == pl 1328 if (ob->invisible
1266 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1329 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330 && ms.player () == ob)
1267 { 1331 {
1268 // force player to be visible to himself if invisible 1332 // force player to be visible to himself if invisible
1269 if (lastcell.faces[0] != pl->face) 1333 if (lastcell.faces[0] != ob->face)
1270 { 1334 {
1271 lastcell.faces[0] = pl->face; 1335 lastcell.faces[0] = ob->face;
1272 1336
1273 mask |= 0x1; 1337 mask |= 0x1;
1274 sl << uint16 (pl->face); 1338 sl << uint16 (ob->face);
1275 1339
1276 socket.send_faces (pl); 1340 socket.send_faces (ob);
1277 } 1341 }
1278 } 1342 }
1279 /* Top face */ 1343 /* Top face */
1280 else if (update_space (sl, socket, ms, lastcell, 0)) 1344 else if (update_space (sl, socket, ms, lastcell, 0))
1281 mask |= 0x1; 1345 mask |= 0x1;
1282
1283 1346
1284 /* Check to see if we are in fact sending anything for this 1347 /* Check to see if we are in fact sending anything for this
1285 * space by checking the mask. If so, update the mask. 1348 * space by checking the mask. If so, update the mask.
1286 * if not, reset the len to that from before adding the mask 1349 * if not, reset the len to that from before adding the mask
1287 * value, so we don't send those bits. 1350 * value, so we don't send those bits.
… …
1346 socket.send_packet (sl); 1409 socket.send_packet (sl);
1347 socket.sent_scroll = 0; 1410 socket.sent_scroll = 0;
1348 } 1411 }
1349} 1412}
1350 1413
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/*****************************************************************************/ 1414/*****************************************************************************/
1412
1413/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1415/* 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 */ 1416/* a player. Of course, the client need to know the command to be able to */
1416
1417/* manage it ! */ 1417/* manage it ! */
1418
1419/*****************************************************************************/ 1418/*****************************************************************************/
1420void 1419void
1421send_plugin_custom_message (object *pl, char *buf) 1420send_plugin_custom_message (object *pl, char *buf)
1422{ 1421{
1423 pl->contr->ns->send_packet (buf); 1422 pl->contr->ns->send_packet (buf);
… …
1432{ 1431{
1433 packet sl; 1432 packet sl;
1434 sl << "replyinfo skill_info\n"; 1433 sl << "replyinfo skill_info\n";
1435 1434
1436 for (int i = 1; i < NUM_SKILLS; i++) 1435 for (int i = 1; i < NUM_SKILLS; i++)
1437 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1436 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1438 1437
1439 if (sl.length () >= MAXSOCKBUF) 1438 if (sl.length () > MAXSOCKBUF)
1440 { 1439 {
1441 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1440 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1442 fatal (0); 1441 fatal (0);
1443 } 1442 }
1444 1443
… …
1457 sl << "replyinfo spell_paths\n"; 1456 sl << "replyinfo spell_paths\n";
1458 1457
1459 for (int i = 0; i < NRSPELLPATHS; i++) 1458 for (int i = 0; i < NRSPELLPATHS; i++)
1460 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1459 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1461 1460
1462 if (sl.length () >= MAXSOCKBUF) 1461 if (sl.length () > MAXSOCKBUF)
1463 { 1462 {
1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1463 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465 fatal (0); 1464 fatal (0);
1466 } 1465 }
1467 1466
… …
1486 if (spell->type == SPELL) 1485 if (spell->type == SPELL)
1487 { 1486 {
1488 int flags = 0; 1487 int flags = 0;
1489 1488
1490 /* check if we need to update it */ 1489 /* check if we need to update it */
1491 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1490 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1492 { 1491 {
1493 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1492 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1494 flags |= UPD_SP_MANA; 1493 flags |= UPD_SP_MANA;
1495 } 1494 }
1496 1495
1497 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1496 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1498 { 1497 {
1499 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1498 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1500 flags |= UPD_SP_GRACE; 1499 flags |= UPD_SP_GRACE;
1501 } 1500 }
1502 1501
1503 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1502 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1504 { 1503 {
1505 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1504 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1506 flags |= UPD_SP_DAMAGE; 1505 flags |= UPD_SP_DAMAGE;
1507 } 1506 }
1508 1507
1509 if (flags) 1508 if (flags)
1510 { 1509 {
… …
1512 1511
1513 sl << "updspell " 1512 sl << "updspell "
1514 << uint8 (flags) 1513 << uint8 (flags)
1515 << uint32 (spell->count); 1514 << uint32 (spell->count);
1516 1515
1517 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1516 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1518 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1517 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1519 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1518 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1520 1519
1521 pl->ns->send_packet (sl); 1520 pl->ns->send_packet (sl);
1522 } 1521 }
1523 } 1522 }
1524 } 1523 }
… …
1554 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1553 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1555 return; 1554 return;
1556 } 1555 }
1557 1556
1558 /* store costs and damage in the object struct, to compare to later */ 1557 /* store costs and damage in the object struct, to compare to later */
1559 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1558 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1560 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1559 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1561 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1560 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1562 1561
1563 /* figure out which skill it uses, if it uses one */ 1562 /* figure out which skill it uses, if it uses one */
1564 if (spell->skill) 1563 if (spell->skill)
1565 { 1564 if (object *tmp = pl->find_skill (spell->skill))
1566 for (i = 1; i < NUM_SKILLS; i++)
1567 if (!strcmp (spell->skill, skill_names[i]))
1568 {
1569 skill = i + CS_STAT_SKILLINFO; 1565 skill = tmp->subtype + CS_STAT_SKILLINFO;
1570 break;
1571 }
1572 }
1573 1566
1574 // spells better have a face 1567 // spells better have a face
1575 if (!spell->face) 1568 if (!spell->face)
1576 { 1569 {
1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1570 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1578 spell->face = face_find ("burnout.x11", blank_face); 1571 spell->face = face_find ("burnout.x11", blank_face);
1579 } 1572 }
1573
1574 pl->ns->send_face (spell->face);
1580 1575
1581 /* send the current values */ 1576 /* send the current values */
1582 sl << uint32 (spell->count) 1577 sl << uint32 (spell->count)
1583 << uint16 (spell->level) 1578 << uint16 (spell->level)
1584 << uint16 (spell->casting_time) 1579 << uint16 (spell->casting_time)
1585 << uint16 (spell->last_sp) 1580 << uint16 (spell->cached_sp)
1586 << uint16 (spell->last_grace) 1581 << uint16 (spell->cached_grace)
1587 << uint16 (spell->last_eat) 1582 << uint16 (spell->cached_eat)
1588 << uint8 (skill) 1583 << uint8 (skill)
1589 << uint32 (spell->path_attuned) 1584 << uint32 (spell->path_attuned)
1590 << uint32 (spell->face) 1585 << uint32 (spell->face)
1591 << data8 (spell->name) 1586 << data8 (spell->name)
1592 << data16 (spell->msg); 1587 << data16 (spell->msg);
… …
1620 * bytes and 3 strings (because that is the spec) so we need to 1615 * 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, 1616 * 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, 1617 * 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 1618 * we need to send what we already have, and restart packet formation
1624 */ 1619 */
1620 if (spell->type != SPELL)
1621 continue;
1622
1625 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1623 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1626 * to show add_spell is 26 bytes + 2 strings. However, the overun 1624 * 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 1625 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1628 * like it will fix this 1626 * like it will fix this
1629 */ 1627 */
1630 if (spell->type != SPELL)
1631 continue;
1632
1633 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1628 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1634 { 1629 {
1630 pl->ns->flush_fx ();
1635 pl->ns->send_packet (sl); 1631 pl->ns->send_packet (sl);
1636 1632
1637 sl.reset (); 1633 sl.reset ();
1638 sl << "addspell "; 1634 sl << "addspell ";
1639 } 1635 }
… …
1647 return; 1643 return;
1648 } 1644 }
1649 else 1645 else
1650 append_spell (pl, sl, spell); 1646 append_spell (pl, sl, spell);
1651 1647
1652 if (sl.length () >= MAXSOCKBUF) 1648 if (sl.length () > MAXSOCKBUF)
1653 { 1649 {
1654 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1650 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1655 fatal (0); 1651 fatal (0);
1656 } 1652 }
1657 1653
1658 /* finally, we can send the packet */ 1654 /* finally, we can send the packet */
1655 pl->ns->flush_fx ();
1659 pl->ns->send_packet (sl); 1656 pl->ns->send_packet (sl);
1660} 1657}
1661 1658

Diff Legend

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