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.89 by root, Wed Apr 25 18:47:51 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])
165 flags |= 1;
166 if (ob->map->tile_path[1])
167 flags |= 2;
168 if (ob->map->tile_path[2])
169 flags |= 4;
170 if (ob->map->tile_path[3])
171 flags |= 8;
172
173 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
174 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
175 }
176 else
177 snprintf (buf, MAX_BUF, "mapinfo current");
178
179 socket.send_packet (buf);
180 }
181 } 207 }
182 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)
183 { 209 {
184 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
185 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
193 } 219 }
194 } 220 }
195 221
196 socket.current_x = ob->x; 222 socket.current_x = ob->x;
197 socket.current_y = ob->y; 223 socket.current_y = ob->y;
198
199 region *reg = ob->region ();
200 if (socket.current_region != reg)
201 {
202 socket.current_region = reg;
203 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
204 }
205} 224}
206 225
207/** 226/**
208 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
210 * that information. 229 * that information.
211 */ 230 */
212void 231void
213RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
214{ 233{
215 char *params = NULL, *cp; 234 char *params;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227 235
228 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
229 * params pointer. 237 * params pointer.
230 */ 238 */
231 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
232 if (*cp == ' ') 240 if (*params == ' ')
233 { 241 {
234 *cp = '\0';
235 params = cp + 1; 242 *params++ = 0;
236 break; 243 break;
237 } 244 }
238 245
239 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 251 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
247 else 254 else
248 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 }
249} 262}
250 263
251void 264void
252ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
253{ 266{
… …
256 269
257void 270void
258ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
259{ 272{
260 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;
261} 360}
262 361
263void 362void
264MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
265{ 364{
266 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
268 367
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 368 char *token = buf;
272 // copy token 369
273 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
274 return; 371 return;
275 372
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
279 { 374 {
280 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
281 377
282 // initial map and its origin 378#if 0
283 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = map->xy_find (dx, dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = map->xy_find (dx, dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 }
341 else 382 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
343 } 385 }
344 else 386 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 388}
349 389
350/** This is the Setup cmd */ 390/** This is the Setup cmd */
351void 391void
352SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
… …
481 521
482 ns->send_packet (cmdback); 522 ns->send_packet (cmdback);
483} 523}
484 524
485/** 525/**
486 * client requested an image. send it rate-limited
487 * before flushing.
488 */
489void
490AskFaceCmd (char *buf, int len, client *ns)
491{
492 ns->askface.push_back (atoi (buf));
493}
494
495/**
496 * Tells client the picture it has to use
497 * to smooth a picture number given as argument.
498 */
499void
500AskSmooth (char *buf, int len, client *ns)
501{
502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
504}
505
506/**
507 * This handles the general commands from the client (ie, north, fire, cast, 526 * This handles the general commands from the client (ie, north, fire, cast,
508 * etc.) 527 * etc.)
509 */ 528 */
510void 529void
511PlayerCmd (char *buf, int len, player *pl) 530PlayerCmd (char *buf, int len, player *pl)
… …
532 * commands. 551 * commands.
533 */ 552 */
534 pl->count = 0; 553 pl->count = 0;
535} 554}
536 555
537
538/** 556/**
539 * 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,
540 * 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
541 * '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
542 * can throttle. 560 * can throttle.
… …
544void 562void
545NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
546{ 564{
547 if (len <= 6) 565 if (len <= 6)
548 { 566 {
549 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);
550 return; 568 return;
551 } 569 }
552 570
553 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
554 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
692 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
693 */ 711 */
694void 712void
695MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
696{ 714{
697 int vals[3], i; 715 int to, tag, nrof;
698 716
699 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
700 * we obviously are not going to find a space after the third
701 * record. Perhaps we should just replace this with a
702 * sscanf?
703 */
704 for (i = 0; i < 2; i++)
705 { 718 {
706 vals[i] = atoi (buf);
707
708 if (!(buf = strchr (buf, ' ')))
709 {
710 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
711 return; 720 return;
712 }
713
714 buf++;
715 } 721 }
716 722
717 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
718
719/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
720 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
721} 724}
722 725
723/****************************************************************************** 726/******************************************************************************
724 * 727 *
725 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
734send_query (client *ns, uint8 flags, const char *text) 737send_query (client *ns, uint8 flags, const char *text)
735{ 738{
736 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 739 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
737} 740}
738 741
742/**
743 * Get player's current range attack in obuf.
744 */
745static void
746rangetostring (player *pl, char *obuf)
747{
748 dynbuf_text buf;
749
750 if (pl->ranged_ob)
751 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752
753 if (pl->combat_ob)
754 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
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?
763 if (pl->golem)
764 buf << " Golem*: " << pl->golem->name;
765
766 buf << '\0';
767 buf.linearise (obuf);
768}
769
739#define AddIfInt64(Old,New,Type) if (Old != New) {\ 770#define AddIfInt64(Old,New,Type) if (Old != New) {\
740 Old = New; \ 771 Old = New; \
741 sl << uint8 (Type) << uint64 (New); \ 772 sl << uint8 (Type) << uint64 (New); \
742 } 773 }
743 774
… …
749#define AddIfShort(Old,New,Type) if (Old != New) {\ 780#define AddIfShort(Old,New,Type) if (Old != New) {\
750 Old = New; \ 781 Old = New; \
751 sl << uint8 (Type) << uint16 (New); \ 782 sl << uint8 (Type) << uint16 (New); \
752 } 783 }
753 784
754#define AddIfFloat(Old,New,Type) if (Old != New) {\ 785#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
755 Old = New; \ 786 Old = New; \
756 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 787 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
757 } 788 }
758 789
759#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 790#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
760 free(Old); Old = strdup (New);\ 791 free(Old); Old = strdup (New);\
761 sl << uint8 (Type) << data8 (New); \ 792 sl << uint8 (Type) << data8 (New); \
… …
775 806
776 client *ns = pl->ns; 807 client *ns = pl->ns;
777 if (!ns) 808 if (!ns)
778 return; 809 return;
779 810
780 object *ob = pl->ob; 811 object *ob = pl->observe;
781 if (!ob) 812 if (!ob)
782 return; 813 return;
814
815 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
783 816
784 packet sl ("stats"); 817 packet sl ("stats");
785 818
786 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 819 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
787 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 820 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
796 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
797 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
798 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
799 832
800 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
801 if (object *skill = pl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
802 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
803 { 836 {
804 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
805 838
806 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
814 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
815 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
816 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
817 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
818 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
819 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
820 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
821 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);
822 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);
823 856
824 flags = 0; 857 flags = 0;
825 858
826 if (pl->fire_on) 859 if (opl->fire_on)
827 flags |= SF_FIREON; 860 flags |= SF_FIREON;
828 861
829 if (pl->run_on) 862 if (opl->run_on)
830 flags |= SF_RUNON; 863 flags |= SF_RUNON;
831 864
832 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
833 866
834 if (ns->sc_version < 1025) 867 if (ns->sc_version < 1025)
… …
848 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);
849 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);
850 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);
851 } 884 }
852 885
853 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 */
854 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 887 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
855 set_title (ob, buf); 888 set_title (ob, buf);
856 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 889 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
857 890
858 /* Only send it away if we have some actual data */ 891 /* Only send it away if we have some actual data */
… …
862 895
863/** 896/**
864 * 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.
865 */ 898 */
866void 899void
867esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
868{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
869 packet sl ("player"); 904 packet sl ("player");
870 905
871 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
872 << uint32 (weight) 907 << uint32 (weight)
873 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
874 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
875 910
876 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
877 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
878 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
879} 913}
880 914
881/****************************************************************************** 915/******************************************************************************
882 * 916 *
883 * Start of map related commands. 917 * Start of map related commands.
… …
940 974
941 if (!ns.faces_sent[face_num]) 975 if (!ns.faces_sent[face_num])
942 if (ob) 976 if (ob)
943 ns.send_faces (ob); 977 ns.send_faces (ob);
944 else 978 else
945 ns.send_face (face_num); 979 ns.send_face (face_num, 10);
946 980
947 sl << uint16 (face_num); 981 sl << uint16 (face_num);
948 return 1; 982 return 1;
949 } 983 }
950 984
… …
992{ 1026{
993 prefetch_surrounding_maps (op->map, 3); 1027 prefetch_surrounding_maps (op->map, 3);
994} 1028}
995 1029
996/** 1030/**
997 * This function uses the new map1 protocol command to send the map 1031 * Draws client map.
998 * to the client. It is necessary because the old map command supports
999 * a maximum map size of 15x15.
1000 * This function is much simpler than the old one. This is because
1001 * the old function optimized to send as few face identifiers as possible,
1002 * at the expense of sending more coordinate location (coordinates were
1003 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1004 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1005 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1006 * and use the other 4 bits for other informatiion. For full documentation
1007 * of what we send, see the doc/Protocol file.
1008 * I will describe internally what we do:
1009 * the ns->lastmap shows how the map last looked when sent to the client.
1010 * in the lastmap structure, there is a cells array, which is set to the
1011 * maximum viewable size (As set in config.h).
1012 * in the cells, there are faces and a count value.
1013 * we use the count value to hold the darkness value. If -1, then this space
1014 * is not viewable.
1015 * we use faces[0] faces[1] faces[2] to hold what the three layers
1016 * look like.
1017 */ 1032 */
1018void 1033void
1019draw_client_map1 (object *pl) 1034draw_client_map (player *pl)
1020{ 1035{
1021 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1036 object *ob = pl->observe;
1022 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;
1023 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1024 uint8 eentrysize; 1049 uint8 eentrysize;
1025 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1026 uint8 extendedinfos; 1051 uint8 extendedinfos;
1027 maptile *m;
1028 1052
1029 client &socket = *pl->contr->ns;
1030
1031 if (!pl->active)
1032 return;
1033
1034 check_map_change (pl->contr); 1053 check_map_change (pl);
1035 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;
1036 1088
1037 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1038 packet esl; 1090 packet esl;
1039 1091
1040 startlen = sl.length (); 1092 startlen = sl.length ();
… …
1056 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1057 1109
1058 estartlen = esl.length (); 1110 estartlen = esl.length ();
1059 } 1111 }
1060 1112
1061 /* x,y are the real map locations. ax, ay are viewport relative
1062 * locations.
1063 */
1064 ay = 0;
1065
1066 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1067 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1068 */ 1115 */
1069 max_x = pl->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1070 max_y = pl->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1071 1118
1072 maptile *plmap = pl->map; 1119 for (int dx = -hx; dx <= hx; dx++)
1073
1074 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1075 { 1120 {
1076 ax = 0; 1121 sint16 nx, ny;
1077 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++)
1078 { 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
1079 int emask, mask; 1144 int emask, mask;
1080 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1081 1146
1082 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1083 1148
1084 /* 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,
1085 * we tell the client as such 1150 * we tell the client as such
1086 */ 1151 */
1087 nx = x;
1088 ny = y;
1089 m = get_map_from_coord (plmap, &nx, &ny);
1090
1091 if (!m) 1152 if (!m)
1092 { 1153 {
1093 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1094 * 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
1095 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1096 */ 1157 */
1097 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1098 { 1159 {
1099 sl << uint16 (mask); 1160 sl << uint16 (mask);
1100 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1101 } 1162 }
1102 1163
1103 continue; 1164 continue;
1104 } 1165 }
1105 1166
1106 m->touch ();
1107
1108 int d = pl->contr->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1109 1168
1110 if (d > 3) 1169 if (d > 3)
1111 { 1170 {
1112
1113 int need_send = 0, count; 1171 int need_send = 0, count;
1114 1172
1115 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1116 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1117 */ 1175 */
… …
1123 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1124 need_send = 1; 1182 need_send = 1;
1125 1183
1126 count = -1; 1184 count = -1;
1127 1185
1128 /* properly clear a previously sent big face */
1129 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1130 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1131 need_send = 1; 1188 need_send = 1;
1132 1189
1190 /* properly clear a previously sent big face */
1133 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1134 1192
1135 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1136 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1137 else 1195 else
… …
1176 } 1234 }
1177 1235
1178 lastcell.count = d; 1236 lastcell.count = d;
1179 1237
1180 mapspace &ms = m->at (nx, ny); 1238 mapspace &ms = m->at (nx, ny);
1239 ms.update ();
1181 1240
1182 if (socket.extmap) 1241 if (socket.extmap)
1183 { 1242 {
1184 uint8 stat_hp = 0; 1243 uint8 stat_hp = 0;
1185 uint8 stat_width = 0; 1244 uint8 stat_width = 0;
1186 uint8 flags = 0; 1245 uint8 flags = 0;
1187 tag_t player = 0; 1246 tag_t player = 0;
1188 1247
1189 // send hp information, if applicable 1248 // send hp information, if applicable
1190 if (object *op = ms.faces_obj [0]) 1249 if (object *op = ms.faces_obj [0])
1191 {
1192 if (op->head || op->invisible) 1250 if (op->is_head () && !op->invisible)
1193 ; // do not show
1194 else if (op->type == PLAYER
1195 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1196 { 1251 {
1197 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)))
1198 { 1259 {
1199 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1200 stat_width = op->arch->tail_x; 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1201 } 1262 }
1202 }
1203 1263
1204 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1205 flags |= 1; 1265 flags |= 1;
1206 1266
1207 if (op->type == PLAYER && op != pl) 1267 if (op->type == PLAYER)
1208 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1209 } 1271 }
1210 1272
1211 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1212 { 1274 {
1213 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1214 1276
… …
1256 1318
1257 /* Middle face */ 1319 /* Middle face */
1258 if (update_space (sl, socket, ms, lastcell, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1259 mask |= 0x2; 1321 mask |= 0x2;
1260 1322
1261 if (ms.player () == pl 1323 if (ob->invisible
1262 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325 && ms.player () == ob)
1263 { 1326 {
1264 // force player to be visible to himself if invisible 1327 // force player to be visible to himself if invisible
1265 if (lastcell.faces[0] != pl->face) 1328 if (lastcell.faces[0] != ob->face)
1266 { 1329 {
1267 lastcell.faces[0] = pl->face; 1330 lastcell.faces[0] = ob->face;
1268 1331
1269 mask |= 0x1; 1332 mask |= 0x1;
1270 sl << uint16 (pl->face); 1333 sl << uint16 (ob->face);
1271 1334
1272 socket.send_faces (pl); 1335 socket.send_faces (ob);
1273 } 1336 }
1274 } 1337 }
1275 /* Top face */ 1338 /* Top face */
1276 else if (update_space (sl, socket, ms, lastcell, 0)) 1339 else if (update_space (sl, socket, ms, lastcell, 0))
1277 mask |= 0x1; 1340 mask |= 0x1;
1278
1279 1341
1280 /* 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
1281 * space by checking the mask. If so, update the mask. 1343 * space by checking the mask. If so, update the mask.
1282 * 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
1283 * value, so we don't send those bits. 1345 * value, so we don't send those bits.
… …
1342 socket.send_packet (sl); 1404 socket.send_packet (sl);
1343 socket.sent_scroll = 0; 1405 socket.sent_scroll = 0;
1344 } 1406 }
1345} 1407}
1346 1408
1347/**
1348 * Draws client map.
1349 */
1350void
1351draw_client_map (object *pl)
1352{
1353 int i, j;
1354 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1355 int mflags;
1356 struct Map newmap;
1357 maptile *m, *pm;
1358
1359 if (pl->type != PLAYER)
1360 {
1361 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1362 return;
1363 }
1364
1365 pm = pl->map;
1366
1367 /* If player is just joining the game, he isn't here yet, so the map
1368 * can get swapped out. If so, don't try to send them a map. All will
1369 * be OK once they really log in.
1370 */
1371 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1372 return;
1373
1374 memset (&newmap, 0, sizeof (struct Map));
1375
1376 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1377 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1378 {
1379 ax = i;
1380 ay = j;
1381 m = pm;
1382 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1383
1384 if (mflags & P_OUT_OF_MAP)
1385 continue;
1386
1387 /* If a map is visible to the player, we don't want to swap it out
1388 * just to reload it. This should really call something like
1389 * swap_map, but this is much more efficient and 'good enough'
1390 */
1391 if (mflags & P_NEW_MAP)
1392 m->timeout = 50;
1393 }
1394
1395 /* do LOS after calls to update_position */
1396 if (pl->contr->do_los)
1397 {
1398 update_los (pl);
1399 pl->contr->do_los = 0;
1400 }
1401
1402 /* Big maps need a different drawing mechanism to work */
1403 draw_client_map1 (pl);
1404}
1405
1406
1407/*****************************************************************************/ 1409/*****************************************************************************/
1408
1409/* 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*/
1410
1411/* 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 */
1412
1413/* manage it ! */ 1412/* manage it ! */
1414
1415/*****************************************************************************/ 1413/*****************************************************************************/
1416void 1414void
1417send_plugin_custom_message (object *pl, char *buf) 1415send_plugin_custom_message (object *pl, char *buf)
1418{ 1416{
1419 pl->contr->ns->send_packet (buf); 1417 pl->contr->ns->send_packet (buf);
… …
1428{ 1426{
1429 packet sl; 1427 packet sl;
1430 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1431 1429
1432 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1433 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]);
1434 1432
1435 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1436 { 1434 {
1437 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1438 fatal (0); 1436 fatal (0);
1439 } 1437 }
1440 1438
… …
1453 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1454 1452
1455 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1456 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1457 1455
1458 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1459 { 1457 {
1460 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1461 fatal (0); 1459 fatal (0);
1462 } 1460 }
1463 1461
… …
1482 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1483 { 1481 {
1484 int flags = 0; 1482 int flags = 0;
1485 1483
1486 /* check if we need to update it */ 1484 /* check if we need to update it */
1487 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))
1488 { 1486 {
1489 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);
1490 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1491 } 1489 }
1492 1490
1493 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))
1494 { 1492 {
1495 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);
1496 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1497 } 1495 }
1498 1496
1499 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))
1500 { 1498 {
1501 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);
1502 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1503 } 1501 }
1504 1502
1505 if (flags) 1503 if (flags)
1506 { 1504 {
… …
1508 1506
1509 sl << "updspell " 1507 sl << "updspell "
1510 << uint8 (flags) 1508 << uint8 (flags)
1511 << uint32 (spell->count); 1509 << uint32 (spell->count);
1512 1510
1513 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1514 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1515 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1516 1514
1517 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1518 } 1516 }
1519 } 1517 }
1520 } 1518 }
… …
1550 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);
1551 return; 1549 return;
1552 } 1550 }
1553 1551
1554 /* 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 */
1555 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);
1556 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);
1557 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);
1558 1556
1559 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1560 if (spell->skill) 1558 if (spell->skill)
1561 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1562 for (i = 1; i < NUM_SKILLS; i++)
1563 if (!strcmp (spell->skill, skill_names[i]))
1564 {
1565 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1566 break;
1567 }
1568 }
1569 1561
1570 // spells better have a face 1562 // spells better have a face
1571 if (!spell->face) 1563 if (!spell->face)
1572 { 1564 {
1573 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);
1574 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1575 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1576 1570
1577 /* send the current values */ 1571 /* send the current values */
1578 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1579 << uint16 (spell->level) 1573 << uint16 (spell->level)
1580 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1581 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1582 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1583 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1584 << uint8 (skill) 1578 << uint8 (skill)
1585 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1586 << uint32 (spell->face) 1580 << uint32 (spell->face)
1587 << data8 (spell->name) 1581 << data8 (spell->name)
1588 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
1616 * 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
1617 * 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,
1618 * 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,
1619 * 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
1620 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1621 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1622 * 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
1623 * 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
1624 * like it will fix this 1621 * like it will fix this
1625 */ 1622 */
1626 if (spell->type != SPELL)
1627 continue;
1628
1629 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))))
1630 { 1624 {
1625 pl->ns->flush_fx ();
1631 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1632 1627
1633 sl.reset (); 1628 sl.reset ();
1634 sl << "addspell "; 1629 sl << "addspell ";
1635 } 1630 }
… …
1643 return; 1638 return;
1644 } 1639 }
1645 else 1640 else
1646 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1647 1642
1648 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1649 { 1644 {
1650 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1651 fatal (0); 1646 fatal (0);
1652 } 1647 }
1653 1648
1654 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1656} 1652}
1657 1653

Diff Legend

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