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.60 by root, Sun Jan 7 02:39:15 2007 UTC vs.
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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
22 The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors 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
160 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
161 { 154 {
155 clear_map (pl);
162 socket.current_map = ob->map; 156 socket.current_map = ob->map;
163
164 clear_map (pl);
165 157
166 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
167 { 159 {
168 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
169 { 161 {
170 int flags = 0; 162 int flags = 0;
171 163
172 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
173 flags |= 1;
174 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
175 flags |= 2;
176 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
177 flags |= 4;
178 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
179 flags |= 8;
180 168
181 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",
182 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);
183 } 172 }
184 else 173 else
185 snprintf (buf, MAX_BUF, "mapinfo current");
186
187 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
188 } 175 }
189 } 176 }
190 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)
191 { 178 {
192 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
201 } 188 }
202 } 189 }
203 190
204 socket.current_x = ob->x; 191 socket.current_x = ob->x;
205 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 }
206} 200}
207 201
208/** 202/**
209 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
211 * that information. 205 * that information.
212 */ 206 */
213void 207void
214RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
215{ 209{
216 char *params = NULL, *cp; 210 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 211
229 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
230 * params pointer. 213 * params pointer.
231 */ 214 */
232 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
233 if (*cp == ' ') 216 if (*params == ' ')
234 { 217 {
235 *cp = '\0';
236 params = cp + 1; 218 *params++ = 0;
237 break; 219 break;
238 } 220 }
239 221
240 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
241 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
244 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
245 send_skill_info (ns, params); 227 send_skill_info (ns, params);
246 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
247 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
248 else 230 else
249 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 }
250} 238}
251 239
252void 240void
253ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
254{ 242{
… …
257 245
258void 246void
259ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
260{ 248{
261 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->ob->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->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))
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[0])
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;
262} 336}
263 337
264void 338void
265MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
266{ 340{
267 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
268 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
269 343
270 char bigbuf[MAX_BUF], *token;
271
272 token = buf; 344 char *token = buf;
273 // copy token 345
274 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
275 return; 347 return;
276 348
277 *buf++ = 0;
278
279 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
280 { 350 {
281 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
282 353
283 // initial map and its origin 354#if 0
284 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
285 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
286 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 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 358 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
344 } 361 }
345 else 362 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
347
348 pl->ns->send_packet (bigbuf);
349} 364}
350 365
351/** This is the Setup cmd - easy first implementation */ 366/** This is the Setup cmd */
352void 367void
353SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
354{ 369{
355 int s, slen; 370 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} 371}
562 372
563/** 373/**
564 * The client has requested to be added to the game. 374 * 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. 375 * 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, 376 * 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. 377 * it either has to be here or init_sockets needs to be exported.
568 */ 378 */
569void 379void
570AddMeCmd (char *buf, int len, client * ns) 380AddMeCmd (char *buf, int len, client *ns)
571{ 381{
572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573} 383}
574 384
575/** Reply to ExtendedInfos command */ 385/** Reply to ExtendedInfos command */
… …
687 497
688 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
689} 499}
690 500
691/** 501/**
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, 502 * This handles the general commands from the client (ie, north, fire, cast,
739 * etc.) 503 * etc.)
740 */ 504 */
741void 505void
742PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
763 * commands. 527 * commands.
764 */ 528 */
765 pl->count = 0; 529 pl->count = 0;
766} 530}
767 531
768
769/** 532/**
770 * 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,
771 * 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
772 * '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
773 * can throttle. 536 * can throttle.
… …
775void 538void
776NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
777{ 540{
778 if (len <= 6) 541 if (len <= 6)
779 { 542 {
780 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);
781 return; 544 return;
782 } 545 }
783 546
784 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
785 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
798 * commands. 561 * commands.
799 */ 562 */
800 pl->count = 0; 563 pl->count = 0;
801 564
802 //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
803 int time = FABS (pl->ob->speed) < 0.001 566 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 567 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 568 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 569
807 /* Send confirmation of command execution now */ 570 /* Send confirmation of command execution now */
808 packet sl ("comc"); 571 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 572 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 573 pl->ns->send_packet (sl);
… …
842 { 605 {
843 case ST_PLAYING: 606 case ST_PLAYING:
844 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845 break; 608 break;
846 609
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 */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
852 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
853 break; 612 break;
854 613
855 default: 614 default:
… …
876 ns->cs_version = atoi (buf); 635 ns->cs_version = atoi (buf);
877 ns->sc_version = ns->cs_version; 636 ns->sc_version = ns->cs_version;
878 637
879 LOG (llevDebug, "connection from client <%s>\n", buf); 638 LOG (llevDebug, "connection from client <%s>\n", buf);
880 639
881
882 //TODO: should log here just for statistics 640 //TODO: should log here just for statistics
883 641
884 //if (VERSION_CS != ns->cs_version) 642 //if (VERSION_CS != ns->cs_version)
885 // unchecked; 643 // unchecked;
886 644
… …
895 653
896 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
897 655
898 if (cp) 656 if (cp)
899 { 657 {
900 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
901 659
902 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
903 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
904 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
905 } 663 }
… …
965/** 723/**
966 * 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
967 * 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)
968 */ 726 */
969void 727void
970send_query (client *ns, uint8 flags, char *text) 728send_query (client *ns, uint8 flags, const char *text)
971{ 729{
972 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);
973} 759}
974 760
975#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
976 Old = New; \ 762 Old = New; \
977 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
… …
985#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
986 Old = New; \ 772 Old = New; \
987 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
988 } 774 }
989 775
990#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
991 Old = New; \ 777 Old = New; \
992 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
993 } 779 }
994 780
995#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
996 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
997 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
1007esrv_update_stats (player *pl) 793esrv_update_stats (player *pl)
1008{ 794{
1009 char buf[MAX_BUF]; 795 char buf[MAX_BUF];
1010 uint16 flags; 796 uint16 flags;
1011 797
798 client *ns = pl->ns;
1012 if (!pl->ns) 799 if (!ns)
1013 return; 800 return;
1014 801
802 object *ob = pl->observe;
803 if (!ob)
804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
807
1015 packet sl ("stats"); 808 packet sl ("stats");
1016 809
1017 if (pl->ob)
1018 {
1019 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1020 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1021 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 812 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1022 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 813 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1023 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 814 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1024 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 815 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1025 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 816 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1026 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 817 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1027 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 818 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1028 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1029 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1030 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1031 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1032 }
1033 823
1034 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
1035 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])
1036 { 827 {
828 ns->last_skill_exp [s] = skill->stats.exp;
829
1037 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
1038 * 1 extra byte, but keeps processing simpler. 831 * 1 extra byte, but keeps processing simpler.
1039 */ 832 */
1040 sl << uint8 (s + CS_STAT_SKILLINFO) 833 sl << uint8 (s + CS_STAT_SKILLINFO)
1041 << uint8 (pl->last_skill_ob[s]->level) 834 << uint8 (skill->level)
1042 << uint64 (pl->last_skill_ob[s]->stats.exp); 835 << uint64 (skill->stats.exp);
1043
1044 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1045 } 836 }
1046 837
1047 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1049 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1050 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1051 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1053 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1054 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);
1055 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
1056 flags = 0; 848 flags = 0;
1057 849
1058 if (pl->fire_on) 850 if (opl->fire_on)
1059 flags |= SF_FIREON; 851 flags |= SF_FIREON;
1060 852
1061 if (pl->run_on) 853 if (opl->run_on)
1062 flags |= SF_RUNON; 854 flags |= SF_RUNON;
1063 855
1064 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1065 857
1066 if (pl->ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
1067 { 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) }
1068 else 860 else
1069 for (int i = 0; i < NROFATTACKS; i++) 861 for (int i = 0; i < NROFATTACKS; i++)
1070 { 862 {
1071 /* Skip ones we won't send */ 863 /* Skip ones we won't send */
1072 if (atnr_cs_stat[i] == -1) 864 if (atnr_cs_stat[i] == -1)
1073 continue; 865 continue;
1074 866
1075 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]);
1076 } 868 }
1077 869
1078 if (pl->ns->monitor_spells) 870 if (pl->ns->monitor_spells)
1079 { 871 {
1080 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);
1081 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);
1082 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);
1083 } 875 }
1084 876
1085 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 */
1086 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1087 set_title (pl->ob, buf); 879 set_title (ob, buf);
1088 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1089 881
1090 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
1091 if (sl.length () > 6) 883 if (sl.length () > 6)
1092 pl->ns->send_packet (sl); 884 ns->send_packet (sl);
1093} 885}
1094 886
1095/** 887/**
1096 * 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.
1097 */ 889 */
1098void 890void
1099esrv_new_player (player *pl, uint32 weight) 891esrv_new_player (player *pl, uint32 weight)
1100{ 892{
1101 pl->last_weight = weight;
1102
1103 packet sl ("player"); 893 packet sl ("player");
1104 894
1105 sl << uint32 (pl->ob->count) 895 sl << uint32 (pl->ob->count)
1106 << uint32 (weight) 896 << uint32 (weight)
1107 << uint32 (pl->ob->face->number) 897 << uint32 (pl->ob->face)
1108 << data8 (pl->ob->name); 898 << data8 (pl->ob->name);
1109 899
900 pl->ns->last_weight = weight;
1110 pl->ns->send_packet (sl); 901 pl->ns->send_packet (sl);
1111 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1112} 903}
1113
1114/**
1115 * Need to send an animation sequence to the client.
1116 * We will send appropriate face commands to the client if we haven't
1117 * sent them the face yet (this can become quite costly in terms of
1118 * how much we are sending - on the other hand, this should only happen
1119 * when the player logs in and picks stuff up.
1120 */
1121void
1122esrv_send_animation (client * ns, short anim_num)
1123{
1124 /* Do some checking on the anim_num we got. Note that the animations
1125 * are added in contigous order, so if the number is in the valid
1126 * range, it must be a valid animation.
1127 */
1128 if (anim_num < 0 || anim_num > num_animations)
1129 {
1130 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1131 return;
1132 }
1133
1134 packet sl ("anim");
1135
1136 sl << uint16 (anim_num)
1137 << uint16 (0); /* flags - not used right now */
1138
1139 /* Build up the list of faces. Also, send any information (ie, the
1140 * the face itself) down to the client.
1141 */
1142 for (int i = 0; i < animations[anim_num].num_animations; i++)
1143 {
1144 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1145 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1146
1147 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1148 }
1149
1150 ns->send_packet (sl);
1151
1152 ns->anims_sent[anim_num] = 1;
1153}
1154
1155 904
1156/****************************************************************************** 905/******************************************************************************
1157 * 906 *
1158 * Start of map related commands. 907 * Start of map related commands.
1159 * 908 *
1160 ******************************************************************************/ 909 ******************************************************************************/
1161 910
1162/**
1163 * This adds face_num to a map cell at x,y. If the client doesn't have
1164 * the face yet, we will also send it.
1165 */
1166static void
1167esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1168{
1169 if (newmap->cells[x][y].count >= MAP_LAYERS)
1170 {
1171 //TODO: one or the other, can't both have abort and return, verify and act
1172 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1173 return;
1174 abort ();
1175 }
1176
1177 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1178 newmap->cells[x][y].count++;
1179
1180 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1181 esrv_send_face (ns, face_num, 0);
1182}
1183
1184/** Clears a map cell */ 911/** Clears a map cell */
1185static void 912static void
1186map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 913map_clearcell (struct MapCell *cell, int count)
1187{ 914{
1188 cell->faces[0] = face0; 915 cell->faces[0] = 0;
1189 cell->faces[1] = face1; 916 cell->faces[1] = 0;
1190 cell->faces[2] = face2; 917 cell->faces[2] = 0;
918 cell->smooth[0] = 0;
919 cell->smooth[1] = 0;
920 cell->smooth[2] = 0;
1191 cell->count = count; 921 cell->count = count;
1192 cell->stat_hp = 0; 922 cell->stat_hp = 0;
1193 cell->flags = 0; 923 cell->flags = 0;
1194 cell->player = 0; 924 cell->player = 0;
1195} 925}
1196 926
1197#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1198#define MAX_LAYERS 3 927#define MAX_LAYERS 3
1199
1200/* Using a global really isn't a good approach, but saves the over head of
1201 * allocating and deallocating such a block of data each time run through,
1202 * and saves the space of allocating this in the socket object when we only
1203 * need it for this cycle. If the server is ever threaded, this needs to be
1204 * re-examined.
1205 */
1206static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1207
1208/**
1209 * Returns true if any of the heads for this
1210 * space is set. Returns false if all are blank - this is used
1211 * for empty space checking.
1212 */
1213static inline int
1214have_head (int ax, int ay)
1215{
1216 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1217 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1218 return 1;
1219
1220 return 0;
1221}
1222
1223/**
1224 * check_head is a bit simplistic version of update_space below.
1225 * basically, it only checks the that the head on space ax,ay at layer
1226 * needs to get sent - if so, it adds the data, sending the head
1227 * if needed, and returning 1. If this no data needs to get
1228 * sent, it returns zero.
1229 */
1230static int
1231check_head (packet &sl, client &ns, int ax, int ay, int layer)
1232{
1233 short face_num;
1234
1235 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1236 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1237 else
1238 face_num = 0;
1239
1240 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1241 {
1242 sl << uint16 (face_num);
1243 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1244 esrv_send_face (&ns, face_num, 0);
1245
1246 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1247 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1248 return 1;
1249 }
1250
1251 return 0; /* No change */
1252}
1253 928
1254/** 929/**
1255 * Removes the need to replicate the same code for each layer. 930 * Removes the need to replicate the same code for each layer.
1256 * 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
1257 * it was. 932 * it was.
1258 * sl is the socklist this data is going into. 933 * sl is the socklist this data is going into.
1259 * 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
1260 * 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
1261 * entire player object. 936 * entire player object.
1262 * mx and my are map coordinate offsets for map mp
1263 * sx and sy are the offsets into the socket structure that
1264 * holds the old values.
1265 * 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
1266 * 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)
1267 * take. Interesting to note that before this function, the map1 function 939 * take. Interesting to note that before this function, the map1 function
1268 * numbers the spaces differently - I think this was a leftover from 940 * numbers the spaces differently - I think this was a leftover from
1269 * 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
1270 * 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
1271 * actually match. 943 * actually match.
1272 */ 944 */
1273static int 945static int
1274update_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)
1275{ 947{
1276 object *ob, *head; 948 object *ob = ms.faces_obj [layer];
1277 uint16 face_num;
1278 int bx, by, i;
1279
1280 /* If there is a multipart object stored away, treat that as more important.
1281 * If not, then do the normal processing.
1282 */
1283 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1284
1285 /* Check to see if this head is part of the set of objects
1286 * we would normally send for this space. If so, then
1287 * don't use the head value. We need to do the check
1288 * here and not when setting up the heads[] value for two reasons -
1289 * 1) the heads[] values will get used even if the space is not visible.
1290 * 2) its possible the head is not on the same map as a part, and I'd
1291 * rather not need to do the map translation overhead.
1292 * 3) We need to do some extra checking to make sure that we will
1293 * otherwise send the image as this layer, eg, either it matches
1294 * the head value, or is not multipart.
1295 */
1296 if (head && !head->more)
1297 {
1298 for (i = 0; i < MAP_LAYERS; i++)
1299 {
1300 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1301 if (!ob)
1302 continue;
1303
1304 if (ob->head)
1305 ob = ob->head;
1306
1307 if (ob == head)
1308 {
1309 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1310 head = NULL;
1311 break;
1312 }
1313 }
1314 }
1315
1316 ob = head;
1317 if (!ob)
1318 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1319 949
1320 /* 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
1321 * is the blank face, set the face number to zero. 951 * is the blank face, set the face number to zero.
1322 * 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
1323 * precedence over the other object for this space. 953 * precedence over the other object for this space.
1324 * otherwise, we do special head processing 954 * otherwise, we do special head processing
1325 */ 955 */
1326 if (!ob || ob->face == blank_face) 956 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1327 face_num = 0;
1328 else if (head)
1329 {
1330 /* if this is a head that had previously been stored */
1331 face_num = ob->face->number;
1332 }
1333 else
1334 {
1335 /* if the faces for the different parts of a multipart object
1336 * are the same, we only want to send the bottom right most
1337 * portion of the object. That info is in the tail_.. values
1338 * of the head. Note that for the head itself, ob->head will
1339 * be null, so we only do this block if we are working on
1340 * a tail piece.
1341 */
1342
1343 /* tail_x and tail_y will only be set in the head object. If
1344 * this is the head object and these are set, we proceed
1345 * with logic to only send bottom right. Similarly, if
1346 * this is one of the more parts but the head has those values
1347 * set, we want to do the processing. There can be cases where
1348 * the head is not visible but one of its parts is, so we just
1349 * can always expect that ob->arch->tail_x will be true for all
1350 * object we may want to display.
1351 */
1352 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1353 {
1354
1355 if (ob->head)
1356 head = ob->head;
1357 else
1358 head = ob;
1359
1360 /* Basically figure out where the offset is from where we are right
1361 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1362 * piece is from the head, and the tail is where the tail is from the
1363 * head. Note that bx and by will equal sx and sy if we are already working
1364 * on the bottom right corner. If ob is the head, the clone values
1365 * will be zero, so the right thing will still happen.
1366 */
1367 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1368 by = sy + head->arch->tail_y - ob->arch->clone.y;
1369
1370 /* I don't think this can ever happen, but better to check for it just
1371 * in case.
1372 */
1373 if (bx < sx || by < sy)
1374 {
1375 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1376 face_num = 0;
1377 }
1378 /* single part object, multipart object with non merged faces,
1379 * of multipart object already at lower right.
1380 */
1381 else if (bx == sx && by == sy)
1382 {
1383 face_num = ob->face->number;
1384
1385 /* if this face matches one stored away, clear that one away.
1386 * this code relies on the fact that the map1 commands
1387 * goes from 2 down to 0.
1388 */
1389 for (i = 0; i < MAP_LAYERS; i++)
1390 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1391 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1393 }
1394 else
1395 {
1396 /* If this head is stored away, clear it - otherwise,
1397 * there can be cases where a object is on multiple layers -
1398 * we only want to send it once.
1399 */
1400 face_num = head->face->number;
1401 for (i = 0; i < MAP_LAYERS; i++)
1402 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1403 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1405
1406 /* First, try to put the new head on the same layer. If that is used up,
1407 * then find another layer.
1408 */
1409 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1410 {
1411 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1412 }
1413 else
1414 for (i = 0; i < MAX_LAYERS; i++)
1415 {
1416 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1417 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1418 {
1419 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1420 }
1421 }
1422 face_num = 0; /* Don't send this object - we'll send the head later */
1423 }
1424 }
1425 else
1426 {
1427 /* In this case, we are already at the lower right or single part object,
1428 * so nothing special
1429 */
1430 face_num = ob->face->number;
1431
1432 /* clear out any head entries that have the same face as this one */
1433 for (bx = 0; bx < layer; bx++)
1434 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1436 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1437 }
1438 } /* else not already head object or blank face */
1439
1440 /* This is a real hack. Basically, if we have nothing to send for this layer,
1441 * but there is a head on the next layer, send that instead.
1442 * Without this, what happens is you can get the case where the player stands
1443 * on the same space as the head. However, if you have overlapping big objects
1444 * of the same type, what happens then is it doesn't think it needs to send
1445 * This tends to make stacking also work/look better.
1446 */
1447 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1448 {
1449 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1450 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1451 }
1452
1453 /* Another hack - because of heads and whatnot, this face may match one
1454 * we already sent for a lower layer. In that case, don't send
1455 * this one.
1456 */
1457 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1458 face_num = 0;
1459 957
1460 /* 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
1461 * 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.
1462 */ 960 */
1463 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 961 if (lastcell.faces[layer] != face_num)
1464 { 962 {
1465 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 963 lastcell.faces[layer] = face_num;
964
1466 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
1467 esrv_send_face (&ns, face_num, 0); 969 ns.send_face (face_num, 10);
1468 970
1469 sl << uint16 (face_num); 971 sl << uint16 (face_num);
1470 return 1;
1471 }
1472
1473 /* Nothing changed */
1474 return 0;
1475}
1476
1477/**
1478 * This function is mainly a copy of update_space,
1479 * except it handles update of the smoothing updates,
1480 * not the face updates.
1481 * Removes the need to replicate the same code for each layer.
1482 * this returns true if this smooth is now in fact different
1483 * than it was.
1484 * sl is the socklist this data is going into.
1485 * ns is the socket we are working on - all the info we care
1486 * about is in this socket structure, so know need to pass the
1487 * entire player object.
1488 * mx and my are map coordinate offsets for map mp
1489 * sx and sy are the offsets into the socket structure that
1490 * holds the old values.
1491 * layer is the layer to update, with 2 being the floor and 0 the
1492 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1493 * take.
1494 */
1495
1496static inline int
1497update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1498{
1499 object *ob;
1500 int smoothlevel; /* old face_num; */
1501
1502 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1503
1504 /* If there is no object for this space, or if the face for the object
1505 * is the blank face, set the smoothlevel to zero.
1506 */
1507 if (!ob || ob->face == blank_face)
1508 smoothlevel = 0;
1509 else
1510 {
1511 smoothlevel = ob->smoothlevel;
1512 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1513 SendSmooth (&ns, ob->face->number);
1514 } /* else not already head object or blank face */
1515
1516 /* We've gotten what face we want to use for the object. Now see if
1517 * if it has changed since we last sent it to the client.
1518 */
1519 if (smoothlevel > 255)
1520 smoothlevel = 255;
1521 else if (smoothlevel < 0)
1522 smoothlevel = 0;
1523
1524 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1525 {
1526 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1527 sl << uint8 (smoothlevel);
1528 return 1; 972 return 1;
1529 } 973 }
1530 974
1531 /* Nothing changed */ 975 /* Nothing changed */
1532 return 0; 976 return 0;
… …
1549 } 993 }
1550 994
1551 return result; 995 return result;
1552} 996}
1553 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
1554/** 1020/**
1555 * This function uses the new map1 protocol command to send the map 1021 * Draws client map.
1556 * to the client. It is necessary because the old map command supports
1557 * a maximum map size of 15x15.
1558 * This function is much simpler than the old one. This is because
1559 * the old function optimized to send as few face identifiers as possible,
1560 * at the expense of sending more coordinate location (coordinates were
1561 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1562 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1563 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1564 * and use the other 4 bits for other informatiion. For full documentation
1565 * of what we send, see the doc/Protocol file.
1566 * I will describe internally what we do:
1567 * the ns->lastmap shows how the map last looked when sent to the client.
1568 * in the lastmap structure, there is a cells array, which is set to the
1569 * maximum viewable size (As set in config.h).
1570 * in the cells, there are faces and a count value.
1571 * we use the count value to hold the darkness value. If -1, then this space
1572 * is not viewable.
1573 * we use faces[0] faces[1] faces[2] to hold what the three layers
1574 * look like.
1575 */ 1022 */
1576void 1023void
1577draw_client_map1 (object *pl) 1024draw_client_map (player *pl)
1578{ 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_IN_MEMORY)
1037 return;
1038
1579 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1580 sint16 nx, ny;
1581 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1582 uint16 mask, emask;
1583 uint8 eentrysize; 1041 uint8 eentrysize;
1584 uint16 ewhatstart, ewhatflag; 1042 uint16 ewhatstart, ewhatflag;
1585 uint8 extendedinfos; 1043 uint8 extendedinfos;
1586 maptile *m;
1587 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
1588 client &socket = *pl->contr->ns; 1080 client &socket = *pl->ns;
1589
1590 if (!pl->active)
1591 return;
1592
1593 check_map_change (pl->contr);
1594 1081
1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596 packet esl; 1083 packet esl;
1597 1084
1598 startlen = sl.length (); 1085 startlen = sl.length ();
… …
1613 << uint8 (extendedinfos) 1100 << uint8 (extendedinfos)
1614 << uint8 (eentrysize); 1101 << uint8 (eentrysize);
1615 1102
1616 estartlen = esl.length (); 1103 estartlen = esl.length ();
1617 } 1104 }
1618 else
1619 {
1620 /* suppress compiler warnings */
1621 ewhatstart = 0;
1622 ewhatflag = 0;
1623 estartlen = 0;
1624 }
1625
1626 /* Init data to zero */
1627 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1628 1105
1629 /* 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
1630 * locations. 1107 * locations.
1631 */ 1108 */
1632 ay = 0; 1109 ay = 0;
1633 1110
1634 /* We could do this logic as conditionals in the if statement, 1111 /* We could do this logic as conditionals in the if statement,
1635 * but that started to get a bit messy to look at. 1112 * but that started to get a bit messy to look at.
1636 */ 1113 */
1637 max_x = pl->x + (socket.mapx + 1) / 2; 1114 max_x = ob->x + (socket.mapx + 1) / 2;
1638 max_y = pl->y + (socket.mapy + 1) / 2; 1115 max_y = ob->y + (socket.mapy + 1) / 2;
1639 1116
1640 if (socket.mapmode == Map1aCmd)
1641 {
1642 max_x += MAX_HEAD_OFFSET;
1643 max_y += MAX_HEAD_OFFSET;
1644 }
1645
1646 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++)
1647 { 1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1648 ax = 0; 1122 ax = 0;
1649 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++)
1650 { 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 = 0;
1136 }
1137
1138 int emask, mask;
1651 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1139 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1652 1140
1653 /* If this space is out of the normal viewable area, we only check
1654 * the heads value ax or ay will only be greater than what
1655 * the client wants if using the map1a command - this is because
1656 * if the map1a command is not used, max_x and max_y will be
1657 * set to lower values.
1658 */
1659 if (ax >= socket.mapx || ay >= socket.mapy)
1660 {
1661 int i, got_one;
1662
1663 oldlen = sl.length ();
1664
1665 sl << uint16 (mask);
1666
1667 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1668 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1669 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1670
1671 /* If all we are doing is sending 0 (blank) faces, we don't
1672 * actually need to send that - just the coordinates
1673 * with no faces tells the client to blank out the
1674 * space.
1675 */
1676 got_one = 0;
1677 for (i = oldlen + 2; i < sl.length (); i++)
1678 if (sl[i])
1679 got_one = 1;
1680
1681 if (got_one && (mask & 0xf))
1682 sl[oldlen + 1] = mask & 0xff;
1683 else
1684 { /*either all faces blank, either no face at all */
1685 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1686 sl.reset (oldlen + 2);
1687 else
1688 sl.reset (oldlen);
1689 }
1690
1691 /*What concerns extendinfos, nothing to be done for now
1692 * (perhaps effects layer later)
1693 */
1694 continue; /* don't do processing below */
1695 }
1696
1697 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1141 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1698
1699 d = pl->contr->blocked_los[ax][ay];
1700 1142
1701 /* If the coordinates are not valid, or it is too dark to see, 1143 /* If the coordinates are not valid, or it is too dark to see,
1702 * we tell the client as such 1144 * we tell the client as such
1703 */ 1145 */
1704 nx = x;
1705 ny = y;
1706 m = get_map_from_coord (pl->map, &nx, &ny);
1707
1708 if (!m) 1146 if (!m)
1709 { 1147 {
1710 /* space is out of map. Update space and clear values 1148 /* space is out of map. Update space and clear values
1711 * if this hasn't already been done. If the space is out 1149 * if this hasn't already been done. If the space is out
1712 * of the map, it shouldn't have a head 1150 * of the map, it shouldn't have a head
1713 */ 1151 */
1714 if (lastcell.count != -1) 1152 if (lastcell.count != -1)
1715 { 1153 {
1716 sl << uint16 (mask); 1154 sl << uint16 (mask);
1717 map_clearcell (&lastcell, 0, 0, 0, -1); 1155 map_clearcell (&lastcell, -1);
1718 } 1156 }
1157
1158 continue;
1719 } 1159 }
1160
1161 m->touch ();
1162
1163 int d = pl->blocked_los[ax][ay];
1164
1720 else if (d > 3) 1165 if (d > 3)
1721 { 1166 {
1722 m->touch ();
1723 1167
1724 int need_send = 0, count; 1168 int need_send = 0, count;
1725 1169
1726 /* This block deals with spaces that are not visible for whatever 1170 /* This block deals with spaces that are not visible for whatever
1727 * reason. Still may need to send the head for this space. 1171 * reason. Still may need to send the head for this space.
1728 */ 1172 */
1729 1173
1730 oldlen = sl.length (); 1174 oldlen = sl.length ();
1731 1175
1732 sl << uint16 (mask); 1176 sl << uint16 (mask);
… …
1734 if (lastcell.count != -1) 1178 if (lastcell.count != -1)
1735 need_send = 1; 1179 need_send = 1;
1736 1180
1737 count = -1; 1181 count = -1;
1738 1182
1739 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1740 {
1741 /* Now check to see if any heads need to be sent */
1742
1743 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1744 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1745 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1746
1747 lastcell.count = count;
1748 }
1749 else
1750 {
1751 /* properly clear a previously sent big face */ 1183 /* properly clear a previously sent big face */
1752 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1753 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1185 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1754 need_send = 1; 1186 need_send = 1;
1755 1187
1756 map_clearcell (&lastcell, 0, 0, 0, count); 1188 map_clearcell (&lastcell, count);
1757 }
1758 1189
1759 if ((mask & 0xf) || need_send) 1190 if ((mask & 0xf) || need_send)
1760 sl[oldlen + 1] = mask & 0xff; 1191 sl[oldlen + 1] = mask & 0xff;
1761 else 1192 else
1762 sl.reset (oldlen); 1193 sl.reset (oldlen);
1763 } 1194 }
1764 else 1195 else
1765 { 1196 {
1766 m->touch ();
1767
1768 /* In this block, the space is visible or there are head objects 1197 /* In this block, the space is visible.
1769 * we need to send.
1770 */ 1198 */
1771 1199
1772 /* Rather than try to figure out what everything that we might 1200 /* Rather than try to figure out what everything that we might
1773 * need to send is, then form the packet after that, 1201 * need to send is, then form the packet after that,
1774 * 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
… …
1777 * is done. 1205 * is done.
1778 * 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
1779 * what if anything we need to send, setting the bits, then 1207 * what if anything we need to send, setting the bits, then
1780 * doing those checks again to add the real data. 1208 * doing those checks again to add the real data.
1781 */ 1209 */
1782 oldlen = sl.length (); 1210 oldlen = sl.length ();
1783 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1784 eoldlen = esl.length (); 1211 eoldlen = esl.length ();
1785 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1212
1786 sl << uint16 (mask); 1213 sl << uint16 (mask);
1787
1788 if (socket.ext_mapinfos)
1789 esl << uint16 (emask);
1790 1214
1791 unsigned char dummy; 1215 unsigned char dummy;
1792 unsigned char *last_ext = &dummy; 1216 unsigned char *last_ext = &dummy;
1793 1217
1794 /* Darkness changed */ 1218 /* Darkness changed */
… …
1806 sl << uint8 (255 - 64 * d); 1230 sl << uint8 (255 - 64 * d);
1807 } 1231 }
1808 1232
1809 lastcell.count = d; 1233 lastcell.count = d;
1810 1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1811 if (socket.extmap) 1238 if (socket.extmap)
1812 { 1239 {
1813 uint8 stat_hp = 0; 1240 uint8 stat_hp = 0;
1814 uint8 stat_width = 0; 1241 uint8 stat_width = 0;
1815 uint8 flags = 0; 1242 uint8 flags = 0;
1816 UUID player = 0; 1243 tag_t player = 0;
1817 1244
1818 // send hp information, if applicable 1245 // send hp information, if applicable
1819 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1246 if (object *op = ms.faces_obj [0])
1820 { 1247 {
1821 if (op->head || op->invisible) 1248 if (op->head || op->invisible)
1822 ; // do not show 1249 ; // do not show
1823 else if (op->type == PLAYER 1250 else if (op->type == PLAYER
1824 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1825 { 1252 {
1826 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1827 { 1254 {
1828 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1829 stat_width = op->arch->tail_x; 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1830 } 1257 }
1831 } 1258 }
1832 1259
1833 if (op->msg && op->msg[0] == '@') 1260 if (op->msg && op->msg[0] == '@')
1834 flags |= 1; 1261 flags |= 1;
1835 1262
1836 if (op->type == PLAYER && op != pl) 1263 if (op->type == PLAYER && op != ob)
1837 player = op->count; 1264 player = op->count;
1838 } 1265 }
1839 1266
1840 if (lastcell.stat_hp != stat_hp) 1267 if (lastcell.stat_hp != stat_hp)
1841 { 1268 {
… …
1862 1289
1863 mask |= 0x8; 1290 mask |= 0x8;
1864 *last_ext |= 0x80; 1291 *last_ext |= 0x80;
1865 last_ext = &sl[sl.length ()]; 1292 last_ext = &sl[sl.length ()];
1866 1293
1867 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1294 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1868 } 1295 }
1869 1296
1870 if (lastcell.flags != flags) 1297 if (lastcell.flags != flags)
1871 { 1298 {
1872 lastcell.flags = flags; 1299 lastcell.flags = flags;
… …
1878 sl << uint8 (8) << uint8 (flags); 1305 sl << uint8 (8) << uint8 (flags);
1879 } 1306 }
1880 } 1307 }
1881 1308
1882 /* Floor face */ 1309 /* Floor face */
1883 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1310 if (update_space (sl, socket, ms, lastcell, 2))
1884 mask |= 0x4; 1311 mask |= 0x4;
1885 1312
1886 if (socket.EMI_smooth)
1887 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1888 emask |= 0x4;
1889
1890 /* Middle face */ 1313 /* Middle face */
1891 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1314 if (update_space (sl, socket, ms, lastcell, 1))
1892 mask |= 0x2; 1315 mask |= 0x2;
1893 1316
1894 if (socket.EMI_smooth) 1317 if (ms.player () == ob
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1896 emask |= 0x2;
1897
1898 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899 { 1319 {
1320 // force player to be visible to himself if invisible
1900 if (lastcell.faces[0] != pl->face->number) 1321 if (lastcell.faces[0] != ob->face)
1901 { 1322 {
1902 lastcell.faces[0] = pl->face->number; 1323 lastcell.faces[0] = ob->face;
1324
1903 mask |= 0x1; 1325 mask |= 0x1;
1904
1905 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1906 esrv_send_face (&socket, pl->face->number, 0);
1907
1908 sl << uint16 (pl->face->number); 1326 sl << uint16 (ob->face);
1327
1328 socket.send_faces (ob);
1909 } 1329 }
1910 } 1330 }
1911 else
1912 {
1913 /* Top face */ 1331 /* Top face */
1914 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1332 else if (update_space (sl, socket, ms, lastcell, 0))
1915 mask |= 0x1; 1333 mask |= 0x1;
1916
1917 if (socket.EMI_smooth)
1918 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1919 emask |= 0x1;
1920 }
1921 1334
1922 /* Check to see if we are in fact sending anything for this 1335 /* Check to see if we are in fact sending anything for this
1923 * space by checking the mask. If so, update the mask. 1336 * space by checking the mask. If so, update the mask.
1924 * if not, reset the len to that from before adding the mask 1337 * if not, reset the len to that from before adding the mask
1925 * value, so we don't send those bits. 1338 * value, so we don't send those bits.
… …
1927 if (mask & 0xf) 1340 if (mask & 0xf)
1928 sl[oldlen + 1] = mask & 0xff; 1341 sl[oldlen + 1] = mask & 0xff;
1929 else 1342 else
1930 sl.reset (oldlen); 1343 sl.reset (oldlen);
1931 1344
1345 if (socket.ext_mapinfos)
1346 esl << uint16 (emask);
1347
1348 if (socket.EMI_smooth)
1349 {
1350 for (int layer = 2+1; layer--; )
1351 {
1352 object *ob = ms.faces_obj [layer];
1353
1354 // If there is no object for this space, or if the face for the object
1355 // is the blank face, set the smoothlevel to zero.
1356 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1357
1358 // We've gotten what face we want to use for the object. Now see if
1359 // if it has changed since we last sent it to the client.
1360 if (lastcell.smooth[layer] != smoothlevel)
1361 {
1362 lastcell.smooth[layer] = smoothlevel;
1363 esl << uint8 (smoothlevel);
1364 emask |= 1 << layer;
1365 }
1366 }
1367
1932 if (emask & 0xf) 1368 if (emask & 0xf)
1933 esl[eoldlen + 1] = emask & 0xff; 1369 esl[eoldlen + 1] = emask & 0xff;
1934 else 1370 else
1935 esl.reset (eoldlen); 1371 esl.reset (eoldlen);
1372 }
1936 } /* else this is a viewable space */ 1373 } /* else this is a viewable space */
1937 } /* for x loop */ 1374 } /* for x loop */
1938 } /* for y loop */ 1375 } /* for y loop */
1376
1377 socket.flush_fx ();
1939 1378
1940 /* Verify that we in fact do need to send this */ 1379 /* Verify that we in fact do need to send this */
1941 if (socket.ext_mapinfos) 1380 if (socket.ext_mapinfos)
1942 { 1381 {
1943 if (!(sl.length () > startlen || socket.sent_scroll)) 1382 if (!(sl.length () > startlen || socket.sent_scroll))
1944 { 1383 {
1945 /* No map data will follow, so don't say the client 1384 /* No map data will follow, so don't say the client
1946 * it doesn't need draw! 1385 * it doesn't need draw!
1947 */ 1386 */
1948 ewhatflag &= (~EMI_NOREDRAW); 1387 ewhatflag &= ~EMI_NOREDRAW;
1949 esl[ewhatstart + 1] = ewhatflag & 0xff; 1388 esl[ewhatstart + 1] = ewhatflag & 0xff;
1950 } 1389 }
1951 1390
1952 if (esl.length () > estartlen) 1391 if (esl.length () > estartlen)
1953 socket.send_packet (esl); 1392 socket.send_packet (esl);
… …
1958 socket.send_packet (sl); 1397 socket.send_packet (sl);
1959 socket.sent_scroll = 0; 1398 socket.sent_scroll = 0;
1960 } 1399 }
1961} 1400}
1962 1401
1963/**
1964 * Draws client map.
1965 */
1966void
1967draw_client_map (object *pl)
1968{
1969 int i, j;
1970 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1971 New_Face *face, *floor;
1972 New_Face *floor2;
1973 int d, mflags;
1974 struct Map newmap;
1975 maptile *m, *pm;
1976
1977 if (pl->type != PLAYER)
1978 {
1979 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1980 return;
1981 }
1982
1983 pm = pl->map;
1984
1985 /* If player is just joining the game, he isn't here yet, so the map
1986 * can get swapped out. If so, don't try to send them a map. All will
1987 * be OK once they really log in.
1988 */
1989 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1990 return;
1991
1992 memset (&newmap, 0, sizeof (struct Map));
1993
1994 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1995 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1996 {
1997 ax = i;
1998 ay = j;
1999 m = pm;
2000 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2001
2002 if (mflags & P_OUT_OF_MAP)
2003 continue;
2004
2005 /* If a map is visible to the player, we don't want to swap it out
2006 * just to reload it. This should really call something like
2007 * swap_map, but this is much more efficient and 'good enough'
2008 */
2009 if (mflags & P_NEW_MAP)
2010 m->timeout = 50;
2011 }
2012
2013 /* do LOS after calls to update_position */
2014 if (pl->contr->do_los)
2015 {
2016 update_los (pl);
2017 pl->contr->do_los = 0;
2018 }
2019
2020 /* Big maps need a different drawing mechanism to work */
2021 draw_client_map1 (pl);
2022}
2023
2024
2025/*****************************************************************************/ 1402/*****************************************************************************/
2026
2027/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1403/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2028
2029/* a player. Of course, the client need to know the command to be able to */ 1404/* a player. Of course, the client need to know the command to be able to */
2030
2031/* manage it ! */ 1405/* manage it ! */
2032
2033/*****************************************************************************/ 1406/*****************************************************************************/
2034void 1407void
2035send_plugin_custom_message (object *pl, char *buf) 1408send_plugin_custom_message (object *pl, char *buf)
2036{ 1409{
2037 pl->contr->ns->send_packet (buf); 1410 pl->contr->ns->send_packet (buf);
… …
2048 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
2049 1422
2050 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
2051 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2052 1425
2053 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
2054 { 1427 {
2055 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2056 fatal (0); 1429 fatal (0);
2057 } 1430 }
2058 1431
… …
2071 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
2072 1445
2073 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
2074 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2075 1448
2076 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
2077 { 1450 {
2078 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2079 fatal (0); 1452 fatal (0);
2080 } 1453 }
2081 1454
… …
2159 1532
2160/* appends the spell *spell to the Socklist we will send the data to. */ 1533/* appends the spell *spell to the Socklist we will send the data to. */
2161static void 1534static void
2162append_spell (player *pl, packet &sl, object *spell) 1535append_spell (player *pl, packet &sl, object *spell)
2163{ 1536{
2164 int len, i, skill = 0; 1537 int i, skill = 0;
2165 1538
2166 if (!(spell->name)) 1539 if (!(spell->name))
2167 { 1540 {
2168 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1541 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169 return; 1542 return;
… …
2182 { 1555 {
2183 skill = i + CS_STAT_SKILLINFO; 1556 skill = i + CS_STAT_SKILLINFO;
2184 break; 1557 break;
2185 } 1558 }
2186 } 1559 }
1560
1561 // spells better have a face
1562 if (!spell->face)
1563 {
1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1565 spell->face = face_find ("burnout.x11", blank_face);
1566 }
1567
1568 pl->ns->send_face (spell->face);
2187 1569
2188 /* send the current values */ 1570 /* send the current values */
2189 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
2190 << uint16 (spell->level) 1572 << uint16 (spell->level)
2191 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
2192 << uint16 (spell->last_sp) 1574 << uint16 (spell->last_sp)
2193 << uint16 (spell->last_grace) 1575 << uint16 (spell->last_grace)
2194 << uint16 (spell->last_eat) 1576 << uint16 (spell->last_eat)
2195 << uint8 (skill) 1577 << uint8 (skill)
2196 << uint32 (spell->path_attuned) 1578 << uint32 (spell->path_attuned)
2197 << uint32 (spell->face ? spell->face->number : 0) 1579 << uint32 (spell->face)
2198 << data8 (spell->name) 1580 << data8 (spell->name)
2199 << data16 (spell->msg); 1581 << data16 (spell->msg);
2200} 1582}
2201 1583
2202/** 1584/**
… …
2217 1599
2218 packet sl ("addspell"); 1600 packet sl ("addspell");
2219 1601
2220 if (!spell) 1602 if (!spell)
2221 { 1603 {
2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1604 for (spell = pl->ob->inv; spell; spell = spell->below)
2223 { 1605 {
2224 /* were we to simply keep appending data here, we could exceed 1606 /* were we to simply keep appending data here, we could exceed
2225 * MAXSOCKBUF if the player has enough spells to add, we know that 1607 * MAXSOCKBUF if the player has enough spells to add, we know that
2226 * append_spells will always append 19 data bytes, plus 4 length 1608 * append_spells will always append 19 data bytes, plus 4 length
2227 * bytes and 3 strings (because that is the spec) so we need to 1609 * bytes and 3 strings (because that is the spec) so we need to
2228 * check that the length of those 3 strings, plus the 23 bytes, 1610 * check that the length of those 3 strings, plus the 23 bytes,
2229 * won't take us over the length limit for the socket, if it does, 1611 * won't take us over the length limit for the socket, if it does,
2230 * we need to send what we already have, and restart packet formation 1612 * we need to send what we already have, and restart packet formation
2231 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
2232 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2233 * to show add_spell is 26 bytes + 2 strings. However, the overun 1618 * to show add_spell is 26 bytes + 2 strings. However, the overun
2234 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1619 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2235 * like it will fix this 1620 * like it will fix this
2236 */ 1621 */
2237 if (spell->type != SPELL)
2238 continue;
2239
2240 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1622 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2241 { 1623 {
1624 pl->ns->flush_fx ();
2242 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
2243 1626
2244 sl.reset (); 1627 sl.reset ();
2245 sl << "addspell "; 1628 sl << "addspell ";
2246 } 1629 }
… …
2254 return; 1637 return;
2255 } 1638 }
2256 else 1639 else
2257 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
2258 1641
2259 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
2260 { 1643 {
2261 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2262 fatal (0); 1645 fatal (0);
2263 } 1646 }
2264 1647
2265 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
2266 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
2267} 1651}
2268 1652

Diff Legend

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