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

Diff Legend

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