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.17 by root, Tue Sep 12 19:20:09 2006 UTC vs.
Revision 1.58 by root, Thu Jan 4 16:19:32 2007 UTC

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

Diff Legend

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