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.93 by root, Tue May 1 05:48:21 2007 UTC vs.
Revision 1.140 by root, Thu Oct 2 16:08:19 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
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.
… …
730 745
731/** 746/**
732 * Get player's current range attack in obuf. 747 * Get player's current range attack in obuf.
733 */ 748 */
734static void 749static void
735rangetostring (object *ob, char *obuf) 750rangetostring (player *pl, char *obuf)
736{ 751{
737 dynbuf_text buf; 752 dynbuf_text buf;
738 753
739 player *pl = ob->contr;
740
741 if (pl->ranged_ob) 754 if (pl->ranged_ob)
742 buf << " Range: " << pl->ranged_ob->name; 755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 756
744 if (pl->combat_ob) 757 if (pl->combat_ob)
745 buf << " Combat: " << pl->combat_ob->name; 758 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746 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?
747 if (pl->golem) 767 if (pl->golem)
748 buf << " Golem: " << pl->golem->name; 768 buf << " Golem*: " << pl->golem->name;
749 769
750 if (buf.empty ()) 770 buf << '\0';
751 *obuf = 0; 771 buf.linearise (obuf);
752 else
753 {
754 memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
755 obuf [buf.size ()] = 0;
756 }
757} 772}
758 773
759#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
760 Old = New; \ 775 Old = New; \
761 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
… …
769#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
770 Old = New; \ 785 Old = New; \
771 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
772 } 787 }
773 788
774#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
775 Old = New; \ 790 Old = New; \
776 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
777 } 792 }
778 793
779#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
780 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
781 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
795 810
796 client *ns = pl->ns; 811 client *ns = pl->ns;
797 if (!ns) 812 if (!ns)
798 return; 813 return;
799 814
800 object *ob = pl->ob; 815 object *ob = pl->observe;
801 if (!ob) 816 if (!ob)
802 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
803 820
804 packet sl ("stats"); 821 packet sl ("stats");
805 822
806 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
807 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
816 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
817 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
818 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
819 836
820 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
821 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob [s])
822 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
823 { 840 {
824 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
825 842
826 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
834 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
835 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
836 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
837 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
838 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
839 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
840 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
841 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);
842 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);
843 860
844 flags = 0; 861 flags = 0;
845 862
846 if (pl->fire_on) 863 if (opl->fire_on)
847 flags |= SF_FIREON; 864 flags |= SF_FIREON;
848 865
849 if (pl->run_on) 866 if (opl->run_on)
850 flags |= SF_RUNON; 867 flags |= SF_RUNON;
851 868
852 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
853 870
854 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
868 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);
869 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);
870 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);
871 } 888 }
872 889
873 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 */
874 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
875 set_title (ob, buf); 892 set_title (ob, buf);
876 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
877 894
878 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
882 899
883/** 900/**
884 * 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.
885 */ 902 */
886void 903void
887esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
888{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
889 packet sl ("player"); 908 packet sl ("player");
890 909
891 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
892 << uint32 (weight) 911 << uint32 (weight)
893 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
894 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
895 914
896 pl->ns->last_weight = weight; 915 pl->ns->last_weight = weight;
897 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
898 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
899} 917}
900 918
901/****************************************************************************** 919/******************************************************************************
902 * 920 *
903 * Start of map related commands. 921 * Start of map related commands.
… …
960 978
961 if (!ns.faces_sent[face_num]) 979 if (!ns.faces_sent[face_num])
962 if (ob) 980 if (ob)
963 ns.send_faces (ob); 981 ns.send_faces (ob);
964 else 982 else
965 ns.send_face (face_num); 983 ns.send_face (face_num, 10);
966 984
967 sl << uint16 (face_num); 985 sl << uint16 (face_num);
968 return 1; 986 return 1;
969 } 987 }
970 988
… …
1012{ 1030{
1013 prefetch_surrounding_maps (op->map, 3); 1031 prefetch_surrounding_maps (op->map, 3);
1014} 1032}
1015 1033
1016/** 1034/**
1017 * This function uses the new map1 protocol command to send the map 1035 * Draws client map.
1018 * to the client. It is necessary because the old map command supports
1019 * a maximum map size of 15x15.
1020 * This function is much simpler than the old one. This is because
1021 * the old function optimized to send as few face identifiers as possible,
1022 * at the expense of sending more coordinate location (coordinates were
1023 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1024 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1025 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1026 * and use the other 4 bits for other informatiion. For full documentation
1027 * of what we send, see the doc/Protocol file.
1028 * I will describe internally what we do:
1029 * the ns->lastmap shows how the map last looked when sent to the client.
1030 * in the lastmap structure, there is a cells array, which is set to the
1031 * maximum viewable size (As set in config.h).
1032 * in the cells, there are faces and a count value.
1033 * we use the count value to hold the darkness value. If -1, then this space
1034 * is not viewable.
1035 * we use faces[0] faces[1] faces[2] to hold what the three layers
1036 * look like.
1037 */ 1036 */
1038void 1037void
1039draw_client_map1 (object *pl) 1038draw_client_map (player *pl)
1040{ 1039{
1040 object *ob = pl->observe;
1041 if (!ob->active)
1042 return;
1043
1044 maptile *plmap = ob->map;
1045
1046 /* If player is just joining the game, he isn't here yet, so the map
1047 * can get swapped out. If so, don't try to send them a map. All will
1048 * be OK once they really log in.
1049 */
1050 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1051 return;
1052
1041 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1053 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1042 sint16 nx, ny;
1043 int estartlen, eoldlen; 1054 int estartlen, eoldlen;
1044 uint8 eentrysize; 1055 uint8 eentrysize;
1045 uint16 ewhatstart, ewhatflag; 1056 uint16 ewhatstart, ewhatflag;
1046 uint8 extendedinfos; 1057 uint8 extendedinfos;
1047 maptile *m;
1048 1058
1049 client &socket = *pl->contr->ns;
1050
1051 if (!pl->active)
1052 return;
1053
1054 check_map_change (pl->contr); 1059 check_map_change (pl);
1055 prefetch_surrounding_maps (pl); 1060 prefetch_surrounding_maps (pl->ob);
1061
1062 /* do LOS after calls to update_position */
1063 if (ob != pl->ob)
1064 clear_los (pl);
1065 else if (pl->do_los)
1066 {
1067 update_los (ob);
1068 pl->do_los = 0;
1069 }
1070
1071 /**
1072 * This function uses the new map1 protocol command to send the map
1073 * to the client. It is necessary because the old map command supports
1074 * a maximum map size of 15x15.
1075 * This function is much simpler than the old one. This is because
1076 * the old function optimized to send as few face identifiers as possible,
1077 * at the expense of sending more coordinate location (coordinates were
1078 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1079 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1080 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1081 * and use the other 4 bits for other informatiion. For full documentation
1082 * of what we send, see the doc/Protocol file.
1083 * I will describe internally what we do:
1084 * the ns->lastmap shows how the map last looked when sent to the client.
1085 * in the lastmap structure, there is a cells array, which is set to the
1086 * maximum viewable size (As set in config.h).
1087 * in the cells, there are faces and a count value.
1088 * we use the count value to hold the darkness value. If -1, then this space
1089 * is not viewable.
1090 * we use faces[0] faces[1] faces[2] to hold what the three layers
1091 * look like.
1092 */
1093
1094 client &socket = *pl->ns;
1056 1095
1057 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1096 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1058 packet esl; 1097 packet esl;
1059 1098
1060 startlen = sl.length (); 1099 startlen = sl.length ();
… …
1084 ay = 0; 1123 ay = 0;
1085 1124
1086 /* We could do this logic as conditionals in the if statement, 1125 /* We could do this logic as conditionals in the if statement,
1087 * but that started to get a bit messy to look at. 1126 * but that started to get a bit messy to look at.
1088 */ 1127 */
1089 max_x = pl->x + (socket.mapx + 1) / 2; 1128 max_x = ob->x + (socket.mapx + 1) / 2;
1090 max_y = pl->y + (socket.mapy + 1) / 2; 1129 max_y = ob->y + (socket.mapy + 1) / 2;
1091 1130
1092 maptile *plmap = pl->map;
1093
1094 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1131 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1095 { 1132 {
1133 sint16 nx, ny;
1134 maptile *m = 0;
1135
1096 ax = 0; 1136 ax = 0;
1097 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1137 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1098 { 1138 {
1139 // check to see if we can simply go one right quickly
1140 ++nx;
1141 if (m && nx >= m->width)
1142 m = 0;
1143
1144 if (!m)
1145 {
1146 nx = x; ny = y; m = plmap;
1147
1148 if (xy_normalise (m, nx, ny))
1149 m->touch ();
1150 else
1151 m = 0;
1152 }
1153
1099 int emask, mask; 1154 int emask, mask;
1100 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1155 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1101 1156
1102 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1157 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1103 1158
1104 /* If the coordinates are not valid, or it is too dark to see, 1159 /* If the coordinates are not valid, or it is too dark to see,
1105 * we tell the client as such 1160 * we tell the client as such
1106 */ 1161 */
1107 nx = x;
1108 ny = y;
1109 m = get_map_from_coord (plmap, &nx, &ny);
1110
1111 if (!m) 1162 if (!m)
1112 { 1163 {
1113 /* space is out of map. Update space and clear values 1164 /* space is out of map. Update space and clear values
1114 * if this hasn't already been done. If the space is out 1165 * if this hasn't already been done. If the space is out
1115 * of the map, it shouldn't have a head 1166 * of the map, it shouldn't have a head
… …
1121 } 1172 }
1122 1173
1123 continue; 1174 continue;
1124 } 1175 }
1125 1176
1126 m->touch ();
1127
1128 int d = pl->contr->blocked_los[ax][ay]; 1177 int d = pl->blocked_los[ax][ay];
1129 1178
1130 if (d > 3) 1179 if (d > 3)
1131 { 1180 {
1132
1133 int need_send = 0, count; 1181 int need_send = 0, count;
1134 1182
1135 /* This block deals with spaces that are not visible for whatever 1183 /* This block deals with spaces that are not visible for whatever
1136 * reason. Still may need to send the head for this space. 1184 * reason. Still may need to send the head for this space.
1137 */ 1185 */
… …
1143 if (lastcell.count != -1) 1191 if (lastcell.count != -1)
1144 need_send = 1; 1192 need_send = 1;
1145 1193
1146 count = -1; 1194 count = -1;
1147 1195
1148 /* properly clear a previously sent big face */
1149 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1196 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1150 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1197 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1151 need_send = 1; 1198 need_send = 1;
1152 1199
1200 /* properly clear a previously sent big face */
1153 map_clearcell (&lastcell, count); 1201 map_clearcell (&lastcell, count);
1154 1202
1155 if ((mask & 0xf) || need_send) 1203 if ((mask & 0xf) || need_send)
1156 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1157 else 1205 else
… …
1196 } 1244 }
1197 1245
1198 lastcell.count = d; 1246 lastcell.count = d;
1199 1247
1200 mapspace &ms = m->at (nx, ny); 1248 mapspace &ms = m->at (nx, ny);
1249 ms.update ();
1201 1250
1202 if (socket.extmap) 1251 if (socket.extmap)
1203 { 1252 {
1204 uint8 stat_hp = 0; 1253 uint8 stat_hp = 0;
1205 uint8 stat_width = 0; 1254 uint8 stat_width = 0;
1206 uint8 flags = 0; 1255 uint8 flags = 0;
1207 tag_t player = 0; 1256 tag_t player = 0;
1208 1257
1209 // send hp information, if applicable 1258 // send hp information, if applicable
1210 if (object *op = ms.faces_obj [0]) 1259 if (object *op = ms.faces_obj [0])
1211 {
1212 if (op->head || op->invisible) 1260 if (op->is_head () && !op->invisible)
1213 ; // do not show
1214 else if (op->type == PLAYER
1215 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1216 { 1261 {
1217 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1262 if (op->stats.maxhp > op->stats.hp
1263 && op->stats.maxhp > 0
1264 && (op->type == PLAYER
1265 || op->type == DOOR // does not work, have maxhp 0
1266 || QUERY_FLAG (op, FLAG_MONSTER)
1267 || QUERY_FLAG (op, FLAG_ALIVE)
1268 || QUERY_FLAG (op, FLAG_GENERATOR)))
1218 { 1269 {
1219 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1220 stat_width = op->arch->tail_x; 1271 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1221 } 1272 }
1222 }
1223 1273
1224 if (op->msg && op->msg[0] == '@') 1274 if (op->has_dialogue ())
1225 flags |= 1; 1275 flags |= 1;
1226 1276
1227 if (op->type == PLAYER && op != pl) 1277 if (op->type == PLAYER)
1228 player = op->count; 1278 player = op == ob ? pl->ob->count
1279 : op == pl->ob ? ob->count
1280 : op->count;
1229 } 1281 }
1230 1282
1231 if (lastcell.stat_hp != stat_hp) 1283 if (lastcell.stat_hp != stat_hp)
1232 { 1284 {
1233 lastcell.stat_hp = stat_hp; 1285 lastcell.stat_hp = stat_hp;
1234 1286
… …
1276 1328
1277 /* Middle face */ 1329 /* Middle face */
1278 if (update_space (sl, socket, ms, lastcell, 1)) 1330 if (update_space (sl, socket, ms, lastcell, 1))
1279 mask |= 0x2; 1331 mask |= 0x2;
1280 1332
1281 if (ms.player () == pl 1333 if (ob->invisible
1282 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1334 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1335 && ms.player () == ob)
1283 { 1336 {
1284 // force player to be visible to himself if invisible 1337 // force player to be visible to himself if invisible
1285 if (lastcell.faces[0] != pl->face) 1338 if (lastcell.faces[0] != ob->face)
1286 { 1339 {
1287 lastcell.faces[0] = pl->face; 1340 lastcell.faces[0] = ob->face;
1288 1341
1289 mask |= 0x1; 1342 mask |= 0x1;
1290 sl << uint16 (pl->face); 1343 sl << uint16 (ob->face);
1291 1344
1292 socket.send_faces (pl); 1345 socket.send_faces (ob);
1293 } 1346 }
1294 } 1347 }
1295 /* Top face */ 1348 /* Top face */
1296 else if (update_space (sl, socket, ms, lastcell, 0)) 1349 else if (update_space (sl, socket, ms, lastcell, 0))
1297 mask |= 0x1; 1350 mask |= 0x1;
1298
1299 1351
1300 /* 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
1301 * space by checking the mask. If so, update the mask. 1353 * space by checking the mask. If so, update the mask.
1302 * 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
1303 * value, so we don't send those bits. 1355 * value, so we don't send those bits.
… …
1362 socket.send_packet (sl); 1414 socket.send_packet (sl);
1363 socket.sent_scroll = 0; 1415 socket.sent_scroll = 0;
1364 } 1416 }
1365} 1417}
1366 1418
1367/**
1368 * Draws client map.
1369 */
1370void
1371draw_client_map (object *pl)
1372{
1373 int i, j;
1374 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1375 int mflags;
1376 struct Map newmap;
1377 maptile *m, *pm;
1378
1379 if (pl->type != PLAYER)
1380 {
1381 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1382 return;
1383 }
1384
1385 pm = pl->map;
1386
1387 /* If player is just joining the game, he isn't here yet, so the map
1388 * can get swapped out. If so, don't try to send them a map. All will
1389 * be OK once they really log in.
1390 */
1391 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1392 return;
1393
1394 memset (&newmap, 0, sizeof (struct Map));
1395
1396 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1397 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1398 {
1399 ax = i;
1400 ay = j;
1401 m = pm;
1402 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1403
1404 if (mflags & P_OUT_OF_MAP)
1405 continue;
1406
1407 /* If a map is visible to the player, we don't want to swap it out
1408 * just to reload it. This should really call something like
1409 * swap_map, but this is much more efficient and 'good enough'
1410 */
1411 if (mflags & P_NEW_MAP)
1412 m->timeout = 50;
1413 }
1414
1415 /* do LOS after calls to update_position */
1416 if (pl->contr->do_los)
1417 {
1418 update_los (pl);
1419 pl->contr->do_los = 0;
1420 }
1421
1422 /* Big maps need a different drawing mechanism to work */
1423 draw_client_map1 (pl);
1424}
1425
1426
1427/*****************************************************************************/ 1419/*****************************************************************************/
1428
1429/* 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*/
1430
1431/* 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 */
1432
1433/* manage it ! */ 1422/* manage it ! */
1434
1435/*****************************************************************************/ 1423/*****************************************************************************/
1436void 1424void
1437send_plugin_custom_message (object *pl, char *buf) 1425send_plugin_custom_message (object *pl, char *buf)
1438{ 1426{
1439 pl->contr->ns->send_packet (buf); 1427 pl->contr->ns->send_packet (buf);
… …
1448{ 1436{
1449 packet sl; 1437 packet sl;
1450 sl << "replyinfo skill_info\n"; 1438 sl << "replyinfo skill_info\n";
1451 1439
1452 for (int i = 1; i < NUM_SKILLS; i++) 1440 for (int i = 1; i < NUM_SKILLS; i++)
1453 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]);
1454 1442
1455 if (sl.length () >= MAXSOCKBUF) 1443 if (sl.length () > MAXSOCKBUF)
1456 { 1444 {
1457 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1445 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1458 fatal (0); 1446 fatal (0);
1459 } 1447 }
1460 1448
… …
1473 sl << "replyinfo spell_paths\n"; 1461 sl << "replyinfo spell_paths\n";
1474 1462
1475 for (int i = 0; i < NRSPELLPATHS; i++) 1463 for (int i = 0; i < NRSPELLPATHS; i++)
1476 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1477 1465
1478 if (sl.length () >= MAXSOCKBUF) 1466 if (sl.length () > MAXSOCKBUF)
1479 { 1467 {
1480 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1481 fatal (0); 1469 fatal (0);
1482 } 1470 }
1483 1471
… …
1502 if (spell->type == SPELL) 1490 if (spell->type == SPELL)
1503 { 1491 {
1504 int flags = 0; 1492 int flags = 0;
1505 1493
1506 /* check if we need to update it */ 1494 /* check if we need to update it */
1507 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))
1508 { 1496 {
1509 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);
1510 flags |= UPD_SP_MANA; 1498 flags |= UPD_SP_MANA;
1511 } 1499 }
1512 1500
1513 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))
1514 { 1502 {
1515 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);
1516 flags |= UPD_SP_GRACE; 1504 flags |= UPD_SP_GRACE;
1517 } 1505 }
1518 1506
1519 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))
1520 { 1508 {
1521 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);
1522 flags |= UPD_SP_DAMAGE; 1510 flags |= UPD_SP_DAMAGE;
1523 } 1511 }
1524 1512
1525 if (flags) 1513 if (flags)
1526 { 1514 {
… …
1528 1516
1529 sl << "updspell " 1517 sl << "updspell "
1530 << uint8 (flags) 1518 << uint8 (flags)
1531 << uint32 (spell->count); 1519 << uint32 (spell->count);
1532 1520
1533 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1534 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1535 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1536 1524
1537 pl->ns->send_packet (sl); 1525 pl->ns->send_packet (sl);
1538 } 1526 }
1539 } 1527 }
1540 } 1528 }
… …
1570 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);
1571 return; 1559 return;
1572 } 1560 }
1573 1561
1574 /* 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 */
1575 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);
1576 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);
1577 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);
1578 1566
1579 /* figure out which skill it uses, if it uses one */ 1567 /* figure out which skill it uses, if it uses one */
1580 if (spell->skill) 1568 if (spell->skill)
1581 { 1569 if (object *tmp = pl->find_skill (spell->skill))
1582 for (i = 1; i < NUM_SKILLS; i++)
1583 if (!strcmp (spell->skill, skill_names[i]))
1584 {
1585 skill = i + CS_STAT_SKILLINFO; 1570 skill = tmp->subtype + CS_STAT_SKILLINFO;
1586 break;
1587 }
1588 }
1589 1571
1590 // spells better have a face 1572 // spells better have a face
1591 if (!spell->face) 1573 if (!spell->face)
1592 { 1574 {
1593 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1575 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1594 spell->face = face_find ("burnout.x11", blank_face); 1576 spell->face = face_find ("burnout.x11", blank_face);
1595 } 1577 }
1578
1579 pl->ns->send_face (spell->face);
1596 1580
1597 /* send the current values */ 1581 /* send the current values */
1598 sl << uint32 (spell->count) 1582 sl << uint32 (spell->count)
1599 << uint16 (spell->level) 1583 << uint16 (spell->level)
1600 << uint16 (spell->casting_time) 1584 << uint16 (spell->casting_time)
1601 << uint16 (spell->last_sp) 1585 << uint16 (spell->cached_sp)
1602 << uint16 (spell->last_grace) 1586 << uint16 (spell->cached_grace)
1603 << uint16 (spell->last_eat) 1587 << uint16 (spell->cached_eat)
1604 << uint8 (skill) 1588 << uint8 (skill)
1605 << uint32 (spell->path_attuned) 1589 << uint32 (spell->path_attuned)
1606 << uint32 (spell->face) 1590 << uint32 (spell->face)
1607 << data8 (spell->name) 1591 << data8 (spell->name)
1608 << data16 (spell->msg); 1592 << data16 (spell->msg);
… …
1636 * bytes and 3 strings (because that is the spec) so we need to 1620 * bytes and 3 strings (because that is the spec) so we need to
1637 * check that the length of those 3 strings, plus the 23 bytes, 1621 * check that the length of those 3 strings, plus the 23 bytes,
1638 * won't take us over the length limit for the socket, if it does, 1622 * won't take us over the length limit for the socket, if it does,
1639 * we need to send what we already have, and restart packet formation 1623 * we need to send what we already have, and restart packet formation
1640 */ 1624 */
1625 if (spell->type != SPELL)
1626 continue;
1627
1641 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1628 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1642 * to show add_spell is 26 bytes + 2 strings. However, the overun 1629 * to show add_spell is 26 bytes + 2 strings. However, the overun
1643 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1630 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1644 * like it will fix this 1631 * like it will fix this
1645 */ 1632 */
1646 if (spell->type != SPELL)
1647 continue;
1648
1649 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1633 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1650 { 1634 {
1635 pl->ns->flush_fx ();
1651 pl->ns->send_packet (sl); 1636 pl->ns->send_packet (sl);
1652 1637
1653 sl.reset (); 1638 sl.reset ();
1654 sl << "addspell "; 1639 sl << "addspell ";
1655 } 1640 }
… …
1663 return; 1648 return;
1664 } 1649 }
1665 else 1650 else
1666 append_spell (pl, sl, spell); 1651 append_spell (pl, sl, spell);
1667 1652
1668 if (sl.length () >= MAXSOCKBUF) 1653 if (sl.length () > MAXSOCKBUF)
1669 { 1654 {
1670 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1655 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1671 fatal (0); 1656 fatal (0);
1672 } 1657 }
1673 1658
1674 /* finally, we can send the packet */ 1659 /* finally, we can send the packet */
1660 pl->ns->flush_fx ();
1675 pl->ns->send_packet (sl); 1661 pl->ns->send_packet (sl);
1676} 1662}
1677 1663

Diff Legend

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