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.22 by root, Tue Sep 19 10:12:50 2006 UTC vs.
Revision 1.79 by root, Thu Mar 15 16:25:45 2007 UTC

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

Diff Legend

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