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.61 by root, Mon Jan 8 18:18:36 2007 UTC vs.
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC

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

Diff Legend

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