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.27 by root, Wed Dec 13 18:08:02 2006 UTC vs.
Revision 1.76 by root, Wed Mar 14 13:05:30 2007 UTC

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

Diff Legend

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