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

Diff Legend

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