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.16 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.79 by root, Thu Mar 15 16:25:45 2007 UTC

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

Diff Legend

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