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.58 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
27 * 27 *
35 * have the prototype of (char *data, int datalen, int client_num). This 35 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 36 * way, we can use one dispatch table.
37 * 37 *
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 40 */
44 41
45#include <global.h> 42#include <global.h>
46#include <sproto.h> 43#include <sproto.h>
47 44
100 * that much difference in bandwidth. 97 * that much difference in bandwidth.
101 */ 98 */
102 mx = ns->mapx; 99 mx = ns->mapx;
103 my = ns->mapy; 100 my = ns->mapy;
104 101
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* 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
112 * (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,
113 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
115 * 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.
138} 129}
139 130
140static void 131static void
141clear_map (player *pl) 132clear_map (player *pl)
142{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137
138 pl->ns->force_newmap = false;
144 139
145 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
146 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
147 142
148 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
149} 144}
150 145
151/** check for map change and send new map data */ 146/** check for map/region change and send new map data */
152static void 147static void
153check_map_change (player *pl) 148check_map_change (player *pl)
154{ 149{
155 client &socket = *pl->ns; 150 client &socket = *pl->ns;
156 object *ob = pl->ob; 151 object *ob = pl->observe;
157 char buf[MAX_BUF]; /* eauugggh */
158 152
159 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
160 { 154 {
155 clear_map (pl);
161 socket.current_map = ob->map; 156 socket.current_map = ob->map;
162
163 clear_map (pl);
164 157
165 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
166 { 159 {
167 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
168 { 161 {
169 int flags = 0; 162 int flags = 0;
170 163
171 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
172 flags |= 1;
173 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
174 flags |= 2;
175 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
176 flags |= 4;
177 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
178 flags |= 8;
179 168
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 169 socket.send_packet_printf ("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); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
182 } 172 }
183 else 173 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
187 } 175 }
188 } 176 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 177 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 178 {
191 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
200 } 188 }
201 } 189 }
202 190
203 socket.current_x = ob->x; 191 socket.current_x = ob->x;
204 socket.current_y = ob->y; 192 socket.current_y = ob->y;
193
194 region *reg = ob->region ();
195 if (socket.current_region != reg)
196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198 socket.current_region = reg;
199 }
205} 200}
206 201
207/** 202/**
208 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
210 * that information. 205 * that information.
211 */ 206 */
212void 207void
213RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
214{ 209{
215 char *params = NULL, *cp; 210 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 211
228 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
229 * params pointer. 213 * params pointer.
230 */ 214 */
231 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
232 if (*cp == ' ') 216 if (*params == ' ')
233 { 217 {
234 *cp = '\0';
235 params = cp + 1; 218 *params++ = 0;
236 break; 219 break;
237 } 220 }
238 221
239 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 223 send_image_info (ns, params);
243 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 227 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
247 else 230 else
248 ns->send_packet (bigbuf, len); 231 {
232 // undo tokenisation above and send replyinfo with the request unchanged
233 if (*params)
234 *--params = ' ';
235
236 ns->send_packet_printf ("replyinfo %s", buf);
237 }
249} 238}
250 239
251void 240void
252ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
253{ 242{
256 245
257void 246void
258ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
259{ 248{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250}
251
252void
253client::mapinfo_queue_clear ()
254{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i);
257
258 mapinfo_queue.clear ();
259}
260
261bool
262client::mapinfo_try (char *buf)
263{
264 char *token = buf;
265 buf += strlen (buf) + 9;
266
267 // initial map and its origin
268 maptile *map = pl->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir, false))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
261} 336}
262 337
263void 338void
264MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
265{ 340{
266 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
268 343
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 344 char *token = buf;
272 // copy token 345
273 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
274 return; 347 return;
275 348
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
279 { 350 {
280 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
281 353
282 // initial map and its origin 354#if 0
283 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 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 358 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
343 } 361 }
344 else 362 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 364}
349 365
350/** This is the Setup cmd - easy first implementation */ 366/** This is the Setup cmd */
351void 367void
352SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
353{ 369{
354 int s, slen; 370 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355 char *cmd, *param, cmdback[HUGE_BUF];
356
357 /* run through the cmds of setup
358 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359 *
360 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361 * The client then must sort this out
362 */
363
364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366 strcpy (cmdback, "setup");
367 for (s = 0; s < len; )
368 {
369 cmd = &buf[s];
370
371 /* find the next space, and put a null there */
372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
375 buf[s++] = 0;
376
377 while (buf[s] == ' ')
378 s++;
379
380 if (s >= len)
381 break;
382
383 param = &buf[s];
384
385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
388 buf[s++] = 0;
389
390 while (buf[s] == ' ')
391 s++;
392
393 slen = strlen (cmdback);
394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398 if (!strcmp (cmd, "sound"))
399 {
400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 }
403 else if (!strcmp (cmd, "exp64"))
404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 else if (!strcmp (cmd, "spellmon"))
406 {
407 ns->monitor_spells = atoi (param);
408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "darkness"))
411 {
412 ns->darkness = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "map1cmd"))
416 {
417 if (atoi (param))
418 ns->mapmode = Map1Cmd;
419 /* if beyond this size, need to use map1cmd no matter what */
420 if (ns->mapx > 11 || ns->mapy > 11)
421 ns->mapmode = Map1Cmd;
422 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
423 }
424 else if (!strcmp (cmd, "map1acmd"))
425 {
426 if (atoi (param))
427 ns->mapmode = Map1aCmd;
428 /* if beyond this size, need to use map1acmd no matter what */
429 if (ns->mapx > 11 || ns->mapy > 11)
430 ns->mapmode = Map1aCmd;
431 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
432 }
433 else if (!strcmp (cmd, "newmapcmd"))
434 {
435 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF);
437// } else if (!strcmp(cmd,"plugincmd")) {
438// ns->plugincmd = atoi(param);
439// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440 }
441 else if (!strcmp (cmd, "mapinfocmd"))
442 {
443 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "extcmd"))
447 {
448 ns->extcmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extmap"))
452 {
453 ns->extmap = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "facecache"))
457 {
458 ns->facecache = atoi (param);
459 safe_strcat (cmdback, param, &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "faceset"))
462 {
463 char tmpbuf[20];
464 int q = atoi (param);
465
466 if (is_valid_faceset (q))
467 ns->faceset = q;
468 sprintf (tmpbuf, "%d", ns->faceset);
469 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
470 /* if the client is using faceset, it knows about image2 command */
471 ns->image2 = 1;
472 }
473 else if (!strcmp (cmd, "itemcmd"))
474 {
475 /* Version of the item protocol command to use. Currently,
476 * only supported versions are 1 and 2. Using a numeric
477 * value will make it very easy to extend this in the future.
478 */
479 char tmpbuf[20];
480 int q = atoi (param);
481
482 if (q < 1 || q > 2)
483 {
484 strcpy (tmpbuf, "FALSE");
485 }
486 else
487 {
488 ns->itemcmd = q;
489 sprintf (tmpbuf, "%d", ns->itemcmd);
490 }
491 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
492 }
493 else if (!strcmp (cmd, "mapsize"))
494 {
495 int x, y = 0;
496 char tmpbuf[MAX_BUF], *cp;
497
498 x = atoi (param);
499 for (cp = param; *cp != 0; cp++)
500 if (*cp == 'x' || *cp == 'X')
501 {
502 y = atoi (cp + 1);
503 break;
504 }
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 }
510 else
511 {
512 ns->mapx = x;
513 ns->mapy = y;
514 /* better to send back what we are really using and not the
515 * param as given to us in case it gets parsed differently.
516 */
517 sprintf (tmpbuf, "%dx%d", x, y);
518 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
519 /* If beyond this size and still using orig map command, need to
520 * go to map1cmd.
521 */
522 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
523 ns->mapmode = Map1Cmd;
524 }
525 }
526 else if (!strcmp (cmd, "extendedMapInfos"))
527 {
528 /* Added by tchize
529 * prepare to use the mapextended command
530 */
531 char tmpbuf[20];
532
533 ns->ext_mapinfos = (atoi (param));
534 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
535 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
536 }
537 else if (!strcmp (cmd, "extendedTextInfos"))
538 {
539 /* Added by tchize
540 * prepare to use the extended text commands
541 * Client toggle this to non zero to get exttext
542 */
543 char tmpbuf[20];
544
545 ns->has_readable_type = (atoi (param));
546 sprintf (tmpbuf, "%d", ns->has_readable_type);
547 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
548 }
549 else
550 {
551 /* Didn't get a setup command we understood -
552 * report a failure to the client.
553 */
554 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
555 }
556 } /* for processing all the setup commands */
557
558 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
559 ns->send_packet (cmdback);
560} 371}
561 372
562/** 373/**
563 * The client has requested to be added to the game. 374 * The client has requested to be added to the game.
564 * This is what takes care of it. We tell the client how things worked out. 375 * This is what takes care of it. We tell the client how things worked out.
565 * I am not sure if this file is the best place for this function. however, 376 * I am not sure if this file is the best place for this function. however,
566 * it either has to be here or init_sockets needs to be exported. 377 * it either has to be here or init_sockets needs to be exported.
567 */ 378 */
568void 379void
569AddMeCmd (char *buf, int len, client * ns) 380AddMeCmd (char *buf, int len, client *ns)
570{ 381{
571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
572} 383}
573 384
574/** Reply to ExtendedInfos command */ 385/** Reply to ExtendedInfos command */
686 497
687 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
688} 499}
689 500
690/** 501/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
692 * Basically, it makes no sense to wait for the client to request a
693 * a piece of data from us that we know the client wants. So
694 * if we know the client wants it, might as well push it to the
695 * client.
696 */
697static void
698SendSmooth (client *ns, uint16 face)
699{
700 uint16 smoothface;
701
702 /* If we can't find a face, return and set it so we won't try to send this
703 * again.
704 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
706 {
707
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 return;
711 }
712
713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
714 esrv_send_face (ns, smoothface, 0);
715
716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717
718 packet sl ("smooth");
719
720 sl << uint16 (face)
721 << uint16 (smoothface);
722
723 ns->send_packet (sl);
724}
725
726 /**
727 * Tells client the picture it has to use
728 * to smooth a picture number given as argument.
729 */
730void
731AskSmooth (char *buf, int len, client *ns)
732{
733 SendSmooth (ns, atoi (buf));
734}
735
736/**
737 * This handles the general commands from the client (ie, north, fire, cast, 502 * This handles the general commands from the client (ie, north, fire, cast,
738 * etc.) 503 * etc.)
739 */ 504 */
740void 505void
741PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
762 * commands. 527 * commands.
763 */ 528 */
764 pl->count = 0; 529 pl->count = 0;
765} 530}
766 531
767
768/** 532/**
769 * This handles the general commands from the client (ie, north, fire, cast, 533 * This handles the general commands from the client (ie, north, fire, cast,
770 * etc.). It is a lot like PlayerCmd above, but is called with the 534 * etc.). It is a lot like PlayerCmd above, but is called with the
771 * 'ncom' method which gives more information back to the client so it 535 * 'ncom' method which gives more information back to the client so it
772 * can throttle. 536 * can throttle.
774void 538void
775NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
776{ 540{
777 if (len <= 6) 541 if (len <= 6)
778 { 542 {
779 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
780 return; 544 return;
781 } 545 }
782 546
783 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
784 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
797 * commands. 561 * commands.
798 */ 562 */
799 pl->count = 0; 563 pl->count = 0;
800 564
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 565 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 566 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 567 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 568 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 569
806 /* Send confirmation of command execution now */ 570 /* Send confirmation of command execution now */
807 packet sl ("comc"); 571 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 572 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 573 pl->ns->send_packet (sl);
841 { 605 {
842 case ST_PLAYING: 606 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 608 break;
845 609
846 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]);
848 break;
849
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
856 break; 612 break;
857 613
858 default: 614 default:
879 ns->cs_version = atoi (buf); 635 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 636 ns->sc_version = ns->cs_version;
881 637
882 LOG (llevDebug, "connection from client <%s>\n", buf); 638 LOG (llevDebug, "connection from client <%s>\n", buf);
883 639
884
885 //TODO: should log here just for statistics 640 //TODO: should log here just for statistics
886 641
887 //if (VERSION_CS != ns->cs_version) 642 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 643 // unchecked;
889 644
898 653
899 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
900 655
901 if (cp) 656 if (cp)
902 { 657 {
903 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
904 659
905 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
908 } 663 }
968/** 723/**
969 * Asks the client to query the user. This way, the client knows 724 * Asks the client to query the user. This way, the client knows
970 * it needs to send something back (vs just printing out a message) 725 * it needs to send something back (vs just printing out a message)
971 */ 726 */
972void 727void
973send_query (client *ns, uint8 flags, char *text) 728send_query (client *ns, uint8 flags, const char *text)
974{ 729{
975 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
731}
732
733/**
734 * Get player's current range attack in obuf.
735 */
736static void
737rangetostring (player *pl, char *obuf)
738{
739 dynbuf_text buf;
740
741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746
747#if 0
748 //TODO: remove this when slot system is working, this is only for debugging
749 if (pl->ob->chosen_skill)
750 buf << " Skill*: " << pl->ob->chosen_skill->name;
751#endif
752
753 //TODO: maybe golem should become the current_weapon, quite simply?
754 if (pl->golem)
755 buf << " Golem*: " << pl->golem->name;
756
757 buf << '\0';
758 buf.linearise (obuf);
976} 759}
977 760
978#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
979 Old = New; \ 762 Old = New; \
980 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
988#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
989 Old = New; \ 772 Old = New; \
990 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
991 } 774 }
992 775
993#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
994 Old = New; \ 777 Old = New; \
995 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
996 } 779 }
997 780
998#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
999 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
1000 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
1010esrv_update_stats (player *pl) 793esrv_update_stats (player *pl)
1011{ 794{
1012 char buf[MAX_BUF]; 795 char buf[MAX_BUF];
1013 uint16 flags; 796 uint16 flags;
1014 797
798 client *ns = pl->ns;
1015 if (!pl->ns) 799 if (!ns)
1016 return; 800 return;
1017 801
802 object *ob = pl->observe;
803 if (!ob)
804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
807
1018 packet sl ("stats"); 808 packet sl ("stats");
1019 809
1020 if (pl->ob)
1021 {
1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 812 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 813 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 814 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 815 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 816 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 817 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 818 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 }
1036 823
1037 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 825 if (object *skill = opl->last_skill_ob[s])
826 if (skill->stats.exp != ns->last_skill_exp [s])
1039 { 827 {
828 ns->last_skill_exp [s] = skill->stats.exp;
829
1040 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
1041 * 1 extra byte, but keeps processing simpler. 831 * 1 extra byte, but keeps processing simpler.
1042 */ 832 */
1043 sl << uint8 (s + CS_STAT_SKILLINFO) 833 sl << uint8 (s + CS_STAT_SKILLINFO)
1044 << uint8 (pl->last_skill_ob[s]->level) 834 << uint8 (skill->level)
1045 << uint64 (pl->last_skill_ob[s]->stats.exp); 835 << uint64 (skill->stats.exp);
1046
1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048 } 836 }
1049 837
1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1056 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1058 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847
1059 flags = 0; 848 flags = 0;
1060 849
1061 if (pl->fire_on) 850 if (opl->fire_on)
1062 flags |= SF_FIREON; 851 flags |= SF_FIREON;
1063 852
1064 if (pl->run_on) 853 if (opl->run_on)
1065 flags |= SF_RUNON; 854 flags |= SF_RUNON;
1066 855
1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068 857
1069 if (pl->ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1071 else 860 else
1072 for (int i = 0; i < NROFATTACKS; i++) 861 for (int i = 0; i < NROFATTACKS; i++)
1073 { 862 {
1074 /* Skip ones we won't send */ 863 /* Skip ones we won't send */
1075 if (atnr_cs_stat[i] == -1) 864 if (atnr_cs_stat[i] == -1)
1076 continue; 865 continue;
1077 866
1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1079 } 868 }
1080 869
1081 if (pl->ns->monitor_spells) 870 if (pl->ns->monitor_spells)
1082 { 871 {
1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1086 } 875 }
1087 876
1088 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090 set_title (pl->ob, buf); 879 set_title (ob, buf);
1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092 881
1093 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
1094 if (sl.length () > 6) 883 if (sl.length () > 6)
1095 pl->ns->send_packet (sl); 884 ns->send_packet (sl);
1096} 885}
1097 886
1098/** 887/**
1099 * Tells the client that here is a player it should start using. 888 * Tells the client that here is a player it should start using.
1100 */ 889 */
1101void 890void
1102esrv_new_player (player *pl, uint32 weight) 891esrv_new_player (player *pl, uint32 weight)
1103{ 892{
1104 pl->last_weight = weight;
1105
1106 packet sl ("player"); 893 packet sl ("player");
1107 894
1108 sl << uint32 (pl->ob->count) 895 sl << uint32 (pl->ob->count)
1109 << uint32 (weight) 896 << uint32 (weight)
1110 << uint32 (pl->ob->face->number) 897 << uint32 (pl->ob->face)
1111 << data8 (pl->ob->name); 898 << data8 (pl->ob->name);
1112 899
900 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 901 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 903}
1116
1117/**
1118 * Need to send an animation sequence to the client.
1119 * We will send appropriate face commands to the client if we haven't
1120 * sent them the face yet (this can become quite costly in terms of
1121 * how much we are sending - on the other hand, this should only happen
1122 * when the player logs in and picks stuff up.
1123 */
1124void
1125esrv_send_animation (client * ns, short anim_num)
1126{
1127 /* Do some checking on the anim_num we got. Note that the animations
1128 * are added in contigous order, so if the number is in the valid
1129 * range, it must be a valid animation.
1130 */
1131 if (anim_num < 0 || anim_num > num_animations)
1132 {
1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134 return;
1135 }
1136
1137 packet sl ("anim");
1138
1139 sl << uint16 (anim_num)
1140 << uint16 (0); /* flags - not used right now */
1141
1142 /* Build up the list of faces. Also, send any information (ie, the
1143 * the face itself) down to the client.
1144 */
1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1146 {
1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151 }
1152
1153 ns->send_packet (sl);
1154
1155 ns->anims_sent[anim_num] = 1;
1156}
1157
1158 904
1159/****************************************************************************** 905/******************************************************************************
1160 * 906 *
1161 * Start of map related commands. 907 * Start of map related commands.
1162 * 908 *
1163 ******************************************************************************/ 909 ******************************************************************************/
1164 910
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186
1187/** Clears a map cell */ 911/** Clears a map cell */
1188static void 912static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 913map_clearcell (struct MapCell *cell, int count)
1190{ 914{
1191 cell->faces[0] = face0; 915 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 916 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 917 cell->faces[2] = 0;
918 cell->smooth[0] = 0;
919 cell->smooth[1] = 0;
920 cell->smooth[2] = 0;
1194 cell->count = count; 921 cell->count = count;
1195 cell->stat_hp = 0; 922 cell->stat_hp = 0;
1196 cell->flags = 0; 923 cell->flags = 0;
1197 cell->player = 0; 924 cell->player = 0;
1198} 925}
1199 926
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 927#define MAX_LAYERS 3
1202
1203/* Using a global really isn't a good approach, but saves the over head of
1204 * allocating and deallocating such a block of data each time run through,
1205 * and saves the space of allocating this in the socket object when we only
1206 * need it for this cycle. If the server is ever threaded, this needs to be
1207 * re-examined.
1208 */
1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211/**
1212 * Returns true if any of the heads for this
1213 * space is set. Returns false if all are blank - this is used
1214 * for empty space checking.
1215 */
1216static inline int
1217have_head (int ax, int ay)
1218{
1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221 return 1;
1222
1223 return 0;
1224}
1225
1226/**
1227 * check_head is a bit simplistic version of update_space below.
1228 * basically, it only checks the that the head on space ax,ay at layer
1229 * needs to get sent - if so, it adds the data, sending the head
1230 * if needed, and returning 1. If this no data needs to get
1231 * sent, it returns zero.
1232 */
1233static int
1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{
1236 short face_num;
1237
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240 else
1241 face_num = 0;
1242
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 {
1245 sl << uint16 (face_num);
1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247 esrv_send_face (&ns, face_num, 0);
1248
1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251 return 1;
1252 }
1253
1254 return 0; /* No change */
1255}
1256 928
1257/** 929/**
1258 * Removes the need to replicate the same code for each layer. 930 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 931 * this returns true if this space is now in fact different than
1260 * it was. 932 * it was.
1261 * sl is the socklist this data is going into. 933 * sl is the socklist this data is going into.
1262 * ns is the socket we are working on - all the info we care 934 * ns is the socket we are working on - all the info we care
1263 * about is in this socket structure, so now need not pass the 935 * about is in this socket structure, so now need not pass the
1264 * entire player object. 936 * entire player object.
1265 * mx and my are map coordinate offsets for map mp
1266 * sx and sy are the offsets into the socket structure that
1267 * holds the old values.
1268 * layer is the layer to update, with 2 being the floor and 0 the 937 * layer is the layer to update, with 2 being the floor and 0 the
1269 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 938 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1270 * take. Interesting to note that before this function, the map1 function 939 * take. Interesting to note that before this function, the map1 function
1271 * numbers the spaces differently - I think this was a leftover from 940 * numbers the spaces differently - I think this was a leftover from
1272 * the map command, where the faces stack up. Sinces that is no longer 941 * the map command, where the faces stack up. Sinces that is no longer
1273 * the case, it seems to make more sense to have these layer values 942 * the case, it seems to make more sense to have these layer values
1274 * actually match. 943 * actually match.
1275 */ 944 */
1276static int 945static int
1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 946update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1278{ 947{
1279 object *ob, *head; 948 object *ob = ms.faces_obj [layer];
1280 uint16 face_num;
1281 int bx, by, i;
1282
1283 /* If there is a multipart object stored away, treat that as more important.
1284 * If not, then do the normal processing.
1285 */
1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288 /* Check to see if this head is part of the set of objects
1289 * we would normally send for this space. If so, then
1290 * don't use the head value. We need to do the check
1291 * here and not when setting up the heads[] value for two reasons -
1292 * 1) the heads[] values will get used even if the space is not visible.
1293 * 2) its possible the head is not on the same map as a part, and I'd
1294 * rather not need to do the map translation overhead.
1295 * 3) We need to do some extra checking to make sure that we will
1296 * otherwise send the image as this layer, eg, either it matches
1297 * the head value, or is not multipart.
1298 */
1299 if (head && !head->more)
1300 {
1301 for (i = 0; i < MAP_LAYERS; i++)
1302 {
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304 if (!ob)
1305 continue;
1306
1307 if (ob->head)
1308 ob = ob->head;
1309
1310 if (ob == head)
1311 {
1312 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313 head = NULL;
1314 break;
1315 }
1316 }
1317 }
1318
1319 ob = head;
1320 if (!ob)
1321 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 949
1323 /* If there is no object for this space, or if the face for the object 950 /* If there is no object for this space, or if the face for the object
1324 * is the blank face, set the face number to zero. 951 * is the blank face, set the face number to zero.
1325 * else if we have the stored head object for this space, that takes 952 * else if we have the stored head object for this space, that takes
1326 * precedence over the other object for this space. 953 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 954 * otherwise, we do special head processing
1328 */ 955 */
1329 if (!ob || ob->face == blank_face) 956 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1330 face_num = 0;
1331 else if (head)
1332 {
1333 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number;
1335 }
1336 else
1337 {
1338 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345
1346 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 {
1357
1358 if (ob->head)
1359 head = ob->head;
1360 else
1361 head = ob;
1362
1363 /* Basically figure out where the offset is from where we are right
1364 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1365 * piece is from the head, and the tail is where the tail is from the
1366 * head. Note that bx and by will equal sx and sy if we are already working
1367 * on the bottom right corner. If ob is the head, the clone values
1368 * will be zero, so the right thing will still happen.
1369 */
1370 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371 by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373 /* I don't think this can ever happen, but better to check for it just
1374 * in case.
1375 */
1376 if (bx < sx || by < sy)
1377 {
1378 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379 face_num = 0;
1380 }
1381 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right.
1383 */
1384 else if (bx == sx && by == sy)
1385 {
1386 face_num = ob->face->number;
1387
1388 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0.
1391 */
1392 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 }
1397 else
1398 {
1399 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once.
1402 */
1403 face_num = head->face->number;
1404 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer.
1411 */
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413 {
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415 }
1416 else
1417 for (i = 0; i < MAX_LAYERS; i++)
1418 {
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421 {
1422 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423 }
1424 }
1425 face_num = 0; /* Don't send this object - we'll send the head later */
1426 }
1427 }
1428 else
1429 {
1430 /* In this case, we are already at the lower right or single part object,
1431 * so nothing special
1432 */
1433 face_num = ob->face->number;
1434
1435 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 }
1441 } /* else not already head object or blank face */
1442
1443 /* This is a real hack. Basically, if we have nothing to send for this layer,
1444 * but there is a head on the next layer, send that instead.
1445 * Without this, what happens is you can get the case where the player stands
1446 * on the same space as the head. However, if you have overlapping big objects
1447 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better.
1449 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 }
1455
1456 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send
1458 * this one.
1459 */
1460 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461 face_num = 0;
1462 957
1463 /* We've gotten what face we want to use for the object. Now see if 958 /* We've gotten what face we want to use for the object. Now see if
1464 * if it has changed since we last sent it to the client. 959 * if it has changed since we last sent it to the client.
1465 */ 960 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 961 if (lastcell.faces[layer] != face_num)
1467 { 962 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 963 lastcell.faces[layer] = face_num;
964
1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 965 if (!ns.faces_sent[face_num])
966 if (ob)
967 ns.send_faces (ob);
968 else
1470 esrv_send_face (&ns, face_num, 0); 969 ns.send_face (face_num, 10);
1471 970
1472 sl << uint16 (face_num); 971 sl << uint16 (face_num);
1473 return 1;
1474 }
1475
1476 /* Nothing changed */
1477 return 0;
1478}
1479
1480/**
1481 * This function is mainly a copy of update_space,
1482 * except it handles update of the smoothing updates,
1483 * not the face updates.
1484 * Removes the need to replicate the same code for each layer.
1485 * this returns true if this smooth is now in fact different
1486 * than it was.
1487 * sl is the socklist this data is going into.
1488 * ns is the socket we are working on - all the info we care
1489 * about is in this socket structure, so know need to pass the
1490 * entire player object.
1491 * mx and my are map coordinate offsets for map mp
1492 * sx and sy are the offsets into the socket structure that
1493 * holds the old values.
1494 * layer is the layer to update, with 2 being the floor and 0 the
1495 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496 * take.
1497 */
1498
1499static inline int
1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501{
1502 object *ob;
1503 int smoothlevel; /* old face_num; */
1504
1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506
1507 /* If there is no object for this space, or if the face for the object
1508 * is the blank face, set the smoothlevel to zero.
1509 */
1510 if (!ob || ob->face == blank_face)
1511 smoothlevel = 0;
1512 else
1513 {
1514 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number);
1517 } /* else not already head object or blank face */
1518
1519 /* We've gotten what face we want to use for the object. Now see if
1520 * if it has changed since we last sent it to the client.
1521 */
1522 if (smoothlevel > 255)
1523 smoothlevel = 255;
1524 else if (smoothlevel < 0)
1525 smoothlevel = 0;
1526
1527 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1528 {
1529 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1530 sl << uint8 (smoothlevel);
1531 return 1; 972 return 1;
1532 } 973 }
1533 974
1534 /* Nothing changed */ 975 /* Nothing changed */
1535 return 0; 976 return 0;
1552 } 993 }
1553 994
1554 return result; 995 return result;
1555} 996}
1556 997
998// prefetch (and touch) all maps within a specific distancd
999static void
1000prefetch_surrounding_maps (maptile *map, int distance)
1001{
1002 map->last_access = runtime;
1003
1004 if (--distance)
1005 for (int dir = 4; --dir; )
1006 if (const shstr &path = map->tile_path [dir])
1007 if (maptile *&neigh = map->tile_map [dir])
1008 prefetch_surrounding_maps (neigh, distance);
1009 else
1010 neigh = maptile::find_async (path, map);
1011}
1012
1013// prefetch a generous area around the player
1014static void
1015prefetch_surrounding_maps (object *op)
1016{
1017 prefetch_surrounding_maps (op->map, 3);
1018}
1019
1557/** 1020/**
1558 * This function uses the new map1 protocol command to send the map 1021 * Draws client map.
1559 * to the client. It is necessary because the old map command supports
1560 * a maximum map size of 15x15.
1561 * This function is much simpler than the old one. This is because
1562 * the old function optimized to send as few face identifiers as possible,
1563 * at the expense of sending more coordinate location (coordinates were
1564 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1565 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1566 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1567 * and use the other 4 bits for other informatiion. For full documentation
1568 * of what we send, see the doc/Protocol file.
1569 * I will describe internally what we do:
1570 * the ns->lastmap shows how the map last looked when sent to the client.
1571 * in the lastmap structure, there is a cells array, which is set to the
1572 * maximum viewable size (As set in config.h).
1573 * in the cells, there are faces and a count value.
1574 * we use the count value to hold the darkness value. If -1, then this space
1575 * is not viewable.
1576 * we use faces[0] faces[1] faces[2] to hold what the three layers
1577 * look like.
1578 */ 1022 */
1579void 1023void
1580draw_client_map1 (object *pl) 1024draw_client_map (player *pl)
1581{ 1025{
1026 object *ob = pl->observe;
1027 if (!ob->active)
1028 return;
1029
1030 maptile *plmap = ob->map;
1031
1032 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in.
1035 */
1036 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1037 return;
1038
1582 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583 sint16 nx, ny;
1584 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1585 uint16 mask, emask;
1586 uint8 eentrysize; 1041 uint8 eentrysize;
1587 uint16 ewhatstart, ewhatflag; 1042 uint16 ewhatstart, ewhatflag;
1588 uint8 extendedinfos; 1043 uint8 extendedinfos;
1589 maptile *m;
1590 1044
1045 check_map_change (pl);
1046 prefetch_surrounding_maps (pl->ob);
1047
1048 /* do LOS after calls to update_position */
1049 if (ob != pl->ob)
1050 clear_los (pl);
1051 else if (pl->do_los)
1052 {
1053 update_los (ob);
1054 pl->do_los = 0;
1055 }
1056
1057 /**
1058 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports
1060 * a maximum map size of 15x15.
1061 * This function is much simpler than the old one. This is because
1062 * the old function optimized to send as few face identifiers as possible,
1063 * at the expense of sending more coordinate location (coordinates were
1064 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1065 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1066 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1067 * and use the other 4 bits for other informatiion. For full documentation
1068 * of what we send, see the doc/Protocol file.
1069 * I will describe internally what we do:
1070 * the ns->lastmap shows how the map last looked when sent to the client.
1071 * in the lastmap structure, there is a cells array, which is set to the
1072 * maximum viewable size (As set in config.h).
1073 * in the cells, there are faces and a count value.
1074 * we use the count value to hold the darkness value. If -1, then this space
1075 * is not viewable.
1076 * we use faces[0] faces[1] faces[2] to hold what the three layers
1077 * look like.
1078 */
1079
1591 client &socket = *pl->contr->ns; 1080 client &socket = *pl->ns;
1592
1593 if (!pl->active ())
1594 return;
1595
1596 check_map_change (pl->contr);
1597 1081
1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1599 packet esl; 1083 packet esl;
1600 1084
1601 startlen = sl.length (); 1085 startlen = sl.length ();
1616 << uint8 (extendedinfos) 1100 << uint8 (extendedinfos)
1617 << uint8 (eentrysize); 1101 << uint8 (eentrysize);
1618 1102
1619 estartlen = esl.length (); 1103 estartlen = esl.length ();
1620 } 1104 }
1621 else
1622 {
1623 /* suppress compiler warnings */
1624 ewhatstart = 0;
1625 ewhatflag = 0;
1626 estartlen = 0;
1627 }
1628
1629 /* Init data to zero */
1630 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1631 1105
1632 /* x,y are the real map locations. ax, ay are viewport relative 1106 /* x,y are the real map locations. ax, ay are viewport relative
1633 * locations. 1107 * locations.
1634 */ 1108 */
1635 ay = 0; 1109 ay = 0;
1636 1110
1637 /* We could do this logic as conditionals in the if statement, 1111 /* We could do this logic as conditionals in the if statement,
1638 * but that started to get a bit messy to look at. 1112 * but that started to get a bit messy to look at.
1639 */ 1113 */
1640 max_x = pl->x + (socket.mapx + 1) / 2; 1114 max_x = ob->x + (socket.mapx + 1) / 2;
1641 max_y = pl->y + (socket.mapy + 1) / 2; 1115 max_y = ob->y + (socket.mapy + 1) / 2;
1642 1116
1643 if (socket.mapmode == Map1aCmd)
1644 {
1645 max_x += MAX_HEAD_OFFSET;
1646 max_y += MAX_HEAD_OFFSET;
1647 }
1648
1649 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1650 { 1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1651 ax = 0; 1122 ax = 0;
1652 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1653 { 1124 {
1125 // check to see if we can simply go one right quickly
1126 ++nx;
1127 if (m && nx >= m->width)
1128 m = 0;
1129
1130 if (!m)
1131 {
1132 nx = x; ny = y; m = plmap;
1133
1134 if (xy_normalise (m, nx, ny))
1135 m->touch ();
1136 else
1137 m = 0;
1138 }
1139
1140 int emask, mask;
1654 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1655 1142
1656 /* If this space is out of the normal viewable area, we only check
1657 * the heads value ax or ay will only be greater than what
1658 * the client wants if using the map1a command - this is because
1659 * if the map1a command is not used, max_x and max_y will be
1660 * set to lower values.
1661 */
1662 if (ax >= socket.mapx || ay >= socket.mapy)
1663 {
1664 int i, got_one;
1665
1666 oldlen = sl.length ();
1667
1668 sl << uint16 (mask);
1669
1670 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1671 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1672 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1673
1674 /* If all we are doing is sending 0 (blank) faces, we don't
1675 * actually need to send that - just the coordinates
1676 * with no faces tells the client to blank out the
1677 * space.
1678 */
1679 got_one = 0;
1680 for (i = oldlen + 2; i < sl.length (); i++)
1681 if (sl[i])
1682 got_one = 1;
1683
1684 if (got_one && (mask & 0xf))
1685 sl[oldlen + 1] = mask & 0xff;
1686 else
1687 { /*either all faces blank, either no face at all */
1688 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1689 sl.reset (oldlen + 2);
1690 else
1691 sl.reset (oldlen);
1692 }
1693
1694 /*What concerns extendinfos, nothing to be done for now
1695 * (perhaps effects layer later)
1696 */
1697 continue; /* don't do processing below */
1698 }
1699
1700 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1143 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1701
1702 d = pl->contr->blocked_los[ax][ay];
1703 1144
1704 /* If the coordinates are not valid, or it is too dark to see, 1145 /* If the coordinates are not valid, or it is too dark to see,
1705 * we tell the client as such 1146 * we tell the client as such
1706 */ 1147 */
1707 nx = x;
1708 ny = y;
1709 m = get_map_from_coord (pl->map, &nx, &ny);
1710
1711 if (!m) 1148 if (!m)
1712 { 1149 {
1713 /* space is out of map. Update space and clear values 1150 /* space is out of map. Update space and clear values
1714 * if this hasn't already been done. If the space is out 1151 * if this hasn't already been done. If the space is out
1715 * of the map, it shouldn't have a head 1152 * of the map, it shouldn't have a head
1716 */ 1153 */
1717 if (lastcell.count != -1) 1154 if (lastcell.count != -1)
1718 { 1155 {
1719 sl << uint16 (mask); 1156 sl << uint16 (mask);
1720 map_clearcell (&lastcell, 0, 0, 0, -1); 1157 map_clearcell (&lastcell, -1);
1721 } 1158 }
1159
1160 continue;
1722 } 1161 }
1162
1163 int d = pl->blocked_los[ax][ay];
1164
1723 else if (d > 3) 1165 if (d > 3)
1724 { 1166 {
1725 m->touch ();
1726 1167
1727 int need_send = 0, count; 1168 int need_send = 0, count;
1728 1169
1729 /* This block deals with spaces that are not visible for whatever 1170 /* This block deals with spaces that are not visible for whatever
1730 * reason. Still may need to send the head for this space. 1171 * reason. Still may need to send the head for this space.
1731 */ 1172 */
1732 1173
1733 oldlen = sl.length (); 1174 oldlen = sl.length ();
1734 1175
1735 sl << uint16 (mask); 1176 sl << uint16 (mask);
1737 if (lastcell.count != -1) 1178 if (lastcell.count != -1)
1738 need_send = 1; 1179 need_send = 1;
1739 1180
1740 count = -1; 1181 count = -1;
1741 1182
1742 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1743 {
1744 /* Now check to see if any heads need to be sent */
1745
1746 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1747 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1748 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1749
1750 lastcell.count = count;
1751 }
1752 else
1753 {
1754 /* properly clear a previously sent big face */ 1183 /* properly clear a previously sent big face */
1755 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1756 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1185 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1757 need_send = 1; 1186 need_send = 1;
1758 1187
1759 map_clearcell (&lastcell, 0, 0, 0, count); 1188 map_clearcell (&lastcell, count);
1760 }
1761 1189
1762 if ((mask & 0xf) || need_send) 1190 if ((mask & 0xf) || need_send)
1763 sl[oldlen + 1] = mask & 0xff; 1191 sl[oldlen + 1] = mask & 0xff;
1764 else 1192 else
1765 sl.reset (oldlen); 1193 sl.reset (oldlen);
1766 } 1194 }
1767 else 1195 else
1768 { 1196 {
1769 m->touch ();
1770
1771 /* In this block, the space is visible or there are head objects 1197 /* In this block, the space is visible.
1772 * we need to send.
1773 */ 1198 */
1774 1199
1775 /* Rather than try to figure out what everything that we might 1200 /* Rather than try to figure out what everything that we might
1776 * need to send is, then form the packet after that, 1201 * need to send is, then form the packet after that,
1777 * we presume that we will in fact form a packet, and update 1202 * we presume that we will in fact form a packet, and update
1780 * is done. 1205 * is done.
1781 * I think this is simpler than doing a bunch of checks to see 1206 * I think this is simpler than doing a bunch of checks to see
1782 * what if anything we need to send, setting the bits, then 1207 * what if anything we need to send, setting the bits, then
1783 * doing those checks again to add the real data. 1208 * doing those checks again to add the real data.
1784 */ 1209 */
1785 oldlen = sl.length (); 1210 oldlen = sl.length ();
1786 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1787 eoldlen = esl.length (); 1211 eoldlen = esl.length ();
1788 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1212
1789 sl << uint16 (mask); 1213 sl << uint16 (mask);
1790
1791 if (socket.ext_mapinfos)
1792 esl << uint16 (emask);
1793 1214
1794 unsigned char dummy; 1215 unsigned char dummy;
1795 unsigned char *last_ext = &dummy; 1216 unsigned char *last_ext = &dummy;
1796 1217
1797 /* Darkness changed */ 1218 /* Darkness changed */
1809 sl << uint8 (255 - 64 * d); 1230 sl << uint8 (255 - 64 * d);
1810 } 1231 }
1811 1232
1812 lastcell.count = d; 1233 lastcell.count = d;
1813 1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1814 if (socket.extmap) 1238 if (socket.extmap)
1815 { 1239 {
1816 uint8 stat_hp = 0; 1240 uint8 stat_hp = 0;
1817 uint8 stat_width = 0; 1241 uint8 stat_width = 0;
1818 uint8 flags = 0; 1242 uint8 flags = 0;
1819 UUID player = 0; 1243 tag_t player = 0;
1820 1244
1821 // send hp information, if applicable 1245 // send hp information, if applicable
1822 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1246 if (object *op = ms.faces_obj [0])
1247 if (op->is_head () && !op->invisible)
1823 { 1248 {
1824 if (op->head || op->invisible) 1249 if (op->stats.maxhp > op->stats.hp
1825 ; // do not show 1250 && op->stats.maxhp > 0
1826 else if (op->type == PLAYER 1251 && (op->type == PLAYER
1252 || op->type == DOOR // does not work, have maxhp 0
1827 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1253 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1828 {
1829 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1830 { 1254 {
1831 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1832 stat_width = op->arch->tail_x; 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1833 } 1257 }
1834 }
1835 1258
1836 if (op->msg && op->msg[0] == '@') 1259 if (op->msg && op->msg[0] == '@')
1837 flags |= 1; 1260 flags |= 1;
1838 1261
1839 if (op->type == PLAYER && op != pl) 1262 if (op->type == PLAYER && op != ob)
1840 player = op->count; 1263 player = op->count;
1841 } 1264 }
1842 1265
1843 if (lastcell.stat_hp != stat_hp) 1266 if (lastcell.stat_hp != stat_hp)
1844 { 1267 {
1845 lastcell.stat_hp = stat_hp; 1268 lastcell.stat_hp = stat_hp;
1846 1269
1865 1288
1866 mask |= 0x8; 1289 mask |= 0x8;
1867 *last_ext |= 0x80; 1290 *last_ext |= 0x80;
1868 last_ext = &sl[sl.length ()]; 1291 last_ext = &sl[sl.length ()];
1869 1292
1870 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1293 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1871 } 1294 }
1872 1295
1873 if (lastcell.flags != flags) 1296 if (lastcell.flags != flags)
1874 { 1297 {
1875 lastcell.flags = flags; 1298 lastcell.flags = flags;
1881 sl << uint8 (8) << uint8 (flags); 1304 sl << uint8 (8) << uint8 (flags);
1882 } 1305 }
1883 } 1306 }
1884 1307
1885 /* Floor face */ 1308 /* Floor face */
1886 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1309 if (update_space (sl, socket, ms, lastcell, 2))
1887 mask |= 0x4; 1310 mask |= 0x4;
1888 1311
1889 if (socket.EMI_smooth)
1890 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1891 emask |= 0x4;
1892
1893 /* Middle face */ 1312 /* Middle face */
1894 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1313 if (update_space (sl, socket, ms, lastcell, 1))
1895 mask |= 0x2; 1314 mask |= 0x2;
1896 1315
1897 if (socket.EMI_smooth) 1316 if (ms.player () == ob
1898 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1317 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1899 emask |= 0x2;
1900
1901 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1902 { 1318 {
1319 // force player to be visible to himself if invisible
1903 if (lastcell.faces[0] != pl->face->number) 1320 if (lastcell.faces[0] != ob->face)
1904 { 1321 {
1905 lastcell.faces[0] = pl->face->number; 1322 lastcell.faces[0] = ob->face;
1323
1906 mask |= 0x1; 1324 mask |= 0x1;
1907
1908 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1909 esrv_send_face (&socket, pl->face->number, 0);
1910
1911 sl << uint16 (pl->face->number); 1325 sl << uint16 (ob->face);
1326
1327 socket.send_faces (ob);
1912 } 1328 }
1913 } 1329 }
1914 else
1915 {
1916 /* Top face */ 1330 /* Top face */
1917 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1331 else if (update_space (sl, socket, ms, lastcell, 0))
1918 mask |= 0x1; 1332 mask |= 0x1;
1919
1920 if (socket.EMI_smooth)
1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1922 emask |= 0x1;
1923 }
1924 1333
1925 /* Check to see if we are in fact sending anything for this 1334 /* Check to see if we are in fact sending anything for this
1926 * space by checking the mask. If so, update the mask. 1335 * space by checking the mask. If so, update the mask.
1927 * if not, reset the len to that from before adding the mask 1336 * if not, reset the len to that from before adding the mask
1928 * value, so we don't send those bits. 1337 * value, so we don't send those bits.
1930 if (mask & 0xf) 1339 if (mask & 0xf)
1931 sl[oldlen + 1] = mask & 0xff; 1340 sl[oldlen + 1] = mask & 0xff;
1932 else 1341 else
1933 sl.reset (oldlen); 1342 sl.reset (oldlen);
1934 1343
1344 if (socket.ext_mapinfos)
1345 esl << uint16 (emask);
1346
1347 if (socket.EMI_smooth)
1348 {
1349 for (int layer = 2+1; layer--; )
1350 {
1351 object *ob = ms.faces_obj [layer];
1352
1353 // If there is no object for this space, or if the face for the object
1354 // is the blank face, set the smoothlevel to zero.
1355 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1356
1357 // We've gotten what face we want to use for the object. Now see if
1358 // if it has changed since we last sent it to the client.
1359 if (lastcell.smooth[layer] != smoothlevel)
1360 {
1361 lastcell.smooth[layer] = smoothlevel;
1362 esl << uint8 (smoothlevel);
1363 emask |= 1 << layer;
1364 }
1365 }
1366
1935 if (emask & 0xf) 1367 if (emask & 0xf)
1936 esl[eoldlen + 1] = emask & 0xff; 1368 esl[eoldlen + 1] = emask & 0xff;
1937 else 1369 else
1938 esl.reset (eoldlen); 1370 esl.reset (eoldlen);
1371 }
1939 } /* else this is a viewable space */ 1372 } /* else this is a viewable space */
1940 } /* for x loop */ 1373 } /* for x loop */
1941 } /* for y loop */ 1374 } /* for y loop */
1375
1376 socket.flush_fx ();
1942 1377
1943 /* Verify that we in fact do need to send this */ 1378 /* Verify that we in fact do need to send this */
1944 if (socket.ext_mapinfos) 1379 if (socket.ext_mapinfos)
1945 { 1380 {
1946 if (!(sl.length () > startlen || socket.sent_scroll)) 1381 if (!(sl.length () > startlen || socket.sent_scroll))
1947 { 1382 {
1948 /* No map data will follow, so don't say the client 1383 /* No map data will follow, so don't say the client
1949 * it doesn't need draw! 1384 * it doesn't need draw!
1950 */ 1385 */
1951 ewhatflag &= (~EMI_NOREDRAW); 1386 ewhatflag &= ~EMI_NOREDRAW;
1952 esl[ewhatstart + 1] = ewhatflag & 0xff; 1387 esl[ewhatstart + 1] = ewhatflag & 0xff;
1953 } 1388 }
1954 1389
1955 if (esl.length () > estartlen) 1390 if (esl.length () > estartlen)
1956 socket.send_packet (esl); 1391 socket.send_packet (esl);
1961 socket.send_packet (sl); 1396 socket.send_packet (sl);
1962 socket.sent_scroll = 0; 1397 socket.sent_scroll = 0;
1963 } 1398 }
1964} 1399}
1965 1400
1966/**
1967 * Draws client map.
1968 */
1969void
1970draw_client_map (object *pl)
1971{
1972 int i, j;
1973 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1974 New_Face *face, *floor;
1975 New_Face *floor2;
1976 int d, mflags;
1977 struct Map newmap;
1978 maptile *m, *pm;
1979
1980 if (pl->type != PLAYER)
1981 {
1982 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1983 return;
1984 }
1985
1986 pm = pl->map;
1987
1988 /* If player is just joining the game, he isn't here yet, so the map
1989 * can get swapped out. If so, don't try to send them a map. All will
1990 * be OK once they really log in.
1991 */
1992 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1993 return;
1994
1995 memset (&newmap, 0, sizeof (struct Map));
1996
1997 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1998 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1999 {
2000 ax = i;
2001 ay = j;
2002 m = pm;
2003 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2004
2005 if (mflags & P_OUT_OF_MAP)
2006 continue;
2007
2008 /* If a map is visible to the player, we don't want to swap it out
2009 * just to reload it. This should really call something like
2010 * swap_map, but this is much more efficient and 'good enough'
2011 */
2012 if (mflags & P_NEW_MAP)
2013 m->timeout = 50;
2014 }
2015
2016 /* do LOS after calls to update_position */
2017 if (pl->contr->do_los)
2018 {
2019 update_los (pl);
2020 pl->contr->do_los = 0;
2021 }
2022
2023 /* Big maps need a different drawing mechanism to work */
2024 draw_client_map1 (pl);
2025}
2026
2027
2028/*****************************************************************************/ 1401/*****************************************************************************/
2029
2030/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1402/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2031
2032/* a player. Of course, the client need to know the command to be able to */ 1403/* a player. Of course, the client need to know the command to be able to */
2033
2034/* manage it ! */ 1404/* manage it ! */
2035
2036/*****************************************************************************/ 1405/*****************************************************************************/
2037void 1406void
2038send_plugin_custom_message (object *pl, char *buf) 1407send_plugin_custom_message (object *pl, char *buf)
2039{ 1408{
2040 pl->contr->ns->send_packet (buf); 1409 pl->contr->ns->send_packet (buf);
2051 sl << "replyinfo skill_info\n"; 1420 sl << "replyinfo skill_info\n";
2052 1421
2053 for (int i = 1; i < NUM_SKILLS; i++) 1422 for (int i = 1; i < NUM_SKILLS; i++)
2054 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1423 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2055 1424
2056 if (sl.length () >= MAXSOCKBUF) 1425 if (sl.length () > MAXSOCKBUF)
2057 { 1426 {
2058 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1427 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2059 fatal (0); 1428 fatal (0);
2060 } 1429 }
2061 1430
2074 sl << "replyinfo spell_paths\n"; 1443 sl << "replyinfo spell_paths\n";
2075 1444
2076 for (int i = 0; i < NRSPELLPATHS; i++) 1445 for (int i = 0; i < NRSPELLPATHS; i++)
2077 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1446 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2078 1447
2079 if (sl.length () >= MAXSOCKBUF) 1448 if (sl.length () > MAXSOCKBUF)
2080 { 1449 {
2081 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1450 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2082 fatal (0); 1451 fatal (0);
2083 } 1452 }
2084 1453
2162 1531
2163/* appends the spell *spell to the Socklist we will send the data to. */ 1532/* appends the spell *spell to the Socklist we will send the data to. */
2164static void 1533static void
2165append_spell (player *pl, packet &sl, object *spell) 1534append_spell (player *pl, packet &sl, object *spell)
2166{ 1535{
2167 int len, i, skill = 0; 1536 int i, skill = 0;
2168 1537
2169 if (!(spell->name)) 1538 if (!(spell->name))
2170 { 1539 {
2171 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1540 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2172 return; 1541 return;
2185 { 1554 {
2186 skill = i + CS_STAT_SKILLINFO; 1555 skill = i + CS_STAT_SKILLINFO;
2187 break; 1556 break;
2188 } 1557 }
2189 } 1558 }
1559
1560 // spells better have a face
1561 if (!spell->face)
1562 {
1563 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1564 spell->face = face_find ("burnout.x11", blank_face);
1565 }
1566
1567 pl->ns->send_face (spell->face);
2190 1568
2191 /* send the current values */ 1569 /* send the current values */
2192 sl << uint32 (spell->count) 1570 sl << uint32 (spell->count)
2193 << uint16 (spell->level) 1571 << uint16 (spell->level)
2194 << uint16 (spell->casting_time) 1572 << uint16 (spell->casting_time)
2195 << uint16 (spell->last_sp) 1573 << uint16 (spell->last_sp)
2196 << uint16 (spell->last_grace) 1574 << uint16 (spell->last_grace)
2197 << uint16 (spell->last_eat) 1575 << uint16 (spell->last_eat)
2198 << uint8 (skill) 1576 << uint8 (skill)
2199 << uint32 (spell->path_attuned) 1577 << uint32 (spell->path_attuned)
2200 << uint32 (spell->face ? spell->face->number : 0) 1578 << uint32 (spell->face)
2201 << data8 (spell->name) 1579 << data8 (spell->name)
2202 << data16 (spell->msg); 1580 << data16 (spell->msg);
2203} 1581}
2204 1582
2205/** 1583/**
2220 1598
2221 packet sl ("addspell"); 1599 packet sl ("addspell");
2222 1600
2223 if (!spell) 1601 if (!spell)
2224 { 1602 {
2225 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1603 for (spell = pl->ob->inv; spell; spell = spell->below)
2226 { 1604 {
2227 /* were we to simply keep appending data here, we could exceed 1605 /* were we to simply keep appending data here, we could exceed
2228 * MAXSOCKBUF if the player has enough spells to add, we know that 1606 * MAXSOCKBUF if the player has enough spells to add, we know that
2229 * append_spells will always append 19 data bytes, plus 4 length 1607 * append_spells will always append 19 data bytes, plus 4 length
2230 * bytes and 3 strings (because that is the spec) so we need to 1608 * bytes and 3 strings (because that is the spec) so we need to
2231 * check that the length of those 3 strings, plus the 23 bytes, 1609 * check that the length of those 3 strings, plus the 23 bytes,
2232 * won't take us over the length limit for the socket, if it does, 1610 * won't take us over the length limit for the socket, if it does,
2233 * we need to send what we already have, and restart packet formation 1611 * we need to send what we already have, and restart packet formation
2234 */ 1612 */
1613 if (spell->type != SPELL)
1614 continue;
1615
2235 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1616 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2236 * to show add_spell is 26 bytes + 2 strings. However, the overun 1617 * to show add_spell is 26 bytes + 2 strings. However, the overun
2237 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1618 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2238 * like it will fix this 1619 * like it will fix this
2239 */ 1620 */
2240 if (spell->type != SPELL)
2241 continue;
2242
2243 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1621 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2244 { 1622 {
1623 pl->ns->flush_fx ();
2245 pl->ns->send_packet (sl); 1624 pl->ns->send_packet (sl);
2246 1625
2247 sl.reset (); 1626 sl.reset ();
2248 sl << "addspell "; 1627 sl << "addspell ";
2249 } 1628 }
2257 return; 1636 return;
2258 } 1637 }
2259 else 1638 else
2260 append_spell (pl, sl, spell); 1639 append_spell (pl, sl, spell);
2261 1640
2262 if (sl.length () >= MAXSOCKBUF) 1641 if (sl.length () > MAXSOCKBUF)
2263 { 1642 {
2264 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1643 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2265 fatal (0); 1644 fatal (0);
2266 } 1645 }
2267 1646
2268 /* finally, we can send the packet */ 1647 /* finally, we can send the packet */
1648 pl->ns->flush_fx ();
2269 pl->ns->send_packet (sl); 1649 pl->ns->send_packet (sl);
2270} 1650}
2271 1651

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines