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.83 by root, Mon Apr 2 18:04:47 2007 UTC vs.
Revision 1.149 by root, Mon Apr 27 01:38:49 2009 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 */
152 174
153 if (socket.force_newmap) 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;
154 { 180 }
155 // force newmap is used for clients that do not redraw their map 181
156 // after image uploads. 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 {
157 socket.current_map = ob->map; 192 socket.current_map = ob->map;
158 clear_map (pl); 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 }
159 } 200 }
160 else if (socket.current_map != ob->map) 201
202 if (socket.current_map != ob->map || socket.force_newmap)
161 { 203 {
162 clear_map (pl); 204 clear_map (pl);
163 socket.current_map = ob->map; 205 socket.current_map = ob->map;
164 206 send_map_info (pl);
165 if (socket.mapinfocmd)
166 {
167 if (ob->map && ob->map->path[0])
168 {
169 int flags = 0;
170
171 if (ob->map->tile_path[0])
172 flags |= 1;
173 if (ob->map->tile_path[1])
174 flags |= 2;
175 if (ob->map->tile_path[2])
176 flags |= 4;
177 if (ob->map->tile_path[3])
178 flags |= 8;
179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 }
183 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf);
187 }
188 } 207 }
189 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)
190 { 209 {
191 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
192 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
193 212
194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
196 else
197 {
198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 213 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
199 socket.floorbox_reset (); 214 socket.floorbox_reset ();
200 }
201 } 215 }
202 216
203 socket.current_x = ob->x; 217 socket.current_x = ob->x;
204 socket.current_y = ob->y; 218 socket.current_y = ob->y;
205
206 region *reg = ob->region ();
207 if (socket.current_region != reg)
208 {
209 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 }
212} 219}
213 220
214/** 221/**
215 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
217 * that information. 224 * that information.
218 */ 225 */
219void 226void
220RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
221{ 228{
222 char *params = NULL, *cp; 229 char *params;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234 230
235 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
236 * params pointer. 232 * params pointer.
237 */ 233 */
238 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
239 if (*cp == ' ') 235 if (*params == ' ')
240 { 236 {
241 *cp = '\0';
242 params = cp + 1; 237 *params++ = 0;
243 break; 238 break;
244 } 239 }
245 240
246 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params); 242 send_image_info (ns, params);
250 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 246 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
254 else 249 else
255 ns->send_packet (bigbuf, len); 250 {
251 // undo tokenisation above and send replyinfo with the request unchanged
252 if (*params)
253 *--params = ' ';
254
255 ns->send_packet_printf ("replyinfo %s", buf);
256 }
256} 257}
257 258
258void 259void
259ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
260{ 261{
263 264
264void 265void
265ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
266{ 267{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
298 if (!map->tile_path [dir])
299 map = 0;
300 else if (map->tile_available (dir, false))
301 {
302 maptile *neigh = map->tile_map [dir];
303
304 switch (dir)
305 {
306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
317 }
318 else
319 max_distance = 0;
320 }
321
322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
352 }
353 else
354 ++i;
268} 355}
269 356
270void 357void
271MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
272{ 359{
273 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
274 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
275 362
276 char bigbuf[MAX_BUF], *token;
277
278 token = buf; 363 char *token = buf;
279 // copy token 364
280 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
281 return; 366 return;
282 367
283 *buf++ = 0;
284
285 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
286 { 369 {
287 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
288 372
289 // initial map and its origin 373#if 0
290 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
291 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
292 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
294 int max_distance = 8; // limit maximum path length to something generous
295
296 while (*buf && map && max_distance)
297 {
298 int dir = *buf++;
299
300 switch (dir)
301 {
302 case '1':
303 dx = 0;
304 dy = -1;
305 map = map->xy_find (dx, dy);
306 map && (mapy -= map->height);
307 break;
308 case '2':
309 mapx += map->width;
310 dx = map->width;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 break;
314 case '3':
315 mapy += map->height;
316 dx = 0;
317 dy = map->height;
318 map = map->xy_find (dx, dy);
319 break;
320 case '4':
321 dx = -1;
322 dy = 0;
323 map = map->xy_find (dx, dy);
324 map && (mapx -= map->width);
325 break;
326 }
327
328 --max_distance;
329 }
330
331 if (!max_distance)
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333 else if (map && map->path[0])
334 {
335 int flags = 0;
336
337 if (map->tile_path[0])
338 flags |= 1;
339 if (map->tile_path[1])
340 flags |= 2;
341 if (map->tile_path[2])
342 flags |= 4;
343 if (map->tile_path[3])
344 flags |= 8;
345
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347 }
348 else 377 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
350 } 380 }
351 else 381 else
352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354 pl->ns->send_packet (bigbuf);
355} 383}
356 384
357/** This is the Setup cmd */ 385/** This is the Setup cmd */
358void 386void
359SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
369 */ 397 */
370void 398void
371AddMeCmd (char *buf, int len, client *ns) 399AddMeCmd (char *buf, int len, client *ns)
372{ 400{
373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
374}
375
376/** Reply to ExtendedInfos command */
377void
378ToggleExtendedInfos (char *buf, int len, client * ns)
379{
380 char cmdback[MAX_BUF];
381 char command[50];
382 int info, nextinfo;
383
384 cmdback[0] = '\0';
385 nextinfo = 0;
386
387 while (1)
388 {
389 /* 1. Extract an info */
390 info = nextinfo;
391
392 while ((info < len) && (buf[info] == ' '))
393 info++;
394
395 if (info >= len)
396 break;
397
398 nextinfo = info + 1;
399
400 while ((nextinfo < len) && (buf[nextinfo] != ' '))
401 nextinfo++;
402
403 if (nextinfo - info >= 49) /*Erroneous info asked */
404 continue;
405
406 strncpy (command, &(buf[info]), nextinfo - info);
407
408 /* 2. Interpret info */
409 if (!strcmp ("smooth", command))
410 /* Toggle smoothing */
411 ns->EMI_smooth = !ns->EMI_smooth;
412 else
413 /*bad value */;
414
415 /*3. Next info */
416 }
417
418 strcpy (cmdback, "ExtendedInfoSet");
419
420 if (ns->EMI_smooth)
421 {
422 strcat (cmdback, " ");
423 strcat (cmdback, "smoothing");
424 }
425
426 ns->send_packet (cmdback);
427} 402}
428 403
429/* 404/*
430#define MSG_TYPE_BOOK 1 405#define MSG_TYPE_BOOK 1
431#define MSG_TYPE_CARD 2 406#define MSG_TYPE_CARD 2
488 463
489 ns->send_packet (cmdback); 464 ns->send_packet (cmdback);
490} 465}
491 466
492/** 467/**
493 * client requested an image. send it rate-limited
494 * before flushing.
495 */
496void
497AskFaceCmd (char *buf, int len, client *ns)
498{
499 ns->askface.push_back (atoi (buf));
500}
501
502/**
503 * Tells client the picture it has to use
504 * to smooth a picture number given as argument.
505 */
506void
507AskSmooth (char *buf, int len, client *ns)
508{
509 ns->send_face (atoi (buf));
510}
511
512/**
513 * This handles the general commands from the client (ie, north, fire, cast, 468 * This handles the general commands from the client (ie, north, fire, cast,
514 * etc.) 469 * etc.)
515 */ 470 */
516void 471void
517PlayerCmd (char *buf, int len, player *pl) 472PlayerCmd (char *buf, int len, player *pl)
538 * commands. 493 * commands.
539 */ 494 */
540 pl->count = 0; 495 pl->count = 0;
541} 496}
542 497
543
544/** 498/**
545 * This handles the general commands from the client (ie, north, fire, cast, 499 * This handles the general commands from the client (ie, north, fire, cast,
546 * etc.). It is a lot like PlayerCmd above, but is called with the 500 * etc.). It is a lot like PlayerCmd above, but is called with the
547 * 'ncom' method which gives more information back to the client so it 501 * 'ncom' method which gives more information back to the client so it
548 * can throttle. 502 * can throttle.
550void 504void
551NewPlayerCmd (char *buf, int len, player *pl) 505NewPlayerCmd (char *buf, int len, player *pl)
552{ 506{
553 if (len <= 6) 507 if (len <= 6)
554 { 508 {
555 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 509 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
556 return; 510 return;
557 } 511 }
558 512
559 uint16 cmdid = net_uint16 ((uint8 *)buf); 513 uint16 cmdid = net_uint16 ((uint8 *)buf);
560 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 514 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
617 { 571 {
618 case ST_PLAYING: 572 case ST_PLAYING:
619 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 573 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
620 break; 574 break;
621 575
622 case ST_CHANGE_CLASS:
623 key_change_class (pl->ob, buf[0]);
624 break;
625
626 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 576 case ST_GET_PARTY_PASSWORD: /* Get password for party */
627 receive_party_password (pl->ob, 13); 577 receive_party_password (pl->ob, 13);
628 break; 578 break;
629 579
630 default: 580 default:
669 619
670 cp = strchr (cp + 1, ' '); 620 cp = strchr (cp + 1, ' ');
671 621
672 if (cp) 622 if (cp)
673 { 623 {
674 assign (ns->version, cp + 1); 624 ns->version = cp + 1;
675 625
676 if (ns->sc_version < 1026) 626 if (ns->sc_version < 1026)
677 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 627 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
678 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 628 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
679 } 629 }
702 * syntax is: move (to) (tag) (nrof) 652 * syntax is: move (to) (tag) (nrof)
703 */ 653 */
704void 654void
705MoveCmd (char *buf, int len, player *pl) 655MoveCmd (char *buf, int len, player *pl)
706{ 656{
707 int vals[3], i; 657 int to, tag, nrof;
708 658
709 /* A little funky here. We only cycle for 2 records, because 659 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
710 * we obviously are not going to find a space after the third
711 * record. Perhaps we should just replace this with a
712 * sscanf?
713 */
714 for (i = 0; i < 2; i++)
715 { 660 {
716 vals[i] = atoi (buf);
717
718 if (!(buf = strchr (buf, ' ')))
719 {
720 LOG (llevError, "Incomplete move command: %s\n", buf); 661 LOG (llevError, "Incomplete move command: %s\n", buf);
721 return; 662 return;
722 }
723
724 buf++;
725 } 663 }
726 664
727 vals[2] = atoi (buf); 665 esrv_move_object (pl->ob, to, tag, nrof);
728
729/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
730 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
731} 666}
732 667
733/****************************************************************************** 668/******************************************************************************
734 * 669 *
735 * Start of commands the server sends to the client. 670 * Start of commands the server sends to the client.
744send_query (client *ns, uint8 flags, const char *text) 679send_query (client *ns, uint8 flags, const char *text)
745{ 680{
746 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 681 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
747} 682}
748 683
684/**
685 * Get player's current range attack in obuf.
686 */
687static void
688rangetostring (player *pl, char *obuf)
689{
690 dynbuf_text &buf = msg_dynbuf; buf.clear ();
691
692 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694
695 if (pl->combat_ob)
696 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
697
698#if 0
699 //TODO: remove this when slot system is working, this is only for debugging
700 if (pl->ob->chosen_skill)
701 buf << " Skill*: " << pl->ob->chosen_skill->name;
702#endif
703
704 //TODO: maybe golem should become the current_weapon, quite simply?
705 if (pl->golem)
706 buf << " Golem*: " << pl->golem->name;
707
708 buf << '\0';
709 buf.linearise (obuf);
710}
711
749#define AddIfInt64(Old,New,Type) if (Old != New) {\ 712#define AddIfInt64(Old,New,Type) if (Old != New) {\
750 Old = New; \ 713 Old = New; \
751 sl << uint8 (Type) << uint64 (New); \ 714 sl << uint8 (Type) << uint64 (New); \
752 } 715 }
753 716
759#define AddIfShort(Old,New,Type) if (Old != New) {\ 722#define AddIfShort(Old,New,Type) if (Old != New) {\
760 Old = New; \ 723 Old = New; \
761 sl << uint8 (Type) << uint16 (New); \ 724 sl << uint8 (Type) << uint16 (New); \
762 } 725 }
763 726
764#define AddIfFloat(Old,New,Type) if (Old != New) {\ 727#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
765 Old = New; \ 728 Old = New; \
766 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 729 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
767 } 730 }
768 731
769#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 732#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
770 free(Old); Old = strdup (New);\ 733 free(Old); Old = strdup (New);\
771 sl << uint8 (Type) << data8 (New); \ 734 sl << uint8 (Type) << data8 (New); \
785 748
786 client *ns = pl->ns; 749 client *ns = pl->ns;
787 if (!ns) 750 if (!ns)
788 return; 751 return;
789 752
790 object *ob = pl->ob; 753 object *ob = pl->observe;
791 if (!ob) 754 if (!ob)
792 return; 755 return;
756
757 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
793 758
794 packet sl ("stats"); 759 packet sl ("stats");
795 760
796 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 761 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
797 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 762 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
806 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
807 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
808 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
809 774
810 for (int s = 0; s < NUM_SKILLS; s++) 775 for (int s = 0; s < NUM_SKILLS; s++)
811 if (object *skill = pl->last_skill_ob[s]) 776 if (object *skill = opl->last_skill_ob [s])
812 if (skill->stats.exp != ns->last_skill_exp [s]) 777 if (skill->stats.exp != ns->last_skill_exp [s])
813 { 778 {
814 ns->last_skill_exp [s] = skill->stats.exp; 779 ns->last_skill_exp [s] = skill->stats.exp;
815 780
816 /* Always send along the level if exp changes. This is only 781 /* Always send along the level if exp changes. This is only
824 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
825 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
826 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
827 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
828 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
829 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
830 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
831 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 796 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
832 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
833 798
834 flags = 0; 799 flags = 0;
835 800
836 if (pl->fire_on) 801 if (opl->fire_on)
837 flags |= SF_FIREON; 802 flags |= SF_FIREON;
838 803
839 if (pl->run_on) 804 if (opl->run_on)
840 flags |= SF_RUNON; 805 flags |= SF_RUNON;
841 806
842 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
843 808
844 if (ns->sc_version < 1025) 809 if (ns->sc_version < 1025)
858 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
859 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 824 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
860 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 825 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
861 } 826 }
862 827
863 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 828 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
864 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
865 set_title (ob, buf); 830 set_title (ob, buf);
866 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
867 832
868 /* Only send it away if we have some actual data */ 833 /* Only send it away if we have some actual data */
872 837
873/** 838/**
874 * Tells the client that here is a player it should start using. 839 * Tells the client that here is a player it should start using.
875 */ 840 */
876void 841void
877esrv_new_player (player *pl, uint32 weight) 842esrv_new_player (player *pl)
878{ 843{
844 sint32 weight = pl->ob->client_weight ();
845
879 packet sl ("player"); 846 packet sl ("player");
880 847
881 sl << uint32 (pl->ob->count) 848 sl << uint32 (pl->ob->count)
882 << uint32 (weight) 849 << uint32 (weight)
883 << uint32 (pl->ob->face) 850 << uint32 (pl->ob->face)
884 << data8 (pl->ob->name); 851 << data8 (pl->ob->name);
885 852
886 pl->ns->last_weight = weight; 853 pl->ns->last_weight = weight;
887 pl->ns->send_packet (sl); 854 pl->ns->send_packet (sl);
888 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
889} 855}
890 856
891/****************************************************************************** 857/******************************************************************************
892 * 858 *
893 * Start of map related commands. 859 * Start of map related commands.
950 916
951 if (!ns.faces_sent[face_num]) 917 if (!ns.faces_sent[face_num])
952 if (ob) 918 if (ob)
953 ns.send_faces (ob); 919 ns.send_faces (ob);
954 else 920 else
955 ns.send_face (face_num); 921 ns.send_face (face_num, 10);
956 922
957 sl << uint16 (face_num); 923 sl << uint16 (face_num);
958 return 1; 924 return 1;
959 } 925 }
960 926
961 /* Nothing changed */ 927 /* Nothing changed */
962 return 0; 928 return 0;
963}
964
965/**
966 * Returns the size of a data for a map square as returned by
967 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
968 * available.
969 */
970int
971getExtendedMapInfoSize (client * ns)
972{
973 int result = 0;
974
975 if (ns->ext_mapinfos)
976 {
977 if (ns->EMI_smooth)
978 result += 1; /*One byte for smoothlevel */
979 }
980
981 return result;
982} 929}
983 930
984// prefetch (and touch) all maps within a specific distancd 931// prefetch (and touch) all maps within a specific distancd
985static void 932static void
986prefetch_surrounding_maps (maptile *map, int distance) 933prefetch_surrounding_maps (maptile *map, int distance)
987{ 934{
988 map->last_access = runtime; 935 map->touch ();
989 936
990 if (--distance) 937 if (--distance)
991 for (int dir = 4; --dir; ) 938 for (int dir = 4; --dir; )
992 if (const shstr &path = map->tile_path [dir]) 939 if (const shstr &path = map->tile_path [dir])
993 if (maptile *&neigh = map->tile_map [dir]) 940 if (maptile *&neigh = map->tile_map [dir])
1002{ 949{
1003 prefetch_surrounding_maps (op->map, 3); 950 prefetch_surrounding_maps (op->map, 3);
1004} 951}
1005 952
1006/** 953/**
1007 * This function uses the new map1 protocol command to send the map 954 * Draws client map.
1008 * to the client. It is necessary because the old map command supports
1009 * a maximum map size of 15x15.
1010 * This function is much simpler than the old one. This is because
1011 * the old function optimized to send as few face identifiers as possible,
1012 * at the expense of sending more coordinate location (coordinates were
1013 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1014 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1015 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1016 * and use the other 4 bits for other informatiion. For full documentation
1017 * of what we send, see the doc/Protocol file.
1018 * I will describe internally what we do:
1019 * the ns->lastmap shows how the map last looked when sent to the client.
1020 * in the lastmap structure, there is a cells array, which is set to the
1021 * maximum viewable size (As set in config.h).
1022 * in the cells, there are faces and a count value.
1023 * we use the count value to hold the darkness value. If -1, then this space
1024 * is not viewable.
1025 * we use faces[0] faces[1] faces[2] to hold what the three layers
1026 * look like.
1027 */ 955 */
1028void 956void
1029draw_client_map1 (object *pl) 957draw_client_map (player *pl)
1030{ 958{
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 959 object *ob = pl->observe;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen;
1034 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos;
1037 maptile *m;
1038
1039 client &socket = *pl->contr->ns;
1040
1041 if (!pl->active) 960 if (!ob->active)
1042 return; 961 return;
1043
1044 check_map_change (pl->contr);
1045 prefetch_surrounding_maps (pl);
1046
1047 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1048 packet esl;
1049
1050 startlen = sl.length ();
1051
1052 /*Extendedmapinfo structure initialisation */
1053 if (socket.ext_mapinfos)
1054 {
1055 extendedinfos = EMI_NOREDRAW;
1056
1057 if (socket.EMI_smooth)
1058 extendedinfos |= EMI_SMOOTH;
1059
1060 ewhatstart = esl.length ();
1061 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1062 could need to be taken away */
1063 eentrysize = getExtendedMapInfoSize (&socket);
1064 esl << "mapextended "
1065 << uint8 (extendedinfos)
1066 << uint8 (eentrysize);
1067
1068 estartlen = esl.length ();
1069 }
1070
1071 /* x,y are the real map locations. ax, ay are viewport relative
1072 * locations.
1073 */
1074 ay = 0;
1075
1076 /* We could do this logic as conditionals in the if statement,
1077 * but that started to get a bit messy to look at.
1078 */
1079 max_x = pl->x + (socket.mapx + 1) / 2;
1080 max_y = pl->y + (socket.mapy + 1) / 2;
1081
1082 maptile *plmap = pl->map;
1083
1084 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1085 {
1086 ax = 0;
1087 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1088 {
1089 int emask, mask;
1090 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1091
1092 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1093
1094 /* If the coordinates are not valid, or it is too dark to see,
1095 * we tell the client as such
1096 */
1097 nx = x;
1098 ny = y;
1099 m = get_map_from_coord (plmap, &nx, &ny);
1100
1101 if (!m)
1102 {
1103 /* space is out of map. Update space and clear values
1104 * if this hasn't already been done. If the space is out
1105 * of the map, it shouldn't have a head
1106 */
1107 if (lastcell.count != -1)
1108 {
1109 sl << uint16 (mask);
1110 map_clearcell (&lastcell, -1);
1111 }
1112
1113 continue;
1114 }
1115
1116 m->touch ();
1117
1118 int d = pl->contr->blocked_los[ax][ay];
1119
1120 if (d > 3)
1121 {
1122
1123 int need_send = 0, count;
1124
1125 /* This block deals with spaces that are not visible for whatever
1126 * reason. Still may need to send the head for this space.
1127 */
1128
1129 oldlen = sl.length ();
1130
1131 sl << uint16 (mask);
1132
1133 if (lastcell.count != -1)
1134 need_send = 1;
1135
1136 count = -1;
1137
1138 /* properly clear a previously sent big face */
1139 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1140 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1141 need_send = 1;
1142
1143 map_clearcell (&lastcell, count);
1144
1145 if ((mask & 0xf) || need_send)
1146 sl[oldlen + 1] = mask & 0xff;
1147 else
1148 sl.reset (oldlen);
1149 }
1150 else
1151 {
1152 /* In this block, the space is visible.
1153 */
1154
1155 /* Rather than try to figure out what everything that we might
1156 * need to send is, then form the packet after that,
1157 * we presume that we will in fact form a packet, and update
1158 * the bits by what we do actually send. If we send nothing,
1159 * we just back out sl.length () to the old value, and no harm
1160 * is done.
1161 * I think this is simpler than doing a bunch of checks to see
1162 * what if anything we need to send, setting the bits, then
1163 * doing those checks again to add the real data.
1164 */
1165 oldlen = sl.length ();
1166 eoldlen = esl.length ();
1167
1168 sl << uint16 (mask);
1169
1170 unsigned char dummy;
1171 unsigned char *last_ext = &dummy;
1172
1173 /* Darkness changed */
1174 if (lastcell.count != d && socket.darkness)
1175 {
1176 mask |= 0x8;
1177
1178 if (socket.extmap)
1179 {
1180 *last_ext |= 0x80;
1181 last_ext = &sl[sl.length ()];
1182 sl << uint8 (d);
1183 }
1184 else
1185 sl << uint8 (255 - 64 * d);
1186 }
1187
1188 lastcell.count = d;
1189
1190 mapspace &ms = m->at (nx, ny);
1191
1192 if (socket.extmap)
1193 {
1194 uint8 stat_hp = 0;
1195 uint8 stat_width = 0;
1196 uint8 flags = 0;
1197 UUID player = 0;
1198
1199 // send hp information, if applicable
1200 if (object *op = ms.faces_obj [0])
1201 {
1202 if (op->head || op->invisible)
1203 ; // do not show
1204 else if (op->type == PLAYER
1205 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1206 {
1207 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1208 {
1209 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1210 stat_width = op->arch->tail_x;
1211 }
1212 }
1213
1214 if (op->msg && op->msg[0] == '@')
1215 flags |= 1;
1216
1217 if (op->type == PLAYER && op != pl)
1218 player = op->count;
1219 }
1220
1221 if (lastcell.stat_hp != stat_hp)
1222 {
1223 lastcell.stat_hp = stat_hp;
1224
1225 mask |= 0x8;
1226 *last_ext |= 0x80;
1227 last_ext = &sl[sl.length ()];
1228
1229 sl << uint8 (5) << uint8 (stat_hp);
1230
1231 if (stat_width > 1)
1232 {
1233 *last_ext |= 0x80;
1234 last_ext = &sl[sl.length ()];
1235
1236 sl << uint8 (6) << uint8 (stat_width);
1237 }
1238 }
1239
1240 if (lastcell.player != player)
1241 {
1242 lastcell.player = player;
1243
1244 mask |= 0x8;
1245 *last_ext |= 0x80;
1246 last_ext = &sl[sl.length ()];
1247
1248 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1249 }
1250
1251 if (lastcell.flags != flags)
1252 {
1253 lastcell.flags = flags;
1254
1255 mask |= 0x8;
1256 *last_ext |= 0x80;
1257 last_ext = &sl[sl.length ()];
1258
1259 sl << uint8 (8) << uint8 (flags);
1260 }
1261 }
1262
1263 /* Floor face */
1264 if (update_space (sl, socket, ms, lastcell, 2))
1265 mask |= 0x4;
1266
1267 /* Middle face */
1268 if (update_space (sl, socket, ms, lastcell, 1))
1269 mask |= 0x2;
1270
1271 if (ms.player () == pl
1272 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1273 {
1274 // force player to be visible to himself if invisible
1275 if (lastcell.faces[0] != pl->face)
1276 {
1277 lastcell.faces[0] = pl->face;
1278
1279 mask |= 0x1;
1280 sl << uint16 (pl->face);
1281
1282 socket.send_faces (pl);
1283 }
1284 }
1285 /* Top face */
1286 else if (update_space (sl, socket, ms, lastcell, 0))
1287 mask |= 0x1;
1288
1289
1290 /* Check to see if we are in fact sending anything for this
1291 * space by checking the mask. If so, update the mask.
1292 * if not, reset the len to that from before adding the mask
1293 * value, so we don't send those bits.
1294 */
1295 if (mask & 0xf)
1296 sl[oldlen + 1] = mask & 0xff;
1297 else
1298 sl.reset (oldlen);
1299
1300 if (socket.ext_mapinfos)
1301 esl << uint16 (emask);
1302
1303 if (socket.EMI_smooth)
1304 {
1305 for (int layer = 2+1; layer--; )
1306 {
1307 object *ob = ms.faces_obj [layer];
1308
1309 // If there is no object for this space, or if the face for the object
1310 // is the blank face, set the smoothlevel to zero.
1311 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1312
1313 // We've gotten what face we want to use for the object. Now see if
1314 // if it has changed since we last sent it to the client.
1315 if (lastcell.smooth[layer] != smoothlevel)
1316 {
1317 lastcell.smooth[layer] = smoothlevel;
1318 esl << uint8 (smoothlevel);
1319 emask |= 1 << layer;
1320 }
1321 }
1322
1323 if (emask & 0xf)
1324 esl[eoldlen + 1] = emask & 0xff;
1325 else
1326 esl.reset (eoldlen);
1327 }
1328 } /* else this is a viewable space */
1329 } /* for x loop */
1330 } /* for y loop */
1331
1332 /* Verify that we in fact do need to send this */
1333 if (socket.ext_mapinfos)
1334 {
1335 if (!(sl.length () > startlen || socket.sent_scroll))
1336 {
1337 /* No map data will follow, so don't say the client
1338 * it doesn't need draw!
1339 */
1340 ewhatflag &= ~EMI_NOREDRAW;
1341 esl[ewhatstart + 1] = ewhatflag & 0xff;
1342 }
1343
1344 if (esl.length () > estartlen)
1345 socket.send_packet (esl);
1346 }
1347
1348 if (sl.length () > startlen || socket.sent_scroll)
1349 {
1350 socket.send_packet (sl);
1351 socket.sent_scroll = 0;
1352 }
1353}
1354
1355/**
1356 * Draws client map.
1357 */
1358void
1359draw_client_map (object *pl)
1360{
1361 int i, j;
1362 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1363 int mflags;
1364 struct Map newmap;
1365 maptile *m, *pm;
1366
1367 if (pl->type != PLAYER)
1368 {
1369 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1370 return;
1371 }
1372
1373 pm = pl->map;
1374 962
1375 /* If player is just joining the game, he isn't here yet, so the map 963 /* If player is just joining the game, he isn't here yet, so the map
1376 * can get swapped out. If so, don't try to send them a map. All will 964 * can get swapped out. If so, don't try to send them a map. All will
1377 * be OK once they really log in. 965 * be OK once they really log in.
1378 */ 966 */
1379 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 967 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1380 return; 968 return;
1381 969
1382 memset (&newmap, 0, sizeof (struct Map)); 970 int startlen, oldlen;
1383 971
1384 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 972 check_map_change (pl);
1385 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 973 prefetch_surrounding_maps (pl->ob);
974
975 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob)
978 {
979 pl->do_los = 0;
980 pl->update_los ();
981 }
982
983 /**
984 * This function uses the new map1 protocol command to send the map
985 * to the client. It is necessary because the old map command supports
986 * a maximum map size of 15x15.
987 * This function is much simpler than the old one. This is because
988 * the old function optimized to send as few face identifiers as possible,
989 * at the expense of sending more coordinate location (coordinates were
990 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
991 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
992 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
993 * and use the other 4 bits for other informatiion. For full documentation
994 * of what we send, see the doc/Protocol file.
995 * I will describe internally what we do:
996 * the ns->lastmap shows how the map last looked when sent to the client.
997 * in the lastmap structure, there is a cells array, which is set to the
998 * maximum viewable size (As set in config.h).
999 * in the cells, there are faces and a count value.
1000 * we use the count value to hold the darkness value. If -1, then this space
1001 * is not viewable.
1002 * we use faces[0] faces[1] faces[2] to hold what the three layers
1003 * look like.
1004 */
1005
1006 client &socket = *pl->ns;
1007
1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1009
1010 startlen = sl.length ();
1011
1012 int hx = socket.mapx / 2;
1013 int hy = socket.mapy / 2;
1014
1015 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1016 int ax = dx + hx;
1017 int ay = dy + hy;
1018
1019 int mask = (ax << 10) | (ay << 4);
1020 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1021
1022 /* If the coordinates are not valid, or it is too dark to see,
1023 * we tell the client as such
1024 */
1025 if (!m)
1386 { 1026 {
1387 ax = i; 1027 /* space is out of map. Update space and clear values
1388 ay = j; 1028 * if this hasn't already been done. If the space is out
1389 m = pm; 1029 * of the map, it shouldn't have a head.
1390 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1391
1392 if (mflags & P_OUT_OF_MAP)
1393 continue;
1394
1395 /* If a map is visible to the player, we don't want to swap it out
1396 * just to reload it. This should really call something like
1397 * swap_map, but this is much more efficient and 'good enough'
1398 */ 1030 */
1399 if (mflags & P_NEW_MAP) 1031 if (lastcell.count != -1)
1400 m->timeout = 50; 1032 {
1033 sl << uint16 (mask);
1034 map_clearcell (&lastcell, -1);
1035 }
1036
1037 continue;
1401 } 1038 }
1039
1040 int d = pl->blocked_los_uc (dx, dy);
1402 1041
1403 /* do LOS after calls to update_position */ 1042 if (d > 3)
1404 if (pl->contr->do_los)
1405 { 1043 {
1406 update_los (pl); 1044 /* This block deals with spaces that are not visible for whatever
1407 pl->contr->do_los = 0; 1045 * reason. Still may need to send the head for this space.
1046 */
1047 if (lastcell.count != -1
1048 || lastcell.faces[0]
1049 || lastcell.faces[1]
1050 || lastcell.faces[2]
1051 || lastcell.stat_hp
1052 || lastcell.flags
1053 || lastcell.player)
1054 sl << uint16 (mask);
1055
1056 /* properly clear a previously sent big face */
1057 map_clearcell (&lastcell, -1);
1408 } 1058 }
1059 else
1060 {
1061 /* In this block, the space is visible.
1062 */
1409 1063
1410 /* Big maps need a different drawing mechanism to work */ 1064 /* Rather than try to figure out what everything that we might
1411 draw_client_map1 (pl); 1065 * need to send is, then form the packet after that,
1412} 1066 * we presume that we will in fact form a packet, and update
1067 * the bits by what we do actually send. If we send nothing,
1068 * we just back out sl.length () to the old value, and no harm
1069 * is done.
1070 * I think this is simpler than doing a bunch of checks to see
1071 * what if anything we need to send, setting the bits, then
1072 * doing those checks again to add the real data.
1073 */
1074 oldlen = sl.length ();
1413 1075
1076 sl << uint16 (mask);
1077
1078 unsigned char dummy;
1079 unsigned char *last_ext = &dummy;
1080
1081 /* Darkness changed */
1082 if (lastcell.count != d)
1083 {
1084 mask |= 0x8;
1085
1086 *last_ext |= 0x80;
1087 last_ext = &sl[sl.length ()];
1088 sl << uint8 (d);
1089 }
1090
1091 lastcell.count = d;
1092
1093 mapspace &ms = m->at (nx, ny);
1094 ms.update ();
1095
1096 // extmap handling
1097 uint8 stat_hp = 0;
1098 uint8 stat_width = 0;
1099 uint8 flags = 0;
1100 tag_t player = 0;
1101
1102 // send hp information, if applicable
1103 if (object *op = ms.faces_obj [0])
1104 if (op->is_head () && !op->invisible)
1105 {
1106 if (op->stats.maxhp > op->stats.hp
1107 && op->stats.maxhp > 0
1108 && (op->type == PLAYER
1109 || op->type == DOOR // does not work, have maxhp 0
1110 || QUERY_FLAG (op, FLAG_MONSTER)
1111 || QUERY_FLAG (op, FLAG_ALIVE)
1112 || QUERY_FLAG (op, FLAG_GENERATOR)))
1113 {
1114 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1115 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1116 }
1117
1118 if (expect_false (op->has_dialogue ()))
1119 flags |= 1;
1120
1121 if (expect_false (op->type == PLAYER))
1122 player = op == ob ? pl->ob->count
1123 : op == pl->ob ? ob->count
1124 : op->count;
1125 }
1126
1127 if (expect_false (lastcell.stat_hp != stat_hp))
1128 {
1129 lastcell.stat_hp = stat_hp;
1130
1131 mask |= 0x8;
1132 *last_ext |= 0x80;
1133 last_ext = &sl[sl.length ()];
1134
1135 sl << uint8 (5) << uint8 (stat_hp);
1136
1137 if (stat_width > 1)
1138 {
1139 *last_ext |= 0x80;
1140 last_ext = &sl[sl.length ()];
1141
1142 sl << uint8 (6) << uint8 (stat_width);
1143 }
1144 }
1145
1146 if (expect_false (lastcell.player != player))
1147 {
1148 lastcell.player = player;
1149
1150 mask |= 0x8;
1151 *last_ext |= 0x80;
1152 last_ext = &sl[sl.length ()];
1153
1154 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1155 }
1156
1157 if (expect_false (lastcell.flags != flags))
1158 {
1159 lastcell.flags = flags;
1160
1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1164
1165 sl << uint8 (8) << uint8 (flags);
1166 }
1167
1168 // faces
1169
1170 /* Floor face */
1171 if (update_space (sl, socket, ms, lastcell, 2))
1172 mask |= 0x4;
1173
1174 /* Middle face */
1175 if (update_space (sl, socket, ms, lastcell, 1))
1176 mask |= 0x2;
1177
1178 if (expect_false (ob->invisible)
1179 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1180 && ms.player () == ob)
1181 {
1182 // force player to be visible to himself if invisible
1183 if (lastcell.faces[0] != ob->face)
1184 {
1185 lastcell.faces[0] = ob->face;
1186
1187 mask |= 0x1;
1188 sl << uint16 (ob->face);
1189
1190 socket.send_faces (ob);
1191 }
1192 }
1193 /* Top face */
1194 else if (update_space (sl, socket, ms, lastcell, 0))
1195 mask |= 0x1;
1196
1197 /* Check to see if we are in fact sending anything for this
1198 * space by checking the mask. If so, update the mask.
1199 * if not, reset the len to that from before adding the mask
1200 * value, so we don't send those bits.
1201 */
1202 if (mask & 0xf)
1203 sl[oldlen + 1] = mask & 0xff;
1204 else
1205 sl.reset (oldlen);
1206 } /* else this is a viewable space */
1207 ordered_mapwalk_end
1208
1209 socket.flush_fx ();
1210
1211 if (sl.length () > startlen || socket.sent_scroll)
1212 {
1213 socket.send_packet (sl);
1214 socket.sent_scroll = 0;
1215 }
1216}
1414 1217
1415/*****************************************************************************/ 1218/*****************************************************************************/
1416
1417/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1219/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1418
1419/* a player. Of course, the client need to know the command to be able to */ 1220/* a player. Of course, the client need to know the command to be able to */
1420
1421/* manage it ! */ 1221/* manage it ! */
1422
1423/*****************************************************************************/ 1222/*****************************************************************************/
1424void 1223void
1425send_plugin_custom_message (object *pl, char *buf) 1224send_plugin_custom_message (object *pl, char *buf)
1426{ 1225{
1427 pl->contr->ns->send_packet (buf); 1226 pl->contr->ns->send_packet (buf);
1436{ 1235{
1437 packet sl; 1236 packet sl;
1438 sl << "replyinfo skill_info\n"; 1237 sl << "replyinfo skill_info\n";
1439 1238
1440 for (int i = 1; i < NUM_SKILLS; i++) 1239 for (int i = 1; i < NUM_SKILLS; i++)
1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1240 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1442 1241
1443 if (sl.length () >= MAXSOCKBUF) 1242 if (sl.length () > MAXSOCKBUF)
1444 { 1243 {
1445 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1244 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446 fatal (0); 1245 fatal (0);
1447 } 1246 }
1448 1247
1461 sl << "replyinfo spell_paths\n"; 1260 sl << "replyinfo spell_paths\n";
1462 1261
1463 for (int i = 0; i < NRSPELLPATHS; i++) 1262 for (int i = 0; i < NRSPELLPATHS; i++)
1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1263 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465 1264
1466 if (sl.length () >= MAXSOCKBUF) 1265 if (sl.length () > MAXSOCKBUF)
1467 { 1266 {
1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1267 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469 fatal (0); 1268 fatal (0);
1470 } 1269 }
1471 1270
1490 if (spell->type == SPELL) 1289 if (spell->type == SPELL)
1491 { 1290 {
1492 int flags = 0; 1291 int flags = 0;
1493 1292
1494 /* check if we need to update it */ 1293 /* check if we need to update it */
1495 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1294 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1496 { 1295 {
1497 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1296 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1498 flags |= UPD_SP_MANA; 1297 flags |= UPD_SP_MANA;
1499 } 1298 }
1500 1299
1501 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1300 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1502 { 1301 {
1503 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1302 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1504 flags |= UPD_SP_GRACE; 1303 flags |= UPD_SP_GRACE;
1505 } 1304 }
1506 1305
1507 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1306 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1508 { 1307 {
1509 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1308 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1510 flags |= UPD_SP_DAMAGE; 1309 flags |= UPD_SP_DAMAGE;
1511 } 1310 }
1512 1311
1513 if (flags) 1312 if (flags)
1514 { 1313 {
1516 1315
1517 sl << "updspell " 1316 sl << "updspell "
1518 << uint8 (flags) 1317 << uint8 (flags)
1519 << uint32 (spell->count); 1318 << uint32 (spell->count);
1520 1319
1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1524 1323
1525 pl->ns->send_packet (sl); 1324 pl->ns->send_packet (sl);
1526 } 1325 }
1527 } 1326 }
1528 } 1327 }
1558 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1357 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1559 return; 1358 return;
1560 } 1359 }
1561 1360
1562 /* store costs and damage in the object struct, to compare to later */ 1361 /* store costs and damage in the object struct, to compare to later */
1563 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1362 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1564 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1363 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1364 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1566 1365
1567 /* figure out which skill it uses, if it uses one */ 1366 /* figure out which skill it uses, if it uses one */
1568 if (spell->skill) 1367 if (spell->skill)
1569 { 1368 if (object *tmp = pl->find_skill (spell->skill))
1570 for (i = 1; i < NUM_SKILLS; i++)
1571 if (!strcmp (spell->skill, skill_names[i]))
1572 {
1573 skill = i + CS_STAT_SKILLINFO; 1369 skill = tmp->subtype + CS_STAT_SKILLINFO;
1574 break;
1575 }
1576 }
1577 1370
1578 // spells better have a face 1371 // spells better have a face
1579 if (!spell->face) 1372 if (!spell->face)
1580 { 1373 {
1581 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1374 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1582 spell->face = face_find ("burnout.x11", blank_face); 1375 spell->face = face_find ("burnout.x11", blank_face);
1583 } 1376 }
1377
1378 pl->ns->send_face (spell->face);
1584 1379
1585 /* send the current values */ 1380 /* send the current values */
1586 sl << uint32 (spell->count) 1381 sl << uint32 (spell->count)
1587 << uint16 (spell->level) 1382 << uint16 (spell->level)
1588 << uint16 (spell->casting_time) 1383 << uint16 (spell->casting_time)
1589 << uint16 (spell->last_sp) 1384 << uint16 (spell->cached_sp)
1590 << uint16 (spell->last_grace) 1385 << uint16 (spell->cached_grace)
1591 << uint16 (spell->last_eat) 1386 << uint16 (spell->cached_eat)
1592 << uint8 (skill) 1387 << uint8 (skill)
1593 << uint32 (spell->path_attuned) 1388 << uint32 (spell->path_attuned)
1594 << uint32 (spell->face) 1389 << uint32 (spell->face)
1595 << data8 (spell->name) 1390 << data8 (spell->name)
1596 << data16 (spell->msg); 1391 << data16 (spell->msg);
1624 * bytes and 3 strings (because that is the spec) so we need to 1419 * bytes and 3 strings (because that is the spec) so we need to
1625 * check that the length of those 3 strings, plus the 23 bytes, 1420 * check that the length of those 3 strings, plus the 23 bytes,
1626 * won't take us over the length limit for the socket, if it does, 1421 * won't take us over the length limit for the socket, if it does,
1627 * we need to send what we already have, and restart packet formation 1422 * we need to send what we already have, and restart packet formation
1628 */ 1423 */
1424 if (spell->type != SPELL)
1425 continue;
1426
1629 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1427 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1630 * to show add_spell is 26 bytes + 2 strings. However, the overun 1428 * to show add_spell is 26 bytes + 2 strings. However, the overun
1631 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1429 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1632 * like it will fix this 1430 * like it will fix this
1633 */ 1431 */
1634 if (spell->type != SPELL)
1635 continue;
1636
1637 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1432 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1638 { 1433 {
1434 pl->ns->flush_fx ();
1639 pl->ns->send_packet (sl); 1435 pl->ns->send_packet (sl);
1640 1436
1641 sl.reset (); 1437 sl.reset ();
1642 sl << "addspell "; 1438 sl << "addspell ";
1643 } 1439 }
1651 return; 1447 return;
1652 } 1448 }
1653 else 1449 else
1654 append_spell (pl, sl, spell); 1450 append_spell (pl, sl, spell);
1655 1451
1656 if (sl.length () >= MAXSOCKBUF) 1452 if (sl.length () > MAXSOCKBUF)
1657 { 1453 {
1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1454 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1659 fatal (0); 1455 fatal (0);
1660 } 1456 }
1661 1457
1662 /* finally, we can send the packet */ 1458 /* finally, we can send the packet */
1459 pl->ns->flush_fx ();
1663 pl->ns->send_packet (sl); 1460 pl->ns->send_packet (sl);
1664} 1461}
1665 1462

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines