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.88 by root, Tue Apr 24 00:42:03 2007 UTC vs.
Revision 1.136 by root, Sun Aug 10 16:31:18 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);
… …
659 681
660 cp = strchr (cp + 1, ' '); 682 cp = strchr (cp + 1, ' ');
661 683
662 if (cp) 684 if (cp)
663 { 685 {
664 assign (ns->version, cp + 1); 686 ns->version = cp + 1;
665 687
666 if (ns->sc_version < 1026) 688 if (ns->sc_version < 1026)
667 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 689 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
668 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 690 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
669 } 691 }
… …
692 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
693 */ 715 */
694void 716void
695MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
696{ 718{
697 int vals[3], i; 719 int to, tag, nrof;
698 720
699 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
700 * we obviously are not going to find a space after the third
701 * record. Perhaps we should just replace this with a
702 * sscanf?
703 */
704 for (i = 0; i < 2; i++)
705 { 722 {
706 vals[i] = atoi (buf);
707
708 if (!(buf = strchr (buf, ' ')))
709 {
710 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
711 return; 724 return;
712 }
713
714 buf++;
715 } 725 }
716 726
717 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
718
719/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
720 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
721} 728}
722 729
723/****************************************************************************** 730/******************************************************************************
724 * 731 *
725 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
734send_query (client *ns, uint8 flags, const char *text) 741send_query (client *ns, uint8 flags, const char *text)
735{ 742{
736 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 743 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
737} 744}
738 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
739#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
740 Old = New; \ 775 Old = New; \
741 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
742 } 777 }
743 778
… …
749#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
750 Old = New; \ 785 Old = New; \
751 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
752 } 787 }
753 788
754#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
755 Old = New; \ 790 Old = New; \
756 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
757 } 792 }
758 793
759#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
760 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
761 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
775 810
776 client *ns = pl->ns; 811 client *ns = pl->ns;
777 if (!ns) 812 if (!ns)
778 return; 813 return;
779 814
780 object *ob = pl->ob; 815 object *ob = pl->observe;
781 if (!ob) 816 if (!ob)
782 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
783 820
784 packet sl ("stats"); 821 packet sl ("stats");
785 822
786 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
787 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
796 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
797 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
798 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
799 836
800 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
801 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob[s])
802 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
803 { 840 {
804 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
805 842
806 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
814 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
815 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
816 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
817 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
818 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
819 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
820 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
821 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);
822 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);
823 860
824 flags = 0; 861 flags = 0;
825 862
826 if (pl->fire_on) 863 if (opl->fire_on)
827 flags |= SF_FIREON; 864 flags |= SF_FIREON;
828 865
829 if (pl->run_on) 866 if (opl->run_on)
830 flags |= SF_RUNON; 867 flags |= SF_RUNON;
831 868
832 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
833 870
834 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
848 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);
849 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);
850 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);
851 } 888 }
852 889
853 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 */
854 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
855 set_title (ob, buf); 892 set_title (ob, buf);
856 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
857 894
858 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
862 899
863/** 900/**
864 * 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.
865 */ 902 */
866void 903void
867esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
868{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
869 packet sl ("player"); 908 packet sl ("player");
870 909
871 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
872 << uint32 (weight) 911 << uint32 (weight)
873 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
… …
940 979
941 if (!ns.faces_sent[face_num]) 980 if (!ns.faces_sent[face_num])
942 if (ob) 981 if (ob)
943 ns.send_faces (ob); 982 ns.send_faces (ob);
944 else 983 else
945 ns.send_face (face_num); 984 ns.send_face (face_num, 10);
946 985
947 sl << uint16 (face_num); 986 sl << uint16 (face_num);
948 return 1; 987 return 1;
949 } 988 }
950 989
… …
992{ 1031{
993 prefetch_surrounding_maps (op->map, 3); 1032 prefetch_surrounding_maps (op->map, 3);
994} 1033}
995 1034
996/** 1035/**
997 * This function uses the new map1 protocol command to send the map 1036 * Draws client map.
998 * to the client. It is necessary because the old map command supports
999 * a maximum map size of 15x15.
1000 * This function is much simpler than the old one. This is because
1001 * the old function optimized to send as few face identifiers as possible,
1002 * at the expense of sending more coordinate location (coordinates were
1003 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1004 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1005 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1006 * and use the other 4 bits for other informatiion. For full documentation
1007 * of what we send, see the doc/Protocol file.
1008 * I will describe internally what we do:
1009 * the ns->lastmap shows how the map last looked when sent to the client.
1010 * in the lastmap structure, there is a cells array, which is set to the
1011 * maximum viewable size (As set in config.h).
1012 * in the cells, there are faces and a count value.
1013 * we use the count value to hold the darkness value. If -1, then this space
1014 * is not viewable.
1015 * we use faces[0] faces[1] faces[2] to hold what the three layers
1016 * look like.
1017 */ 1037 */
1018void 1038void
1019draw_client_map1 (object *pl) 1039draw_client_map (player *pl)
1020{ 1040{
1041 object *ob = pl->observe;
1042 if (!ob->active)
1043 return;
1044
1045 maptile *plmap = ob->map;
1046
1047 /* If player is just joining the game, he isn't here yet, so the map
1048 * can get swapped out. If so, don't try to send them a map. All will
1049 * be OK once they really log in.
1050 */
1051 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1052 return;
1053
1021 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1022 sint16 nx, ny;
1023 int estartlen, eoldlen; 1055 int estartlen, eoldlen;
1024 uint8 eentrysize; 1056 uint8 eentrysize;
1025 uint16 ewhatstart, ewhatflag; 1057 uint16 ewhatstart, ewhatflag;
1026 uint8 extendedinfos; 1058 uint8 extendedinfos;
1027 maptile *m;
1028 1059
1029 client &socket = *pl->contr->ns;
1030
1031 if (!pl->active)
1032 return;
1033
1034 check_map_change (pl->contr); 1060 check_map_change (pl);
1035 prefetch_surrounding_maps (pl); 1061 prefetch_surrounding_maps (pl->ob);
1062
1063 /* do LOS after calls to update_position */
1064 if (ob != pl->ob)
1065 clear_los (pl);
1066 else if (pl->do_los)
1067 {
1068 update_los (ob);
1069 pl->do_los = 0;
1070 }
1071
1072 /**
1073 * This function uses the new map1 protocol command to send the map
1074 * to the client. It is necessary because the old map command supports
1075 * a maximum map size of 15x15.
1076 * This function is much simpler than the old one. This is because
1077 * the old function optimized to send as few face identifiers as possible,
1078 * at the expense of sending more coordinate location (coordinates were
1079 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1080 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1081 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1082 * and use the other 4 bits for other informatiion. For full documentation
1083 * of what we send, see the doc/Protocol file.
1084 * I will describe internally what we do:
1085 * the ns->lastmap shows how the map last looked when sent to the client.
1086 * in the lastmap structure, there is a cells array, which is set to the
1087 * maximum viewable size (As set in config.h).
1088 * in the cells, there are faces and a count value.
1089 * we use the count value to hold the darkness value. If -1, then this space
1090 * is not viewable.
1091 * we use faces[0] faces[1] faces[2] to hold what the three layers
1092 * look like.
1093 */
1094
1095 client &socket = *pl->ns;
1036 1096
1037 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1038 packet esl; 1098 packet esl;
1039 1099
1040 startlen = sl.length (); 1100 startlen = sl.length ();
… …
1064 ay = 0; 1124 ay = 0;
1065 1125
1066 /* We could do this logic as conditionals in the if statement, 1126 /* We could do this logic as conditionals in the if statement,
1067 * but that started to get a bit messy to look at. 1127 * but that started to get a bit messy to look at.
1068 */ 1128 */
1069 max_x = pl->x + (socket.mapx + 1) / 2; 1129 max_x = ob->x + (socket.mapx + 1) / 2;
1070 max_y = pl->y + (socket.mapy + 1) / 2; 1130 max_y = ob->y + (socket.mapy + 1) / 2;
1071 1131
1072 maptile *plmap = pl->map;
1073
1074 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1132 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1075 { 1133 {
1134 sint16 nx, ny;
1135 maptile *m = 0;
1136
1076 ax = 0; 1137 ax = 0;
1077 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1078 { 1139 {
1140 // check to see if we can simply go one right quickly
1141 ++nx;
1142 if (m && nx >= m->width)
1143 m = 0;
1144
1145 if (!m)
1146 {
1147 nx = x; ny = y; m = plmap;
1148
1149 if (xy_normalise (m, nx, ny))
1150 m->touch ();
1151 else
1152 m = 0;
1153 }
1154
1079 int emask, mask; 1155 int emask, mask;
1080 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1081 1157
1082 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1083 1159
1084 /* If the coordinates are not valid, or it is too dark to see, 1160 /* If the coordinates are not valid, or it is too dark to see,
1085 * we tell the client as such 1161 * we tell the client as such
1086 */ 1162 */
1087 nx = x;
1088 ny = y;
1089 m = get_map_from_coord (plmap, &nx, &ny);
1090
1091 if (!m) 1163 if (!m)
1092 { 1164 {
1093 /* space is out of map. Update space and clear values 1165 /* space is out of map. Update space and clear values
1094 * if this hasn't already been done. If the space is out 1166 * if this hasn't already been done. If the space is out
1095 * of the map, it shouldn't have a head 1167 * of the map, it shouldn't have a head
… …
1101 } 1173 }
1102 1174
1103 continue; 1175 continue;
1104 } 1176 }
1105 1177
1106 m->touch ();
1107
1108 int d = pl->contr->blocked_los[ax][ay]; 1178 int d = pl->blocked_los[ax][ay];
1109 1179
1110 if (d > 3) 1180 if (d > 3)
1111 { 1181 {
1112
1113 int need_send = 0, count; 1182 int need_send = 0, count;
1114 1183
1115 /* This block deals with spaces that are not visible for whatever 1184 /* This block deals with spaces that are not visible for whatever
1116 * reason. Still may need to send the head for this space. 1185 * reason. Still may need to send the head for this space.
1117 */ 1186 */
… …
1123 if (lastcell.count != -1) 1192 if (lastcell.count != -1)
1124 need_send = 1; 1193 need_send = 1;
1125 1194
1126 count = -1; 1195 count = -1;
1127 1196
1128 /* properly clear a previously sent big face */
1129 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1197 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1130 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1198 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1131 need_send = 1; 1199 need_send = 1;
1132 1200
1201 /* properly clear a previously sent big face */
1133 map_clearcell (&lastcell, count); 1202 map_clearcell (&lastcell, count);
1134 1203
1135 if ((mask & 0xf) || need_send) 1204 if ((mask & 0xf) || need_send)
1136 sl[oldlen + 1] = mask & 0xff; 1205 sl[oldlen + 1] = mask & 0xff;
1137 else 1206 else
… …
1176 } 1245 }
1177 1246
1178 lastcell.count = d; 1247 lastcell.count = d;
1179 1248
1180 mapspace &ms = m->at (nx, ny); 1249 mapspace &ms = m->at (nx, ny);
1250 ms.update ();
1181 1251
1182 if (socket.extmap) 1252 if (socket.extmap)
1183 { 1253 {
1184 uint8 stat_hp = 0; 1254 uint8 stat_hp = 0;
1185 uint8 stat_width = 0; 1255 uint8 stat_width = 0;
1186 uint8 flags = 0; 1256 uint8 flags = 0;
1187 tag_t player = 0; 1257 tag_t player = 0;
1188 1258
1189 // send hp information, if applicable 1259 // send hp information, if applicable
1190 if (object *op = ms.faces_obj [0]) 1260 if (object *op = ms.faces_obj [0])
1191 {
1192 if (op->head || op->invisible) 1261 if (op->is_head () && !op->invisible)
1193 ; // do not show
1194 else if (op->type == PLAYER
1195 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1196 { 1262 {
1197 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1263 if (op->stats.maxhp > op->stats.hp
1264 && op->stats.maxhp > 0
1265 && (op->type == PLAYER
1266 || op->type == DOOR // does not work, have maxhp 0
1267 || QUERY_FLAG (op, FLAG_MONSTER)
1268 || QUERY_FLAG (op, FLAG_ALIVE)
1269 || QUERY_FLAG (op, FLAG_GENERATOR)))
1198 { 1270 {
1199 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1271 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1200 stat_width = op->arch->tail_x; 1272 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1201 } 1273 }
1202 }
1203 1274
1204 if (op->msg && op->msg[0] == '@') 1275 if (op->has_dialogue ())
1205 flags |= 1; 1276 flags |= 1;
1206 1277
1207 if (op->type == PLAYER && op != pl) 1278 if (op->type == PLAYER)
1208 player = op->count; 1279 player = op == ob ? pl->ob->count
1280 : op == pl->ob ? ob->count
1281 : op->count;
1209 } 1282 }
1210 1283
1211 if (lastcell.stat_hp != stat_hp) 1284 if (lastcell.stat_hp != stat_hp)
1212 { 1285 {
1213 lastcell.stat_hp = stat_hp; 1286 lastcell.stat_hp = stat_hp;
1214 1287
… …
1256 1329
1257 /* Middle face */ 1330 /* Middle face */
1258 if (update_space (sl, socket, ms, lastcell, 1)) 1331 if (update_space (sl, socket, ms, lastcell, 1))
1259 mask |= 0x2; 1332 mask |= 0x2;
1260 1333
1261 if (ms.player () == pl 1334 if (ms.player () == ob
1262 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1335 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1263 { 1336 {
1264 // force player to be visible to himself if invisible 1337 // force player to be visible to himself if invisible
1265 if (lastcell.faces[0] != pl->face) 1338 if (lastcell.faces[0] != ob->face)
1266 { 1339 {
1267 lastcell.faces[0] = pl->face; 1340 lastcell.faces[0] = ob->face;
1268 1341
1269 mask |= 0x1; 1342 mask |= 0x1;
1270 sl << uint16 (pl->face); 1343 sl << uint16 (ob->face);
1271 1344
1272 socket.send_faces (pl); 1345 socket.send_faces (ob);
1273 } 1346 }
1274 } 1347 }
1275 /* Top face */ 1348 /* Top face */
1276 else if (update_space (sl, socket, ms, lastcell, 0)) 1349 else if (update_space (sl, socket, ms, lastcell, 0))
1277 mask |= 0x1; 1350 mask |= 0x1;
1278
1279 1351
1280 /* Check to see if we are in fact sending anything for this 1352 /* Check to see if we are in fact sending anything for this
1281 * space by checking the mask. If so, update the mask. 1353 * space by checking the mask. If so, update the mask.
1282 * if not, reset the len to that from before adding the mask 1354 * if not, reset the len to that from before adding the mask
1283 * value, so we don't send those bits. 1355 * value, so we don't send those bits.
… …
1342 socket.send_packet (sl); 1414 socket.send_packet (sl);
1343 socket.sent_scroll = 0; 1415 socket.sent_scroll = 0;
1344 } 1416 }
1345} 1417}
1346 1418
1347/**
1348 * Draws client map.
1349 */
1350void
1351draw_client_map (object *pl)
1352{
1353 int i, j;
1354 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1355 int mflags;
1356 struct Map newmap;
1357 maptile *m, *pm;
1358
1359 if (pl->type != PLAYER)
1360 {
1361 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1362 return;
1363 }
1364
1365 pm = pl->map;
1366
1367 /* If player is just joining the game, he isn't here yet, so the map
1368 * can get swapped out. If so, don't try to send them a map. All will
1369 * be OK once they really log in.
1370 */
1371 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1372 return;
1373
1374 memset (&newmap, 0, sizeof (struct Map));
1375
1376 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1377 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1378 {
1379 ax = i;
1380 ay = j;
1381 m = pm;
1382 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1383
1384 if (mflags & P_OUT_OF_MAP)
1385 continue;
1386
1387 /* If a map is visible to the player, we don't want to swap it out
1388 * just to reload it. This should really call something like
1389 * swap_map, but this is much more efficient and 'good enough'
1390 */
1391 if (mflags & P_NEW_MAP)
1392 m->timeout = 50;
1393 }
1394
1395 /* do LOS after calls to update_position */
1396 if (pl->contr->do_los)
1397 {
1398 update_los (pl);
1399 pl->contr->do_los = 0;
1400 }
1401
1402 /* Big maps need a different drawing mechanism to work */
1403 draw_client_map1 (pl);
1404}
1405
1406
1407/*****************************************************************************/ 1419/*****************************************************************************/
1408
1409/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1420/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1410
1411/* a player. Of course, the client need to know the command to be able to */ 1421/* a player. Of course, the client need to know the command to be able to */
1412
1413/* manage it ! */ 1422/* manage it ! */
1414
1415/*****************************************************************************/ 1423/*****************************************************************************/
1416void 1424void
1417send_plugin_custom_message (object *pl, char *buf) 1425send_plugin_custom_message (object *pl, char *buf)
1418{ 1426{
1419 pl->contr->ns->send_packet (buf); 1427 pl->contr->ns->send_packet (buf);
… …
1430 sl << "replyinfo skill_info\n"; 1438 sl << "replyinfo skill_info\n";
1431 1439
1432 for (int i = 1; i < NUM_SKILLS; i++) 1440 for (int i = 1; i < NUM_SKILLS; i++)
1433 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1434 1442
1435 if (sl.length () >= MAXSOCKBUF) 1443 if (sl.length () > MAXSOCKBUF)
1436 { 1444 {
1437 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1445 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1438 fatal (0); 1446 fatal (0);
1439 } 1447 }
1440 1448
… …
1453 sl << "replyinfo spell_paths\n"; 1461 sl << "replyinfo spell_paths\n";
1454 1462
1455 for (int i = 0; i < NRSPELLPATHS; i++) 1463 for (int i = 0; i < NRSPELLPATHS; i++)
1456 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1457 1465
1458 if (sl.length () >= MAXSOCKBUF) 1466 if (sl.length () > MAXSOCKBUF)
1459 { 1467 {
1460 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1461 fatal (0); 1469 fatal (0);
1462 } 1470 }
1463 1471
… …
1482 if (spell->type == SPELL) 1490 if (spell->type == SPELL)
1483 { 1491 {
1484 int flags = 0; 1492 int flags = 0;
1485 1493
1486 /* check if we need to update it */ 1494 /* check if we need to update it */
1487 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1495 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1488 { 1496 {
1489 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1497 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1490 flags |= UPD_SP_MANA; 1498 flags |= UPD_SP_MANA;
1491 } 1499 }
1492 1500
1493 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1501 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1494 { 1502 {
1495 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1503 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1496 flags |= UPD_SP_GRACE; 1504 flags |= UPD_SP_GRACE;
1497 } 1505 }
1498 1506
1499 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1507 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1500 { 1508 {
1501 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1509 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1502 flags |= UPD_SP_DAMAGE; 1510 flags |= UPD_SP_DAMAGE;
1503 } 1511 }
1504 1512
1505 if (flags) 1513 if (flags)
1506 { 1514 {
… …
1508 1516
1509 sl << "updspell " 1517 sl << "updspell "
1510 << uint8 (flags) 1518 << uint8 (flags)
1511 << uint32 (spell->count); 1519 << uint32 (spell->count);
1512 1520
1513 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1514 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1515 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1516 1524
1517 pl->ns->send_packet (sl); 1525 pl->ns->send_packet (sl);
1518 } 1526 }
1519 } 1527 }
1520 } 1528 }
… …
1550 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1558 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1551 return; 1559 return;
1552 } 1560 }
1553 1561
1554 /* store costs and damage in the object struct, to compare to later */ 1562 /* store costs and damage in the object struct, to compare to later */
1555 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1563 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1556 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1564 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1557 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1565 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1558 1566
1559 /* figure out which skill it uses, if it uses one */ 1567 /* figure out which skill it uses, if it uses one */
1560 if (spell->skill) 1568 if (spell->skill)
1561 { 1569 {
1562 for (i = 1; i < NUM_SKILLS; i++) 1570 for (i = 1; i < NUM_SKILLS; i++)
… …
1572 { 1580 {
1573 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1581 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1574 spell->face = face_find ("burnout.x11", blank_face); 1582 spell->face = face_find ("burnout.x11", blank_face);
1575 } 1583 }
1576 1584
1585 pl->ns->send_face (spell->face);
1586
1577 /* send the current values */ 1587 /* send the current values */
1578 sl << uint32 (spell->count) 1588 sl << uint32 (spell->count)
1579 << uint16 (spell->level) 1589 << uint16 (spell->level)
1580 << uint16 (spell->casting_time) 1590 << uint16 (spell->casting_time)
1581 << uint16 (spell->last_sp) 1591 << uint16 (spell->cached_sp)
1582 << uint16 (spell->last_grace) 1592 << uint16 (spell->cached_grace)
1583 << uint16 (spell->last_eat) 1593 << uint16 (spell->cached_eat)
1584 << uint8 (skill) 1594 << uint8 (skill)
1585 << uint32 (spell->path_attuned) 1595 << uint32 (spell->path_attuned)
1586 << uint32 (spell->face) 1596 << uint32 (spell->face)
1587 << data8 (spell->name) 1597 << data8 (spell->name)
1588 << data16 (spell->msg); 1598 << data16 (spell->msg);
… …
1616 * bytes and 3 strings (because that is the spec) so we need to 1626 * bytes and 3 strings (because that is the spec) so we need to
1617 * check that the length of those 3 strings, plus the 23 bytes, 1627 * check that the length of those 3 strings, plus the 23 bytes,
1618 * won't take us over the length limit for the socket, if it does, 1628 * won't take us over the length limit for the socket, if it does,
1619 * we need to send what we already have, and restart packet formation 1629 * we need to send what we already have, and restart packet formation
1620 */ 1630 */
1631 if (spell->type != SPELL)
1632 continue;
1633
1621 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1634 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1622 * to show add_spell is 26 bytes + 2 strings. However, the overun 1635 * to show add_spell is 26 bytes + 2 strings. However, the overun
1623 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1636 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1624 * like it will fix this 1637 * like it will fix this
1625 */ 1638 */
1626 if (spell->type != SPELL)
1627 continue;
1628
1629 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1639 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1630 { 1640 {
1641 pl->ns->flush_fx ();
1631 pl->ns->send_packet (sl); 1642 pl->ns->send_packet (sl);
1632 1643
1633 sl.reset (); 1644 sl.reset ();
1634 sl << "addspell "; 1645 sl << "addspell ";
1635 } 1646 }
… …
1643 return; 1654 return;
1644 } 1655 }
1645 else 1656 else
1646 append_spell (pl, sl, spell); 1657 append_spell (pl, sl, spell);
1647 1658
1648 if (sl.length () >= MAXSOCKBUF) 1659 if (sl.length () > MAXSOCKBUF)
1649 { 1660 {
1650 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1661 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1651 fatal (0); 1662 fatal (0);
1652 } 1663 }
1653 1664
1654 /* finally, we can send the packet */ 1665 /* finally, we can send the packet */
1666 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1667 pl->ns->send_packet (sl);
1656} 1668}
1657 1669

Diff Legend

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