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.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.146 by root, Sat Dec 27 01:25:00 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
27 * 27 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 35 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 36 * way, we can use one dispatch table.
37 * 37 *
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 40 */
44 41
45#include <global.h> 42#include <global.h>
46#include <sproto.h> 43#include <sproto.h>
47 44
… …
100 * that much difference in bandwidth. 97 * that much difference in bandwidth.
101 */ 98 */
102 mx = ns->mapx; 99 mx = ns->mapx;
103 my = ns->mapy; 100 my = ns->mapy;
104 101
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
112 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
113 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
115 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
116 */ 107 */
117 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
118 {
119 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
120 {
121 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
122 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
123 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
124 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
125 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
126 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
127 else 116 else
128 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
129 }
130 }
131 118
132 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
133 120
134 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
135 * empty). 122 * empty).
… …
138} 125}
139 126
140static void 127static void
141clear_map (player *pl) 128clear_map (player *pl)
142{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 133
134 pl->ns->force_newmap = false;
135
145 if (pl->socket->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
147 138
148 pl->socket->floorbox_reset (); 139 pl->ns->floorbox_reset ();
149} 140}
150 141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
166}
167
151/** check for map change and send new map data */ 168/** check for map/region change and send new map data */
152static void 169static void
153check_map_change (player *pl) 170check_map_change (player *pl)
154{ 171{
155 client &socket = *pl->socket; 172 client &socket = *pl->ns;
156 object *ob = pl->ob; 173 object *ob = pl->observe;
157 char buf[MAX_BUF]; /* eauugggh */
158 174
159 if (socket.current_map != ob->map) 175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
160 { 180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
202 if (socket.current_map != ob->map || socket.force_newmap)
203 {
204 clear_map (pl);
161 socket.current_map = ob->map; 205 socket.current_map = ob->map;
162 206 send_map_info (pl);
163 clear_map (pl);
164
165 if (socket.mapinfocmd)
166 {
167 if (ob->map && ob->map->path[0])
168 {
169 int flags = 0;
170
171 if (ob->map->tile_path[0])
172 flags |= 1;
173 if (ob->map->tile_path[1])
174 flags |= 2;
175 if (ob->map->tile_path[2])
176 flags |= 4;
177 if (ob->map->tile_path[3])
178 flags |= 8;
179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
182 }
183 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf);
187 }
188 } 207 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 209 {
191 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
192 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
193 212
194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
196 else
197 {
198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 213 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
199 socket.floorbox_reset (); 214 socket.floorbox_reset ();
200 }
201 } 215 }
202 216
203 socket.current_x = ob->x; 217 socket.current_x = ob->x;
204 socket.current_y = ob->y; 218 socket.current_y = ob->y;
205} 219}
… …
208 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
210 * that information. 224 * that information.
211 */ 225 */
212void 226void
213RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
214{ 228{
215 char *params = NULL, *cp; 229 char *params;
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 230
228 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
229 * params pointer. 232 * params pointer.
230 */ 233 */
231 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
232 if (*cp == ' ') 235 if (*params == ' ')
233 { 236 {
234 *cp = '\0';
235 params = cp + 1; 237 *params++ = 0;
236 break; 238 break;
237 } 239 }
238 240
239 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 246 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
247 else 249 else
248 ns->send_packet (bigbuf, len); 250 {
251 // undo tokenisation above and send replyinfo with the request unchanged
252 if (*params)
253 *--params = ' ';
254
255 ns->send_packet_printf ("replyinfo %s", buf);
256 }
249} 257}
250 258
251void 259void
252ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
253{ 261{
… …
256 264
257void 265void
258ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
259{ 267{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
298 if (!map->tile_path [dir])
299 map = 0;
300 else if (map->tile_available (dir, false))
301 {
302 maptile *neigh = map->tile_map [dir];
303
304 switch (dir)
305 {
306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
317 }
318 else
319 max_distance = 0;
320 }
321
322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
352 }
353 else
354 ++i;
261} 355}
262 356
263void 357void
264MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
265{ 359{
266 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
268 362
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 363 char *token = buf;
272 // copy token 364
273 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
274 return; 366 return;
275 367
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
279 { 369 {
280 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
281 372
282 // initial map and its origin 373#if 0
283 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 376 free (copy);
286 int mapy = pl->socket->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
340 }
341 else 377 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
343 } 380 }
344 else 381 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->socket->send_packet (bigbuf);
348} 383}
349 384
350/** This is the Setup cmd - easy first implementation */ 385/** This is the Setup cmd */
351void 386void
352SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
353{ 388{
354 int s, slen; 389 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355 char *cmd, *param, cmdback[HUGE_BUF];
356
357 /* run through the cmds of setup
358 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359 *
360 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361 * The client then must sort this out
362 */
363
364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366 strcpy (cmdback, "setup");
367 for (s = 0; s < len; )
368 {
369 cmd = &buf[s];
370
371 /* find the next space, and put a null there */
372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
375 buf[s++] = 0;
376
377 while (buf[s] == ' ')
378 s++;
379
380 if (s >= len)
381 break;
382
383 param = &buf[s];
384
385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
388 buf[s++] = 0;
389
390 while (buf[s] == ' ')
391 s++;
392
393 slen = strlen (cmdback);
394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398 if (!strcmp (cmd, "sound"))
399 {
400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 }
403 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon"))
409 {
410 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 }
413 else if (!strcmp (cmd, "darkness"))
414 {
415 ns->darkness = atoi (param);
416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
417 }
418 else if (!strcmp (cmd, "map1cmd"))
419 {
420 if (atoi (param))
421 ns->mapmode = Map1Cmd;
422 /* if beyond this size, need to use map1cmd no matter what */
423 if (ns->mapx > 11 || ns->mapy > 11)
424 ns->mapmode = Map1Cmd;
425 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
426 }
427 else if (!strcmp (cmd, "map1acmd"))
428 {
429 if (atoi (param))
430 ns->mapmode = Map1aCmd;
431 /* if beyond this size, need to use map1acmd no matter what */
432 if (ns->mapx > 11 || ns->mapy > 11)
433 ns->mapmode = Map1aCmd;
434 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
435 }
436 else if (!strcmp (cmd, "newmapcmd"))
437 {
438 ns->newmapcmd = atoi (param);
439 safe_strcat (cmdback, param, &slen, HUGE_BUF);
440// } else if (!strcmp(cmd,"plugincmd")) {
441// ns->plugincmd = atoi(param);
442// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443 }
444 else if (!strcmp (cmd, "mapinfocmd"))
445 {
446 ns->mapinfocmd = atoi (param);
447 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
448 }
449 else if (!strcmp (cmd, "extcmd"))
450 {
451 ns->extcmd = atoi (param);
452 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453 }
454 else if (!strcmp (cmd, "extmap"))
455 {
456 ns->extmap = atoi (param);
457 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458 }
459 else if (!strcmp (cmd, "facecache"))
460 {
461 ns->facecache = atoi (param);
462 safe_strcat (cmdback, param, &slen, HUGE_BUF);
463 }
464 else if (!strcmp (cmd, "faceset"))
465 {
466 char tmpbuf[20];
467 int q = atoi (param);
468
469 if (is_valid_faceset (q))
470 ns->faceset = q;
471 sprintf (tmpbuf, "%d", ns->faceset);
472 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473 /* if the client is using faceset, it knows about image2 command */
474 ns->image2 = 1;
475 }
476 else if (!strcmp (cmd, "itemcmd"))
477 {
478 /* Version of the item protocol command to use. Currently,
479 * only supported versions are 1 and 2. Using a numeric
480 * value will make it very easy to extend this in the future.
481 */
482 char tmpbuf[20];
483 int q = atoi (param);
484
485 if (q < 1 || q > 2)
486 {
487 strcpy (tmpbuf, "FALSE");
488 }
489 else
490 {
491 ns->itemcmd = q;
492 sprintf (tmpbuf, "%d", ns->itemcmd);
493 }
494 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
495 }
496 else if (!strcmp (cmd, "mapsize"))
497 {
498 int x, y = 0;
499 char tmpbuf[MAX_BUF], *cp;
500
501 x = atoi (param);
502 for (cp = param; *cp != 0; cp++)
503 if (*cp == 'x' || *cp == 'X')
504 {
505 y = atoi (cp + 1);
506 break;
507 }
508 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509 {
510 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512 }
513 else
514 {
515 ns->mapx = x;
516 ns->mapy = y;
517 /* better to send back what we are really using and not the
518 * param as given to us in case it gets parsed differently.
519 */
520 sprintf (tmpbuf, "%dx%d", x, y);
521 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
522 /* If beyond this size and still using orig map command, need to
523 * go to map1cmd.
524 */
525 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
526 ns->mapmode = Map1Cmd;
527 }
528 }
529 else if (!strcmp (cmd, "extendedMapInfos"))
530 {
531 /* Added by tchize
532 * prepare to use the mapextended command
533 */
534 char tmpbuf[20];
535
536 ns->ext_mapinfos = (atoi (param));
537 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
538 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
539 }
540 else if (!strcmp (cmd, "extendedTextInfos"))
541 {
542 /* Added by tchize
543 * prepare to use the extended text commands
544 * Client toggle this to non zero to get exttext
545 */
546 char tmpbuf[20];
547
548 ns->has_readable_type = (atoi (param));
549 sprintf (tmpbuf, "%d", ns->has_readable_type);
550 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
551 }
552 else
553 {
554 /* Didn't get a setup command we understood -
555 * report a failure to the client.
556 */
557 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
558 }
559 } /* for processing all the setup commands */
560
561 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
562 ns->send_packet (cmdback);
563} 390}
564 391
565/** 392/**
566 * The client has requested to be added to the game. 393 * The client has requested to be added to the game.
567 * This is what takes care of it. We tell the client how things worked out. 394 * This is what takes care of it. We tell the client how things worked out.
568 * I am not sure if this file is the best place for this function. however, 395 * I am not sure if this file is the best place for this function. however,
569 * it either has to be here or init_sockets needs to be exported. 396 * it either has to be here or init_sockets needs to be exported.
570 */ 397 */
571void 398void
572AddMeCmd (char *buf, int len, client * ns) 399AddMeCmd (char *buf, int len, client *ns)
573{ 400{
574 if (ns->status != Ns_Add || add_player (ns)) 401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 ns->send_packet ("addme_failed");
576 else
577 ns->send_packet ("addme_success");
578}
579
580/** Reply to ExtendedInfos command */
581void
582ToggleExtendedInfos (char *buf, int len, client * ns)
583{
584 char cmdback[MAX_BUF];
585 char command[50];
586 int info, nextinfo;
587
588 cmdback[0] = '\0';
589 nextinfo = 0;
590
591 while (1)
592 {
593 /* 1. Extract an info */
594 info = nextinfo;
595
596 while ((info < len) && (buf[info] == ' '))
597 info++;
598
599 if (info >= len)
600 break;
601
602 nextinfo = info + 1;
603
604 while ((nextinfo < len) && (buf[nextinfo] != ' '))
605 nextinfo++;
606
607 if (nextinfo - info >= 49) /*Erroneous info asked */
608 continue;
609
610 strncpy (command, &(buf[info]), nextinfo - info);
611
612 /* 2. Interpret info */
613 if (!strcmp ("smooth", command))
614 /* Toggle smoothing */
615 ns->EMI_smooth = !ns->EMI_smooth;
616 else
617 /*bad value */;
618
619 /*3. Next info */
620 }
621
622 strcpy (cmdback, "ExtendedInfoSet");
623
624 if (ns->EMI_smooth)
625 {
626 strcat (cmdback, " ");
627 strcat (cmdback, "smoothing");
628 }
629
630 ns->send_packet (cmdback);
631} 402}
632 403
633/* 404/*
634#define MSG_TYPE_BOOK 1 405#define MSG_TYPE_BOOK 1
635#define MSG_TYPE_CARD 2 406#define MSG_TYPE_CARD 2
… …
692 463
693 ns->send_packet (cmdback); 464 ns->send_packet (cmdback);
694} 465}
695 466
696/** 467/**
697 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
698 * Basically, it makes no sense to wait for the client to request a
699 * a piece of data from us that we know the client wants. So
700 * if we know the client wants it, might as well push it to the
701 * client.
702 */
703static void
704SendSmooth (client *ns, uint16 face)
705{
706 uint16 smoothface;
707
708 /* If we can't find a face, return and set it so we won't try to send this
709 * again.
710 */
711 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
712 {
713
714 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
715 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
716 return;
717 }
718
719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720 esrv_send_face (ns, smoothface, 0);
721
722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
723
724 packet sl ("smooth");
725
726 sl << uint16 (face)
727 << uint16 (smoothface);
728
729 ns->send_packet (sl);
730}
731
732 /**
733 * Tells client the picture it has to use
734 * to smooth a picture number given as argument.
735 */
736void
737AskSmooth (char *buf, int len, client *ns)
738{
739 SendSmooth (ns, atoi (buf));
740}
741
742/**
743 * This handles the general commands from the client (ie, north, fire, cast, 468 * This handles the general commands from the client (ie, north, fire, cast,
744 * etc.) 469 * etc.)
745 */ 470 */
746void 471void
747PlayerCmd (char *buf, int len, player *pl) 472PlayerCmd (char *buf, int len, player *pl)
… …
768 * commands. 493 * commands.
769 */ 494 */
770 pl->count = 0; 495 pl->count = 0;
771} 496}
772 497
773
774/** 498/**
775 * This handles the general commands from the client (ie, north, fire, cast, 499 * This handles the general commands from the client (ie, north, fire, cast,
776 * etc.). It is a lot like PlayerCmd above, but is called with the 500 * etc.). It is a lot like PlayerCmd above, but is called with the
777 * 'ncom' method which gives more information back to the client so it 501 * 'ncom' method which gives more information back to the client so it
778 * can throttle. 502 * can throttle.
… …
780void 504void
781NewPlayerCmd (char *buf, int len, player *pl) 505NewPlayerCmd (char *buf, int len, player *pl)
782{ 506{
783 if (len <= 6) 507 if (len <= 6)
784 { 508 {
785 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 509 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
786 return; 510 return;
787 } 511 }
788 512
789 uint16 cmdid = net_uint16 ((uint8 *)buf); 513 uint16 cmdid = net_uint16 ((uint8 *)buf);
790 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 514 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
803 * commands. 527 * commands.
804 */ 528 */
805 pl->count = 0; 529 pl->count = 0;
806 530
807 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 531 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
808 int time = FABS (pl->ob->speed) < 0.001 532 int time = fabs (pl->ob->speed) < 0.001
809 ? time = MAX_TIME * 100 533 ? time = MAX_TIME * 100
810 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 534 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
811 535
812 /* Send confirmation of command execution now */ 536 /* Send confirmation of command execution now */
813 packet sl ("comc"); 537 packet sl ("comc");
814 sl << uint16 (cmdid) << uint32 (time); 538 sl << uint16 (cmdid) << uint32 (time);
815 pl->socket->send_packet (sl); 539 pl->ns->send_packet (sl);
816} 540}
817
818 541
819/** This is a reply to a previous query. */ 542/** This is a reply to a previous query. */
820void 543void
821ReplyCmd (char *buf, int len, player *pl) 544ReplyCmd (char *buf, int len, client *ns)
822{ 545{
546 if (ns->state == ST_CUSTOM)
547 {
548 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
549 return;
550 }
551
552 if (!ns->pl)
553 return; //TODO: depends on the exact reply we are after
554 //TODO: but right now, we always have a ns->pl
555
556 player *pl = ns->pl;
557
823 /* This is to synthesize how the data would be stored if it 558 /* This is to synthesize how the data would be stored if it
824 * was normally entered. A bit of a hack, and should be cleaned up 559 * was normally entered. A bit of a hack, and should be cleaned up
825 * once all the X11 code is removed from the server. 560 * once all the X11 code is removed from the server.
826 * 561 *
827 * We pass 13 to many of the functions because this way they 562 * We pass 13 to many of the functions because this way they
… …
830 */ 565 */
831 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 566 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
832 567
833 /* this avoids any hacking here */ 568 /* this avoids any hacking here */
834 569
835 switch (pl->state) 570 switch (ns->state)
836 { 571 {
837 case ST_PLAYING: 572 case ST_PLAYING:
838 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 573 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
839 break; 574 break;
840 575
841 case ST_PLAY_AGAIN:
842 /* We can check this for return value (2==quit). Maybe we
843 * should, and do something appropriate?
844 */
845 receive_play_again (pl->ob, buf[0]);
846 break;
847
848 case ST_ROLL_STAT:
849 key_roll_stat (pl->ob, buf[0]);
850 break;
851
852 case ST_CHANGE_CLASS:
853
854 key_change_class (pl->ob, buf[0]);
855 break;
856
857 case ST_CONFIRM_QUIT:
858 key_confirm_quit (pl->ob, buf[0]);
859 break;
860
861 case ST_CONFIGURE:
862 LOG (llevError, "In client input handling, but into configure state\n");
863 pl->state = ST_PLAYING;
864 break;
865
866 case ST_GET_NAME:
867 receive_player_name (pl->ob, 13);
868 break;
869
870 case ST_GET_PASSWORD:
871 case ST_CONFIRM_PASSWORD:
872 receive_player_password (pl->ob, 13);
873 break;
874
875 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 576 case ST_GET_PARTY_PASSWORD: /* Get password for party */
876 receive_party_password (pl->ob, 13); 577 receive_party_password (pl->ob, 13);
877 break; 578 break;
878 579
879 default: 580 default:
880 LOG (llevError, "Unknown input state: %d\n", pl->state); 581 LOG (llevError, "Unknown input state: %d\n", ns->state);
881 } 582 }
882} 583}
883 584
884/** 585/**
885 * Client tells its version. If there is a mismatch, we close the 586 * Client tells its version. If there is a mismatch, we close the
… …
900 ns->cs_version = atoi (buf); 601 ns->cs_version = atoi (buf);
901 ns->sc_version = ns->cs_version; 602 ns->sc_version = ns->cs_version;
902 603
903 LOG (llevDebug, "connection from client <%s>\n", buf); 604 LOG (llevDebug, "connection from client <%s>\n", buf);
904 605
905
906 //TODO: should log here just for statistics 606 //TODO: should log here just for statistics
907 607
908 //if (VERSION_CS != ns->cs_version) 608 //if (VERSION_CS != ns->cs_version)
909 // unchecked; 609 // unchecked;
910 610
… …
919 619
920 cp = strchr (cp + 1, ' '); 620 cp = strchr (cp + 1, ' ');
921 621
922 if (cp) 622 if (cp)
923 { 623 {
924 assign (ns->version, cp + 1); 624 ns->version = cp + 1;
925 625
926 if (ns->sc_version < 1026) 626 if (ns->sc_version < 1026)
927 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 627 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
928 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 628 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
929 } 629 }
… …
935{ 635{
936 ns->sound = atoi (buf); 636 ns->sound = atoi (buf);
937} 637}
938 638
939/** client wants the map resent */ 639/** client wants the map resent */
940
941void 640void
942MapRedrawCmd (char *buf, int len, player *pl) 641MapRedrawCmd (char *buf, int len, player *pl)
943{ 642{
944/* This function is currently disabled; just clearing the map state results in 643/* This function is currently disabled; just clearing the map state results in
945 * display errors. It should clear the cache and send a newmap command. 644 * display errors. It should clear the cache and send a newmap command.
… …
953 * syntax is: move (to) (tag) (nrof) 652 * syntax is: move (to) (tag) (nrof)
954 */ 653 */
955void 654void
956MoveCmd (char *buf, int len, player *pl) 655MoveCmd (char *buf, int len, player *pl)
957{ 656{
958 int vals[3], i; 657 int to, tag, nrof;
959 658
960 /* A little funky here. We only cycle for 2 records, because 659 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
961 * we obviously are not going to find a space after the third
962 * record. Perhaps we should just replace this with a
963 * sscanf?
964 */
965 for (i = 0; i < 2; i++)
966 { 660 {
967 vals[i] = atoi (buf);
968
969 if (!(buf = strchr (buf, ' ')))
970 {
971 LOG (llevError, "Incomplete move command: %s\n", buf); 661 LOG (llevError, "Incomplete move command: %s\n", buf);
972 return; 662 return;
973 }
974
975 buf++;
976 } 663 }
977 664
978 vals[2] = atoi (buf); 665 esrv_move_object (pl->ob, to, tag, nrof);
979
980/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
981 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
982} 666}
983 667
984/****************************************************************************** 668/******************************************************************************
985 * 669 *
986 * Start of commands the server sends to the client. 670 * Start of commands the server sends to the client.
… …
990/** 674/**
991 * Asks the client to query the user. This way, the client knows 675 * Asks the client to query the user. This way, the client knows
992 * it needs to send something back (vs just printing out a message) 676 * it needs to send something back (vs just printing out a message)
993 */ 677 */
994void 678void
995send_query (client *ns, uint8 flags, char *text) 679send_query (client *ns, uint8 flags, const char *text)
996{ 680{
997 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 681 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
682}
683
684/**
685 * Get player's current range attack in obuf.
686 */
687static void
688rangetostring (player *pl, char *obuf)
689{
690 dynbuf_text buf;
691
692 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694
695 if (pl->combat_ob)
696 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
697
698#if 0
699 //TODO: remove this when slot system is working, this is only for debugging
700 if (pl->ob->chosen_skill)
701 buf << " Skill*: " << pl->ob->chosen_skill->name;
702#endif
703
704 //TODO: maybe golem should become the current_weapon, quite simply?
705 if (pl->golem)
706 buf << " Golem*: " << pl->golem->name;
707
708 buf << '\0';
709 buf.linearise (obuf);
998} 710}
999 711
1000#define AddIfInt64(Old,New,Type) if (Old != New) {\ 712#define AddIfInt64(Old,New,Type) if (Old != New) {\
1001 Old = New; \ 713 Old = New; \
1002 sl << uint8 (Type) << uint64 (New); \ 714 sl << uint8 (Type) << uint64 (New); \
… …
1010#define AddIfShort(Old,New,Type) if (Old != New) {\ 722#define AddIfShort(Old,New,Type) if (Old != New) {\
1011 Old = New; \ 723 Old = New; \
1012 sl << uint8 (Type) << uint16 (New); \ 724 sl << uint8 (Type) << uint16 (New); \
1013 } 725 }
1014 726
1015#define AddIfFloat(Old,New,Type) if (Old != New) {\ 727#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1016 Old = New; \ 728 Old = New; \
1017 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 729 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1018 } 730 }
1019 731
1020#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 732#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1021 free(Old); Old = strdup (New);\ 733 free(Old); Old = strdup (New);\
1022 sl << uint8 (Type) << data8 (New); \ 734 sl << uint8 (Type) << data8 (New); \
… …
1032esrv_update_stats (player *pl) 744esrv_update_stats (player *pl)
1033{ 745{
1034 char buf[MAX_BUF]; 746 char buf[MAX_BUF];
1035 uint16 flags; 747 uint16 flags;
1036 748
749 client *ns = pl->ns;
750 if (!ns)
751 return;
752
753 object *ob = pl->observe;
754 if (!ob)
755 return;
756
757 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
758
1037 packet sl ("stats"); 759 packet sl ("stats");
1038 760
1039 if (pl->ob)
1040 {
1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 761 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 762 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 763 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 764 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1045 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 765 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1046 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 766 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 767 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1048 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1049 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1050 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1051 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 768 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 769 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
770 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1054 }
1055 774
1056 if (pl->socket->exp64)
1057 for (int s = 0; s < NUM_SKILLS; s++) 775 for (int s = 0; s < NUM_SKILLS; s++)
1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 776 if (object *skill = opl->last_skill_ob [s])
777 if (skill->stats.exp != ns->last_skill_exp [s])
1059 { 778 {
779 ns->last_skill_exp [s] = skill->stats.exp;
780
1060 /* Always send along the level if exp changes. This is only 781 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 782 * 1 extra byte, but keeps processing simpler.
1062 */ 783 */
1063 sl << uint8 (s + CS_STAT_SKILLINFO) 784 sl << uint8 (s + CS_STAT_SKILLINFO)
1064 << uint8 (pl->last_skill_ob[s]->level) 785 << uint8 (skill->level)
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 786 << uint64 (skill->stats.exp);
1066
1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068 } 787 }
1069 788
1070 if (pl->socket->exp64)
1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1072 else
1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074
1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1076 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1077 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1078 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1079 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1080 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1081 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 796 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1082 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798
1083 flags = 0; 799 flags = 0;
1084 800
1085 if (pl->fire_on) 801 if (opl->fire_on)
1086 flags |= SF_FIREON; 802 flags |= SF_FIREON;
1087 803
1088 if (pl->run_on) 804 if (opl->run_on)
1089 flags |= SF_RUNON; 805 flags |= SF_RUNON;
1090 806
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1092 808
1093 if (pl->socket->sc_version < 1025) 809 if (ns->sc_version < 1025)
1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 810 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095 else 811 else
1096 for (int i = 0; i < NROFATTACKS; i++) 812 for (int i = 0; i < NROFATTACKS; i++)
1097 { 813 {
1098 /* Skip ones we won't send */ 814 /* Skip ones we won't send */
1099 if (atnr_cs_stat[i] == -1) 815 if (atnr_cs_stat[i] == -1)
1100 continue; 816 continue;
1101 817
1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 818 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1103 } 819 }
1104 820
1105 if (pl->socket->monitor_spells) 821 if (pl->ns->monitor_spells)
1106 { 822 {
1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 824 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1109 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 825 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1110 } 826 }
1111 827
1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 828 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 830 set_title (ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1116 832
1117 /* Only send it away if we have some actual data */ 833 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 834 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 835 ns->send_packet (sl);
1120} 836}
1121 837
1122/** 838/**
1123 * Tells the client that here is a player it should start using. 839 * Tells the client that here is a player it should start using.
1124 */ 840 */
1125void 841void
1126esrv_new_player (player *pl, uint32 weight) 842esrv_new_player (player *pl)
1127{ 843{
1128 pl->last_weight = weight; 844 sint32 weight = pl->ob->client_weight ();
1129 845
1130 packet sl ("player"); 846 packet sl ("player");
1131 847
1132 sl << uint32 (pl->ob->count) 848 sl << uint32 (pl->ob->count)
1133 << uint32 (weight) 849 << uint32 (weight)
1134 << uint32 (pl->ob->face->number) 850 << uint32 (pl->ob->face)
1135 << data8 (pl->ob->name); 851 << data8 (pl->ob->name);
1136 852
1137 pl->socket->send_packet (sl); 853 pl->ns->last_weight = weight;
1138 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1139}
1140
1141/**
1142 * Need to send an animation sequence to the client.
1143 * We will send appropriate face commands to the client if we haven't
1144 * sent them the face yet (this can become quite costly in terms of
1145 * how much we are sending - on the other hand, this should only happen
1146 * when the player logs in and picks stuff up.
1147 */
1148void
1149esrv_send_animation (client * ns, short anim_num)
1150{
1151 /* Do some checking on the anim_num we got. Note that the animations
1152 * are added in contigous order, so if the number is in the valid
1153 * range, it must be a valid animation.
1154 */
1155 if (anim_num < 0 || anim_num > num_animations)
1156 {
1157 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1158 return;
1159 }
1160
1161 packet sl ("anim");
1162
1163 sl << uint16 (anim_num)
1164 << uint16 (0); /* flags - not used right now */
1165
1166 /* Build up the list of faces. Also, send any information (ie, the
1167 * the face itself) down to the client.
1168 */
1169 for (int i = 0; i < animations[anim_num].num_animations; i++)
1170 {
1171 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1172 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1173
1174 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1175 }
1176
1177 ns->send_packet (sl); 854 pl->ns->send_packet (sl);
1178
1179 ns->anims_sent[anim_num] = 1;
1180} 855}
1181
1182 856
1183/****************************************************************************** 857/******************************************************************************
1184 * 858 *
1185 * Start of map related commands. 859 * Start of map related commands.
1186 * 860 *
1187 ******************************************************************************/ 861 ******************************************************************************/
1188 862
1189/**
1190 * This adds face_num to a map cell at x,y. If the client doesn't have
1191 * the face yet, we will also send it.
1192 */
1193static void
1194esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1195{
1196 if (newmap->cells[x][y].count >= MAP_LAYERS)
1197 {
1198 //TODO: one or the other, can't both have abort and return, verify and act
1199 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1200 return;
1201 abort ();
1202 }
1203
1204 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1205 newmap->cells[x][y].count++;
1206
1207 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1208 esrv_send_face (ns, face_num, 0);
1209}
1210
1211/** Clears a map cell */ 863/** Clears a map cell */
1212static void 864static void
1213map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 865map_clearcell (struct MapCell *cell, int count)
1214{ 866{
1215 cell->faces[0] = face0; 867 cell->faces[0] = 0;
1216 cell->faces[1] = face1; 868 cell->faces[1] = 0;
1217 cell->faces[2] = face2; 869 cell->faces[2] = 0;
870 cell->smooth[0] = 0;
871 cell->smooth[1] = 0;
872 cell->smooth[2] = 0;
1218 cell->count = count; 873 cell->count = count;
1219 cell->stat_hp = 0; 874 cell->stat_hp = 0;
1220 cell->flags = 0; 875 cell->flags = 0;
1221 cell->player = 0; 876 cell->player = 0;
1222} 877}
1223 878
1224#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1225#define MAX_LAYERS 3 879#define MAX_LAYERS 3
1226
1227/* Using a global really isn't a good approach, but saves the over head of
1228 * allocating and deallocating such a block of data each time run through,
1229 * and saves the space of allocating this in the socket object when we only
1230 * need it for this cycle. If the server is ever threaded, this needs to be
1231 * re-examined.
1232 */
1233static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1234
1235/**
1236 * Returns true if any of the heads for this
1237 * space is set. Returns false if all are blank - this is used
1238 * for empty space checking.
1239 */
1240static inline int
1241have_head (int ax, int ay)
1242{
1243 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1244 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1245 return 1;
1246
1247 return 0;
1248}
1249
1250/**
1251 * check_head is a bit simplistic version of update_space below.
1252 * basically, it only checks the that the head on space ax,ay at layer
1253 * needs to get sent - if so, it adds the data, sending the head
1254 * if needed, and returning 1. If this no data needs to get
1255 * sent, it returns zero.
1256 */
1257static int
1258check_head (packet &sl, client &ns, int ax, int ay, int layer)
1259{
1260 short face_num;
1261
1262 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1263 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1264 else
1265 face_num = 0;
1266
1267 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1268 {
1269 sl << uint16 (face_num);
1270 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1271 esrv_send_face (&ns, face_num, 0);
1272
1273 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1274 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1275 return 1;
1276 }
1277
1278 return 0; /* No change */
1279}
1280 880
1281/** 881/**
1282 * Removes the need to replicate the same code for each layer. 882 * Removes the need to replicate the same code for each layer.
1283 * this returns true if this space is now in fact different than 883 * this returns true if this space is now in fact different than
1284 * it was. 884 * it was.
1285 * sl is the socklist this data is going into. 885 * sl is the socklist this data is going into.
1286 * ns is the socket we are working on - all the info we care 886 * ns is the socket we are working on - all the info we care
1287 * about is in this socket structure, so now need not pass the 887 * about is in this socket structure, so now need not pass the
1288 * entire player object. 888 * entire player object.
1289 * mx and my are map coordinate offsets for map mp
1290 * sx and sy are the offsets into the socket structure that
1291 * holds the old values.
1292 * layer is the layer to update, with 2 being the floor and 0 the 889 * layer is the layer to update, with 2 being the floor and 0 the
1293 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 890 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1294 * take. Interesting to note that before this function, the map1 function 891 * take. Interesting to note that before this function, the map1 function
1295 * numbers the spaces differently - I think this was a leftover from 892 * numbers the spaces differently - I think this was a leftover from
1296 * the map command, where the faces stack up. Sinces that is no longer 893 * the map command, where the faces stack up. Sinces that is no longer
1297 * the case, it seems to make more sense to have these layer values 894 * the case, it seems to make more sense to have these layer values
1298 * actually match. 895 * actually match.
1299 */ 896 */
1300static int 897static int
1301update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 898update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1302{ 899{
1303 object *ob, *head; 900 object *ob = ms.faces_obj [layer];
1304 uint16 face_num;
1305 int bx, by, i;
1306
1307 /* If there is a multipart object stored away, treat that as more important.
1308 * If not, then do the normal processing.
1309 */
1310 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1311
1312 /* Check to see if this head is part of the set of objects
1313 * we would normally send for this space. If so, then
1314 * don't use the head value. We need to do the check
1315 * here and not when setting up the heads[] value for two reasons -
1316 * 1) the heads[] values will get used even if the space is not visible.
1317 * 2) its possible the head is not on the same map as a part, and I'd
1318 * rather not need to do the map translation overhead.
1319 * 3) We need to do some extra checking to make sure that we will
1320 * otherwise send the image as this layer, eg, either it matches
1321 * the head value, or is not multipart.
1322 */
1323 if (head && !head->more)
1324 {
1325 for (i = 0; i < MAP_LAYERS; i++)
1326 {
1327 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1328 if (!ob)
1329 continue;
1330
1331 if (ob->head)
1332 ob = ob->head;
1333
1334 if (ob == head)
1335 {
1336 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1337 head = NULL;
1338 break;
1339 }
1340 }
1341 }
1342
1343 ob = head;
1344 if (!ob)
1345 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1346 901
1347 /* If there is no object for this space, or if the face for the object 902 /* If there is no object for this space, or if the face for the object
1348 * is the blank face, set the face number to zero. 903 * is the blank face, set the face number to zero.
1349 * else if we have the stored head object for this space, that takes 904 * else if we have the stored head object for this space, that takes
1350 * precedence over the other object for this space. 905 * precedence over the other object for this space.
1351 * otherwise, we do special head processing 906 * otherwise, we do special head processing
1352 */ 907 */
1353 if (!ob || ob->face == blank_face) 908 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1354 face_num = 0;
1355 else if (head)
1356 {
1357 /* if this is a head that had previously been stored */
1358 face_num = ob->face->number;
1359 }
1360 else
1361 {
1362 /* if the faces for the different parts of a multipart object
1363 * are the same, we only want to send the bottom right most
1364 * portion of the object. That info is in the tail_.. values
1365 * of the head. Note that for the head itself, ob->head will
1366 * be null, so we only do this block if we are working on
1367 * a tail piece.
1368 */
1369
1370 /* tail_x and tail_y will only be set in the head object. If
1371 * this is the head object and these are set, we proceed
1372 * with logic to only send bottom right. Similarly, if
1373 * this is one of the more parts but the head has those values
1374 * set, we want to do the processing. There can be cases where
1375 * the head is not visible but one of its parts is, so we just
1376 * can always expect that ob->arch->tail_x will be true for all
1377 * object we may want to display.
1378 */
1379 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1380 {
1381
1382 if (ob->head)
1383 head = ob->head;
1384 else
1385 head = ob;
1386
1387 /* Basically figure out where the offset is from where we are right
1388 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1389 * piece is from the head, and the tail is where the tail is from the
1390 * head. Note that bx and by will equal sx and sy if we are already working
1391 * on the bottom right corner. If ob is the head, the clone values
1392 * will be zero, so the right thing will still happen.
1393 */
1394 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1395 by = sy + head->arch->tail_y - ob->arch->clone.y;
1396
1397 /* I don't think this can ever happen, but better to check for it just
1398 * in case.
1399 */
1400 if (bx < sx || by < sy)
1401 {
1402 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1403 face_num = 0;
1404 }
1405 /* single part object, multipart object with non merged faces,
1406 * of multipart object already at lower right.
1407 */
1408 else if (bx == sx && by == sy)
1409 {
1410 face_num = ob->face->number;
1411
1412 /* if this face matches one stored away, clear that one away.
1413 * this code relies on the fact that the map1 commands
1414 * goes from 2 down to 0.
1415 */
1416 for (i = 0; i < MAP_LAYERS; i++)
1417 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1418 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1419 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1420 }
1421 else
1422 {
1423 /* If this head is stored away, clear it - otherwise,
1424 * there can be cases where a object is on multiple layers -
1425 * we only want to send it once.
1426 */
1427 face_num = head->face->number;
1428 for (i = 0; i < MAP_LAYERS; i++)
1429 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1430 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1431 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1432
1433 /* First, try to put the new head on the same layer. If that is used up,
1434 * then find another layer.
1435 */
1436 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1437 {
1438 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1439 }
1440 else
1441 for (i = 0; i < MAX_LAYERS; i++)
1442 {
1443 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1444 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1445 {
1446 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1447 }
1448 }
1449 face_num = 0; /* Don't send this object - we'll send the head later */
1450 }
1451 }
1452 else
1453 {
1454 /* In this case, we are already at the lower right or single part object,
1455 * so nothing special
1456 */
1457 face_num = ob->face->number;
1458
1459 /* clear out any head entries that have the same face as this one */
1460 for (bx = 0; bx < layer; bx++)
1461 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1462 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1463 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1464 }
1465 } /* else not already head object or blank face */
1466
1467 /* This is a real hack. Basically, if we have nothing to send for this layer,
1468 * but there is a head on the next layer, send that instead.
1469 * Without this, what happens is you can get the case where the player stands
1470 * on the same space as the head. However, if you have overlapping big objects
1471 * of the same type, what happens then is it doesn't think it needs to send
1472 * This tends to make stacking also work/look better.
1473 */
1474 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1475 {
1476 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1477 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1478 }
1479
1480 /* Another hack - because of heads and whatnot, this face may match one
1481 * we already sent for a lower layer. In that case, don't send
1482 * this one.
1483 */
1484 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1485 face_num = 0;
1486 909
1487 /* We've gotten what face we want to use for the object. Now see if 910 /* We've gotten what face we want to use for the object. Now see if
1488 * if it has changed since we last sent it to the client. 911 * if it has changed since we last sent it to the client.
1489 */ 912 */
1490 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 913 if (lastcell.faces[layer] != face_num)
1491 { 914 {
1492 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 915 lastcell.faces[layer] = face_num;
916
1493 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 917 if (!ns.faces_sent[face_num])
918 if (ob)
919 ns.send_faces (ob);
920 else
1494 esrv_send_face (&ns, face_num, 0); 921 ns.send_face (face_num, 10);
1495 922
1496 sl << uint16 (face_num); 923 sl << uint16 (face_num);
1497 return 1; 924 return 1;
1498 } 925 }
1499 926
1500 /* Nothing changed */ 927 /* Nothing changed */
1501 return 0; 928 return 0;
1502} 929}
1503 930
1504/** 931// prefetch (and touch) all maps within a specific distancd
1505 * This function is mainly a copy of update_space, 932static void
1506 * except it handles update of the smoothing updates, 933prefetch_surrounding_maps (maptile *map, int distance)
1507 * not the face updates.
1508 * Removes the need to replicate the same code for each layer.
1509 * this returns true if this smooth is now in fact different
1510 * than it was.
1511 * sl is the socklist this data is going into.
1512 * ns is the socket we are working on - all the info we care
1513 * about is in this socket structure, so know need to pass the
1514 * entire player object.
1515 * mx and my are map coordinate offsets for map mp
1516 * sx and sy are the offsets into the socket structure that
1517 * holds the old values.
1518 * layer is the layer to update, with 2 being the floor and 0 the
1519 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1520 * take.
1521 */
1522
1523static inline int
1524update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1525{ 934{
1526 object *ob; 935 map->last_access = runtime;
1527 int smoothlevel; /* old face_num; */
1528 936
1529 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 937 if (--distance)
1530 938 for (int dir = 4; --dir; )
1531 /* If there is no object for this space, or if the face for the object 939 if (const shstr &path = map->tile_path [dir])
1532 * is the blank face, set the smoothlevel to zero. 940 if (maptile *&neigh = map->tile_map [dir])
1533 */ 941 prefetch_surrounding_maps (neigh, distance);
1534 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1535 smoothlevel = 0;
1536 else
1537 {
1538 smoothlevel = ob->smoothlevel;
1539 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1540 SendSmooth (&ns, ob->face->number);
1541 } /* else not already head object or blank face */
1542
1543 /* We've gotten what face we want to use for the object. Now see if
1544 * if it has changed since we last sent it to the client.
1545 */
1546 if (smoothlevel > 255)
1547 smoothlevel = 255;
1548 else if (smoothlevel < 0)
1549 smoothlevel = 0;
1550
1551 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1552 {
1553 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1554 sl << uint8 (smoothlevel);
1555 return 1;
1556 }
1557
1558 /* Nothing changed */
1559 return 0;
1560}
1561
1562/**
1563 * Returns the size of a data for a map square as returned by
1564 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1565 * available.
1566 */
1567int
1568getExtendedMapInfoSize (client * ns)
1569{
1570 int result = 0;
1571
1572 if (ns->ext_mapinfos)
1573 {
1574 if (ns->EMI_smooth)
1575 result += 1; /*One byte for smoothlevel */
1576 }
1577
1578 return result;
1579}
1580
1581/**
1582 * This function uses the new map1 protocol command to send the map
1583 * to the client. It is necessary because the old map command supports
1584 * a maximum map size of 15x15.
1585 * This function is much simpler than the old one. This is because
1586 * the old function optimized to send as few face identifiers as possible,
1587 * at the expense of sending more coordinate location (coordinates were
1588 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1589 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1590 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1591 * and use the other 4 bits for other informatiion. For full documentation
1592 * of what we send, see the doc/Protocol file.
1593 * I will describe internally what we do:
1594 * the socket->lastmap shows how the map last looked when sent to the client.
1595 * in the lastmap structure, there is a cells array, which is set to the
1596 * maximum viewable size (As set in config.h).
1597 * in the cells, there are faces and a count value.
1598 * we use the count value to hold the darkness value. If -1, then this space
1599 * is not viewable.
1600 * we use faces[0] faces[1] faces[2] to hold what the three layers
1601 * look like.
1602 */
1603void
1604draw_client_map1 (object *pl)
1605{
1606 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1607 sint16 nx, ny;
1608 int estartlen, eoldlen;
1609 uint16 mask, emask;
1610 uint8 eentrysize;
1611 uint16 ewhatstart, ewhatflag;
1612 uint8 extendedinfos;
1613 maptile *m;
1614
1615 client &socket = *pl->contr->socket;
1616
1617 check_map_change (pl->contr);
1618
1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620 packet esl;
1621
1622 startlen = sl.length ();
1623
1624 /*Extendedmapinfo structure initialisation */
1625 if (socket.ext_mapinfos)
1626 {
1627 extendedinfos = EMI_NOREDRAW;
1628
1629 if (socket.EMI_smooth)
1630 extendedinfos |= EMI_SMOOTH;
1631
1632 ewhatstart = esl.length ();
1633 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1634 could need to be taken away */
1635 eentrysize = getExtendedMapInfoSize (&socket);
1636 esl << "mapextended "
1637 << uint8 (extendedinfos)
1638 << uint8 (eentrysize);
1639
1640 estartlen = esl.length ();
1641 }
1642 else
1643 {
1644 /* suppress compiler warnings */
1645 ewhatstart = 0;
1646 ewhatflag = 0;
1647 estartlen = 0;
1648 }
1649
1650 /* Init data to zero */
1651 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1652
1653 /* x,y are the real map locations. ax, ay are viewport relative
1654 * locations.
1655 */
1656 ay = 0;
1657
1658 /* We could do this logic as conditionals in the if statement,
1659 * but that started to get a bit messy to look at.
1660 */
1661 max_x = pl->x + (socket.mapx + 1) / 2;
1662 max_y = pl->y + (socket.mapy + 1) / 2;
1663
1664 if (socket.mapmode == Map1aCmd)
1665 {
1666 max_x += MAX_HEAD_OFFSET;
1667 max_y += MAX_HEAD_OFFSET;
1668 }
1669
1670 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1671 {
1672 ax = 0;
1673 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1674 {
1675
1676 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1677
1678 /* If this space is out of the normal viewable area, we only check
1679 * the heads value ax or ay will only be greater than what
1680 * the client wants if using the map1a command - this is because
1681 * if the map1a command is not used, max_x and max_y will be
1682 * set to lower values.
1683 */
1684 if (ax >= socket.mapx || ay >= socket.mapy)
1685 {
1686 int i, got_one;
1687
1688 oldlen = sl.length ();
1689
1690 sl << uint16 (mask);
1691
1692 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1693 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1694 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1695
1696 /* If all we are doing is sending 0 (blank) faces, we don't
1697 * actually need to send that - just the coordinates
1698 * with no faces tells the client to blank out the
1699 * space.
1700 */
1701 got_one = 0;
1702 for (i = oldlen + 2; i < sl.length (); i++)
1703 if (sl[i])
1704 got_one = 1;
1705
1706 if (got_one && (mask & 0xf))
1707 sl[oldlen + 1] = mask & 0xff;
1708 else
1709 { /*either all faces blank, either no face at all */
1710 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1711 sl.reset (oldlen + 2);
1712 else
1713 sl.reset (oldlen);
1714 }
1715
1716 /*What concerns extendinfos, nothing to be done for now
1717 * (perhaps effects layer later)
1718 */
1719 continue; /* don't do processing below */
1720 }
1721
1722 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1723
1724 d = pl->contr->blocked_los[ax][ay];
1725
1726 /* If the coordinates are not valid, or it is too dark to see,
1727 * we tell the client as such
1728 */
1729 nx = x;
1730 ny = y;
1731 m = get_map_from_coord (pl->map, &nx, &ny);
1732
1733 if (!m)
1734 {
1735 /* space is out of map. Update space and clear values
1736 * if this hasn't already been done. If the space is out
1737 * of the map, it shouldn't have a head
1738 */
1739 if (lastcell.count != -1)
1740 {
1741 sl << uint16 (mask);
1742 map_clearcell (&lastcell, 0, 0, 0, -1);
1743 }
1744 }
1745 else if (d > 3)
1746 {
1747 int need_send = 0, count;
1748
1749 /* This block deals with spaces that are not visible for whatever
1750 * reason. Still may need to send the head for this space.
1751 */
1752
1753 oldlen = sl.length ();
1754
1755 sl << uint16 (mask);
1756
1757 if (lastcell.count != -1)
1758 need_send = 1;
1759
1760 count = -1;
1761
1762 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1763 {
1764 /* Now check to see if any heads need to be sent */
1765
1766 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1767 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1768 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1769
1770 lastcell.count = count;
1771 }
1772 else
1773 {
1774 /* properly clear a previously sent big face */
1775 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1776 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1777 need_send = 1;
1778
1779 map_clearcell (&lastcell, 0, 0, 0, count);
1780 }
1781
1782 if ((mask & 0xf) || need_send)
1783 sl[oldlen + 1] = mask & 0xff;
1784 else
1785 sl.reset (oldlen);
1786 }
1787 else 942 else
1788 { 943 neigh = maptile::find_async (path, map);
1789 /* In this block, the space is visible or there are head objects 944}
1790 * we need to send.
1791 */
1792 945
1793 /* Rather than try to figure out what everything that we might 946// prefetch a generous area around the player
1794 * need to send is, then form the packet after that, 947static void
1795 * we presume that we will in fact form a packet, and update 948prefetch_surrounding_maps (object *op)
1796 * the bits by what we do actually send. If we send nothing, 949{
1797 * we just back out sl.length () to the old value, and no harm 950 prefetch_surrounding_maps (op->map, 3);
1798 * is done.
1799 * I think this is simpler than doing a bunch of checks to see
1800 * what if anything we need to send, setting the bits, then
1801 * doing those checks again to add the real data.
1802 */
1803 oldlen = sl.length ();
1804 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1805 eoldlen = esl.length ();
1806 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1807 sl << uint16 (mask);
1808
1809 if (socket.ext_mapinfos)
1810 esl << uint16 (emask);
1811
1812 unsigned char dummy;
1813 unsigned char *last_ext = &dummy;
1814
1815 /* Darkness changed */
1816 if (lastcell.count != d && socket.darkness)
1817 {
1818 mask |= 0x8;
1819
1820 if (socket.extmap)
1821 {
1822 *last_ext |= 0x80;
1823 last_ext = &sl[sl.length ()];
1824 sl << uint8 (d);
1825 }
1826 else
1827 sl << uint8 (255 - 64 * d);
1828 }
1829
1830 lastcell.count = d;
1831
1832 if (socket.extmap)
1833 {
1834 uint8 stat_hp = 0;
1835 uint8 stat_width = 0;
1836 uint8 flags = 0;
1837 UUID player = 0;
1838
1839 // send hp information, if applicable
1840 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1841 {
1842 if (op->head || op->invisible)
1843 ; // do not show
1844 else if (op->type == PLAYER
1845 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1846 {
1847 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1848 {
1849 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1850 stat_width = op->arch->tail_x;
1851 }
1852 }
1853
1854 if (op->msg && op->msg[0] == '@')
1855 flags |= 1;
1856
1857 if (op->type == PLAYER && op != pl)
1858 player = op->count;
1859 }
1860
1861 if (lastcell.stat_hp != stat_hp)
1862 {
1863 lastcell.stat_hp = stat_hp;
1864
1865 mask |= 0x8;
1866 *last_ext |= 0x80;
1867 last_ext = &sl[sl.length ()];
1868
1869 sl << uint8 (5) << uint8 (stat_hp);
1870
1871 if (stat_width > 1)
1872 {
1873 *last_ext |= 0x80;
1874 last_ext = &sl[sl.length ()];
1875
1876 sl << uint8 (6) << uint8 (stat_width);
1877 }
1878 }
1879
1880 if (lastcell.player != player)
1881 {
1882 lastcell.player = player;
1883
1884 mask |= 0x8;
1885 *last_ext |= 0x80;
1886 last_ext = &sl[sl.length ()];
1887
1888 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1889 }
1890
1891 if (lastcell.flags != flags)
1892 {
1893 lastcell.flags = flags;
1894
1895 mask |= 0x8;
1896 *last_ext |= 0x80;
1897 last_ext = &sl[sl.length ()];
1898
1899 sl << uint8 (8) << uint8 (flags);
1900 }
1901 }
1902
1903 /* Floor face */
1904 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1905 mask |= 0x4;
1906
1907 if (socket.EMI_smooth)
1908 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1909 emask |= 0x4;
1910
1911 /* Middle face */
1912 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1913 mask |= 0x2;
1914
1915 if (socket.EMI_smooth)
1916 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1917 emask |= 0x2;
1918
1919 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1920 {
1921 if (lastcell.faces[0] != pl->face->number)
1922 {
1923 lastcell.faces[0] = pl->face->number;
1924 mask |= 0x1;
1925
1926 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1927 esrv_send_face (&socket, pl->face->number, 0);
1928
1929 sl << uint16 (pl->face->number);
1930 }
1931 }
1932 else
1933 {
1934 /* Top face */
1935 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1936 mask |= 0x1;
1937
1938 if (socket.EMI_smooth)
1939 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1940 emask |= 0x1;
1941 }
1942
1943 /* Check to see if we are in fact sending anything for this
1944 * space by checking the mask. If so, update the mask.
1945 * if not, reset the len to that from before adding the mask
1946 * value, so we don't send those bits.
1947 */
1948 if (mask & 0xf)
1949 sl[oldlen + 1] = mask & 0xff;
1950 else
1951 sl.reset (oldlen);
1952
1953 if (emask & 0xf)
1954 esl[eoldlen + 1] = emask & 0xff;
1955 else
1956 esl.reset (eoldlen);
1957 } /* else this is a viewable space */
1958 } /* for x loop */
1959 } /* for y loop */
1960
1961 /* Verify that we in fact do need to send this */
1962 if (socket.ext_mapinfos)
1963 {
1964 if (!(sl.length () > startlen || socket.sent_scroll))
1965 {
1966 /* No map data will follow, so don't say the client
1967 * it doesn't need draw!
1968 */
1969 ewhatflag &= (~EMI_NOREDRAW);
1970 esl[ewhatstart + 1] = ewhatflag & 0xff;
1971 }
1972
1973 if (esl.length () > estartlen)
1974 socket.send_packet (esl);
1975 }
1976
1977 if (sl.length () > startlen || socket.sent_scroll)
1978 {
1979 socket.send_packet (sl);
1980 socket.sent_scroll = 0;
1981 }
1982} 951}
1983 952
1984/** 953/**
1985 * Draws client map. 954 * Draws client map.
1986 */ 955 */
1987void 956void
1988draw_client_map (object *pl) 957draw_client_map (player *pl)
1989{ 958{
1990 int i, j; 959 object *ob = pl->observe;
1991 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 960 if (!ob->active)
1992 New_Face *face, *floor;
1993 New_Face *floor2;
1994 int d, mflags;
1995 struct Map newmap;
1996 maptile *m, *pm;
1997
1998 if (pl->type != PLAYER)
1999 {
2000 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2001 return; 961 return;
2002 }
2003
2004 pm = pl->map;
2005 962
2006 /* If player is just joining the game, he isn't here yet, so the map 963 /* If player is just joining the game, he isn't here yet, so the map
2007 * can get swapped out. If so, don't try to send them a map. All will 964 * can get swapped out. If so, don't try to send them a map. All will
2008 * be OK once they really log in. 965 * be OK once they really log in.
2009 */ 966 */
2010 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 967 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
2011 return; 968 return;
2012 969
2013 memset (&newmap, 0, sizeof (struct Map)); 970 int startlen, oldlen;
2014 971
2015 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 972 check_map_change (pl);
2016 { 973 prefetch_surrounding_maps (pl->ob);
2017 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2018 {
2019 ax = i;
2020 ay = j;
2021 m = pm;
2022 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023 974
2024 if (mflags & P_OUT_OF_MAP)
2025 continue;
2026
2027 if (mflags & P_NEED_UPDATE)
2028 update_position (m, ax, ay);
2029
2030 /* If a map is visible to the player, we don't want to swap it out
2031 * just to reload it. This should really call something like
2032 * swap_map, but this is much more efficient and 'good enough'
2033 */
2034 if (mflags & P_NEW_MAP)
2035 m->timeout = 50;
2036 }
2037 }
2038 /* do LOS after calls to update_position */ 975 /* do LOS after calls to update_position */
2039 if (pl->contr->do_los) 976 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob)
2040 { 978 {
979 pl->do_los = 0;
2041 update_los (pl); 980 pl->update_los ();
2042 pl->contr->do_los = 0; 981 }
982
983 /**
984 * This function uses the new map1 protocol command to send the map
985 * to the client. It is necessary because the old map command supports
986 * a maximum map size of 15x15.
987 * This function is much simpler than the old one. This is because
988 * the old function optimized to send as few face identifiers as possible,
989 * at the expense of sending more coordinate location (coordinates were
990 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
991 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
992 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
993 * and use the other 4 bits for other informatiion. For full documentation
994 * of what we send, see the doc/Protocol file.
995 * I will describe internally what we do:
996 * the ns->lastmap shows how the map last looked when sent to the client.
997 * in the lastmap structure, there is a cells array, which is set to the
998 * maximum viewable size (As set in config.h).
999 * in the cells, there are faces and a count value.
1000 * we use the count value to hold the darkness value. If -1, then this space
1001 * is not viewable.
1002 * we use faces[0] faces[1] faces[2] to hold what the three layers
1003 * look like.
1004 */
1005
1006 client &socket = *pl->ns;
1007
1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1009
1010 startlen = sl.length ();
1011
1012 int hx = socket.mapx / 2;
1013 int hy = socket.mapy / 2;
1014
1015 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1016 int ax = dx + hx;
1017 int ay = dy + hy;
1018
1019 int mask = (ax << 10) | (ay << 4);
1020 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1021
1022 /* If the coordinates are not valid, or it is too dark to see,
1023 * we tell the client as such
1024 */
1025 if (!m)
1026 {
1027 /* space is out of map. Update space and clear values
1028 * if this hasn't already been done. If the space is out
1029 * of the map, it shouldn't have a head.
1030 */
1031 if (lastcell.count != -1)
1032 {
1033 sl << uint16 (mask);
1034 map_clearcell (&lastcell, -1);
1035 }
1036
1037 continue;
2043 } 1038 }
1039
1040 int d = pl->blocked_los_uc (dx, dy);
2044 1041
2045 /* Big maps need a different drawing mechanism to work */ 1042 if (d > 3)
2046 draw_client_map1 (pl); 1043 {
2047} 1044 /* This block deals with spaces that are not visible for whatever
1045 * reason. Still may need to send the head for this space.
1046 */
1047 if (lastcell.count != -1
1048 || lastcell.faces[0]
1049 || lastcell.faces[1]
1050 || lastcell.faces[2]
1051 || lastcell.stat_hp
1052 || lastcell.flags
1053 || lastcell.player)
1054 sl << uint16 (mask);
2048 1055
1056 /* properly clear a previously sent big face */
1057 map_clearcell (&lastcell, -1);
1058 }
1059 else
1060 {
1061 /* In this block, the space is visible.
1062 */
1063
1064 /* Rather than try to figure out what everything that we might
1065 * need to send is, then form the packet after that,
1066 * we presume that we will in fact form a packet, and update
1067 * the bits by what we do actually send. If we send nothing,
1068 * we just back out sl.length () to the old value, and no harm
1069 * is done.
1070 * I think this is simpler than doing a bunch of checks to see
1071 * what if anything we need to send, setting the bits, then
1072 * doing those checks again to add the real data.
1073 */
1074 oldlen = sl.length ();
1075
1076 sl << uint16 (mask);
1077
1078 unsigned char dummy;
1079 unsigned char *last_ext = &dummy;
1080
1081 /* Darkness changed */
1082 if (lastcell.count != d)
1083 {
1084 mask |= 0x8;
1085
1086 if (socket.extmap)
1087 {
1088 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095
1096 lastcell.count = d;
1097
1098 mapspace &ms = m->at (nx, ny);
1099 ms.update ();
1100
1101 if (expect_true (socket.extmap))
1102 {
1103 uint8 stat_hp = 0;
1104 uint8 stat_width = 0;
1105 uint8 flags = 0;
1106 tag_t player = 0;
1107
1108 // send hp information, if applicable
1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1111 {
1112 if (op->stats.maxhp > op->stats.hp
1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1123
1124 if (expect_false (op->has_dialogue ()))
1125 flags |= 1;
1126
1127 if (expect_false (op->type == PLAYER))
1128 player = op == ob ? pl->ob->count
1129 : op == pl->ob ? ob->count
1130 : op->count;
1131 }
1132
1133 if (expect_false (lastcell.stat_hp != stat_hp))
1134 {
1135 lastcell.stat_hp = stat_hp;
1136
1137 mask |= 0x8;
1138 *last_ext |= 0x80;
1139 last_ext = &sl[sl.length ()];
1140
1141 sl << uint8 (5) << uint8 (stat_hp);
1142
1143 if (stat_width > 1)
1144 {
1145 *last_ext |= 0x80;
1146 last_ext = &sl[sl.length ()];
1147
1148 sl << uint8 (6) << uint8 (stat_width);
1149 }
1150 }
1151
1152 if (expect_false (lastcell.player != player))
1153 {
1154 lastcell.player = player;
1155
1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1159
1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1170
1171 sl << uint8 (8) << uint8 (flags);
1172 }
1173 }
1174
1175 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4;
1178
1179 /* Middle face */
1180 if (update_space (sl, socket, ms, lastcell, 1))
1181 mask |= 0x2;
1182
1183 if (expect_false (ob->invisible)
1184 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1185 && ms.player () == ob)
1186 {
1187 // force player to be visible to himself if invisible
1188 if (lastcell.faces[0] != ob->face)
1189 {
1190 lastcell.faces[0] = ob->face;
1191
1192 mask |= 0x1;
1193 sl << uint16 (ob->face);
1194
1195 socket.send_faces (ob);
1196 }
1197 }
1198 /* Top face */
1199 else if (update_space (sl, socket, ms, lastcell, 0))
1200 mask |= 0x1;
1201
1202 /* Check to see if we are in fact sending anything for this
1203 * space by checking the mask. If so, update the mask.
1204 * if not, reset the len to that from before adding the mask
1205 * value, so we don't send those bits.
1206 */
1207 if (mask & 0xf)
1208 sl[oldlen + 1] = mask & 0xff;
1209 else
1210 sl.reset (oldlen);
1211 } /* else this is a viewable space */
1212 ordered_mapwalk_end
1213
1214 socket.flush_fx ();
1215
1216 if (sl.length () > startlen || socket.sent_scroll)
1217 {
1218 socket.send_packet (sl);
1219 socket.sent_scroll = 0;
1220 }
1221}
2049 1222
2050/*****************************************************************************/ 1223/*****************************************************************************/
2051
2052/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1224/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2053
2054/* a player. Of course, the client need to know the command to be able to */ 1225/* a player. Of course, the client need to know the command to be able to */
2055
2056/* manage it ! */ 1226/* manage it ! */
2057
2058/*****************************************************************************/ 1227/*****************************************************************************/
2059void 1228void
2060send_plugin_custom_message (object *pl, char *buf) 1229send_plugin_custom_message (object *pl, char *buf)
2061{ 1230{
2062 pl->contr->socket->send_packet (buf); 1231 pl->contr->ns->send_packet (buf);
2063} 1232}
2064 1233
2065/** 1234/**
2066 * This sends the skill number to name mapping. We ignore 1235 * This sends the skill number to name mapping. We ignore
2067 * the params - we always send the same info no matter what. 1236 * the params - we always send the same info no matter what.
… …
2071{ 1240{
2072 packet sl; 1241 packet sl;
2073 sl << "replyinfo skill_info\n"; 1242 sl << "replyinfo skill_info\n";
2074 1243
2075 for (int i = 1; i < NUM_SKILLS; i++) 1244 for (int i = 1; i < NUM_SKILLS; i++)
2076 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
2077 1246
2078 if (sl.length () >= MAXSOCKBUF) 1247 if (sl.length () > MAXSOCKBUF)
2079 { 1248 {
2080 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2081 fatal (0); 1250 fatal (0);
2082 } 1251 }
2083 1252
… …
2096 sl << "replyinfo spell_paths\n"; 1265 sl << "replyinfo spell_paths\n";
2097 1266
2098 for (int i = 0; i < NRSPELLPATHS; i++) 1267 for (int i = 0; i < NRSPELLPATHS; i++)
2099 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2100 1269
2101 if (sl.length () >= MAXSOCKBUF) 1270 if (sl.length () > MAXSOCKBUF)
2102 { 1271 {
2103 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2104 fatal (0); 1273 fatal (0);
2105 } 1274 }
2106 1275
… …
2112 * it then sends an updspell packet for each spell that has changed in this way 1281 * it then sends an updspell packet for each spell that has changed in this way
2113 */ 1282 */
2114void 1283void
2115esrv_update_spells (player *pl) 1284esrv_update_spells (player *pl)
2116{ 1285{
1286 if (!pl->ns)
1287 return;
1288
2117 if (!pl->socket->monitor_spells) 1289 if (!pl->ns->monitor_spells)
2118 return; 1290 return;
2119 1291
2120 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1292 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2121 { 1293 {
2122 if (spell->type == SPELL) 1294 if (spell->type == SPELL)
2123 { 1295 {
2124 int flags = 0; 1296 int flags = 0;
2125 1297
2126 /* check if we need to update it */ 1298 /* check if we need to update it */
2127 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2128 { 1300 {
2129 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2130 flags |= UPD_SP_MANA; 1302 flags |= UPD_SP_MANA;
2131 } 1303 }
2132 1304
2133 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2134 { 1306 {
2135 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2136 flags |= UPD_SP_GRACE; 1308 flags |= UPD_SP_GRACE;
2137 } 1309 }
2138 1310
2139 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2140 { 1312 {
2141 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2142 flags |= UPD_SP_DAMAGE; 1314 flags |= UPD_SP_DAMAGE;
2143 } 1315 }
2144 1316
2145 if (flags) 1317 if (flags)
2146 { 1318 {
… …
2148 1320
2149 sl << "updspell " 1321 sl << "updspell "
2150 << uint8 (flags) 1322 << uint8 (flags)
2151 << uint32 (spell->count); 1323 << uint32 (spell->count);
2152 1324
2153 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2154 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
2155 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
2156 1328
2157 pl->socket->send_packet (sl); 1329 pl->ns->send_packet (sl);
2158 } 1330 }
2159 } 1331 }
2160 } 1332 }
2161} 1333}
2162 1334
2163void 1335void
2164esrv_remove_spell (player *pl, object *spell) 1336esrv_remove_spell (player *pl, object *spell)
2165{ 1337{
2166 if (!pl->socket->monitor_spells) 1338 if (!pl->ns->monitor_spells)
2167 return; 1339 return;
2168 1340
2169 if (!pl || !spell || spell->env != pl->ob) 1341 if (!pl || !spell || spell->env != pl->ob)
2170 { 1342 {
2171 LOG (llevError, "Invalid call to esrv_remove_spell"); 1343 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2174 1346
2175 packet sl ("delspell"); 1347 packet sl ("delspell");
2176 1348
2177 sl << uint32 (spell->count); 1349 sl << uint32 (spell->count);
2178 1350
2179 pl->socket->send_packet (sl); 1351 pl->ns->send_packet (sl);
2180} 1352}
2181 1353
2182/* appends the spell *spell to the Socklist we will send the data to. */ 1354/* appends the spell *spell to the Socklist we will send the data to. */
2183static void 1355static void
2184append_spell (player *pl, packet &sl, object *spell) 1356append_spell (player *pl, packet &sl, object *spell)
2185{ 1357{
2186 int len, i, skill = 0; 1358 int i, skill = 0;
2187 1359
2188 if (!(spell->name)) 1360 if (!(spell->name))
2189 { 1361 {
2190 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1362 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2191 return; 1363 return;
2192 } 1364 }
2193 1365
2194 /* store costs and damage in the object struct, to compare to later */ 1366 /* store costs and damage in the object struct, to compare to later */
2195 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1367 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2196 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1368 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2197 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2198 1370
2199 /* figure out which skill it uses, if it uses one */ 1371 /* figure out which skill it uses, if it uses one */
2200 if (spell->skill) 1372 if (spell->skill)
2201 { 1373 if (object *tmp = pl->find_skill (spell->skill))
2202 for (i = 1; i < NUM_SKILLS; i++)
2203 if (!strcmp (spell->skill, skill_names[i]))
2204 {
2205 skill = i + CS_STAT_SKILLINFO; 1374 skill = tmp->subtype + CS_STAT_SKILLINFO;
2206 break; 1375
2207 } 1376 // spells better have a face
1377 if (!spell->face)
2208 } 1378 {
1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1380 spell->face = face_find ("burnout.x11", blank_face);
1381 }
1382
1383 pl->ns->send_face (spell->face);
2209 1384
2210 /* send the current values */ 1385 /* send the current values */
2211 sl << uint32 (spell->count) 1386 sl << uint32 (spell->count)
2212 << uint16 (spell->level) 1387 << uint16 (spell->level)
2213 << uint16 (spell->casting_time) 1388 << uint16 (spell->casting_time)
2214 << uint16 (spell->last_sp) 1389 << uint16 (spell->cached_sp)
2215 << uint16 (spell->last_grace) 1390 << uint16 (spell->cached_grace)
2216 << uint16 (spell->last_eat) 1391 << uint16 (spell->cached_eat)
2217 << uint8 (skill) 1392 << uint8 (skill)
2218 << uint32 (spell->path_attuned) 1393 << uint32 (spell->path_attuned)
2219 << uint32 (spell->face ? spell->face->number : 0) 1394 << uint32 (spell->face)
2220 << data8 (spell->name) 1395 << data8 (spell->name)
2221 << data16 (spell->msg); 1396 << data16 (spell->msg);
2222} 1397}
2223 1398
2224/** 1399/**
… …
2232 { 1407 {
2233 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1408 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2234 return; 1409 return;
2235 } 1410 }
2236 1411
2237 if (!pl->socket->monitor_spells) 1412 if (!pl->ns->monitor_spells)
2238 return; 1413 return;
2239 1414
2240 packet sl ("addspell"); 1415 packet sl ("addspell");
2241 1416
2242 if (!spell) 1417 if (!spell)
2243 { 1418 {
2244 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1419 for (spell = pl->ob->inv; spell; spell = spell->below)
2245 { 1420 {
2246 /* were we to simply keep appending data here, we could exceed 1421 /* were we to simply keep appending data here, we could exceed
2247 * MAXSOCKBUF if the player has enough spells to add, we know that 1422 * MAXSOCKBUF if the player has enough spells to add, we know that
2248 * append_spells will always append 19 data bytes, plus 4 length 1423 * append_spells will always append 19 data bytes, plus 4 length
2249 * bytes and 3 strings (because that is the spec) so we need to 1424 * bytes and 3 strings (because that is the spec) so we need to
2250 * check that the length of those 3 strings, plus the 23 bytes, 1425 * check that the length of those 3 strings, plus the 23 bytes,
2251 * won't take us over the length limit for the socket, if it does, 1426 * won't take us over the length limit for the socket, if it does,
2252 * we need to send what we already have, and restart packet formation 1427 * we need to send what we already have, and restart packet formation
2253 */ 1428 */
1429 if (spell->type != SPELL)
1430 continue;
1431
2254 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1432 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2255 * to show add_spell is 26 bytes + 2 strings. However, the overun 1433 * to show add_spell is 26 bytes + 2 strings. However, the overun
2256 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1434 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2257 * like it will fix this 1435 * like it will fix this
2258 */ 1436 */
2259 if (spell->type != SPELL)
2260 continue;
2261
2262 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1437 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2263 { 1438 {
1439 pl->ns->flush_fx ();
2264 pl->socket->send_packet (sl); 1440 pl->ns->send_packet (sl);
2265 1441
2266 sl.reset (); 1442 sl.reset ();
2267 sl << "addspell "; 1443 sl << "addspell ";
2268 } 1444 }
2269 1445
… …
2276 return; 1452 return;
2277 } 1453 }
2278 else 1454 else
2279 append_spell (pl, sl, spell); 1455 append_spell (pl, sl, spell);
2280 1456
2281 if (sl.length () >= MAXSOCKBUF) 1457 if (sl.length () > MAXSOCKBUF)
2282 { 1458 {
2283 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2284 fatal (0); 1460 fatal (0);
2285 } 1461 }
2286 1462
2287 /* finally, we can send the packet */ 1463 /* finally, we can send the packet */
1464 pl->ns->flush_fx ();
2288 pl->socket->send_packet (sl); 1465 pl->ns->send_packet (sl);
2289} 1466}
2290 1467

Diff Legend

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