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

Diff Legend

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