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

Diff Legend

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