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.32 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.102 by root, Sun Jun 3 17:42:39 2007 UTC

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

Diff Legend

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