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.74 by root, Wed Mar 14 01:19:10 2007 UTC

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

Diff Legend

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