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.143 by root, Tue Dec 23 06:58:24 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.
… …
99 */ 98 */
100 mx = ns->mapx; 99 mx = ns->mapx;
101 my = ns->mapy; 100 my = ns->mapy;
102 101
103 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
108 */ 107 */
109 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 116 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 118
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 120
126 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 122 * empty).
… …
130} 125}
131 126
132static void 127static void
133clear_map (player *pl) 128clear_map (player *pl)
134{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 133
137 pl->ns->force_newmap = false; 134 pl->ns->force_newmap = false;
138 135
139 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
141 138
142 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
140}
141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
143} 166}
144 167
145/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
146static void 169static void
147check_map_change (player *pl) 170check_map_change (player *pl)
148{ 171{
149 client &socket = *pl->ns; 172 client &socket = *pl->ns;
150 object *ob = pl->ob; 173 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */ 174
175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
152 201
153 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
154 { 203 {
155 clear_map (pl); 204 clear_map (pl);
156 socket.current_map = ob->map; 205 socket.current_map = ob->map;
157 206 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 } 207 }
178 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
179 { 209 {
180 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
181 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
189 } 219 }
190 } 220 }
191 221
192 socket.current_x = ob->x; 222 socket.current_x = ob->x;
193 socket.current_y = ob->y; 223 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} 224}
202 225
203/** 226/**
204 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
205 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
206 * that information. 229 * that information.
207 */ 230 */
208void 231void
209RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
210{ 233{
211 char *params = NULL, *cp; 234 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 235
224 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
225 * params pointer. 237 * params pointer.
226 */ 238 */
227 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
228 if (*cp == ' ') 240 if (*params == ' ')
229 { 241 {
230 *cp = '\0';
231 params = cp + 1; 242 *params++ = 0;
232 break; 243 break;
233 } 244 }
234 245
235 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
236 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
239 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
240 send_skill_info (ns, params); 251 send_skill_info (ns, params);
241 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
242 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
243 else 254 else
244 ns->send_packet (bigbuf, len); 255 {
256 // undo tokenisation above and send replyinfo with the request unchanged
257 if (*params)
258 *--params = ' ';
259
260 ns->send_packet_printf ("replyinfo %s", buf);
261 }
245} 262}
246 263
247void 264void
248ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
249{ 266{
… …
252 269
253void 270void
254ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
255{ 272{
256 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274}
275
276void
277client::mapinfo_queue_clear ()
278{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i);
281
282 mapinfo_queue.clear ();
283}
284
285bool
286client::mapinfo_try (char *buf)
287{
288 char *token = buf;
289 buf += strlen (buf) + 9;
290
291 // initial map and its origin
292 maptile *map = pl->observe->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y;
295 int max_distance = 8; // limit maximum path length to something generous
296
297 while (*buf && map && max_distance)
298 {
299 int dir = *buf++ - '1';
300
301 if (dir >= 0 && dir <= 3)
302 {
303 if (!map->tile_path [dir])
304 map = 0;
305 else if (map->tile_available (dir, false))
306 {
307 maptile *neigh = map->tile_map [dir];
308
309 switch (dir)
310 {
311 case 0: mapy -= neigh->height; break;
312 case 2: mapy += map ->height; break;
313 case 3: mapx -= neigh->width ; break;
314 case 1: mapx += map ->width ; break;
315 }
316
317 map = neigh;
318 --max_distance;
319 }
320 else
321 return 0;
322 }
323 else
324 max_distance = 0;
325 }
326
327 if (!max_distance)
328 send_packet_printf ("mapinfo %s error", token);
329 else if (!map || !map->path)
330 send_packet_printf ("mapinfo %s nomap", token);
331 else
332 {
333 int flags = 0;
334
335 if (map->tile_path[0]) flags |= 1;
336 if (map->tile_path[1]) flags |= 2;
337 if (map->tile_path[2]) flags |= 4;
338 if (map->tile_path[3]) flags |= 8;
339
340 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 }
342
343 return 1;
344}
345
346void
347client::mapinfo_queue_run ()
348{
349 if (mapinfo_queue.empty () || !pl)
350 return;
351
352 for (int i = 0; i < mapinfo_queue.size (); ++i)
353 if (mapinfo_try (mapinfo_queue [i]))
354 {
355 free (mapinfo_queue [i]);
356 mapinfo_queue.erase (i);
357 }
358 else
359 ++i;
257} 360}
258 361
259void 362void
260MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
261{ 364{
262 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
263 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
264 367
265 char bigbuf[MAX_BUF], *token;
266
267 token = buf; 368 char *token = buf;
268 // copy token 369
269 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
270 return; 371 return;
271 372
272 *buf++ = 0;
273
274 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
275 { 374 {
276 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
277 377
278 // initial map and its origin 378#if 0
279 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
280 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
281 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 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 382 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
335 } 385 }
336 else 386 else
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
338
339 pl->ns->send_packet (bigbuf);
340} 388}
341 389
342/** This is the Setup cmd */ 390/** This is the Setup cmd */
343void 391void
344SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
… …
473 521
474 ns->send_packet (cmdback); 522 ns->send_packet (cmdback);
475} 523}
476 524
477/** 525/**
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, 526 * This handles the general commands from the client (ie, north, fire, cast,
500 * etc.) 527 * etc.)
501 */ 528 */
502void 529void
503PlayerCmd (char *buf, int len, player *pl) 530PlayerCmd (char *buf, int len, player *pl)
… …
524 * commands. 551 * commands.
525 */ 552 */
526 pl->count = 0; 553 pl->count = 0;
527} 554}
528 555
529
530/** 556/**
531 * This handles the general commands from the client (ie, north, fire, cast, 557 * 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 558 * 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 559 * 'ncom' method which gives more information back to the client so it
534 * can throttle. 560 * can throttle.
… …
536void 562void
537NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
538{ 564{
539 if (len <= 6) 565 if (len <= 6)
540 { 566 {
541 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 567 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
542 return; 568 return;
543 } 569 }
544 570
545 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
546 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
684 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
685 */ 711 */
686void 712void
687MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
688{ 714{
689 int vals[3], i; 715 int to, tag, nrof;
690 716
691 /* A little funky here. We only cycle for 2 records, because 717 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 { 718 {
698 vals[i] = atoi (buf);
699
700 if (!(buf = strchr (buf, ' ')))
701 {
702 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
703 return; 720 return;
704 }
705
706 buf++;
707 } 721 }
708 722
709 vals[2] = atoi (buf); 723 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} 724}
714 725
715/****************************************************************************** 726/******************************************************************************
716 * 727 *
717 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
730 741
731/** 742/**
732 * Get player's current range attack in obuf. 743 * Get player's current range attack in obuf.
733 */ 744 */
734static void 745static void
735rangetostring (object *ob, char *obuf) 746rangetostring (player *pl, char *obuf)
736{ 747{
737 dynbuf_text buf; 748 dynbuf_text buf;
738 749
739 player *pl = ob->contr;
740
741 if (pl->ranged_ob) 750 if (pl->ranged_ob)
742 buf << " Range: " << pl->ranged_ob->name; 751 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 752
744 if (pl->combat_ob) 753 if (pl->combat_ob)
745 buf << " Combat: " << pl->combat_ob->name; 754 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746 755
756#if 0
757 //TODO: remove this when slot system is working, this is only for debugging
758 if (pl->ob->chosen_skill)
759 buf << " Skill*: " << pl->ob->chosen_skill->name;
760#endif
761
762 //TODO: maybe golem should become the current_weapon, quite simply?
747 if (pl->golem) 763 if (pl->golem)
748 buf << " Golem: " << pl->golem->name; 764 buf << " Golem*: " << pl->golem->name;
749 765
750 if (buf.empty ()) 766 buf << '\0';
751 *obuf = 0; 767 buf.linearise (obuf);
752 else
753 {
754 memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
755 obuf [buf.size ()] = 0;
756 }
757} 768}
758 769
759#define AddIfInt64(Old,New,Type) if (Old != New) {\ 770#define AddIfInt64(Old,New,Type) if (Old != New) {\
760 Old = New; \ 771 Old = New; \
761 sl << uint8 (Type) << uint64 (New); \ 772 sl << uint8 (Type) << uint64 (New); \
… …
769#define AddIfShort(Old,New,Type) if (Old != New) {\ 780#define AddIfShort(Old,New,Type) if (Old != New) {\
770 Old = New; \ 781 Old = New; \
771 sl << uint8 (Type) << uint16 (New); \ 782 sl << uint8 (Type) << uint16 (New); \
772 } 783 }
773 784
774#define AddIfFloat(Old,New,Type) if (Old != New) {\ 785#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
775 Old = New; \ 786 Old = New; \
776 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 787 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
777 } 788 }
778 789
779#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 790#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
780 free(Old); Old = strdup (New);\ 791 free(Old); Old = strdup (New);\
781 sl << uint8 (Type) << data8 (New); \ 792 sl << uint8 (Type) << data8 (New); \
… …
795 806
796 client *ns = pl->ns; 807 client *ns = pl->ns;
797 if (!ns) 808 if (!ns)
798 return; 809 return;
799 810
800 object *ob = pl->ob; 811 object *ob = pl->observe;
801 if (!ob) 812 if (!ob)
802 return; 813 return;
814
815 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
803 816
804 packet sl ("stats"); 817 packet sl ("stats");
805 818
806 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 819 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
807 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 820 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
816 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
817 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
818 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
819 832
820 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
821 if (object *skill = pl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
822 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
823 { 836 {
824 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
825 838
826 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
834 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
835 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
836 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
837 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
838 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
839 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
840 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
841 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 854 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); 855 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
843 856
844 flags = 0; 857 flags = 0;
845 858
846 if (pl->fire_on) 859 if (opl->fire_on)
847 flags |= SF_FIREON; 860 flags |= SF_FIREON;
848 861
849 if (pl->run_on) 862 if (opl->run_on)
850 flags |= SF_RUNON; 863 flags |= SF_RUNON;
851 864
852 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
853 866
854 if (ns->sc_version < 1025) 867 if (ns->sc_version < 1025)
… …
868 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 881 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); 882 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); 883 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
871 } 884 }
872 885
873 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 886 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
874 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 887 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
875 set_title (ob, buf); 888 set_title (ob, buf);
876 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 889 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
877 890
878 /* Only send it away if we have some actual data */ 891 /* Only send it away if we have some actual data */
… …
882 895
883/** 896/**
884 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
885 */ 898 */
886void 899void
887esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
888{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
889 packet sl ("player"); 904 packet sl ("player");
890 905
891 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
892 << uint32 (weight) 907 << uint32 (weight)
893 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
894 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
895 910
896 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
897 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
898 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
899} 913}
900 914
901/****************************************************************************** 915/******************************************************************************
902 * 916 *
903 * Start of map related commands. 917 * Start of map related commands.
… …
960 974
961 if (!ns.faces_sent[face_num]) 975 if (!ns.faces_sent[face_num])
962 if (ob) 976 if (ob)
963 ns.send_faces (ob); 977 ns.send_faces (ob);
964 else 978 else
965 ns.send_face (face_num); 979 ns.send_face (face_num, 10);
966 980
967 sl << uint16 (face_num); 981 sl << uint16 (face_num);
968 return 1; 982 return 1;
969 } 983 }
970 984
… …
1012{ 1026{
1013 prefetch_surrounding_maps (op->map, 3); 1027 prefetch_surrounding_maps (op->map, 3);
1014} 1028}
1015 1029
1016/** 1030/**
1017 * This function uses the new map1 protocol command to send the map 1031 * 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 */ 1032 */
1038void 1033void
1039draw_client_map1 (object *pl) 1034draw_client_map (player *pl)
1040{ 1035{
1041 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1036 object *ob = pl->observe;
1042 sint16 nx, ny; 1037 if (!ob->active)
1038 return;
1039
1040 /* If player is just joining the game, he isn't here yet, so the map
1041 * can get swapped out. If so, don't try to send them a map. All will
1042 * be OK once they really log in.
1043 */
1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1045 return;
1046
1047 int startlen, oldlen;
1043 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1044 uint8 eentrysize; 1049 uint8 eentrysize;
1045 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1046 uint8 extendedinfos; 1051 uint8 extendedinfos;
1047 maptile *m;
1048 1052
1049 client &socket = *pl->contr->ns;
1050
1051 if (!pl->active)
1052 return;
1053
1054 check_map_change (pl->contr); 1053 check_map_change (pl);
1055 prefetch_surrounding_maps (pl); 1054 prefetch_surrounding_maps (pl->ob);
1055
1056 /* do LOS after calls to update_position */
1057 /* unfortunately, we need to udpate los when observing, currently */
1058 if (pl->do_los || pl->observe != pl->ob)
1059 {
1060 pl->do_los = 0;
1061 pl->update_los ();
1062 }
1063
1064 /**
1065 * This function uses the new map1 protocol command to send the map
1066 * to the client. It is necessary because the old map command supports
1067 * a maximum map size of 15x15.
1068 * This function is much simpler than the old one. This is because
1069 * the old function optimized to send as few face identifiers as possible,
1070 * at the expense of sending more coordinate location (coordinates were
1071 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1072 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1073 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1074 * and use the other 4 bits for other informatiion. For full documentation
1075 * of what we send, see the doc/Protocol file.
1076 * I will describe internally what we do:
1077 * the ns->lastmap shows how the map last looked when sent to the client.
1078 * in the lastmap structure, there is a cells array, which is set to the
1079 * maximum viewable size (As set in config.h).
1080 * in the cells, there are faces and a count value.
1081 * we use the count value to hold the darkness value. If -1, then this space
1082 * is not viewable.
1083 * we use faces[0] faces[1] faces[2] to hold what the three layers
1084 * look like.
1085 */
1086
1087 client &socket = *pl->ns;
1056 1088
1057 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1058 packet esl; 1090 packet esl;
1059 1091
1060 startlen = sl.length (); 1092 startlen = sl.length ();
… …
1076 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1077 1109
1078 estartlen = esl.length (); 1110 estartlen = esl.length ();
1079 } 1111 }
1080 1112
1081 /* x,y are the real map locations. ax, ay are viewport relative
1082 * locations.
1083 */
1084 ay = 0;
1085
1086 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1087 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1088 */ 1115 */
1089 max_x = pl->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1090 max_y = pl->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1091 1118
1092 maptile *plmap = pl->map; 1119 for (int dx = -hx; dx <= hx; dx++)
1093
1094 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1095 { 1120 {
1096 ax = 0; 1121 sint16 nx, ny;
1097 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1122 maptile *m = 0;
1123
1124 for (int dy = -hy; dy <= hy; dy++)
1098 { 1125 {
1126 // check to see if we can simply go one down quickly
1127 if (m && ++ny >= m->height)
1128 m = 0;
1129
1130 // no, so do it the slow way
1131 if (!m)
1132 {
1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1134
1135 if (xy_normalise (m, nx, ny))
1136 m->touch ();
1137 else
1138 m = 0;
1139 }
1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1099 int emask, mask; 1144 int emask, mask;
1100 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1101 1146
1102 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1103 1148
1104 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1105 * we tell the client as such 1150 * we tell the client as such
1106 */ 1151 */
1107 nx = x;
1108 ny = y;
1109 m = get_map_from_coord (plmap, &nx, &ny);
1110
1111 if (!m) 1152 if (!m)
1112 { 1153 {
1113 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1114 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1115 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1116 */ 1157 */
1117 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1118 { 1159 {
1119 sl << uint16 (mask); 1160 sl << uint16 (mask);
1120 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1121 } 1162 }
1122 1163
1123 continue; 1164 continue;
1124 } 1165 }
1125 1166
1126 m->touch ();
1127
1128 int d = pl->contr->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1129 1168
1130 if (d > 3) 1169 if (d > 3)
1131 { 1170 {
1132
1133 int need_send = 0, count; 1171 int need_send = 0, count;
1134 1172
1135 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1136 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1137 */ 1175 */
… …
1143 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1144 need_send = 1; 1182 need_send = 1;
1145 1183
1146 count = -1; 1184 count = -1;
1147 1185
1148 /* properly clear a previously sent big face */
1149 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1150 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1151 need_send = 1; 1188 need_send = 1;
1152 1189
1190 /* properly clear a previously sent big face */
1153 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1154 1192
1155 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1156 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1157 else 1195 else
… …
1196 } 1234 }
1197 1235
1198 lastcell.count = d; 1236 lastcell.count = d;
1199 1237
1200 mapspace &ms = m->at (nx, ny); 1238 mapspace &ms = m->at (nx, ny);
1239 ms.update ();
1201 1240
1202 if (socket.extmap) 1241 if (socket.extmap)
1203 { 1242 {
1204 uint8 stat_hp = 0; 1243 uint8 stat_hp = 0;
1205 uint8 stat_width = 0; 1244 uint8 stat_width = 0;
1206 uint8 flags = 0; 1245 uint8 flags = 0;
1207 tag_t player = 0; 1246 tag_t player = 0;
1208 1247
1209 // send hp information, if applicable 1248 // send hp information, if applicable
1210 if (object *op = ms.faces_obj [0]) 1249 if (object *op = ms.faces_obj [0])
1211 {
1212 if (op->head || op->invisible) 1250 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 { 1251 {
1217 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1252 if (op->stats.maxhp > op->stats.hp
1253 && op->stats.maxhp > 0
1254 && (op->type == PLAYER
1255 || op->type == DOOR // does not work, have maxhp 0
1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1218 { 1259 {
1219 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1220 stat_width = op->arch->tail_x; 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1221 } 1262 }
1222 }
1223 1263
1224 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1225 flags |= 1; 1265 flags |= 1;
1226 1266
1227 if (op->type == PLAYER && op != pl) 1267 if (op->type == PLAYER)
1228 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1229 } 1271 }
1230 1272
1231 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1232 { 1274 {
1233 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1234 1276
… …
1276 1318
1277 /* Middle face */ 1319 /* Middle face */
1278 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1279 mask |= 0x2; 1321 mask |= 0x2;
1280 1322
1281 if (ms.player () == pl 1323 if (ob->invisible
1282 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325 && ms.player () == ob)
1283 { 1326 {
1284 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1285 if (lastcell.faces[0] != pl->face) 1328 if (lastcell.faces[0] != ob->face)
1286 { 1329 {
1287 lastcell.faces[0] = pl->face; 1330 lastcell.faces[0] = ob->face;
1288 1331
1289 mask |= 0x1; 1332 mask |= 0x1;
1290 sl << uint16 (pl->face); 1333 sl << uint16 (ob->face);
1291 1334
1292 socket.send_faces (pl); 1335 socket.send_faces (ob);
1293 } 1336 }
1294 } 1337 }
1295 /* Top face */ 1338 /* Top face */
1296 else if (update_space (sl, socket, ms, lastcell, 0)) 1339 else if (update_space (sl, socket, ms, lastcell, 0))
1297 mask |= 0x1; 1340 mask |= 0x1;
1298
1299 1341
1300 /* Check to see if we are in fact sending anything for this 1342 /* Check to see if we are in fact sending anything for this
1301 * space by checking the mask. If so, update the mask. 1343 * space by checking the mask. If so, update the mask.
1302 * if not, reset the len to that from before adding the mask 1344 * if not, reset the len to that from before adding the mask
1303 * value, so we don't send those bits. 1345 * value, so we don't send those bits.
… …
1362 socket.send_packet (sl); 1404 socket.send_packet (sl);
1363 socket.sent_scroll = 0; 1405 socket.sent_scroll = 0;
1364 } 1406 }
1365} 1407}
1366 1408
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/*****************************************************************************/ 1409/*****************************************************************************/
1428
1429/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1410/* 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 */ 1411/* a player. Of course, the client need to know the command to be able to */
1432
1433/* manage it ! */ 1412/* manage it ! */
1434
1435/*****************************************************************************/ 1413/*****************************************************************************/
1436void 1414void
1437send_plugin_custom_message (object *pl, char *buf) 1415send_plugin_custom_message (object *pl, char *buf)
1438{ 1416{
1439 pl->contr->ns->send_packet (buf); 1417 pl->contr->ns->send_packet (buf);
… …
1448{ 1426{
1449 packet sl; 1427 packet sl;
1450 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1451 1429
1452 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1453 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1454 1432
1455 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1456 { 1434 {
1457 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1458 fatal (0); 1436 fatal (0);
1459 } 1437 }
1460 1438
… …
1473 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1474 1452
1475 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1476 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1477 1455
1478 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1479 { 1457 {
1480 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1481 fatal (0); 1459 fatal (0);
1482 } 1460 }
1483 1461
… …
1502 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1503 { 1481 {
1504 int flags = 0; 1482 int flags = 0;
1505 1483
1506 /* check if we need to update it */ 1484 /* check if we need to update it */
1507 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1508 { 1486 {
1509 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1510 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1511 } 1489 }
1512 1490
1513 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1514 { 1492 {
1515 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1516 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1517 } 1495 }
1518 1496
1519 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1520 { 1498 {
1521 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1522 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1523 } 1501 }
1524 1502
1525 if (flags) 1503 if (flags)
1526 { 1504 {
… …
1528 1506
1529 sl << "updspell " 1507 sl << "updspell "
1530 << uint8 (flags) 1508 << uint8 (flags)
1531 << uint32 (spell->count); 1509 << uint32 (spell->count);
1532 1510
1533 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1534 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1535 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1536 1514
1537 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1538 } 1516 }
1539 } 1517 }
1540 } 1518 }
… …
1570 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1548 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1571 return; 1549 return;
1572 } 1550 }
1573 1551
1574 /* store costs and damage in the object struct, to compare to later */ 1552 /* 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); 1553 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); 1554 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); 1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1578 1556
1579 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1580 if (spell->skill) 1558 if (spell->skill)
1581 { 1559 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; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1586 break;
1587 }
1588 }
1589 1561
1590 // spells better have a face 1562 // spells better have a face
1591 if (!spell->face) 1563 if (!spell->face)
1592 { 1564 {
1593 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1594 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1595 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1596 1570
1597 /* send the current values */ 1571 /* send the current values */
1598 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1599 << uint16 (spell->level) 1573 << uint16 (spell->level)
1600 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1601 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1602 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1603 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1604 << uint8 (skill) 1578 << uint8 (skill)
1605 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1606 << uint32 (spell->face) 1580 << uint32 (spell->face)
1607 << data8 (spell->name) 1581 << data8 (spell->name)
1608 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
1636 * bytes and 3 strings (because that is the spec) so we need to 1610 * 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, 1611 * 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, 1612 * 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 1613 * we need to send what we already have, and restart packet formation
1640 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1641 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1642 * to show add_spell is 26 bytes + 2 strings. However, the overun 1619 * 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 1620 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1644 * like it will fix this 1621 * like it will fix this
1645 */ 1622 */
1646 if (spell->type != SPELL)
1647 continue;
1648
1649 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1623 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1650 { 1624 {
1625 pl->ns->flush_fx ();
1651 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1652 1627
1653 sl.reset (); 1628 sl.reset ();
1654 sl << "addspell "; 1629 sl << "addspell ";
1655 } 1630 }
… …
1663 return; 1638 return;
1664 } 1639 }
1665 else 1640 else
1666 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1667 1642
1668 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1669 { 1644 {
1670 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1671 fatal (0); 1646 fatal (0);
1672 } 1647 }
1673 1648
1674 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1675 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1676} 1652}
1677 1653

Diff Legend

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