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.90 by root, Fri Apr 27 00:49:58 2007 UTC vs.
Revision 1.132 by elmex, Sun Jun 15 19:34: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]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 snprintf (buf, MAX_BUF, "mapinfo current");
174
175 socket.send_packet (buf);
176 }
177 } 211 }
178 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)
179 { 213 {
180 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
181 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
189 } 223 }
190 } 224 }
191 225
192 socket.current_x = ob->x; 226 socket.current_x = ob->x;
193 socket.current_y = ob->y; 227 socket.current_y = ob->y;
194
195 region *reg = ob->region ();
196 if (socket.current_region != reg)
197 {
198 socket.current_region = reg;
199 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
200 }
201} 228}
202 229
203/** 230/**
204 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
205 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
206 * that information. 233 * that information.
207 */ 234 */
208void 235void
209RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
210{ 237{
211 char *params = NULL, *cp; 238 char *params;
212
213 /* No match */
214 char bigbuf[MAX_BUF];
215 int slen;
216
217 /* Set up replyinfo before we modify any of the buffers - this is used
218 * if we don't find a match.
219 */
220 strcpy (bigbuf, "replyinfo ");
221 slen = strlen (bigbuf);
222 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
223 239
224 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
225 * params pointer. 241 * params pointer.
226 */ 242 */
227 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
228 if (*cp == ' ') 244 if (*params == ' ')
229 { 245 {
230 *cp = '\0';
231 params = cp + 1; 246 *params++ = 0;
232 break; 247 break;
233 } 248 }
234 249
235 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
236 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
239 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
240 send_skill_info (ns, params); 255 send_skill_info (ns, params);
241 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
242 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
243 else 258 else
244 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 }
245} 266}
246 267
247void 268void
248ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
249{ 270{
… …
252 273
253void 274void
254ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
255{ 276{
256 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;
257} 364}
258 365
259void 366void
260MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
261{ 368{
262 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
263 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
264 371
265 char bigbuf[MAX_BUF], *token;
266
267 token = buf; 372 char *token = buf;
268 // copy token 373
269 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
270 return; 375 return;
271 376
272 *buf++ = 0;
273
274 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
275 { 378 {
276 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
277 381
278 // initial map and its origin 382#if 0
279 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
280 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
281 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 free (copy);
282 int mapy = pl->ns->mapy / 2 - pl->ob->y;
283 int max_distance = 8; // limit maximum path length to something generous
284
285 while (*buf && map && max_distance)
286 {
287 int dir = *buf++;
288
289 switch (dir)
290 {
291 case '1':
292 dx = 0;
293 dy = -1;
294 map = map->xy_find (dx, dy);
295 map && (mapy -= map->height);
296 break;
297 case '2':
298 mapx += map->width;
299 dx = map->width;
300 dy = 0;
301 map = map->xy_find (dx, dy);
302 break;
303 case '3':
304 mapy += map->height;
305 dx = 0;
306 dy = map->height;
307 map = map->xy_find (dx, dy);
308 break;
309 case '4':
310 dx = -1;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 map && (mapx -= map->width);
314 break;
315 }
316
317 --max_distance;
318 }
319
320 if (!max_distance)
321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
322 else if (map && map->path[0])
323 {
324 int flags = 0;
325
326 if (map->tile_path[0]) flags |= 1;
327 if (map->tile_path[1]) flags |= 2;
328 if (map->tile_path[2]) flags |= 4;
329 if (map->tile_path[3]) flags |= 8;
330
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
332 }
333 else 386 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
335 } 389 }
336 else 390 else
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
338
339 pl->ns->send_packet (bigbuf);
340} 392}
341 393
342/** This is the Setup cmd */ 394/** This is the Setup cmd */
343void 395void
344SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
… …
473 525
474 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
475} 527}
476 528
477/** 529/**
478 * client requested an image. send it rate-limited
479 * before flushing.
480 */
481void
482AskFaceCmd (char *buf, int len, client *ns)
483{
484 ns->askface.push_back (atoi (buf));
485}
486
487/**
488 * Tells client the picture it has to use
489 * to smooth a picture number given as argument.
490 */
491void
492AskSmooth (char *buf, int len, client *ns)
493{
494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
496}
497
498/**
499 * 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,
500 * etc.) 531 * etc.)
501 */ 532 */
502void 533void
503PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
… …
524 * commands. 555 * commands.
525 */ 556 */
526 pl->count = 0; 557 pl->count = 0;
527} 558}
528 559
529
530/** 560/**
531 * 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,
532 * 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
533 * '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
534 * can throttle. 564 * can throttle.
… …
536void 566void
537NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
538{ 568{
539 if (len <= 6) 569 if (len <= 6)
540 { 570 {
541 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);
542 return; 572 return;
543 } 573 }
544 574
545 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
546 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
684 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
685 */ 715 */
686void 716void
687MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
688{ 718{
689 int vals[3], i; 719 int to, tag, nrof;
690 720
691 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
692 * we obviously are not going to find a space after the third
693 * record. Perhaps we should just replace this with a
694 * sscanf?
695 */
696 for (i = 0; i < 2; i++)
697 { 722 {
698 vals[i] = atoi (buf);
699
700 if (!(buf = strchr (buf, ' ')))
701 {
702 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
703 return; 724 return;
704 }
705
706 buf++;
707 } 725 }
708 726
709 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
710
711/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
712 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
713} 728}
714 729
715/****************************************************************************** 730/******************************************************************************
716 * 731 *
717 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
726send_query (client *ns, uint8 flags, const char *text) 741send_query (client *ns, uint8 flags, const char *text)
727{ 742{
728 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 743 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
729} 744}
730 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
731#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
732 Old = New; \ 775 Old = New; \
733 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
734 } 777 }
735 778
… …
741#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
742 Old = New; \ 785 Old = New; \
743 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
744 } 787 }
745 788
746#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
747 Old = New; \ 790 Old = New; \
748 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
749 } 792 }
750 793
751#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
752 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
753 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
767 810
768 client *ns = pl->ns; 811 client *ns = pl->ns;
769 if (!ns) 812 if (!ns)
770 return; 813 return;
771 814
772 object *ob = pl->ob; 815 object *ob = pl->observe;
773 if (!ob) 816 if (!ob)
774 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
775 820
776 packet sl ("stats"); 821 packet sl ("stats");
777 822
778 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
779 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
788 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
789 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
790 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
791 836
792 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
793 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob[s])
794 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
795 { 840 {
796 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
797 842
798 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
806 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
807 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
808 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
809 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
810 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
811 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
812 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
813 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);
814 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);
815 860
816 flags = 0; 861 flags = 0;
817 862
818 if (pl->fire_on) 863 if (opl->fire_on)
819 flags |= SF_FIREON; 864 flags |= SF_FIREON;
820 865
821 if (pl->run_on) 866 if (opl->run_on)
822 flags |= SF_RUNON; 867 flags |= SF_RUNON;
823 868
824 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
825 870
826 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
840 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);
841 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);
842 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);
843 } 888 }
844 889
845 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 */
846 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
847 set_title (ob, buf); 892 set_title (ob, buf);
848 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
849 894
850 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
854 899
855/** 900/**
856 * 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.
857 */ 902 */
858void 903void
859esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
860{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
861 packet sl ("player"); 908 packet sl ("player");
862 909
863 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
864 << uint32 (weight) 911 << uint32 (weight)
865 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
… …
932 979
933 if (!ns.faces_sent[face_num]) 980 if (!ns.faces_sent[face_num])
934 if (ob) 981 if (ob)
935 ns.send_faces (ob); 982 ns.send_faces (ob);
936 else 983 else
937 ns.send_face (face_num); 984 ns.send_face (face_num, 10);
938 985
939 sl << uint16 (face_num); 986 sl << uint16 (face_num);
940 return 1; 987 return 1;
941 } 988 }
942 989
… …
984{ 1031{
985 prefetch_surrounding_maps (op->map, 3); 1032 prefetch_surrounding_maps (op->map, 3);
986} 1033}
987 1034
988/** 1035/**
989 * This function uses the new map1 protocol command to send the map 1036 * Draws client map.
990 * to the client. It is necessary because the old map command supports
991 * a maximum map size of 15x15.
992 * This function is much simpler than the old one. This is because
993 * the old function optimized to send as few face identifiers as possible,
994 * at the expense of sending more coordinate location (coordinates were
995 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
996 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
997 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
998 * and use the other 4 bits for other informatiion. For full documentation
999 * of what we send, see the doc/Protocol file.
1000 * I will describe internally what we do:
1001 * the ns->lastmap shows how the map last looked when sent to the client.
1002 * in the lastmap structure, there is a cells array, which is set to the
1003 * maximum viewable size (As set in config.h).
1004 * in the cells, there are faces and a count value.
1005 * we use the count value to hold the darkness value. If -1, then this space
1006 * is not viewable.
1007 * we use faces[0] faces[1] faces[2] to hold what the three layers
1008 * look like.
1009 */ 1037 */
1010void 1038void
1011draw_client_map1 (object *pl) 1039draw_client_map (player *pl)
1012{ 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
1013 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1014 sint16 nx, ny;
1015 int estartlen, eoldlen; 1055 int estartlen, eoldlen;
1016 uint8 eentrysize; 1056 uint8 eentrysize;
1017 uint16 ewhatstart, ewhatflag; 1057 uint16 ewhatstart, ewhatflag;
1018 uint8 extendedinfos; 1058 uint8 extendedinfos;
1019 maptile *m;
1020 1059
1021 client &socket = *pl->contr->ns;
1022
1023 if (!pl->active)
1024 return;
1025
1026 check_map_change (pl->contr); 1060 check_map_change (pl);
1027 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;
1028 1096
1029 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1030 packet esl; 1098 packet esl;
1031 1099
1032 startlen = sl.length (); 1100 startlen = sl.length ();
… …
1056 ay = 0; 1124 ay = 0;
1057 1125
1058 /* We could do this logic as conditionals in the if statement, 1126 /* We could do this logic as conditionals in the if statement,
1059 * but that started to get a bit messy to look at. 1127 * but that started to get a bit messy to look at.
1060 */ 1128 */
1061 max_x = pl->x + (socket.mapx + 1) / 2; 1129 max_x = ob->x + (socket.mapx + 1) / 2;
1062 max_y = pl->y + (socket.mapy + 1) / 2; 1130 max_y = ob->y + (socket.mapy + 1) / 2;
1063 1131
1064 maptile *plmap = pl->map;
1065
1066 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++)
1067 { 1133 {
1134 sint16 nx, ny;
1135 maptile *m = 0;
1136
1068 ax = 0; 1137 ax = 0;
1069 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++)
1070 { 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
1071 int emask, mask; 1155 int emask, mask;
1072 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1073 1157
1074 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1075 1159
1076 /* 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,
1077 * we tell the client as such 1161 * we tell the client as such
1078 */ 1162 */
1079 nx = x;
1080 ny = y;
1081 m = get_map_from_coord (plmap, &nx, &ny);
1082
1083 if (!m) 1163 if (!m)
1084 { 1164 {
1085 /* space is out of map. Update space and clear values 1165 /* space is out of map. Update space and clear values
1086 * 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
1087 * of the map, it shouldn't have a head 1167 * of the map, it shouldn't have a head
… …
1093 } 1173 }
1094 1174
1095 continue; 1175 continue;
1096 } 1176 }
1097 1177
1098 m->touch ();
1099
1100 int d = pl->contr->blocked_los[ax][ay]; 1178 int d = pl->blocked_los[ax][ay];
1101 1179
1102 if (d > 3) 1180 if (d > 3)
1103 { 1181 {
1104 1182
1105 int need_send = 0, count; 1183 int need_send = 0, count;
… …
1168 } 1246 }
1169 1247
1170 lastcell.count = d; 1248 lastcell.count = d;
1171 1249
1172 mapspace &ms = m->at (nx, ny); 1250 mapspace &ms = m->at (nx, ny);
1251 ms.update ();
1173 1252
1174 if (socket.extmap) 1253 if (socket.extmap)
1175 { 1254 {
1176 uint8 stat_hp = 0; 1255 uint8 stat_hp = 0;
1177 uint8 stat_width = 0; 1256 uint8 stat_width = 0;
1178 uint8 flags = 0; 1257 uint8 flags = 0;
1179 tag_t player = 0; 1258 tag_t player = 0;
1180 1259
1181 // send hp information, if applicable 1260 // send hp information, if applicable
1182 if (object *op = ms.faces_obj [0]) 1261 if (object *op = ms.faces_obj [0])
1262 if (op->is_head () && !op->invisible)
1183 { 1263 {
1184 if (op->head || op->invisible) 1264 if (op->stats.maxhp > op->stats.hp
1185 ; // do not show 1265 && op->stats.maxhp > 0
1186 else if (op->type == PLAYER 1266 && (op->type == PLAYER
1267 || op->type == DOOR // does not work, have maxhp 0
1187 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1268 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1188 {
1189 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1190 { 1269 {
1191 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1192 stat_width = op->arch->tail_x; 1271 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1193 } 1272 }
1194 }
1195 1273
1196 if (op->msg && op->msg[0] == '@') 1274 if (op->msg && op->msg[0] == '@')
1197 flags |= 1; 1275 flags |= 1;
1198 1276
1199 if (op->type == PLAYER && op != pl) 1277 if (op->type == PLAYER && op != ob)
1200 player = op->count; 1278 player = op->count;
1201 } 1279 }
1202 1280
1203 if (lastcell.stat_hp != stat_hp) 1281 if (lastcell.stat_hp != stat_hp)
1204 { 1282 {
1205 lastcell.stat_hp = stat_hp; 1283 lastcell.stat_hp = stat_hp;
1206 1284
… …
1248 1326
1249 /* Middle face */ 1327 /* Middle face */
1250 if (update_space (sl, socket, ms, lastcell, 1)) 1328 if (update_space (sl, socket, ms, lastcell, 1))
1251 mask |= 0x2; 1329 mask |= 0x2;
1252 1330
1253 if (ms.player () == pl 1331 if (ms.player () == ob
1254 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1332 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1255 { 1333 {
1256 // force player to be visible to himself if invisible 1334 // force player to be visible to himself if invisible
1257 if (lastcell.faces[0] != pl->face) 1335 if (lastcell.faces[0] != ob->face)
1258 { 1336 {
1259 lastcell.faces[0] = pl->face; 1337 lastcell.faces[0] = ob->face;
1260 1338
1261 mask |= 0x1; 1339 mask |= 0x1;
1262 sl << uint16 (pl->face); 1340 sl << uint16 (ob->face);
1263 1341
1264 socket.send_faces (pl); 1342 socket.send_faces (ob);
1265 } 1343 }
1266 } 1344 }
1267 /* Top face */ 1345 /* Top face */
1268 else if (update_space (sl, socket, ms, lastcell, 0)) 1346 else if (update_space (sl, socket, ms, lastcell, 0))
1269 mask |= 0x1; 1347 mask |= 0x1;
1270
1271 1348
1272 /* Check to see if we are in fact sending anything for this 1349 /* Check to see if we are in fact sending anything for this
1273 * space by checking the mask. If so, update the mask. 1350 * space by checking the mask. If so, update the mask.
1274 * if not, reset the len to that from before adding the mask 1351 * if not, reset the len to that from before adding the mask
1275 * value, so we don't send those bits. 1352 * value, so we don't send those bits.
… …
1334 socket.send_packet (sl); 1411 socket.send_packet (sl);
1335 socket.sent_scroll = 0; 1412 socket.sent_scroll = 0;
1336 } 1413 }
1337} 1414}
1338 1415
1339/**
1340 * Draws client map.
1341 */
1342void
1343draw_client_map (object *pl)
1344{
1345 int i, j;
1346 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1347 int mflags;
1348 struct Map newmap;
1349 maptile *m, *pm;
1350
1351 if (pl->type != PLAYER)
1352 {
1353 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1354 return;
1355 }
1356
1357 pm = pl->map;
1358
1359 /* If player is just joining the game, he isn't here yet, so the map
1360 * can get swapped out. If so, don't try to send them a map. All will
1361 * be OK once they really log in.
1362 */
1363 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1364 return;
1365
1366 memset (&newmap, 0, sizeof (struct Map));
1367
1368 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1369 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1370 {
1371 ax = i;
1372 ay = j;
1373 m = pm;
1374 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1375
1376 if (mflags & P_OUT_OF_MAP)
1377 continue;
1378
1379 /* If a map is visible to the player, we don't want to swap it out
1380 * just to reload it. This should really call something like
1381 * swap_map, but this is much more efficient and 'good enough'
1382 */
1383 if (mflags & P_NEW_MAP)
1384 m->timeout = 50;
1385 }
1386
1387 /* do LOS after calls to update_position */
1388 if (pl->contr->do_los)
1389 {
1390 update_los (pl);
1391 pl->contr->do_los = 0;
1392 }
1393
1394 /* Big maps need a different drawing mechanism to work */
1395 draw_client_map1 (pl);
1396}
1397
1398
1399/*****************************************************************************/ 1416/*****************************************************************************/
1400
1401/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1417/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1402
1403/* a player. Of course, the client need to know the command to be able to */ 1418/* a player. Of course, the client need to know the command to be able to */
1404
1405/* manage it ! */ 1419/* manage it ! */
1406
1407/*****************************************************************************/ 1420/*****************************************************************************/
1408void 1421void
1409send_plugin_custom_message (object *pl, char *buf) 1422send_plugin_custom_message (object *pl, char *buf)
1410{ 1423{
1411 pl->contr->ns->send_packet (buf); 1424 pl->contr->ns->send_packet (buf);
… …
1422 sl << "replyinfo skill_info\n"; 1435 sl << "replyinfo skill_info\n";
1423 1436
1424 for (int i = 1; i < NUM_SKILLS; i++) 1437 for (int i = 1; i < NUM_SKILLS; i++)
1425 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1438 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1426 1439
1427 if (sl.length () >= MAXSOCKBUF) 1440 if (sl.length () > MAXSOCKBUF)
1428 { 1441 {
1429 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1442 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1430 fatal (0); 1443 fatal (0);
1431 } 1444 }
1432 1445
… …
1445 sl << "replyinfo spell_paths\n"; 1458 sl << "replyinfo spell_paths\n";
1446 1459
1447 for (int i = 0; i < NRSPELLPATHS; i++) 1460 for (int i = 0; i < NRSPELLPATHS; i++)
1448 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1461 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1449 1462
1450 if (sl.length () >= MAXSOCKBUF) 1463 if (sl.length () > MAXSOCKBUF)
1451 { 1464 {
1452 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1465 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1453 fatal (0); 1466 fatal (0);
1454 } 1467 }
1455 1468
… …
1474 if (spell->type == SPELL) 1487 if (spell->type == SPELL)
1475 { 1488 {
1476 int flags = 0; 1489 int flags = 0;
1477 1490
1478 /* check if we need to update it */ 1491 /* check if we need to update it */
1479 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1492 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1480 { 1493 {
1481 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1494 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1482 flags |= UPD_SP_MANA; 1495 flags |= UPD_SP_MANA;
1483 } 1496 }
1484 1497
1485 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1498 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1486 { 1499 {
1487 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1500 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1488 flags |= UPD_SP_GRACE; 1501 flags |= UPD_SP_GRACE;
1489 } 1502 }
1490 1503
1491 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1504 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1492 { 1505 {
1493 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1506 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1494 flags |= UPD_SP_DAMAGE; 1507 flags |= UPD_SP_DAMAGE;
1495 } 1508 }
1496 1509
1497 if (flags) 1510 if (flags)
1498 { 1511 {
… …
1500 1513
1501 sl << "updspell " 1514 sl << "updspell "
1502 << uint8 (flags) 1515 << uint8 (flags)
1503 << uint32 (spell->count); 1516 << uint32 (spell->count);
1504 1517
1505 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1518 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1506 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1519 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1507 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1520 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1508 1521
1509 pl->ns->send_packet (sl); 1522 pl->ns->send_packet (sl);
1510 } 1523 }
1511 } 1524 }
1512 } 1525 }
… …
1542 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1555 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1543 return; 1556 return;
1544 } 1557 }
1545 1558
1546 /* store costs and damage in the object struct, to compare to later */ 1559 /* store costs and damage in the object struct, to compare to later */
1547 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1560 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1548 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1561 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1549 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1562 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1550 1563
1551 /* figure out which skill it uses, if it uses one */ 1564 /* figure out which skill it uses, if it uses one */
1552 if (spell->skill) 1565 if (spell->skill)
1553 { 1566 {
1554 for (i = 1; i < NUM_SKILLS; i++) 1567 for (i = 1; i < NUM_SKILLS; i++)
… …
1564 { 1577 {
1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1578 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1566 spell->face = face_find ("burnout.x11", blank_face); 1579 spell->face = face_find ("burnout.x11", blank_face);
1567 } 1580 }
1568 1581
1582 pl->ns->send_face (spell->face);
1583
1569 /* send the current values */ 1584 /* send the current values */
1570 sl << uint32 (spell->count) 1585 sl << uint32 (spell->count)
1571 << uint16 (spell->level) 1586 << uint16 (spell->level)
1572 << uint16 (spell->casting_time) 1587 << uint16 (spell->casting_time)
1573 << uint16 (spell->last_sp) 1588 << uint16 (spell->cached_sp)
1574 << uint16 (spell->last_grace) 1589 << uint16 (spell->cached_grace)
1575 << uint16 (spell->last_eat) 1590 << uint16 (spell->cached_eat)
1576 << uint8 (skill) 1591 << uint8 (skill)
1577 << uint32 (spell->path_attuned) 1592 << uint32 (spell->path_attuned)
1578 << uint32 (spell->face) 1593 << uint32 (spell->face)
1579 << data8 (spell->name) 1594 << data8 (spell->name)
1580 << data16 (spell->msg); 1595 << data16 (spell->msg);
… …
1608 * bytes and 3 strings (because that is the spec) so we need to 1623 * bytes and 3 strings (because that is the spec) so we need to
1609 * check that the length of those 3 strings, plus the 23 bytes, 1624 * check that the length of those 3 strings, plus the 23 bytes,
1610 * won't take us over the length limit for the socket, if it does, 1625 * won't take us over the length limit for the socket, if it does,
1611 * we need to send what we already have, and restart packet formation 1626 * we need to send what we already have, and restart packet formation
1612 */ 1627 */
1628 if (spell->type != SPELL)
1629 continue;
1630
1613 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1631 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1614 * to show add_spell is 26 bytes + 2 strings. However, the overun 1632 * to show add_spell is 26 bytes + 2 strings. However, the overun
1615 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1633 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1616 * like it will fix this 1634 * like it will fix this
1617 */ 1635 */
1618 if (spell->type != SPELL)
1619 continue;
1620
1621 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1636 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1622 { 1637 {
1638 pl->ns->flush_fx ();
1623 pl->ns->send_packet (sl); 1639 pl->ns->send_packet (sl);
1624 1640
1625 sl.reset (); 1641 sl.reset ();
1626 sl << "addspell "; 1642 sl << "addspell ";
1627 } 1643 }
… …
1635 return; 1651 return;
1636 } 1652 }
1637 else 1653 else
1638 append_spell (pl, sl, spell); 1654 append_spell (pl, sl, spell);
1639 1655
1640 if (sl.length () >= MAXSOCKBUF) 1656 if (sl.length () > MAXSOCKBUF)
1641 { 1657 {
1642 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1643 fatal (0); 1659 fatal (0);
1644 } 1660 }
1645 1661
1646 /* finally, we can send the packet */ 1662 /* finally, we can send the packet */
1663 pl->ns->flush_fx ();
1647 pl->ns->send_packet (sl); 1664 pl->ns->send_packet (sl);
1648} 1665}
1649 1666

Diff Legend

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