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.33 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.84 by root, Tue Apr 3 00:21:38 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 41 */
50 42
51#include <global.h> 43#include <global.h>
52#include <sproto.h> 44#include <sproto.h>
53 45
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 46#include <living.h>
57#include <commands.h> 47#include <commands.h>
58 48
59/* This block is basically taken from socket.c - I assume if it works there, 49/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 50 * it should work here.
… …
63#include <sys/time.h> 53#include <sys/time.h>
64#include <sys/socket.h> 54#include <sys/socket.h>
65#include <netinet/in.h> 55#include <netinet/in.h>
66#include <netdb.h> 56#include <netdb.h>
67 57
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 58#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 59#include <sys/time.h>
74#endif
75 60
76#include "sounds.h" 61#include "sounds.h"
77 62
78/** 63/**
79 * This table translates the attack numbers as used within the 64 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 81 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 82 -1 /* Disease - not fully done yet */
98}; 83};
99 84
100static void 85static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 86socket_map_scroll (client *ns, int dx, int dy)
102{ 87{
103 struct Map newmap; 88 struct Map newmap;
104 int x, y, mx, my; 89 int x, y, mx, my;
105 90
106 {
107 packet sl;
108
109 sl.printf ("map_scroll %d %d", dx, dy); 91 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl);
111 }
112 92
113 /* If we are using the Map1aCmd, we may in fact send 93 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 94 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 95 * So set the mx,my to the max value we want to
116 * look for. Removed code to do so - it caused extra 96 * look for. Removed code to do so - it caused extra
117 * complexities for the client, and probably doesn't make 97 * complexities for the client, and probably doesn't make
118 * that much difference in bandwidth. 98 * that much difference in bandwidth.
119 */ 99 */
120 mx = ns->mapx; 100 mx = ns->mapx;
121 my = ns->mapy; 101 my = ns->mapy;
122
123 if (ns->mapmode == Map1aCmd)
124 {
125 mx += MAX_HEAD_OFFSET;
126 my += MAX_HEAD_OFFSET;
127 }
128 102
129 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
130 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
131 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
132 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
… …
156} 130}
157 131
158static void 132static void
159clear_map (player *pl) 133clear_map (player *pl)
160{ 134{
161 NewSocket & socket = pl->socket;
162
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
164 136
137 pl->ns->force_newmap = false;
138
165 if (socket.newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
166 socket.send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
167 141
168 socket.update_look = 1; 142 pl->ns->floorbox_reset ();
169 socket.look_position = 0;
170} 143}
171 144
172/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
173static void 146static void
174check_map_change (player *pl) 147check_map_change (player *pl)
175{ 148{
176 NewSocket & socket = pl->socket; 149 client &socket = *pl->ns;
177 object *ob = pl->ob; 150 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
179 152
180 if (socket.current_map != ob->map) 153 if (socket.force_newmap)
181 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
182 socket.current_map = ob->map; 157 socket.current_map = ob->map;
183
184 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
185 164
186 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
187 { 166 {
188 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
189 { 168 {
… …
197 flags |= 4; 176 flags |= 4;
198 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
199 flags |= 8; 178 flags |= 8;
200 179
201 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
203 } 182 }
204 else 183 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
206 185
207 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
215 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
216 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
217 else 196 else
218 { 197 {
219 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
220 socket.update_look = 1; 199 socket.floorbox_reset ();
221 socket.look_position = 0;
222 } 200 }
223 } 201 }
224 202
225 socket.current_x = ob->x; 203 socket.current_x = ob->x;
226 socket.current_y = ob->y; 204 socket.current_y = ob->y;
205
206 region *reg = ob->region ();
207 if (socket.current_region != reg)
208 {
209 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 }
212}
213
214/**
215 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide
217 * that information.
218 */
219void
220RequestInfo (char *buf, int len, client * ns)
221{
222 char *params = NULL, *cp;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234
235 /* find the first space, make it null, and update the
236 * params pointer.
237 */
238 for (cp = buf; *cp != '\0'; cp++)
239 if (*cp == ' ')
240 {
241 *cp = '\0';
242 params = cp + 1;
243 break;
244 }
245
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params);
254 else
255 ns->send_packet (bigbuf, len);
227} 256}
228 257
229void 258void
230ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
231{ 260{
232 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262}
263
264void
265ExtiCmd (char *buf, int len, client *ns)
266{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
233} 268}
234 269
235void 270void
236MapInfoCmd (char *buf, int len, player *pl) 271MapInfoCmd (char *buf, int len, player *pl)
237{ 272{
… …
252 buf += 8; 287 buf += 8;
253 288
254 // initial map and its origin 289 // initial map and its origin
255 maptile *map = pl->ob->map; 290 maptile *map = pl->ob->map;
256 sint16 dx, dy; 291 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 292 int mapx = pl->ns->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 294 int max_distance = 8; // limit maximum path length to something generous
260 295
261 while (*buf && map && max_distance) 296 while (*buf && map && max_distance)
262 { 297 {
263 int dir = *buf++; 298 int dir = *buf++;
264 299
265 switch (dir) 300 switch (dir)
266 { 301 {
267 case '1': 302 case '1':
268 dx = 0; 303 dx = 0;
269 dy = -1; 304 dy = -1;
270 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
271 map && (mapy -= map->height); 306 map && (mapy -= map->height);
272 break; 307 break;
273 case '2': 308 case '2':
274 mapx += map->width; 309 mapx += map->width;
275 dx = map->width; 310 dx = map->width;
276 dy = 0; 311 dy = 0;
277 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
278 break; 313 break;
279 case '3': 314 case '3':
280 mapy += map->height; 315 mapy += map->height;
281 dx = 0; 316 dx = 0;
282 dy = map->height; 317 dy = map->height;
283 map = get_map_from_coord (map, &dx, &dy); 318 map = map->xy_find (dx, dy);
284 break; 319 break;
285 case '4': 320 case '4':
286 dx = -1; 321 dx = -1;
287 dy = 0; 322 dy = 0;
288 map = get_map_from_coord (map, &dx, &dy); 323 map = map->xy_find (dx, dy);
289 map && (mapx -= map->width); 324 map && (mapx -= map->width);
290 break; 325 break;
291 } 326 }
292 327
293 --max_distance; 328 --max_distance;
294 } 329 }
295 330
… …
306 if (map->tile_path[2]) 341 if (map->tile_path[2])
307 flags |= 4; 342 flags |= 4;
308 if (map->tile_path[3]) 343 if (map->tile_path[3])
309 flags |= 8; 344 flags |= 8;
310 345
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
312 } 347 }
313 else 348 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 350 }
316 else 351 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 353
319 pl->socket.send_packet (bigbuf); 354 pl->ns->send_packet (bigbuf);
320} 355}
321 356
322/** This is the Setup cmd - easy first implementation */ 357/** This is the Setup cmd */
323void 358void
324SetUp (char *buf, int len, NewSocket * ns) 359SetUp (char *buf, int len, client * ns)
325{ 360{
326 int s, slen; 361 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
327 char *cmd, *param, cmdback[HUGE_BUF];
328
329 /* run through the cmds of setup
330 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
331 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
333 * The client then must sort this out
334 */
335
336 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
337
338 strcpy (cmdback, "setup");
339 for (s = 0; s < len; )
340 {
341 cmd = &buf[s];
342
343 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++)
345 ;
346
347 buf[s++] = 0;
348
349 while (buf[s] == ' ')
350 s++;
351
352 if (s >= len)
353 break;
354
355 param = &buf[s];
356
357 for (; buf[s] && buf[s] != ' '; s++)
358 ;
359
360 buf[s++] = 0;
361
362 while (buf[s] == ' ')
363 s++;
364
365 slen = strlen (cmdback);
366 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
367 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
368 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
369
370 if (!strcmp (cmd, "sound"))
371 {
372 ns->sound = atoi (param);
373 safe_strcat (cmdback, param, &slen, HUGE_BUF);
374 }
375 else if (!strcmp (cmd, "exp64"))
376 {
377 ns->exp64 = atoi (param);
378 safe_strcat (cmdback, param, &slen, HUGE_BUF);
379 }
380 else if (!strcmp (cmd, "spellmon"))
381 {
382 ns->monitor_spells = atoi (param);
383 safe_strcat (cmdback, param, &slen, HUGE_BUF);
384 }
385 else if (!strcmp (cmd, "darkness"))
386 {
387 ns->darkness = atoi (param);
388 safe_strcat (cmdback, param, &slen, HUGE_BUF);
389 }
390 else if (!strcmp (cmd, "map1cmd"))
391 {
392 if (atoi (param))
393 ns->mapmode = Map1Cmd;
394 /* if beyond this size, need to use map1cmd no matter what */
395 if (ns->mapx > 11 || ns->mapy > 11)
396 ns->mapmode = Map1Cmd;
397 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
398 }
399 else if (!strcmp (cmd, "map1acmd"))
400 {
401 if (atoi (param))
402 ns->mapmode = Map1aCmd;
403 /* if beyond this size, need to use map1acmd no matter what */
404 if (ns->mapx > 11 || ns->mapy > 11)
405 ns->mapmode = Map1aCmd;
406 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "newmapcmd"))
409 {
410 ns->newmapcmd = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412// } else if (!strcmp(cmd,"plugincmd")) {
413// ns->plugincmd = atoi(param);
414// safe_strcat(cmdback, param, &slen, HUGE_BUF);
415 }
416 else if (!strcmp (cmd, "mapinfocmd"))
417 {
418 ns->mapinfocmd = atoi (param);
419 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
420 }
421 else if (!strcmp (cmd, "extcmd"))
422 {
423 ns->extcmd = atoi (param);
424 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
425 }
426 else if (!strcmp (cmd, "extmap"))
427 {
428 ns->extmap = atoi (param);
429 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
430 }
431 else if (!strcmp (cmd, "facecache"))
432 {
433 ns->facecache = atoi (param);
434 safe_strcat (cmdback, param, &slen, HUGE_BUF);
435 }
436 else if (!strcmp (cmd, "faceset"))
437 {
438 char tmpbuf[20];
439 int q = atoi (param);
440
441 if (is_valid_faceset (q))
442 ns->faceset = q;
443 sprintf (tmpbuf, "%d", ns->faceset);
444 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
445 /* if the client is using faceset, it knows about image2 command */
446 ns->image2 = 1;
447 }
448 else if (!strcmp (cmd, "itemcmd"))
449 {
450 /* Version of the item protocol command to use. Currently,
451 * only supported versions are 1 and 2. Using a numeric
452 * value will make it very easy to extend this in the future.
453 */
454 char tmpbuf[20];
455 int q = atoi (param);
456
457 if (q < 1 || q > 2)
458 {
459 strcpy (tmpbuf, "FALSE");
460 }
461 else
462 {
463 ns->itemcmd = q;
464 sprintf (tmpbuf, "%d", ns->itemcmd);
465 }
466 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
467 }
468 else if (!strcmp (cmd, "mapsize"))
469 {
470 int x, y = 0;
471 char tmpbuf[MAX_BUF], *cp;
472
473 x = atoi (param);
474 for (cp = param; *cp != 0; cp++)
475 if (*cp == 'x' || *cp == 'X')
476 {
477 y = atoi (cp + 1);
478 break;
479 }
480 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
481 {
482 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
483 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
484 }
485 else
486 {
487 ns->mapx = x;
488 ns->mapy = y;
489 /* better to send back what we are really using and not the
490 * param as given to us in case it gets parsed differently.
491 */
492 sprintf (tmpbuf, "%dx%d", x, y);
493 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
494 /* If beyond this size and still using orig map command, need to
495 * go to map1cmd.
496 */
497 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
498 ns->mapmode = Map1Cmd;
499 }
500 }
501 else if (!strcmp (cmd, "extendedMapInfos"))
502 {
503 /* Added by tchize
504 * prepare to use the mapextended command
505 */
506 char tmpbuf[20];
507
508 ns->ext_mapinfos = (atoi (param));
509 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
510 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
511 }
512 else if (!strcmp (cmd, "extendedTextInfos"))
513 {
514 /* Added by tchize
515 * prepare to use the extended text commands
516 * Client toggle this to non zero to get exttext
517 */
518 char tmpbuf[20];
519
520 ns->has_readable_type = (atoi (param));
521 sprintf (tmpbuf, "%d", ns->has_readable_type);
522 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
523 }
524 else
525 {
526 /* Didn't get a setup command we understood -
527 * report a failure to the client.
528 */
529 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
530 }
531 } /* for processing all the setup commands */
532
533 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
534 ns->send_packet (cmdback);
535} 362}
536 363
537/** 364/**
538 * The client has requested to be added to the game. 365 * The client has requested to be added to the game.
539 * This is what takes care of it. We tell the client how things worked out. 366 * This is what takes care of it. We tell the client how things worked out.
540 * I am not sure if this file is the best place for this function. however, 367 * I am not sure if this file is the best place for this function. however,
541 * it either has to be here or init_sockets needs to be exported. 368 * it either has to be here or init_sockets needs to be exported.
542 */ 369 */
543void 370void
544AddMeCmd (char *buf, int len, NewSocket * ns) 371AddMeCmd (char *buf, int len, client *ns)
545{ 372{
546 Settings oldsettings; 373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
547
548 oldsettings = settings;
549 if (ns->status != Ns_Add || add_player (ns))
550 ns->send_packet ("addme_failed");
551 else
552 {
553 /* Basically, the add_player copies the socket structure into
554 * the player structure, so this one (which is from init_sockets)
555 * is not needed anymore. The write below should still work, as the
556 * stuff in ns is still relevant.
557 */
558 ns->send_packet ("addme_success");
559 socket_info.nconns--;
560 ns->status = Ns_Avail;
561 }
562
563 settings = oldsettings;
564} 374}
565 375
566/** Reply to ExtendedInfos command */ 376/** Reply to ExtendedInfos command */
567void 377void
568ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 378ToggleExtendedInfos (char *buf, int len, client * ns)
569{ 379{
570 char cmdback[MAX_BUF]; 380 char cmdback[MAX_BUF];
571 char command[50]; 381 char command[50];
572 int info, nextinfo; 382 int info, nextinfo;
573 383
… …
624#define MSG_TYPE_MONUMENT 5 434#define MSG_TYPE_MONUMENT 5
625#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 435#define MSG_TYPE_SCRIPTED_DIALOG 6*/
626 436
627/** Reply to ExtendedInfos command */ 437/** Reply to ExtendedInfos command */
628void 438void
629ToggleExtendedText (char *buf, int len, NewSocket * ns) 439ToggleExtendedText (char *buf, int len, client * ns)
630{ 440{
631 char cmdback[MAX_BUF]; 441 char cmdback[MAX_BUF];
632 char temp[10]; 442 char temp[10];
633 char command[50]; 443 char command[50];
634 int info, nextinfo, i, flag; 444 int info, nextinfo, i, flag;
… …
678 488
679 ns->send_packet (cmdback); 489 ns->send_packet (cmdback);
680} 490}
681 491
682/** 492/**
683 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 493 * client requested an image. send it rate-limited
684 * Basically, it makes no sense to wait for the client to request a 494 * before flushing.
685 * a piece of data from us that we know the client wants. So
686 * if we know the client wants it, might as well push it to the
687 * client.
688 */
689static void
690SendSmooth (NewSocket * ns, uint16 face)
691{
692 uint16 smoothface;
693
694 /* If we can't find a face, return and set it so we won't try to send this
695 * again.
696 */ 495 */
697 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 496void
698 { 497AskFaceCmd (char *buf, int len, client *ns)
699 498{
700 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 499 ns->askface.push_back (atoi (buf));
701 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
702 return;
703 }
704
705 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
706 esrv_send_face (ns, smoothface, 0);
707
708 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
709
710 packet sl;
711
712 sl << "smooth "
713 << uint16 (face)
714 << uint16 (smoothface);
715
716 Send_With_Handling (ns, &sl);
717} 500}
718 501
719 /** 502/**
720 * Tells client the picture it has to use 503 * Tells client the picture it has to use
721 * to smooth a picture number given as argument. 504 * to smooth a picture number given as argument.
722 */ 505 */
723void 506void
724AskSmooth (char *buf, int len, NewSocket * ns) 507AskSmooth (char *buf, int len, client *ns)
725{ 508{
726 uint16 facenbr; 509 ns->send_face (atoi (buf));
727 510 ns->flush_fx ();
728 facenbr = atoi (buf);
729 SendSmooth (ns, facenbr);
730} 511}
731 512
732/** 513/**
733 * This handles the general commands from the client (ie, north, fire, cast, 514 * This handles the general commands from the client (ie, north, fire, cast,
734 * etc.) 515 * etc.)
735 */ 516 */
736void 517void
737PlayerCmd (char *buf, int len, player *pl) 518PlayerCmd (char *buf, int len, player *pl)
738{ 519{
739
740 /* The following should never happen with a proper or honest client.
741 * Therefore, the error message doesn't have to be too clear - if
742 * someone is playing with a hacked/non working client, this gives them
743 * an idea of the problem, but they deserve what they get
744 */
745 if (pl->state != ST_PLAYING)
746 {
747 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
748 return;
749 }
750 /* Check if there is a count. In theory, a zero count could also be 520 /* Check if there is a count. In theory, a zero count could also be
751 * sent, so check for that also. 521 * sent, so check for that also.
752 */ 522 */
753 if (atoi (buf) || buf[0] == '0') 523 if (atoi (buf) || buf[0] == '0')
754 { 524 {
755 pl->count = atoi ((char *) buf); 525 pl->count = atoi ((char *) buf);
526
756 buf = strchr (buf, ' '); /* advance beyond the numbers */ 527 buf = strchr (buf, ' '); /* advance beyond the numbers */
757 if (!buf) 528 if (!buf)
758 {
759#ifdef ESRV_DEBUG
760 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
761#endif
762 return; 529 return;
763 } 530
764 buf++; 531 buf++;
765 } 532 }
766 /* This should not happen anymore. */ 533
767 if (pl->ob->speed_left < -1.0)
768 {
769 LOG (llevError, "Player has negative time - shouldn't do command.\n");
770 }
771 /* In c_new.c */
772 execute_newserver_command (pl->ob, (char *) buf); 534 execute_newserver_command (pl->ob, (char *) buf);
773 /* Perhaps something better should be done with a left over count.
774 * Cleaning up the input should probably be done first - all actions
775 * for the command that issued the count should be done before any other
776 * commands.
777 */
778 535
779 pl->count = 0;
780
781}
782
783
784/**
785 * This handles the general commands from the client (ie, north, fire, cast,
786 * etc.). It is a lot like PlayerCmd above, but is called with the
787 * 'ncom' method which gives more information back to the client so it
788 * can throttle.
789 */
790void
791NewPlayerCmd (uint8 * buf, int len, player *pl)
792{
793 int time, repeat;
794 char command[MAX_BUF];
795 int pktlen;
796
797 if (len < 7)
798 {
799 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
800 return;
801 }
802
803 pktlen = net_uint16 (buf);
804 repeat = net_uint32 (buf + 2);
805
806 /* -1 is special - no repeat, but don't update */
807 if (repeat != -1)
808 pl->count = repeat;
809
810 if ((len - 4) >= MAX_BUF)
811 len = MAX_BUF - 5;
812
813 strncpy ((char *) command, (char *) buf + 6, len - 4);
814 command[len - 4] = '\0';
815
816 /* The following should never happen with a proper or honest client.
817 * Therefore, the error message doesn't have to be too clear - if
818 * someone is playing with a hacked/non working client, this gives them
819 * an idea of the problem, but they deserve what they get
820 */
821 if (pl->state != ST_PLAYING)
822 {
823 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
824 return;
825 }
826
827 /* This should not happen anymore. */
828 if (pl->ob->speed_left < -1.0)
829 LOG (llevError, "Player has negative time - shouldn't do command.\n");
830
831 /* In c_new.c */
832 execute_newserver_command (pl->ob, (char *) command);
833 /* Perhaps something better should be done with a left over count. 536 /* Perhaps something better should be done with a left over count.
834 * Cleaning up the input should probably be done first - all actions 537 * Cleaning up the input should probably be done first - all actions
835 * for the command that issued the count should be done before any other 538 * for the command that issued the count should be done before any other
836 * commands. 539 * commands.
837 */ 540 */
838 pl->count = 0; 541 pl->count = 0;
542}
839 543
840 if (FABS (pl->ob->speed) < 0.001) 544
545/**
546 * This handles the general commands from the client (ie, north, fire, cast,
547 * etc.). It is a lot like PlayerCmd above, but is called with the
548 * 'ncom' method which gives more information back to the client so it
549 * can throttle.
550 */
551void
552NewPlayerCmd (char *buf, int len, player *pl)
553{
554 if (len <= 6)
555 {
556 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
557 return;
558 }
559
560 uint16 cmdid = net_uint16 ((uint8 *)buf);
561 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
562
563 /* -1 is special - no repeat, but don't update */
564 if (repeat != -1)
565 pl->count = repeat;
566
567 buf += 6; //len -= 6;
568
569 execute_newserver_command (pl->ob, buf);
570
571 /* Perhaps something better should be done with a left over count.
572 * Cleaning up the input should probably be done first - all actions
573 * for the command that issued the count should be done before any other
574 * commands.
575 */
576 pl->count = 0;
577
578 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
579 int time = fabs (pl->ob->speed) < 0.001
841 time = MAX_TIME * 100; 580 ? time = MAX_TIME * 100
842 else
843 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 581 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
844 582
845 /* Send confirmation of command execution now */ 583 /* Send confirmation of command execution now */
846 584 packet sl ("comc");
847 packet sl;
848 sl << "comc " << uint16 (pktlen) << uint32 (time); 585 sl << uint16 (cmdid) << uint32 (time);
849 Send_With_Handling (&pl->socket, &sl); 586 pl->ns->send_packet (sl);
850} 587}
851
852 588
853/** This is a reply to a previous query. */ 589/** This is a reply to a previous query. */
854void 590void
855ReplyCmd (char *buf, int len, player *pl) 591ReplyCmd (char *buf, int len, client *ns)
856{ 592{
593 if (ns->state == ST_CUSTOM)
594 {
595 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
596 return;
597 }
598
599 if (!ns->pl)
600 return; //TODO: depends on the exact reply we are after
601 //TODO: but right now, we always have a ns->pl
602
603 player *pl = ns->pl;
604
857 /* This is to synthesize how the data would be stored if it 605 /* This is to synthesize how the data would be stored if it
858 * was normally entered. A bit of a hack, and should be cleaned up 606 * was normally entered. A bit of a hack, and should be cleaned up
859 * once all the X11 code is removed from the server. 607 * once all the X11 code is removed from the server.
860 * 608 *
861 * We pass 13 to many of the functions because this way they 609 * We pass 13 to many of the functions because this way they
862 * think it was the carriage return that was entered, and the 610 * think it was the carriage return that was entered, and the
863 * function then does not try to do additional input. 611 * function then does not try to do additional input.
864 */ 612 */
865 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 613 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
866 614
867 /* this avoids any hacking here */ 615 /* this avoids any hacking here */
868 616
869 switch (pl->state) 617 switch (ns->state)
870 { 618 {
871 case ST_PLAYING: 619 case ST_PLAYING:
872 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 620 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
873 break; 621 break;
874 622
875 case ST_PLAY_AGAIN:
876 /* We can check this for return value (2==quit). Maybe we
877 * should, and do something appropriate?
878 */
879 receive_play_again (pl->ob, buf[0]);
880 break;
881
882 case ST_ROLL_STAT:
883 key_roll_stat (pl->ob, buf[0]);
884 break;
885
886 case ST_CHANGE_CLASS: 623 case ST_CHANGE_CLASS:
887
888 key_change_class (pl->ob, buf[0]); 624 key_change_class (pl->ob, buf[0]);
889 break; 625 break;
890 626
891 case ST_CONFIRM_QUIT:
892 key_confirm_quit (pl->ob, buf[0]);
893 break;
894
895 case ST_CONFIGURE:
896 LOG (llevError, "In client input handling, but into configure state\n");
897 pl->state = ST_PLAYING;
898 break;
899
900 case ST_GET_NAME:
901 receive_player_name (pl->ob, 13);
902 break;
903
904 case ST_GET_PASSWORD:
905 case ST_CONFIRM_PASSWORD:
906 receive_player_password (pl->ob, 13);
907 break;
908
909 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 627 case ST_GET_PARTY_PASSWORD: /* Get password for party */
910 receive_party_password (pl->ob, 13); 628 receive_party_password (pl->ob, 13);
911 break; 629 break;
912 630
913 default: 631 default:
914 LOG (llevError, "Unknown input state: %d\n", pl->state); 632 LOG (llevError, "Unknown input state: %d\n", ns->state);
915 } 633 }
916} 634}
917 635
918/** 636/**
919 * Client tells its version. If there is a mismatch, we close the 637 * Client tells its version. If there is a mismatch, we close the
… …
921 * something older than the server. If we assume the client will be 639 * something older than the server. If we assume the client will be
922 * backwards compatible, having it be a later version should not be a 640 * backwards compatible, having it be a later version should not be a
923 * problem. 641 * problem.
924 */ 642 */
925void 643void
926VersionCmd (char *buf, int len, NewSocket * ns) 644VersionCmd (char *buf, int len, client * ns)
927{ 645{
928 char *cp;
929 char version_warning[256];
930
931 if (!buf) 646 if (!buf)
932 { 647 {
933 LOG (llevError, "CS: received corrupted version command\n"); 648 LOG (llevError, "CS: received corrupted version command\n");
934 return; 649 return;
935 } 650 }
936 651
937 ns->cs_version = atoi (buf); 652 ns->cs_version = atoi (buf);
938 ns->sc_version = ns->cs_version; 653 ns->sc_version = ns->cs_version;
654
655 LOG (llevDebug, "connection from client <%s>\n", buf);
656
657 //TODO: should log here just for statistics
658
939 if (VERSION_CS != ns->cs_version) 659 //if (VERSION_CS != ns->cs_version)
940 { 660 // unchecked;
941#ifdef ESRV_DEBUG 661
942 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
943#endif
944 }
945 cp = strchr (buf + 1, ' '); 662 char *cp = strchr (buf + 1, ' ');
946 if (!cp) 663 if (!cp)
947 return; 664 return;
665
948 ns->sc_version = atoi (cp); 666 ns->sc_version = atoi (cp);
667
949 if (VERSION_SC != ns->sc_version) 668 //if (VERSION_SC != ns->sc_version)
950 { 669 // unchecked;
951#ifdef ESRV_DEBUG 670
952 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
953#endif
954 }
955 cp = strchr (cp + 1, ' '); 671 cp = strchr (cp + 1, ' ');
672
956 if (cp) 673 if (cp)
957 { 674 {
958 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 675 assign (ns->version, cp + 1);
959 676
960 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
961
962 /* This is first implementation - i skip all beta DX clients with it
963 * Add later stuff here for other clients
964 */
965
966 /* these are old dxclients */
967 /* Version 1024 added support for singular + plural name values -
968 * requiing this minimal value reduces complexity of that code, and it
969 * has been around for a long time.
970 */
971 if (ns->sc_version < 1026) 677 if (ns->sc_version < 1026)
972 { 678 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 679 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 ns->send_packet (version_warning);
976 }
977
978 } 680 }
979} 681}
980 682
981/** sound related functions. */ 683/** sound related functions. */
982
983void 684void
984SetSound (char *buf, int len, NewSocket * ns) 685SetSound (char *buf, int len, client * ns)
985{ 686{
986 ns->sound = atoi (buf); 687 ns->sound = atoi (buf);
987} 688}
988 689
989/** client wants the map resent */ 690/** client wants the map resent */
990
991void 691void
992MapRedrawCmd (char *buf, int len, player *pl) 692MapRedrawCmd (char *buf, int len, player *pl)
993{ 693{
994
995/* This function is currently disabled; just clearing the map state results in 694/* This function is currently disabled; just clearing the map state results in
996 * display errors. It should clear the cache and send a newmap command. 695 * display errors. It should clear the cache and send a newmap command.
997 * Unfortunately this solution does not work because some client versions send 696 * Unfortunately this solution does not work because some client versions send
998 * a mapredraw command after receiving a newmap command. 697 * a mapredraw command after receiving a newmap command.
999 */ 698 */
1000#if 0
1001 /* Okay, this is MAJOR UGLY. but the only way I know how to
1002 * clear the "cache"
1003 */
1004 memset (&pl->socket.lastmap, 0, sizeof (struct Map));
1005 draw_client_map (pl->ob);
1006#endif
1007} 699}
1008 700
1009/** 701/**
1010 * Moves an object (typically, container to inventory). 702 * Moves an object (typically, container to inventory).
1011 * syntax is: move (to) (tag) (nrof) 703 * syntax is: move (to) (tag) (nrof)
… …
1014MoveCmd (char *buf, int len, player *pl) 706MoveCmd (char *buf, int len, player *pl)
1015{ 707{
1016 int vals[3], i; 708 int vals[3], i;
1017 709
1018 /* A little funky here. We only cycle for 2 records, because 710 /* A little funky here. We only cycle for 2 records, because
1019 * we obviously am not going to find a space after the third 711 * we obviously are not going to find a space after the third
1020 * record. Perhaps we should just replace this with a 712 * record. Perhaps we should just replace this with a
1021 * sscanf? 713 * sscanf?
1022 */ 714 */
1023 for (i = 0; i < 2; i++) 715 for (i = 0; i < 2; i++)
1024 { 716 {
1025 vals[i] = atoi (buf); 717 vals[i] = atoi (buf);
718
1026 if (!(buf = strchr (buf, ' '))) 719 if (!(buf = strchr (buf, ' ')))
1027 { 720 {
1028 LOG (llevError, "Incomplete move command: %s\n", buf); 721 LOG (llevError, "Incomplete move command: %s\n", buf);
1029 return; 722 return;
1030 } 723 }
724
1031 buf++; 725 buf++;
1032 } 726 }
727
1033 vals[2] = atoi (buf); 728 vals[2] = atoi (buf);
1034 729
1035/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 730/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1036 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 731 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1037} 732}
1038
1039
1040 733
1041/****************************************************************************** 734/******************************************************************************
1042 * 735 *
1043 * Start of commands the server sends to the client. 736 * Start of commands the server sends to the client.
1044 * 737 *
… …
1047/** 740/**
1048 * Asks the client to query the user. This way, the client knows 741 * Asks the client to query the user. This way, the client knows
1049 * it needs to send something back (vs just printing out a message) 742 * it needs to send something back (vs just printing out a message)
1050 */ 743 */
1051void 744void
1052send_query (NewSocket * ns, uint8 flags, char *text) 745send_query (client *ns, uint8 flags, const char *text)
1053{ 746{
1054 char buf[MAX_BUF];
1055
1056 sprintf (buf, "query %d %s", flags, text ? text : ""); 747 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1057 ns->send_packet (buf);
1058} 748}
1059 749
1060#define AddIfInt64(Old,New,Type) if (Old != New) {\ 750#define AddIfInt64(Old,New,Type) if (Old != New) {\
1061 Old = New; \ 751 Old = New; \
1062 sl << uint8 (Type) << uint64 (New); \ 752 sl << uint8 (Type) << uint64 (New); \
… …
1092esrv_update_stats (player *pl) 782esrv_update_stats (player *pl)
1093{ 783{
1094 char buf[MAX_BUF]; 784 char buf[MAX_BUF];
1095 uint16 flags; 785 uint16 flags;
1096 786
1097 packet sl; 787 client *ns = pl->ns;
1098 sl << "stats "; 788 if (!ns)
789 return;
1099 790
1100 if (pl->ob != NULL) 791 object *ob = pl->ob;
1101 { 792 if (!ob)
793 return;
794
795 packet sl ("stats");
796
1102 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 797 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1103 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 798 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1104 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 799 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1105 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 800 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1106 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 801 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1107 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 802 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1108 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 803 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1109 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1110 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1111 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1112 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 804 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1113 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 805 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
806 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
807 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
808 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1114 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 809 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1115 }
1116 810
1117 if (pl->socket.exp64)
1118 {
1119 uint8 s;
1120
1121 for (s = 0; s < NUM_SKILLS; s++) 811 for (int s = 0; s < NUM_SKILLS; s++)
812 if (object *skill = pl->last_skill_ob[s])
813 if (skill->stats.exp != ns->last_skill_exp [s])
1122 { 814 {
1123 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 815 ns->last_skill_exp [s] = skill->stats.exp;
1124 { 816
1125 /* Always send along the level if exp changes. This is only 817 /* Always send along the level if exp changes. This is only
1126 * 1 extra byte, but keeps processing simpler. 818 * 1 extra byte, but keeps processing simpler.
1127 */ 819 */
1128 sl << uint8 (s + CS_STAT_SKILLINFO) 820 sl << uint8 (s + CS_STAT_SKILLINFO)
1129 << uint8 (pl->last_skill_ob[s]->level) 821 << uint8 (skill->level)
1130 << uint64 (pl->last_skill_ob[s]->stats.exp); 822 << uint64 (skill->stats.exp);
1131
1132 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1133 }
1134 } 823 }
1135 }
1136 824
1137 if (pl->socket.exp64)
1138 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 825 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1139 else
1140 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1141
1142 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 826 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1143 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 827 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1144 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 828 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1145 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 829 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1146 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 830 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1147 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 831 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1148 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 832 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1149 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 833 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
834
1150 flags = 0; 835 flags = 0;
1151 836
1152 if (pl->fire_on) 837 if (pl->fire_on)
1153 flags |= SF_FIREON; 838 flags |= SF_FIREON;
1154 839
1155 if (pl->run_on) 840 if (pl->run_on)
1156 flags |= SF_RUNON; 841 flags |= SF_RUNON;
1157 842
1158 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 843 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1159 844
1160 if (pl->socket.sc_version < 1025) 845 if (ns->sc_version < 1025)
1161 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 846 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1162 else 847 else
1163 {
1164 int i;
1165
1166 for (i = 0; i < NROFATTACKS; i++) 848 for (int i = 0; i < NROFATTACKS; i++)
1167 { 849 {
1168 /* Skip ones we won't send */ 850 /* Skip ones we won't send */
1169 if (atnr_cs_stat[i] == -1) 851 if (atnr_cs_stat[i] == -1)
1170 continue; 852 continue;
1171 853
1172 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 854 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1173 } 855 }
1174 }
1175 856
1176 if (pl->socket.monitor_spells) 857 if (pl->ns->monitor_spells)
1177 { 858 {
1178 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 859 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1179 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 860 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1180 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 861 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1181 } 862 }
1182 863
1183 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 864 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1184 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 865 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1185 set_title (pl->ob, buf); 866 set_title (ob, buf);
1186 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 867 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1187 868
1188 /* Only send it away if we have some actual data */ 869 /* Only send it away if we have some actual data */
1189 if (sl.len > 6) 870 if (sl.length () > 6)
1190 { 871 ns->send_packet (sl);
1191#ifdef ESRV_DEBUG
1192 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1193#endif
1194 Send_With_Handling (&pl->socket, &sl);
1195 }
1196
1197} 872}
1198 873
1199/** 874/**
1200 * Tells the client that here is a player it should start using. 875 * Tells the client that here is a player it should start using.
1201 */ 876 */
1202void 877void
1203esrv_new_player (player *pl, uint32 weight) 878esrv_new_player (player *pl, uint32 weight)
1204{ 879{
1205 pl->last_weight = weight; 880 packet sl ("player");
1206
1207 packet sl;
1208 sl << "player ";
1209 881
1210 sl << uint32 (pl->ob->count) 882 sl << uint32 (pl->ob->count)
1211 << uint32 (weight) 883 << uint32 (weight)
1212 << uint32 (pl->ob->face->number) 884 << uint32 (pl->ob->face)
1213 << data8 (pl->ob->name); 885 << data8 (pl->ob->name);
1214 886
1215 Send_With_Handling (&pl->socket, &sl); 887 pl->ns->last_weight = weight;
888 pl->ns->send_packet (sl);
1216 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1217} 890}
1218
1219/**
1220 * Need to send an animation sequence to the client.
1221 * We will send appropriate face commands to the client if we haven't
1222 * sent them the face yet (this can become quite costly in terms of
1223 * how much we are sending - on the other hand, this should only happen
1224 * when the player logs in and picks stuff up.
1225 */
1226void
1227esrv_send_animation (NewSocket * ns, short anim_num)
1228{
1229 int i;
1230
1231 /* Do some checking on the anim_num we got. Note that the animations
1232 * are added in contigous order, so if the number is in the valid
1233 * range, it must be a valid animation.
1234 */
1235 if (anim_num < 0 || anim_num > num_animations)
1236 {
1237 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1238 return;
1239 }
1240
1241 packet sl;
1242
1243 sl << "anim "
1244 << uint16 (anim_num)
1245 << uint16 (0); /* flags - not used right now */
1246
1247 /* Build up the list of faces. Also, send any information (ie, the
1248 * the face itself) down to the client.
1249 */
1250 for (i = 0; i < animations[anim_num].num_animations; i++)
1251 {
1252 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1253 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1254 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1255 }
1256
1257 Send_With_Handling (ns, &sl);
1258
1259 ns->anims_sent[anim_num] = 1;
1260}
1261
1262 891
1263/****************************************************************************** 892/******************************************************************************
1264 * 893 *
1265 * Start of map related commands. 894 * Start of map related commands.
1266 * 895 *
1267 ******************************************************************************/ 896 ******************************************************************************/
1268 897
1269/**
1270 * This adds face_num to a map cell at x,y. If the client doesn't have
1271 * the face yet, we will also send it.
1272 */
1273static void
1274esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
1275{
1276 if (newmap->cells[x][y].count >= MAP_LAYERS)
1277 {
1278 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1279 return;
1280 abort ();
1281 }
1282
1283 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1284 newmap->cells[x][y].count++;
1285
1286 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1287 esrv_send_face (ns, face_num, 0);
1288}
1289
1290struct LayerCell
1291{
1292 uint16 xy;
1293 short face;
1294};
1295
1296struct MapLayer
1297{
1298 int count;
1299 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1300};
1301
1302/** Checkes if map cells have changed */
1303static int
1304mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1305{
1306 int k;
1307
1308 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1309 return 1;
1310 for (k = 0; k < newmap->cells[i][j].count; k++)
1311 {
1312 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1313 {
1314 return 1;
1315 }
1316 }
1317 return 0;
1318}
1319
1320/**
1321 * Basically, what this does is pack the data into layers.
1322 * cnum is the client number, cur is the the buffer we put all of
1323 * this data into. we return the end of the data. layers is
1324 * how many layers of data we should back.
1325 */
1326static uint8 *
1327compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1328{
1329 int x, y, k;
1330 int face;
1331 unsigned char *fcur;
1332 struct MapLayer layers[MAP_LAYERS];
1333
1334 for (k = 0; k < MAP_LAYERS; k++)
1335 layers[k].count = 0;
1336 fcur = cur;
1337 for (x = 0; x < ns->mapx; x++)
1338 {
1339 for (y = 0; y < ns->mapy; y++)
1340 {
1341 if (!mapcellchanged (ns, x, y, newmap))
1342 continue;
1343 if (newmap->cells[x][y].count == 0)
1344 {
1345 *cur = x * ns->mapy + y; /* mark empty space */
1346 cur++;
1347 continue;
1348 }
1349 for (k = 0; k < newmap->cells[x][y].count; k++)
1350 {
1351 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1352 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1353 layers[k].count++;
1354 }
1355 }
1356 }
1357 /* If no data, return now. */
1358 if (fcur == cur && layers[0].count == 0)
1359 return cur;
1360 *cur = 255; /* mark end of explicitly cleared cells */
1361 cur++;
1362 /* First pack by layers. */
1363 for (k = 0; k < numlayers; k++)
1364 {
1365 if (layers[k].count == 0)
1366 break; /* once a layer is entirely empty, no layer below it can
1367 have anything in it either */
1368 /* Pack by entries in thie layer */
1369 for (x = 0; x < layers[k].count;)
1370 {
1371 fcur = cur;
1372 *cur = layers[k].lcells[x].face >> 8;
1373 cur++;
1374 *cur = layers[k].lcells[x].face & 0xFF;
1375 cur++;
1376 face = layers[k].lcells[x].face;
1377 /* Now, we back the redundant data into 1 byte xy pairings */
1378 for (y = x; y < layers[k].count; y++)
1379 {
1380 if (layers[k].lcells[y].face == face)
1381 {
1382 *cur = (uint8) layers[k].lcells[y].xy;
1383 cur++;
1384 layers[k].lcells[y].face = -1;
1385 }
1386 }
1387 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1388 /* forward over the now redundant data */
1389 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1390 x++;
1391 }
1392 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1393 }
1394 return cur;
1395}
1396
1397static void
1398esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1399{
1400 static long frames, bytes, tbytes, tframes;
1401 char *cur;
1402
1403 packet sl;
1404 sl << "map ";
1405
1406 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1407 sl.len = cur - (char *) sl.buf;
1408
1409/* LOG(llevDebug, "Sending map command.\n");*/
1410
1411 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1412 {
1413 /* All of this is just accounting stuff */
1414 if (tframes > 100)
1415 tframes = tbytes = 0;
1416
1417 tframes++;
1418 frames++;
1419 tbytes += sl.len;
1420 bytes += sl.len;
1421 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1422 Send_With_Handling (ns, &sl);
1423 ns->sent_scroll = 0;
1424 }
1425
1426}
1427
1428
1429/** Clears a map cell */ 898/** Clears a map cell */
1430static void 899static void
1431map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 900map_clearcell (struct MapCell *cell, int count)
1432{ 901{
1433 cell->faces[0] = face0; 902 cell->faces[0] = 0;
1434 cell->faces[1] = face1; 903 cell->faces[1] = 0;
1435 cell->faces[2] = face2; 904 cell->faces[2] = 0;
905 cell->smooth[0] = 0;
906 cell->smooth[1] = 0;
907 cell->smooth[2] = 0;
1436 cell->count = count; 908 cell->count = count;
1437 cell->stat_hp = 0; 909 cell->stat_hp = 0;
1438 cell->flags = 0; 910 cell->flags = 0;
1439 cell->player = 0; 911 cell->player = 0;
1440} 912}
1441 913
1442#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1443#define MAX_LAYERS 3 914#define MAX_LAYERS 3
1444
1445/* Using a global really isn't a good approach, but saves the over head of
1446 * allocating and deallocating such a block of data each time run through,
1447 * and saves the space of allocating this in the socket object when we only
1448 * need it for this cycle. If the serve is ever threaded, this needs to be
1449 * re-examined.
1450 */
1451
1452static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1453
1454/**
1455 * Returns true if any of the heads for this
1456 * space is set. Returns false if all are blank - this is used
1457 * for empty space checking.
1458 */
1459static inline int
1460have_head (int ax, int ay)
1461{
1462
1463 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1464 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1465 return 1;
1466 return 0;
1467}
1468
1469/**
1470 * check_head is a bit simplistic version of update_space below.
1471 * basically, it only checks the that the head on space ax,ay at layer
1472 * needs to get sent - if so, it adds the data, sending the head
1473 * if needed, and returning 1. If this no data needs to get
1474 * sent, it returns zero.
1475 */
1476static int
1477check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer)
1478{
1479 short face_num;
1480
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1483 else
1484 face_num = 0;
1485
1486 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1487 {
1488 sl << uint16 (face_num);
1489 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1490 esrv_send_face (&ns, face_num, 0);
1491
1492 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1493 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1494 return 1;
1495 }
1496
1497 return 0; /* No change */
1498}
1499 915
1500/** 916/**
1501 * Removes the need to replicate the same code for each layer. 917 * Removes the need to replicate the same code for each layer.
1502 * this returns true if this space is now in fact different than 918 * this returns true if this space is now in fact different than
1503 * it was. 919 * it was.
1504 * sl is the socklist this data is going into. 920 * sl is the socklist this data is going into.
1505 * ns is the socket we are working on - all the info we care 921 * ns is the socket we are working on - all the info we care
1506 * about is in this socket structure, so now need not pass the 922 * about is in this socket structure, so now need not pass the
1507 * entire player object. 923 * entire player object.
1508 * mx and my are map coordinate offsets for map mp
1509 * sx and sy are the offsets into the socket structure that
1510 * holds the old values.
1511 * layer is the layer to update, with 2 being the floor and 0 the 924 * layer is the layer to update, with 2 being the floor and 0 the
1512 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 925 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1513 * take. Interesting to note that before this function, the map1 function 926 * take. Interesting to note that before this function, the map1 function
1514 * numbers the spaces differently - I think this was a leftover from 927 * numbers the spaces differently - I think this was a leftover from
1515 * the map command, where the faces stack up. Sinces that is no longer 928 * the map command, where the faces stack up. Sinces that is no longer
1516 * the case, it seems to make more sense to have these layer values 929 * the case, it seems to make more sense to have these layer values
1517 * actually match. 930 * actually match.
1518 */ 931 */
1519
1520static int 932static int
1521update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 933update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1522{ 934{
1523 object *ob, *head; 935 object *ob = ms.faces_obj [layer];
1524 uint16 face_num;
1525 int bx, by, i;
1526
1527 /* If there is a multipart object stored away, treat that as more important.
1528 * If not, then do the normal processing.
1529 */
1530 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1531
1532 /* Check to see if this head is part of the set of objects
1533 * we would normally send for this space. If so, then
1534 * don't use the head value. We need to do the check
1535 * here and not when setting up the heads[] value for two reasons -
1536 * 1) the heads[] values will get used even if the space is not visible.
1537 * 2) its possible the head is not on the same map as a part, and I'd
1538 * rather not need to do the map translation overhead.
1539 * 3) We need to do some extra checking to make sure that we will
1540 * otherwise send the image as this layer, eg, either it matches
1541 * the head value, or is not multipart.
1542 */
1543 if (head && !head->more)
1544 {
1545 for (i = 0; i < MAP_LAYERS; i++)
1546 {
1547 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1548 if (!ob)
1549 continue;
1550
1551 if (ob->head)
1552 ob = ob->head;
1553
1554 if (ob == head)
1555 {
1556 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1557 head = NULL;
1558 break;
1559 }
1560 }
1561 }
1562
1563 ob = head;
1564 if (!ob)
1565 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1566 936
1567 /* If there is no object for this space, or if the face for the object 937 /* If there is no object for this space, or if the face for the object
1568 * is the blank face, set the face number to zero. 938 * is the blank face, set the face number to zero.
1569 * else if we have the stored head object for this space, that takes 939 * else if we have the stored head object for this space, that takes
1570 * precedence over the other object for this space. 940 * precedence over the other object for this space.
1571 * otherwise, we do special head processing 941 * otherwise, we do special head processing
1572 */ 942 */
1573 if (!ob || ob->face == blank_face) 943 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1574 face_num = 0;
1575 else if (head)
1576 {
1577 /* if this is a head that had previously been stored */
1578 face_num = ob->face->number;
1579 }
1580 else
1581 {
1582 /* if the faces for the different parts of a multipart object
1583 * are the same, we only want to send the bottom right most
1584 * portion of the object. That info is in the tail_.. values
1585 * of the head. Note that for the head itself, ob->head will
1586 * be null, so we only do this block if we are working on
1587 * a tail piece.
1588 */
1589
1590 /* tail_x and tail_y will only be set in the head object. If
1591 * this is the head object and these are set, we proceed
1592 * with logic to only send bottom right. Similarly, if
1593 * this is one of the more parts but the head has those values
1594 * set, we want to do the processing. There can be cases where
1595 * the head is not visible but one of its parts is, so we just
1596 * can always expect that ob->arch->tail_x will be true for all
1597 * object we may want to display.
1598 */
1599 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1600 {
1601
1602 if (ob->head)
1603 head = ob->head;
1604 else
1605 head = ob;
1606
1607 /* Basically figure out where the offset is from where we are right
1608 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1609 * piece is from the head, and the tail is where the tail is from the
1610 * head. Note that bx and by will equal sx and sy if we are already working
1611 * on the bottom right corner. If ob is the head, the clone values
1612 * will be zero, so the right thing will still happen.
1613 */
1614 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1615 by = sy + head->arch->tail_y - ob->arch->clone.y;
1616
1617 /* I don't think this can ever happen, but better to check for it just
1618 * in case.
1619 */
1620 if (bx < sx || by < sy)
1621 {
1622 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1623 face_num = 0;
1624 }
1625 /* single part object, multipart object with non merged faces,
1626 * of multipart object already at lower right.
1627 */
1628 else if (bx == sx && by == sy)
1629 {
1630 face_num = ob->face->number;
1631
1632 /* if this face matches one stored away, clear that one away.
1633 * this code relies on the fact that the map1 commands
1634 * goes from 2 down to 0.
1635 */
1636 for (i = 0; i < MAP_LAYERS; i++)
1637 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1638 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1639 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1640 }
1641 else
1642 {
1643 /* If this head is stored away, clear it - otherwise,
1644 * there can be cases where a object is on multiple layers -
1645 * we only want to send it once.
1646 */
1647 face_num = head->face->number;
1648 for (i = 0; i < MAP_LAYERS; i++)
1649 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1650 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1651 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1652
1653 /* First, try to put the new head on the same layer. If that is used up,
1654 * then find another layer.
1655 */
1656 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1657 {
1658 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1659 }
1660 else
1661 for (i = 0; i < MAX_LAYERS; i++)
1662 {
1663 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1664 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1665 {
1666 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1667 }
1668 }
1669 face_num = 0; /* Don't send this object - we'll send the head later */
1670 }
1671 }
1672 else
1673 {
1674 /* In this case, we are already at the lower right or single part object,
1675 * so nothing special
1676 */
1677 face_num = ob->face->number;
1678
1679 /* clear out any head entries that have the same face as this one */
1680 for (bx = 0; bx < layer; bx++)
1681 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1682 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1683 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1684 }
1685 } /* else not already head object or blank face */
1686
1687 /* This is a real hack. Basically, if we have nothing to send for this layer,
1688 * but there is a head on the next layer, send that instead.
1689 * Without this, what happens is you can get the case where the player stands
1690 * on the same space as the head. However, if you have overlapping big objects
1691 * of the same type, what happens then is it doesn't think it needs to send
1692 * This tends to make stacking also work/look better.
1693 */
1694 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1695 {
1696 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1697 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1698 }
1699
1700 /* Another hack - because of heads and whatnot, this face may match one
1701 * we already sent for a lower layer. In that case, don't send
1702 * this one.
1703 */
1704 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1705 face_num = 0;
1706 944
1707 /* We've gotten what face we want to use for the object. Now see if 945 /* We've gotten what face we want to use for the object. Now see if
1708 * if it has changed since we last sent it to the client. 946 * if it has changed since we last sent it to the client.
1709 */ 947 */
1710 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 948 if (lastcell.faces[layer] != face_num)
1711 { 949 {
1712 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 950 lastcell.faces[layer] = face_num;
951
1713 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 952 if (!ns.faces_sent[face_num])
953 if (ob)
954 ns.send_faces (ob);
955 else
1714 esrv_send_face (&ns, face_num, 0); 956 ns.send_face (face_num);
1715 957
1716 sl << uint16 (face_num); 958 sl << uint16 (face_num);
1717 return 1;
1718 }
1719
1720 /* Nothing changed */
1721 return 0;
1722}
1723
1724/**
1725 * This function is mainly a copy of update_space,
1726 * except it handles update of the smoothing updates,
1727 * not the face updates.
1728 * Removes the need to replicate the same code for each layer.
1729 * this returns true if this smooth is now in fact different
1730 * than it was.
1731 * sl is the socklist this data is going into.
1732 * ns is the socket we are working on - all the info we care
1733 * about is in this socket structure, so know need to pass the
1734 * entire player object.
1735 * mx and my are map coordinate offsets for map mp
1736 * sx and sy are the offsets into the socket structure that
1737 * holds the old values.
1738 * layer is the layer to update, with 2 being the floor and 0 the
1739 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1740 * take.
1741 */
1742
1743static inline int
1744update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1745{
1746 object *ob;
1747 int smoothlevel; /* old face_num; */
1748
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1750
1751 /* If there is no object for this space, or if the face for the object
1752 * is the blank face, set the smoothlevel to zero.
1753 */
1754 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1755 smoothlevel = 0;
1756 else
1757 {
1758 smoothlevel = ob->smoothlevel;
1759 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1760 SendSmooth (&ns, ob->face->number);
1761 } /* else not already head object or blank face */
1762
1763 /* We've gotten what face we want to use for the object. Now see if
1764 * if it has changed since we last sent it to the client.
1765 */
1766 if (smoothlevel > 255)
1767 smoothlevel = 255;
1768 else if (smoothlevel < 0)
1769 smoothlevel = 0;
1770
1771 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1772 {
1773 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1774 sl << uint8 (smoothlevel);
1775 return 1; 959 return 1;
1776 } 960 }
1777 961
1778 /* Nothing changed */ 962 /* Nothing changed */
1779 return 0; 963 return 0;
… …
1783 * Returns the size of a data for a map square as returned by 967 * Returns the size of a data for a map square as returned by
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 968 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 969 * available.
1786 */ 970 */
1787int 971int
1788getExtendedMapInfoSize (NewSocket * ns) 972getExtendedMapInfoSize (client * ns)
1789{ 973{
1790 int result = 0; 974 int result = 0;
1791 975
1792 if (ns->ext_mapinfos) 976 if (ns->ext_mapinfos)
1793 { 977 {
1794 if (ns->EMI_smooth) 978 if (ns->EMI_smooth)
1795 result += 1; /*One byte for smoothlevel */ 979 result += 1; /*One byte for smoothlevel */
1796 } 980 }
981
1797 return result; 982 return result;
983}
984
985// prefetch (and touch) all maps within a specific distancd
986static void
987prefetch_surrounding_maps (maptile *map, int distance)
988{
989 map->last_access = runtime;
990
991 if (--distance)
992 for (int dir = 4; --dir; )
993 if (const shstr &path = map->tile_path [dir])
994 if (maptile *&neigh = map->tile_map [dir])
995 prefetch_surrounding_maps (neigh, distance);
996 else
997 neigh = maptile::find_async (path, map);
998}
999
1000// prefetch a generous area around the player
1001static void
1002prefetch_surrounding_maps (object *op)
1003{
1004 prefetch_surrounding_maps (op->map, 3);
1798} 1005}
1799 1006
1800/** 1007/**
1801 * This function uses the new map1 protocol command to send the map 1008 * This function uses the new map1 protocol command to send the map
1802 * to the client. It is necessary because the old map command supports 1009 * to the client. It is necessary because the old map command supports
… …
1808 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1015 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1809 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1016 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1810 * and use the other 4 bits for other informatiion. For full documentation 1017 * and use the other 4 bits for other informatiion. For full documentation
1811 * of what we send, see the doc/Protocol file. 1018 * of what we send, see the doc/Protocol file.
1812 * I will describe internally what we do: 1019 * I will describe internally what we do:
1813 * the socket->lastmap shows how the map last looked when sent to the client. 1020 * the ns->lastmap shows how the map last looked when sent to the client.
1814 * in the lastmap structure, there is a cells array, which is set to the 1021 * in the lastmap structure, there is a cells array, which is set to the
1815 * maximum viewable size (As set in config.h). 1022 * maximum viewable size (As set in config.h).
1816 * in the cells, there are faces and a count value. 1023 * in the cells, there are faces and a count value.
1817 * we use the count value to hold the darkness value. If -1, then this space 1024 * we use the count value to hold the darkness value. If -1, then this space
1818 * is not viewable. 1025 * is not viewable.
… …
1820 * look like. 1027 * look like.
1821 */ 1028 */
1822void 1029void
1823draw_client_map1 (object *pl) 1030draw_client_map1 (object *pl)
1824{ 1031{
1825 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1826 sint16 nx, ny; 1033 sint16 nx, ny;
1827 int estartlen, eoldlen; 1034 int estartlen, eoldlen;
1828 uint16 mask, emask;
1829 uint8 eentrysize; 1035 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1036 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1037 uint8 extendedinfos;
1832 maptile *m; 1038 maptile *m;
1833 1039
1834 NewSocket &socket = pl->contr->socket; 1040 client &socket = *pl->contr->ns;
1041
1042 if (!pl->active)
1043 return;
1835 1044
1836 check_map_change (pl->contr); 1045 check_map_change (pl->contr);
1046 prefetch_surrounding_maps (pl);
1837 1047
1838 packet sl; 1048 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1839 packet esl; 1049 packet esl;
1840 1050
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1842 startlen = sl.len; 1051 startlen = sl.length ();
1843 1052
1844 /*Extendedmapinfo structure initialisation */ 1053 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1054 if (socket.ext_mapinfos)
1846 { 1055 {
1847 extendedinfos = EMI_NOREDRAW; 1056 extendedinfos = EMI_NOREDRAW;
1848 1057
1849 if (socket.EMI_smooth) 1058 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1059 extendedinfos |= EMI_SMOOTH;
1851 1060
1852 ewhatstart = esl.len; 1061 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1062 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1063 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1064 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1065 esl << "mapextended "
1857 << uint8 (extendedinfos) 1066 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1067 << uint8 (eentrysize);
1068
1859 estartlen = esl.len; 1069 estartlen = esl.length ();
1860 }
1861 else
1862 { 1070 }
1863 /* suppress compiler warnings */
1864 ewhatstart = 0;
1865 ewhatflag = 0;
1866 estartlen = 0;
1867 }
1868
1869 /* Init data to zero */
1870 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1871 1071
1872 /* x,y are the real map locations. ax, ay are viewport relative 1072 /* x,y are the real map locations. ax, ay are viewport relative
1873 * locations. 1073 * locations.
1874 */ 1074 */
1875 ay = 0; 1075 ay = 0;
… …
1878 * but that started to get a bit messy to look at. 1078 * but that started to get a bit messy to look at.
1879 */ 1079 */
1880 max_x = pl->x + (socket.mapx + 1) / 2; 1080 max_x = pl->x + (socket.mapx + 1) / 2;
1881 max_y = pl->y + (socket.mapy + 1) / 2; 1081 max_y = pl->y + (socket.mapy + 1) / 2;
1882 1082
1883 if (socket.mapmode == Map1aCmd) 1083 maptile *plmap = pl->map;
1884 {
1885 max_x += MAX_HEAD_OFFSET;
1886 max_y += MAX_HEAD_OFFSET;
1887 }
1888 1084
1889 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1085 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1890 { 1086 {
1891 ax = 0; 1087 ax = 0;
1892 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1088 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1893 { 1089 {
1894 1090 int emask, mask;
1895 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1091 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1896 1092
1897 /* If this space is out of the normal viewable area, we only check
1898 * the heads value ax or ay will only be greater than what
1899 * the client wants if using the map1a command - this is because
1900 * if the map1a command is not used, max_x and max_y will be
1901 * set to lower values.
1902 */
1903 if (ax >= socket.mapx || ay >= socket.mapy)
1904 {
1905 int i, got_one;
1906
1907 oldlen = sl.len;
1908
1909 sl << uint16 (mask);
1910
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1913 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1914
1915 /* If all we are doing is sending 0 (blank) faces, we don't
1916 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the
1918 * space.
1919 */
1920 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++)
1922 if (sl.buf[i])
1923 got_one = 1;
1924
1925 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff;
1927 else
1928 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2;
1931 else
1932 sl.len = oldlen;
1933 }
1934
1935 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later)
1937 */
1938 continue; /* don't do processing below */
1939 }
1940
1941 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1093 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1942
1943 d = pl->contr->blocked_los[ax][ay];
1944 1094
1945 /* If the coordinates are not valid, or it is too dark to see, 1095 /* If the coordinates are not valid, or it is too dark to see,
1946 * we tell the client as such 1096 * we tell the client as such
1947 */ 1097 */
1948 nx = x; 1098 nx = x;
1949 ny = y; 1099 ny = y;
1950 m = get_map_from_coord (pl->map, &nx, &ny); 1100 m = get_map_from_coord (plmap, &nx, &ny);
1951 1101
1952 if (!m) 1102 if (!m)
1953 { 1103 {
1954 /* space is out of map. Update space and clear values 1104 /* space is out of map. Update space and clear values
1955 * if this hasn't already been done. If the space is out 1105 * if this hasn't already been done. If the space is out
1956 * of the map, it shouldn't have a head 1106 * of the map, it shouldn't have a head
1957 */ 1107 */
1958 if (lastcell.count != -1) 1108 if (lastcell.count != -1)
1959 { 1109 {
1960 sl << uint16 (mask); 1110 sl << uint16 (mask);
1961 map_clearcell (&lastcell, 0, 0, 0, -1); 1111 map_clearcell (&lastcell, -1);
1962 } 1112 }
1113
1114 continue;
1963 } 1115 }
1116
1117 m->touch ();
1118
1119 int d = pl->contr->blocked_los[ax][ay];
1120
1964 else if (d > 3) 1121 if (d > 3)
1965 { 1122 {
1123
1966 int need_send = 0, count; 1124 int need_send = 0, count;
1967 1125
1968 /* This block deals with spaces that are not visible for whatever 1126 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1127 * reason. Still may need to send the head for this space.
1970 */ 1128 */
1971 1129
1972 oldlen = sl.len; 1130 oldlen = sl.length ();
1973 1131
1974 sl << uint16 (mask); 1132 sl << uint16 (mask);
1975 1133
1976 if (lastcell.count != -1) 1134 if (lastcell.count != -1)
1977 need_send = 1; 1135 need_send = 1;
1978 1136
1979 count = -1; 1137 count = -1;
1980 1138
1981 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1139 /* properly clear a previously sent big face */
1982 { 1140 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1983 /* Now check to see if any heads need to be sent */ 1141 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1142 need_send = 1;
1984 1143
1985 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1144 map_clearcell (&lastcell, count);
1986 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1987 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1988 1145
1989 lastcell.count = count; 1146 if ((mask & 0xf) || need_send)
1990 } 1147 sl[oldlen + 1] = mask & 0xff;
1991 else 1148 else
1992 {
1993 /* properly clear a previously sent big face */
1994 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1995 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1996 need_send = 1;
1997
1998 map_clearcell (&lastcell, 0, 0, 0, count);
1999 }
2000
2001 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff;
2003 else
2004 sl.len = oldlen; 1149 sl.reset (oldlen);
2005 } 1150 }
2006 else 1151 else
2007 { 1152 {
2008 /* In this block, the space is visible or there are head objects 1153 /* In this block, the space is visible.
2009 * we need to send.
2010 */ 1154 */
2011 1155
2012 /* Rather than try to figure out what everything that we might 1156 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1157 * need to send is, then form the packet after that,
2014 * we presume that we will in fact form a packet, and update 1158 * we presume that we will in fact form a packet, and update
2015 * the bits by what we do actually send. If we send nothing, 1159 * the bits by what we do actually send. If we send nothing,
2016 * we just back out sl.len to the old value, and no harm 1160 * we just back out sl.length () to the old value, and no harm
2017 * is done. 1161 * is done.
2018 * I think this is simpler than doing a bunch of checks to see 1162 * I think this is simpler than doing a bunch of checks to see
2019 * what if anything we need to send, setting the bits, then 1163 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1164 * doing those checks again to add the real data.
2021 */ 1165 */
2022 oldlen = sl.len; 1166 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1167 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1168
2026 sl << uint16 (mask); 1169 sl << uint16 (mask);
2027
2028 if (socket.ext_mapinfos)
2029 esl << uint16 (emask);
2030 1170
2031 unsigned char dummy; 1171 unsigned char dummy;
2032 unsigned char *last_ext = &dummy; 1172 unsigned char *last_ext = &dummy;
2033 1173
2034 /* Darkness changed */ 1174 /* Darkness changed */
… …
2037 mask |= 0x8; 1177 mask |= 0x8;
2038 1178
2039 if (socket.extmap) 1179 if (socket.extmap)
2040 { 1180 {
2041 *last_ext |= 0x80; 1181 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 1182 last_ext = &sl[sl.length ()];
2043 sl << uint8 (d); 1183 sl << uint8 (d);
2044 } 1184 }
2045 else 1185 else
2046 sl << uint8 (255 - 64 * d); 1186 sl << uint8 (255 - 64 * d);
2047 } 1187 }
2048 1188
2049 lastcell.count = d; 1189 lastcell.count = d;
1190
1191 mapspace &ms = m->at (nx, ny);
2050 1192
2051 if (socket.extmap) 1193 if (socket.extmap)
2052 { 1194 {
2053 uint8 stat_hp = 0; 1195 uint8 stat_hp = 0;
2054 uint8 stat_width = 0; 1196 uint8 stat_width = 0;
2055 uint8 flags = 0; 1197 uint8 flags = 0;
2056 UUID player = 0; 1198 UUID player = 0;
2057 1199
2058 // send hp information, if applicable 1200 // send hp information, if applicable
2059 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1201 if (object *op = ms.faces_obj [0])
2060 { 1202 {
2061 if (op->head || op->invisible) 1203 if (op->head || op->invisible)
2062 ; // do not show 1204 ; // do not show
2063 else if (op->type == PLAYER 1205 else if (op->type == PLAYER
2064 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1206 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
2081 { 1223 {
2082 lastcell.stat_hp = stat_hp; 1224 lastcell.stat_hp = stat_hp;
2083 1225
2084 mask |= 0x8; 1226 mask |= 0x8;
2085 *last_ext |= 0x80; 1227 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 1228 last_ext = &sl[sl.length ()];
2087 1229
2088 sl << uint8 (5) << uint8 (stat_hp); 1230 sl << uint8 (5) << uint8 (stat_hp);
2089 1231
2090 if (stat_width > 1) 1232 if (stat_width > 1)
2091 { 1233 {
2092 *last_ext |= 0x80; 1234 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 1235 last_ext = &sl[sl.length ()];
2094 1236
2095 sl << uint8 (6) << uint8 (stat_width); 1237 sl << uint8 (6) << uint8 (stat_width);
2096 } 1238 }
2097 } 1239 }
2098 1240
… …
2100 { 1242 {
2101 lastcell.player = player; 1243 lastcell.player = player;
2102 1244
2103 mask |= 0x8; 1245 mask |= 0x8;
2104 *last_ext |= 0x80; 1246 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 1247 last_ext = &sl[sl.length ()];
2106 1248
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1249 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 1250 }
2109 1251
2110 if (lastcell.flags != flags) 1252 if (lastcell.flags != flags)
2111 { 1253 {
2112 lastcell.flags = flags; 1254 lastcell.flags = flags;
2113 1255
2114 mask |= 0x8; 1256 mask |= 0x8;
2115 *last_ext |= 0x80; 1257 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 1258 last_ext = &sl[sl.length ()];
2117 1259
2118 sl << uint8 (8) << uint8 (flags); 1260 sl << uint8 (8) << uint8 (flags);
2119 } 1261 }
2120 } 1262 }
2121 1263
2122 /* Floor face */ 1264 /* Floor face */
2123 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1265 if (update_space (sl, socket, ms, lastcell, 2))
2124 mask |= 0x4; 1266 mask |= 0x4;
2125 1267
2126 if (socket.EMI_smooth)
2127 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2128 emask |= 0x4;
2129
2130 /* Middle face */ 1268 /* Middle face */
2131 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1269 if (update_space (sl, socket, ms, lastcell, 1))
2132 mask |= 0x2; 1270 mask |= 0x2;
2133 1271
2134 if (socket.EMI_smooth) 1272 if (ms.player () == pl
2135 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1273 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2136 emask |= 0x2;
2137
2138 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2139 { 1274 {
1275 // force player to be visible to himself if invisible
2140 if (lastcell.faces[0] != pl->face->number) 1276 if (lastcell.faces[0] != pl->face)
2141 { 1277 {
2142 lastcell.faces[0] = pl->face->number; 1278 lastcell.faces[0] = pl->face;
1279
2143 mask |= 0x1; 1280 mask |= 0x1;
2144
2145 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2146 esrv_send_face (&socket, pl->face->number, 0);
2147
2148 sl << uint16 (pl->face->number); 1281 sl << uint16 (pl->face);
1282
1283 socket.send_faces (pl);
2149 } 1284 }
2150 } 1285 }
2151 else
2152 {
2153 /* Top face */ 1286 /* Top face */
2154 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1287 else if (update_space (sl, socket, ms, lastcell, 0))
2155 mask |= 0x1; 1288 mask |= 0x1;
2156
2157 if (socket.EMI_smooth)
2158 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2159 emask |= 0x1;
2160 } 1289
2161 1290
2162 /* Check to see if we are in fact sending anything for this 1291 /* Check to see if we are in fact sending anything for this
2163 * space by checking the mask. If so, update the mask. 1292 * space by checking the mask. If so, update the mask.
2164 * if not, reset the len to that from before adding the mask 1293 * if not, reset the len to that from before adding the mask
2165 * value, so we don't send those bits. 1294 * value, so we don't send those bits.
2166 */ 1295 */
2167 if (mask & 0xf) 1296 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 1297 sl[oldlen + 1] = mask & 0xff;
2169 else 1298 else
2170 sl.len = oldlen; 1299 sl.reset (oldlen);
2171 1300
1301 if (socket.ext_mapinfos)
1302 esl << uint16 (emask);
1303
1304 if (socket.EMI_smooth)
1305 {
1306 for (int layer = 2+1; layer--; )
1307 {
1308 object *ob = ms.faces_obj [layer];
1309
1310 // If there is no object for this space, or if the face for the object
1311 // is the blank face, set the smoothlevel to zero.
1312 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1313
1314 // We've gotten what face we want to use for the object. Now see if
1315 // if it has changed since we last sent it to the client.
1316 if (lastcell.smooth[layer] != smoothlevel)
1317 {
1318 lastcell.smooth[layer] = smoothlevel;
1319 esl << uint8 (smoothlevel);
1320 emask |= 1 << layer;
1321 }
1322 }
1323
2172 if (emask & 0xf) 1324 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 1325 esl[eoldlen + 1] = emask & 0xff;
2174 else 1326 else
2175 esl.len = eoldlen; 1327 esl.reset (eoldlen);
1328 }
2176 } /* else this is a viewable space */ 1329 } /* else this is a viewable space */
2177 } /* for x loop */ 1330 } /* for x loop */
2178 } /* for y loop */ 1331 } /* for y loop */
2179 1332
1333 socket.flush_fx ();
1334
2180 /* Verify that we in fact do need to send this */ 1335 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 1336 if (socket.ext_mapinfos)
2182 { 1337 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 1338 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 1339 {
2185 /* No map data will follow, so don't say the client 1340 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 1341 * it doesn't need draw!
2187 */ 1342 */
2188 ewhatflag &= (~EMI_NOREDRAW); 1343 ewhatflag &= ~EMI_NOREDRAW;
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1344 esl[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 1345 }
2191 1346
2192 if (esl.len > estartlen) 1347 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 1348 socket.send_packet (esl);
2194 } 1349 }
2195 1350
2196 if (sl.len > startlen || socket.sent_scroll) 1351 if (sl.length () > startlen || socket.sent_scroll)
2197 { 1352 {
2198 Send_With_Handling (&socket, &sl); 1353 socket.send_packet (sl);
2199 socket.sent_scroll = 0; 1354 socket.sent_scroll = 0;
2200 } 1355 }
2201} 1356}
2202 1357
2203/** 1358/**
… …
2205 */ 1360 */
2206void 1361void
2207draw_client_map (object *pl) 1362draw_client_map (object *pl)
2208{ 1363{
2209 int i, j; 1364 int i, j;
2210 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1365 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2211 New_Face *face, *floor;
2212 New_Face *floor2;
2213 int d, mflags; 1366 int mflags;
2214 struct Map newmap; 1367 struct Map newmap;
2215 maptile *m, *pm; 1368 maptile *m, *pm;
2216 1369
2217 if (pl->type != PLAYER) 1370 if (pl->type != PLAYER)
2218 { 1371 {
… …
2229 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1382 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2230 return; 1383 return;
2231 1384
2232 memset (&newmap, 0, sizeof (struct Map)); 1385 memset (&newmap, 0, sizeof (struct Map));
2233 1386
2234 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 1387 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2235 {
2236 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 1388 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2237 { 1389 {
2238 ax = i; 1390 ax = i;
2239 ay = j; 1391 ay = j;
2240 m = pm; 1392 m = pm;
2241 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1393 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1394
2242 if (mflags & P_OUT_OF_MAP) 1395 if (mflags & P_OUT_OF_MAP)
2243 continue; 1396 continue;
2244 if (mflags & P_NEED_UPDATE) 1397
2245 update_position (m, ax, ay);
2246 /* If a map is visible to the player, we don't want to swap it out 1398 /* If a map is visible to the player, we don't want to swap it out
2247 * just to reload it. This should really call something like 1399 * just to reload it. This should really call something like
2248 * swap_map, but this is much more efficient and 'good enough' 1400 * swap_map, but this is much more efficient and 'good enough'
2249 */ 1401 */
2250 if (mflags & P_NEW_MAP) 1402 if (mflags & P_NEW_MAP)
2251 m->timeout = 50; 1403 m->timeout = 50;
2252 } 1404 }
2253 } 1405
2254 /* do LOS after calls to update_position */ 1406 /* do LOS after calls to update_position */
2255 if (pl->contr->do_los) 1407 if (pl->contr->do_los)
2256 { 1408 {
2257 update_los (pl); 1409 update_los (pl);
2258 pl->contr->do_los = 0; 1410 pl->contr->do_los = 0;
2259 } 1411 }
2260 1412
2261 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2262 {
2263 /* Big maps need a different drawing mechanism to work */ 1413 /* Big maps need a different drawing mechanism to work */
2264 draw_client_map1 (pl); 1414 draw_client_map1 (pl);
2265 return;
2266 }
2267
2268 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2269 {
2270 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2271 }
2272
2273 /* j and i are the y and x coordinates of the real map (which is
2274 * basically some number of spaces around the player)
2275 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2276 * left corner) and are thus disconnected from the map values.
2277 * Subtract 1 from the max values so that we properly handle cases where
2278 * player has specified an even map. Otherwise, we try to send them too
2279 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2280 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2281 * odd, this still works fine.
2282 */
2283 ay = 0;
2284 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2285 {
2286 ax = 0;
2287 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2288 {
2289
2290 d = pl->contr->blocked_los[ax][ay];
2291 /* note the out_of_map and d>3 checks are both within the same
2292 * negation check.
2293 */
2294 nx = i;
2295 ny = j;
2296 m = get_map_from_coord (pm, &nx, &ny);
2297 if (m && d < 4)
2298 {
2299 face = GET_MAP_FACE (m, nx, ny, 0);
2300 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2301 floor = GET_MAP_FACE (m, nx, ny, 2);
2302
2303 /* If all is blank, send a blank face. */
2304 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2305 {
2306 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2307 }
2308 else
2309 { /* actually have something interesting */
2310 /* send the darkness mask, if any. */
2311 if (d && pl->contr->socket.darkness)
2312 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2313
2314 if (face && face != blank_face)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2316 if (floor2 && floor2 != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2318 if (floor && floor != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2320 }
2321 } /* Is a valid space */
2322 }
2323 }
2324
2325 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2326
2327 check_map_change (pl->contr);
2328} 1415}
2329 1416
2330 1417
2331/*****************************************************************************/ 1418/*****************************************************************************/
2332 1419
… …
2338 1425
2339/*****************************************************************************/ 1426/*****************************************************************************/
2340void 1427void
2341send_plugin_custom_message (object *pl, char *buf) 1428send_plugin_custom_message (object *pl, char *buf)
2342{ 1429{
2343 pl->contr->socket.send_packet (buf); 1430 pl->contr->ns->send_packet (buf);
2344} 1431}
2345 1432
2346/** 1433/**
2347 * This sends the skill number to name mapping. We ignore 1434 * This sends the skill number to name mapping. We ignore
2348 * the params - we always send the same info no matter what. 1435 * the params - we always send the same info no matter what.
2349 */ 1436 */
2350void 1437void
2351send_skill_info (NewSocket *ns, char *params) 1438send_skill_info (client *ns, char *params)
2352{ 1439{
2353 packet sl; 1440 packet sl;
2354 sl << "replyinfo skill_info\n"; 1441 sl << "replyinfo skill_info\n";
2355 1442
2356 for (int i = 1; i < NUM_SKILLS; i++) 1443 for (int i = 1; i < NUM_SKILLS; i++)
2357 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1444 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2358 1445
2359 if (sl.len >= MAXSOCKBUF) 1446 if (sl.length () >= MAXSOCKBUF)
2360 { 1447 {
2361 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1448 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2362 fatal (0); 1449 fatal (0);
2363 } 1450 }
2364 1451
2365 Send_With_Handling (ns, &sl); 1452 ns->send_packet (sl);
2366} 1453}
2367 1454
2368/** 1455/**
2369 * This sends the spell path to name mapping. We ignore 1456 * This sends the spell path to name mapping. We ignore
2370 * the params - we always send the same info no matter what. 1457 * the params - we always send the same info no matter what.
2371 */ 1458 */
2372void 1459void
2373send_spell_paths (NewSocket * ns, char *params) 1460send_spell_paths (client * ns, char *params)
2374{ 1461{
2375 packet sl; 1462 packet sl;
2376 1463
2377 sl << "replyinfo spell_paths\n"; 1464 sl << "replyinfo spell_paths\n";
2378 1465
2379 for (int i = 0; i < NRSPELLPATHS; i++) 1466 for (int i = 0; i < NRSPELLPATHS; i++)
2380 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1467 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2381 1468
2382 if (sl.len >= MAXSOCKBUF) 1469 if (sl.length () >= MAXSOCKBUF)
2383 { 1470 {
2384 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1471 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2385 fatal (0); 1472 fatal (0);
2386 } 1473 }
2387 1474
2388 Send_With_Handling (ns, &sl); 1475 ns->send_packet (sl);
2389} 1476}
2390 1477
2391/** 1478/**
2392 * This looks for any spells the player may have that have changed their stats. 1479 * This looks for any spells the player may have that have changed their stats.
2393 * it then sends an updspell packet for each spell that has changed in this way 1480 * it then sends an updspell packet for each spell that has changed in this way
2394 */ 1481 */
2395void 1482void
2396esrv_update_spells (player *pl) 1483esrv_update_spells (player *pl)
2397{ 1484{
1485 if (!pl->ns)
1486 return;
1487
2398 if (!pl->socket.monitor_spells) 1488 if (!pl->ns->monitor_spells)
2399 return; 1489 return;
2400 1490
2401 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1491 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2402 { 1492 {
2403 if (spell->type == SPELL) 1493 if (spell->type == SPELL)
… …
2433 1523
2434 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1524 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2435 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1525 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2436 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1526 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2437 1527
2438 Send_With_Handling (&pl->socket, &sl); 1528 pl->ns->send_packet (sl);
2439 } 1529 }
2440 } 1530 }
2441 } 1531 }
2442} 1532}
2443 1533
2444void 1534void
2445esrv_remove_spell (player *pl, object *spell) 1535esrv_remove_spell (player *pl, object *spell)
2446{ 1536{
2447 if (!pl->socket.monitor_spells) 1537 if (!pl->ns->monitor_spells)
2448 return; 1538 return;
2449 1539
2450 if (!pl || !spell || spell->env != pl->ob) 1540 if (!pl || !spell || spell->env != pl->ob)
2451 { 1541 {
2452 LOG (llevError, "Invalid call to esrv_remove_spell"); 1542 LOG (llevError, "Invalid call to esrv_remove_spell");
2453 return; 1543 return;
2454 } 1544 }
2455 1545
2456 packet sl; 1546 packet sl ("delspell");
2457 1547
2458 sl << "delspell "
2459 << uint32 (spell->count); 1548 sl << uint32 (spell->count);
2460 1549
2461 Send_With_Handling (&pl->socket, &sl); 1550 pl->ns->send_packet (sl);
2462} 1551}
2463 1552
2464/* appends the spell *spell to the Socklist we will send the data to. */ 1553/* appends the spell *spell to the Socklist we will send the data to. */
2465static void 1554static void
2466append_spell (player *pl, packet &sl, object *spell) 1555append_spell (player *pl, packet &sl, object *spell)
2467{ 1556{
2468 int len, i, skill = 0; 1557 int i, skill = 0;
2469 1558
2470 if (!(spell->name)) 1559 if (!(spell->name))
2471 { 1560 {
2472 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1561 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2473 return; 1562 return;
… …
2485 if (!strcmp (spell->skill, skill_names[i])) 1574 if (!strcmp (spell->skill, skill_names[i]))
2486 { 1575 {
2487 skill = i + CS_STAT_SKILLINFO; 1576 skill = i + CS_STAT_SKILLINFO;
2488 break; 1577 break;
2489 } 1578 }
1579 }
1580
1581 // spells better have a face
1582 if (!spell->face)
1583 {
1584 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1585 spell->face = face_find ("burnout.x11", blank_face);
2490 } 1586 }
2491 1587
2492 /* send the current values */ 1588 /* send the current values */
2493 sl << uint32 (spell->count) 1589 sl << uint32 (spell->count)
2494 << uint16 (spell->level) 1590 << uint16 (spell->level)
… …
2496 << uint16 (spell->last_sp) 1592 << uint16 (spell->last_sp)
2497 << uint16 (spell->last_grace) 1593 << uint16 (spell->last_grace)
2498 << uint16 (spell->last_eat) 1594 << uint16 (spell->last_eat)
2499 << uint8 (skill) 1595 << uint8 (skill)
2500 << uint32 (spell->path_attuned) 1596 << uint32 (spell->path_attuned)
2501 << uint32 (spell->face ? spell->face->number : 0) 1597 << uint32 (spell->face)
2502 << data8 (spell->name) 1598 << data8 (spell->name)
2503 << data16 (spell->msg); 1599 << data16 (spell->msg);
2504} 1600}
2505 1601
2506/** 1602/**
… …
2514 { 1610 {
2515 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1611 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2516 return; 1612 return;
2517 } 1613 }
2518 1614
2519 if (!pl->socket.monitor_spells) 1615 if (!pl->ns->monitor_spells)
2520 return; 1616 return;
2521 1617
2522 packet sl; 1618 packet sl ("addspell");
2523
2524 sl << "addspell ";
2525 1619
2526 if (!spell) 1620 if (!spell)
2527 { 1621 {
2528 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1622 for (spell = pl->ob->inv; spell; spell = spell->below)
2529 { 1623 {
2530 /* were we to simply keep appending data here, we could exceed 1624 /* were we to simply keep appending data here, we could exceed
2531 * MAXSOCKBUF if the player has enough spells to add, we know that 1625 * MAXSOCKBUF if the player has enough spells to add, we know that
2532 * append_spells will always append 19 data bytes, plus 4 length 1626 * append_spells will always append 19 data bytes, plus 4 length
2533 * bytes and 3 strings (because that is the spec) so we need to 1627 * bytes and 3 strings (because that is the spec) so we need to
… …
2541 * like it will fix this 1635 * like it will fix this
2542 */ 1636 */
2543 if (spell->type != SPELL) 1637 if (spell->type != SPELL)
2544 continue; 1638 continue;
2545 1639
2546 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1640 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2547 { 1641 {
2548 Send_With_Handling (&pl->socket, &sl); 1642 pl->ns->send_packet (sl);
2549 strcpy ((char *) sl.buf, "addspell "); 1643
2550 sl.len = strlen ((char *) sl.buf); 1644 sl.reset ();
1645 sl << "addspell ";
2551 } 1646 }
2552 1647
2553 append_spell (pl, sl, spell); 1648 append_spell (pl, sl, spell);
2554 } 1649 }
2555 } 1650 }
… …
2566 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1661 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2567 fatal (0); 1662 fatal (0);
2568 } 1663 }
2569 1664
2570 /* finally, we can send the packet */ 1665 /* finally, we can send the packet */
2571 Send_With_Handling (&pl->socket, &sl); 1666 pl->ns->send_packet (sl);
2572
2573} 1667}
2574 1668

Diff Legend

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