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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines