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.134 by root, Mon Jul 14 23:57:46 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
109 * complexities for the client, and probably doesn't make 96 * complexities for the client, and probably doesn't make
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
115 if (ns->mapmode == Map1aCmd)
116 {
117 mx += MAX_HEAD_OFFSET;
118 my += MAX_HEAD_OFFSET;
119 }
120 101
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
… …
148} 129}
149 130
150static void 131static void
151clear_map (player *pl) 132clear_map (player *pl)
152{ 133{
153 client_socket &socket = *pl->socket; 134 pl->ns->mapinfo_queue_clear ();
154 135
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156 137
138 pl->ns->force_newmap = false;
139
157 if (socket.newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
159 142
160 socket.update_look = 1; 143 pl->ns->floorbox_reset ();
161 socket.look_position = 0;
162} 144}
163 145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
170}
171
164/** check for map change and send new map data */ 172/** check for map/region change and send new map data */
165static void 173static void
166check_map_change (player *pl) 174check_map_change (player *pl)
167{ 175{
168 client_socket &socket = *pl->socket; 176 client &socket = *pl->ns;
169 object *ob = pl->ob; 177 object *ob = pl->observe;
170 char buf[MAX_BUF]; /* eauugggh */
171 178
172 if (socket.current_map != ob->map) 179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
173 { 184 }
185
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
205
206 if (socket.current_map != ob->map || socket.force_newmap)
207 {
208 clear_map (pl);
174 socket.current_map = ob->map; 209 socket.current_map = ob->map;
175 210 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 } 211 }
202 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
203 { 213 {
204 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
205 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 217 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 218 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
209 else 219 else
210 { 220 {
211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 221 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
212 socket.update_look = 1; 222 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 223 }
215 } 224 }
216 225
217 socket.current_x = ob->x; 226 socket.current_x = ob->x;
218 socket.current_y = ob->y; 227 socket.current_y = ob->y;
… …
222 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
224 * that information. 233 * that information.
225 */ 234 */
226void 235void
227RequestInfo (char *buf, int len, client_socket * ns) 236RequestInfo (char *buf, int len, client *ns)
228{ 237{
229 char *params = NULL, *cp; 238 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 239
242 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
243 * params pointer. 241 * params pointer.
244 */ 242 */
245 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
246 if (*cp == ' ') 244 if (*params == ' ')
247 { 245 {
248 *cp = '\0';
249 params = cp + 1; 246 *params++ = 0;
250 break; 247 break;
251 } 248 }
252 249
253 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
254 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
257 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
258 send_skill_info (ns, params); 255 send_skill_info (ns, params);
259 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
260 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
261 else 258 else
262 ns->send_packet (bigbuf, len); 259 {
260 // undo tokenisation above and send replyinfo with the request unchanged
261 if (*params)
262 *--params = ' ';
263
264 ns->send_packet_printf ("replyinfo %s", buf);
265 }
263} 266}
264 267
265void 268void
266ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
267{ 270{
268 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 271 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
272}
273
274void
275ExtiCmd (char *buf, int len, client *ns)
276{
277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278}
279
280void
281client::mapinfo_queue_clear ()
282{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i);
285
286 mapinfo_queue.clear ();
287}
288
289bool
290client::mapinfo_try (char *buf)
291{
292 char *token = buf;
293 buf += strlen (buf) + 9;
294
295 // initial map and its origin
296 maptile *map = pl->observe->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y;
299 int max_distance = 8; // limit maximum path length to something generous
300
301 while (*buf && map && max_distance)
302 {
303 int dir = *buf++ - '1';
304
305 if (dir >= 0 && dir <= 3)
306 {
307 if (!map->tile_path [dir])
308 map = 0;
309 else if (map->tile_available (dir, false))
310 {
311 maptile *neigh = map->tile_map [dir];
312
313 switch (dir)
314 {
315 case 0: mapy -= neigh->height; break;
316 case 2: mapy += map ->height; break;
317 case 3: mapx -= neigh->width ; break;
318 case 1: mapx += map ->width ; break;
319 }
320
321 map = neigh;
322 --max_distance;
323 }
324 else
325 return 0;
326 }
327 else
328 max_distance = 0;
329 }
330
331 if (!max_distance)
332 send_packet_printf ("mapinfo %s error", token);
333 else if (!map || !map->path)
334 send_packet_printf ("mapinfo %s nomap", token);
335 else
336 {
337 int flags = 0;
338
339 if (map->tile_path[0]) flags |= 1;
340 if (map->tile_path[1]) flags |= 2;
341 if (map->tile_path[2]) flags |= 4;
342 if (map->tile_path[3]) flags |= 8;
343
344 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346
347 return 1;
348}
349
350void
351client::mapinfo_queue_run ()
352{
353 if (mapinfo_queue.empty () || !pl)
354 return;
355
356 for (int i = 0; i < mapinfo_queue.size (); ++i)
357 if (mapinfo_try (mapinfo_queue [i]))
358 {
359 free (mapinfo_queue [i]);
360 mapinfo_queue.erase (i);
361 }
362 else
363 ++i;
269} 364}
270 365
271void 366void
272MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
273{ 368{
274 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
275 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
276 371
277 char bigbuf[MAX_BUF], *token;
278
279 token = buf; 372 char *token = buf;
280 // copy token 373
281 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
282 return; 375 return;
283 376
284 *buf++ = 0;
285
286 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
287 { 378 {
288 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
289 381
290 // initial map and its origin 382#if 0
291 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
292 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
293 int mapx = pl->socket->mapx / 2 - pl->ob->x; 385 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 386 else
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
351 } 389 }
352 else 390 else
353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
354
355 pl->socket->send_packet (bigbuf);
356} 392}
357 393
358/** This is the Setup cmd - easy first implementation */ 394/** This is the Setup cmd */
359void 395void
360SetUp (char *buf, int len, client_socket * ns) 396SetUp (char *buf, int len, client * ns)
361{ 397{
362 int s, slen; 398 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} 399}
572 400
573/** 401/**
574 * The client has requested to be added to the game. 402 * 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. 403 * 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, 404 * 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. 405 * it either has to be here or init_sockets needs to be exported.
578 */ 406 */
579void 407void
580AddMeCmd (char *buf, int len, client_socket * ns) 408AddMeCmd (char *buf, int len, client *ns)
581{ 409{
582 Settings oldsettings; 410 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} 411}
592 412
593/** Reply to ExtendedInfos command */ 413/** Reply to ExtendedInfos command */
594void 414void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 415ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 416{
597 char cmdback[MAX_BUF]; 417 char cmdback[MAX_BUF];
598 char command[50]; 418 char command[50];
599 int info, nextinfo; 419 int info, nextinfo;
600 420
… …
651#define MSG_TYPE_MONUMENT 5 471#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 472#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 473
654/** Reply to ExtendedInfos command */ 474/** Reply to ExtendedInfos command */
655void 475void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 476ToggleExtendedText (char *buf, int len, client * ns)
657{ 477{
658 char cmdback[MAX_BUF]; 478 char cmdback[MAX_BUF];
659 char temp[10]; 479 char temp[10];
660 char command[50]; 480 char command[50];
661 int info, nextinfo, i, flag; 481 int info, nextinfo, i, flag;
… …
705 525
706 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
707} 527}
708 528
709/** 529/**
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, 530 * This handles the general commands from the client (ie, north, fire, cast,
761 * etc.) 531 * etc.)
762 */ 532 */
763void 533void
764PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
765{ 535{
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 536 /* Check if there is a count. In theory, a zero count could also be
778 * sent, so check for that also. 537 * sent, so check for that also.
779 */ 538 */
780 if (atoi (buf) || buf[0] == '0') 539 if (atoi (buf) || buf[0] == '0')
781 { 540 {
782 pl->count = atoi ((char *) buf); 541 pl->count = atoi ((char *) buf);
542
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 543 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 544 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 545 return;
790 } 546
791 buf++; 547 buf++;
792 } 548 }
793 /* This should not happen anymore. */ 549
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); 550 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 551
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. 552 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 553 * 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 554 * for the command that issued the count should be done before any other
852 * commands. 555 * commands.
853 */ 556 */
854 pl->count = 0; 557 pl->count = 0;
558}
855 559
856 if (FABS (pl->ob->speed) < 0.001) 560/**
561 * This handles the general commands from the client (ie, north, fire, cast,
562 * etc.). It is a lot like PlayerCmd above, but is called with the
563 * 'ncom' method which gives more information back to the client so it
564 * can throttle.
565 */
566void
567NewPlayerCmd (char *buf, int len, player *pl)
568{
569 if (len <= 6)
570 {
571 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
572 return;
573 }
574
575 uint16 cmdid = net_uint16 ((uint8 *)buf);
576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
577
578 /* -1 is special - no repeat, but don't update */
579 if (repeat != -1)
580 pl->count = repeat;
581
582 buf += 6; //len -= 6;
583
584 execute_newserver_command (pl->ob, buf);
585
586 /* Perhaps something better should be done with a left over count.
587 * Cleaning up the input should probably be done first - all actions
588 * for the command that issued the count should be done before any other
589 * commands.
590 */
591 pl->count = 0;
592
593 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
594 int time = fabs (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 595 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 596 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
860 597
861 /* Send confirmation of command execution now */ 598 /* Send confirmation of command execution now */
862 599 packet sl ("comc");
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 600 sl << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 601 pl->ns->send_packet (sl);
866} 602}
867
868 603
869/** This is a reply to a previous query. */ 604/** This is a reply to a previous query. */
870void 605void
871ReplyCmd (char *buf, int len, player *pl) 606ReplyCmd (char *buf, int len, client *ns)
872{ 607{
608 if (ns->state == ST_CUSTOM)
609 {
610 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
611 return;
612 }
613
614 if (!ns->pl)
615 return; //TODO: depends on the exact reply we are after
616 //TODO: but right now, we always have a ns->pl
617
618 player *pl = ns->pl;
619
873 /* This is to synthesize how the data would be stored if it 620 /* 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 621 * was normally entered. A bit of a hack, and should be cleaned up
875 * once all the X11 code is removed from the server. 622 * once all the X11 code is removed from the server.
876 * 623 *
877 * We pass 13 to many of the functions because this way they 624 * We pass 13 to many of the functions because this way they
878 * think it was the carriage return that was entered, and the 625 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 626 * function then does not try to do additional input.
880 */ 627 */
881 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 628 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
882 629
883 /* this avoids any hacking here */ 630 /* this avoids any hacking here */
884 631
885 switch (pl->state) 632 switch (ns->state)
886 { 633 {
887 case ST_PLAYING: 634 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 635 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 636 break;
890 637
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 */ 638 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 639 receive_party_password (pl->ob, 13);
927 break; 640 break;
928 641
929 default: 642 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 643 LOG (llevError, "Unknown input state: %d\n", ns->state);
931 } 644 }
932} 645}
933 646
934/** 647/**
935 * Client tells its version. If there is a mismatch, we close the 648 * 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 650 * 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 651 * backwards compatible, having it be a later version should not be a
939 * problem. 652 * problem.
940 */ 653 */
941void 654void
942VersionCmd (char *buf, int len, client_socket * ns) 655VersionCmd (char *buf, int len, client * ns)
943{ 656{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 657 if (!buf)
948 { 658 {
949 LOG (llevError, "CS: received corrupted version command\n"); 659 LOG (llevError, "CS: received corrupted version command\n");
950 return; 660 return;
951 } 661 }
952 662
953 ns->cs_version = atoi (buf); 663 ns->cs_version = atoi (buf);
954 ns->sc_version = ns->cs_version; 664 ns->sc_version = ns->cs_version;
665
666 LOG (llevDebug, "connection from client <%s>\n", buf);
667
668 //TODO: should log here just for statistics
669
955 if (VERSION_CS != ns->cs_version) 670 //if (VERSION_CS != ns->cs_version)
956 { 671 // unchecked;
957#ifdef ESRV_DEBUG 672
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 673 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 674 if (!cp)
963 return; 675 return;
676
964 ns->sc_version = atoi (cp); 677 ns->sc_version = atoi (cp);
678
965 if (VERSION_SC != ns->sc_version) 679 //if (VERSION_SC != ns->sc_version)
966 { 680 // unchecked;
967#ifdef ESRV_DEBUG 681
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 682 cp = strchr (cp + 1, ' ');
683
972 if (cp) 684 if (cp)
973 { 685 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 686 ns->version = cp + 1;
975 687
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) 688 if (ns->sc_version < 1026)
988 { 689 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!! ****"); 690 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 691 }
995} 692}
996 693
997/** sound related functions. */ 694/** sound related functions. */
998
999void 695void
1000SetSound (char *buf, int len, client_socket * ns) 696SetSound (char *buf, int len, client * ns)
1001{ 697{
1002 ns->sound = atoi (buf); 698 ns->sound = atoi (buf);
1003} 699}
1004 700
1005/** client wants the map resent */ 701/** client wants the map resent */
1006
1007void 702void
1008MapRedrawCmd (char *buf, int len, player *pl) 703MapRedrawCmd (char *buf, int len, player *pl)
1009{ 704{
1010
1011/* This function is currently disabled; just clearing the map state results in 705/* 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. 706 * display errors. It should clear the cache and send a newmap command.
1013 * Unfortunately this solution does not work because some client versions send 707 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 708 * a mapredraw command after receiving a newmap command.
1015 */ 709 */
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} 710}
1024 711
1025/** 712/**
1026 * Moves an object (typically, container to inventory). 713 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
1028 */ 715 */
1029void 716void
1030MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
1031{ 718{
1032 int vals[3], i; 719 int to, tag, nrof;
1033 720
1034 /* A little funky here. We only cycle for 2 records, because 721 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 { 722 {
1041 vals[i] = atoi (buf);
1042 if (!(buf = strchr (buf, ' ')))
1043 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 724 return;
1046 }
1047 buf++;
1048 } 725 }
1049 vals[2] = atoi (buf);
1050 726
1051/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 727 esrv_move_object (pl->ob, to, tag, nrof);
1052 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 728}
1054
1055
1056 729
1057/****************************************************************************** 730/******************************************************************************
1058 * 731 *
1059 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
1060 * 733 *
… …
1063/** 736/**
1064 * Asks the client to query the user. This way, the client knows 737 * 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) 738 * it needs to send something back (vs just printing out a message)
1066 */ 739 */
1067void 740void
1068send_query (client_socket * ns, uint8 flags, char *text) 741send_query (client *ns, uint8 flags, const char *text)
1069{ 742{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 743 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf); 744}
745
746/**
747 * Get player's current range attack in obuf.
748 */
749static void
750rangetostring (player *pl, char *obuf)
751{
752 dynbuf_text buf;
753
754 if (pl->ranged_ob)
755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756
757 if (pl->combat_ob)
758 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
759
760#if 0
761 //TODO: remove this when slot system is working, this is only for debugging
762 if (pl->ob->chosen_skill)
763 buf << " Skill*: " << pl->ob->chosen_skill->name;
764#endif
765
766 //TODO: maybe golem should become the current_weapon, quite simply?
767 if (pl->golem)
768 buf << " Golem*: " << pl->golem->name;
769
770 buf << '\0';
771 buf.linearise (obuf);
1074} 772}
1075 773
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 775 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
… …
1086#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
1087 Old = New; \ 785 Old = New; \
1088 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
1089 } 787 }
1090 788
1091#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1092 Old = New; \ 790 Old = New; \
1093 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1094 } 792 }
1095 793
1096#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1097 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
1098 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
1108esrv_update_stats (player *pl) 806esrv_update_stats (player *pl)
1109{ 807{
1110 char buf[MAX_BUF]; 808 char buf[MAX_BUF];
1111 uint16 flags; 809 uint16 flags;
1112 810
1113 packet sl; 811 client *ns = pl->ns;
1114 sl << "stats "; 812 if (!ns)
813 return;
1115 814
1116 if (pl->ob != NULL) 815 object *ob = pl->observe;
1117 { 816 if (!ob)
817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
820
821 packet sl ("stats");
822
1118 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1119 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1120 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 825 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1121 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 826 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1122 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 827 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1123 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 828 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1124 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 829 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); 830 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1129 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 831 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
832 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1130 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1131 }
1132 836
1133 if (pl->socket->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
838 if (object *skill = opl->last_skill_ob[s])
839 if (skill->stats.exp != ns->last_skill_exp [s])
1138 { 840 {
1139 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 841 ns->last_skill_exp [s] = skill->stats.exp;
1140 { 842
1141 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 844 * 1 extra byte, but keeps processing simpler.
1143 */ 845 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 846 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 847 << uint8 (skill->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 848 << uint64 (skill->stats.exp);
1147
1148 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1149 }
1150 } 849 }
1151 }
1152 850
1153 if (pl->socket->exp64)
1154 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
858 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
859 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860
861 flags = 0;
862
863 if (opl->fire_on)
864 flags |= SF_FIREON;
865
866 if (opl->run_on)
867 flags |= SF_RUNON;
868
869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870
871 if (ns->sc_version < 1025)
872 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1155 else 873 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++) 874 for (int i = 0; i < NROFATTACKS; i++)
1183 { 875 {
1184 /* Skip ones we won't send */ 876 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 877 if (atnr_cs_stat[i] == -1)
1186 continue; 878 continue;
1187 879
1188 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 880 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1189 } 881 }
1190 }
1191 882
1192 if (pl->socket->monitor_spells) 883 if (pl->ns->monitor_spells)
1193 { 884 {
1194 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 885 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); 886 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); 887 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1197 } 888 }
1198 889
1199 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 890 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1200 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1201 set_title (pl->ob, buf); 892 set_title (ob, buf);
1202 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1203 894
1204 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
1205 if (sl.length () > 6) 896 if (sl.length () > 6)
1206 pl->socket->send_packet (sl); 897 ns->send_packet (sl);
1207} 898}
1208 899
1209/** 900/**
1210 * Tells the client that here is a player it should start using. 901 * Tells the client that here is a player it should start using.
1211 */ 902 */
1212void 903void
1213esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
1214{ 905{
1215 pl->last_weight = weight; 906 sint32 weight = pl->ob->client_weight ();
1216 907
1217 packet sl; 908 packet sl ("player");
1218 sl << "player ";
1219 909
1220 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
1221 << uint32 (weight) 911 << uint32 (weight)
1222 << uint32 (pl->ob->face->number) 912 << uint32 (pl->ob->face)
1223 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
1224 914
915 pl->ns->last_weight = weight;
1225 pl->socket->send_packet (sl); 916 pl->ns->send_packet (sl);
1226 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 917 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1227} 918}
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);
1268
1269 ns->anims_sent[anim_num] = 1;
1270}
1271
1272 919
1273/****************************************************************************** 920/******************************************************************************
1274 * 921 *
1275 * Start of map related commands. 922 * Start of map related commands.
1276 * 923 *
1277 ******************************************************************************/ 924 ******************************************************************************/
1278 925
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 */ 926/** Clears a map cell */
1408static void 927static void
1409map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 928map_clearcell (struct MapCell *cell, int count)
1410{ 929{
1411 cell->faces[0] = face0; 930 cell->faces[0] = 0;
1412 cell->faces[1] = face1; 931 cell->faces[1] = 0;
1413 cell->faces[2] = face2; 932 cell->faces[2] = 0;
933 cell->smooth[0] = 0;
934 cell->smooth[1] = 0;
935 cell->smooth[2] = 0;
1414 cell->count = count; 936 cell->count = count;
1415 cell->stat_hp = 0; 937 cell->stat_hp = 0;
1416 cell->flags = 0; 938 cell->flags = 0;
1417 cell->player = 0; 939 cell->player = 0;
1418} 940}
1419 941
1420#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1421#define MAX_LAYERS 3 942#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 943
1478/** 944/**
1479 * Removes the need to replicate the same code for each layer. 945 * Removes the need to replicate the same code for each layer.
1480 * this returns true if this space is now in fact different than 946 * this returns true if this space is now in fact different than
1481 * it was. 947 * it was.
1482 * sl is the socklist this data is going into. 948 * sl is the socklist this data is going into.
1483 * ns is the socket we are working on - all the info we care 949 * 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 950 * about is in this socket structure, so now need not pass the
1485 * entire player object. 951 * 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 952 * 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) 953 * 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 954 * take. Interesting to note that before this function, the map1 function
1492 * numbers the spaces differently - I think this was a leftover from 955 * 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 956 * 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 957 * the case, it seems to make more sense to have these layer values
1495 * actually match. 958 * actually match.
1496 */ 959 */
1497
1498static int 960static int
1499update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 961update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1500{ 962{
1501 object *ob, *head; 963 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 964
1545 /* If there is no object for this space, or if the face for the object 965 /* 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. 966 * is the blank face, set the face number to zero.
1547 * else if we have the stored head object for this space, that takes 967 * else if we have the stored head object for this space, that takes
1548 * precedence over the other object for this space. 968 * precedence over the other object for this space.
1549 * otherwise, we do special head processing 969 * otherwise, we do special head processing
1550 */ 970 */
1551 if (!ob || ob->face == blank_face) 971 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 972
1685 /* We've gotten what face we want to use for the object. Now see if 973 /* 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. 974 * if it has changed since we last sent it to the client.
1687 */ 975 */
1688 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 976 if (lastcell.faces[layer] != face_num)
1689 { 977 {
1690 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 978 lastcell.faces[layer] = face_num;
979
1691 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 980 if (!ns.faces_sent[face_num])
981 if (ob)
982 ns.send_faces (ob);
983 else
1692 esrv_send_face (&ns, face_num, 0); 984 ns.send_face (face_num, 10);
1693 985
1694 sl << uint16 (face_num); 986 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; 987 return 1;
1754 } 988 }
1755 989
1756 /* Nothing changed */ 990 /* Nothing changed */
1757 return 0; 991 return 0;
… …
1761 * Returns the size of a data for a map square as returned by 995 * Returns the size of a data for a map square as returned by
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 996 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 997 * available.
1764 */ 998 */
1765int 999int
1766getExtendedMapInfoSize (client_socket * ns) 1000getExtendedMapInfoSize (client * ns)
1767{ 1001{
1768 int result = 0; 1002 int result = 0;
1769 1003
1770 if (ns->ext_mapinfos) 1004 if (ns->ext_mapinfos)
1771 { 1005 {
1772 if (ns->EMI_smooth) 1006 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1007 result += 1; /*One byte for smoothlevel */
1774 } 1008 }
1009
1775 return result; 1010 return result;
1776} 1011}
1777 1012
1013// prefetch (and touch) all maps within a specific distancd
1014static void
1015prefetch_surrounding_maps (maptile *map, int distance)
1016{
1017 map->last_access = runtime;
1018
1019 if (--distance)
1020 for (int dir = 4; --dir; )
1021 if (const shstr &path = map->tile_path [dir])
1022 if (maptile *&neigh = map->tile_map [dir])
1023 prefetch_surrounding_maps (neigh, distance);
1024 else
1025 neigh = maptile::find_async (path, map);
1026}
1027
1028// prefetch a generous area around the player
1029static void
1030prefetch_surrounding_maps (object *op)
1031{
1032 prefetch_surrounding_maps (op->map, 3);
1033}
1034
1778/** 1035/**
1779 * This function uses the new map1 protocol command to send the map 1036 * 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 */ 1037 */
1800void 1038void
1801draw_client_map1 (object *pl) 1039draw_client_map (player *pl)
1802{ 1040{
1041 object *ob = pl->observe;
1042 if (!ob->active)
1043 return;
1044
1045 maptile *plmap = ob->map;
1046
1047 /* If player is just joining the game, he isn't here yet, so the map
1048 * can get swapped out. If so, don't try to send them a map. All will
1049 * be OK once they really log in.
1050 */
1051 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1052 return;
1053
1803 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1804 sint16 nx, ny;
1805 int estartlen, eoldlen; 1055 int estartlen, eoldlen;
1806 uint16 mask, emask;
1807 uint8 eentrysize; 1056 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1057 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1058 uint8 extendedinfos;
1810 maptile *m;
1811 1059
1812 client_socket &socket = *pl->contr->socket;
1813
1814 check_map_change (pl->contr); 1060 check_map_change (pl);
1061 prefetch_surrounding_maps (pl->ob);
1815 1062
1816 packet sl; 1063 /* do LOS after calls to update_position */
1064 if (ob != pl->ob)
1065 clear_los (pl);
1066 else if (pl->do_los)
1067 {
1068 update_los (ob);
1069 pl->do_los = 0;
1070 }
1071
1072 /**
1073 * This function uses the new map1 protocol command to send the map
1074 * to the client. It is necessary because the old map command supports
1075 * a maximum map size of 15x15.
1076 * This function is much simpler than the old one. This is because
1077 * the old function optimized to send as few face identifiers as possible,
1078 * at the expense of sending more coordinate location (coordinates were
1079 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1080 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1081 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1082 * and use the other 4 bits for other informatiion. For full documentation
1083 * of what we send, see the doc/Protocol file.
1084 * I will describe internally what we do:
1085 * the ns->lastmap shows how the map last looked when sent to the client.
1086 * in the lastmap structure, there is a cells array, which is set to the
1087 * maximum viewable size (As set in config.h).
1088 * in the cells, there are faces and a count value.
1089 * we use the count value to hold the darkness value. If -1, then this space
1090 * is not viewable.
1091 * we use faces[0] faces[1] faces[2] to hold what the three layers
1092 * look like.
1093 */
1094
1095 client &socket = *pl->ns;
1096
1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817 packet esl; 1098 packet esl;
1818 1099
1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820 startlen = sl.length (); 1100 startlen = sl.length ();
1821 1101
1822 /*Extendedmapinfo structure initialisation */ 1102 /*Extendedmapinfo structure initialisation */
1823 if (socket.ext_mapinfos) 1103 if (socket.ext_mapinfos)
1824 { 1104 {
… …
1835 << uint8 (extendedinfos) 1115 << uint8 (extendedinfos)
1836 << uint8 (eentrysize); 1116 << uint8 (eentrysize);
1837 1117
1838 estartlen = esl.length (); 1118 estartlen = esl.length ();
1839 } 1119 }
1840 else
1841 {
1842 /* suppress compiler warnings */
1843 ewhatstart = 0;
1844 ewhatflag = 0;
1845 estartlen = 0;
1846 }
1847
1848 /* Init data to zero */
1849 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1850 1120
1851 /* x,y are the real map locations. ax, ay are viewport relative 1121 /* x,y are the real map locations. ax, ay are viewport relative
1852 * locations. 1122 * locations.
1853 */ 1123 */
1854 ay = 0; 1124 ay = 0;
1855 1125
1856 /* We could do this logic as conditionals in the if statement, 1126 /* We could do this logic as conditionals in the if statement,
1857 * but that started to get a bit messy to look at. 1127 * but that started to get a bit messy to look at.
1858 */ 1128 */
1859 max_x = pl->x + (socket.mapx + 1) / 2; 1129 max_x = ob->x + (socket.mapx + 1) / 2;
1860 max_y = pl->y + (socket.mapy + 1) / 2; 1130 max_y = ob->y + (socket.mapy + 1) / 2;
1861 1131
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++) 1132 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1869 { 1133 {
1134 sint16 nx, ny;
1135 maptile *m = 0;
1136
1870 ax = 0; 1137 ax = 0;
1871 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1872 { 1139 {
1140 // check to see if we can simply go one right quickly
1141 ++nx;
1142 if (m && nx >= m->width)
1143 m = 0;
1873 1144
1145 if (!m)
1146 {
1147 nx = x; ny = y; m = plmap;
1148
1149 if (xy_normalise (m, nx, ny))
1150 m->touch ();
1151 else
1152 m = 0;
1153 }
1154
1155 int emask, mask;
1874 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1875 1157
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 */
1882 if (ax >= socket.mapx || ay >= socket.mapy)
1883 {
1884 int i, got_one;
1885
1886 oldlen = sl.length ();
1887
1888 sl << uint16 (mask);
1889
1890 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1891 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1892 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1893
1894 /* If all we are doing is sending 0 (blank) faces, we don't
1895 * actually need to send that - just the coordinates
1896 * with no faces tells the client to blank out the
1897 * space.
1898 */
1899 got_one = 0;
1900 for (i = oldlen + 2; i < sl.length (); i++)
1901 if (sl[i])
1902 got_one = 1;
1903
1904 if (got_one && (mask & 0xf))
1905 sl[oldlen + 1] = mask & 0xff;
1906 else
1907 { /*either all faces blank, either no face at all */
1908 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1909 sl.reset (oldlen + 2);
1910 else
1911 sl.reset (oldlen);
1912 }
1913
1914 /*What concerns extendinfos, nothing to be done for now
1915 * (perhaps effects layer later)
1916 */
1917 continue; /* don't do processing below */
1918 }
1919
1920 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1921
1922 d = pl->contr->blocked_los[ax][ay];
1923 1159
1924 /* If the coordinates are not valid, or it is too dark to see, 1160 /* If the coordinates are not valid, or it is too dark to see,
1925 * we tell the client as such 1161 * we tell the client as such
1926 */ 1162 */
1927 nx = x;
1928 ny = y;
1929 m = get_map_from_coord (pl->map, &nx, &ny);
1930
1931 if (!m) 1163 if (!m)
1932 { 1164 {
1933 /* space is out of map. Update space and clear values 1165 /* space is out of map. Update space and clear values
1934 * if this hasn't already been done. If the space is out 1166 * if this hasn't already been done. If the space is out
1935 * of the map, it shouldn't have a head 1167 * of the map, it shouldn't have a head
1936 */ 1168 */
1937 if (lastcell.count != -1) 1169 if (lastcell.count != -1)
1938 { 1170 {
1939 sl << uint16 (mask); 1171 sl << uint16 (mask);
1940 map_clearcell (&lastcell, 0, 0, 0, -1); 1172 map_clearcell (&lastcell, -1);
1941 } 1173 }
1174
1175 continue;
1942 } 1176 }
1177
1178 int d = pl->blocked_los[ax][ay];
1179
1943 else if (d > 3) 1180 if (d > 3)
1944 { 1181 {
1945 int need_send = 0, count; 1182 int need_send = 0, count;
1946 1183
1947 /* This block deals with spaces that are not visible for whatever 1184 /* This block deals with spaces that are not visible for whatever
1948 * reason. Still may need to send the head for this space. 1185 * reason. Still may need to send the head for this space.
1949 */ 1186 */
1950 1187
1951 oldlen = sl.length (); 1188 oldlen = sl.length ();
1952 1189
1953 sl << uint16 (mask); 1190 sl << uint16 (mask);
… …
1955 if (lastcell.count != -1) 1192 if (lastcell.count != -1)
1956 need_send = 1; 1193 need_send = 1;
1957 1194
1958 count = -1; 1195 count = -1;
1959 1196
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 1197 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1974 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1198 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1975 need_send = 1; 1199 need_send = 1;
1976 1200
1201 /* properly clear a previously sent big face */
1977 map_clearcell (&lastcell, 0, 0, 0, count); 1202 map_clearcell (&lastcell, count);
1978 }
1979 1203
1980 if ((mask & 0xf) || need_send) 1204 if ((mask & 0xf) || need_send)
1981 sl[oldlen + 1] = mask & 0xff; 1205 sl[oldlen + 1] = mask & 0xff;
1982 else 1206 else
1983 sl.reset (oldlen); 1207 sl.reset (oldlen);
1984 } 1208 }
1985 else 1209 else
1986 { 1210 {
1987 /* In this block, the space is visible or there are head objects 1211 /* In this block, the space is visible.
1988 * we need to send.
1989 */ 1212 */
1990 1213
1991 /* Rather than try to figure out what everything that we might 1214 /* Rather than try to figure out what everything that we might
1992 * need to send is, then form the packet after that, 1215 * need to send is, then form the packet after that,
1993 * we presume that we will in fact form a packet, and update 1216 * we presume that we will in fact form a packet, and update
… …
1996 * is done. 1219 * is done.
1997 * I think this is simpler than doing a bunch of checks to see 1220 * 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 1221 * what if anything we need to send, setting the bits, then
1999 * doing those checks again to add the real data. 1222 * doing those checks again to add the real data.
2000 */ 1223 */
2001 oldlen = sl.length (); 1224 oldlen = sl.length ();
2002 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2003 eoldlen = esl.length (); 1225 eoldlen = esl.length ();
2004 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1226
2005 sl << uint16 (mask); 1227 sl << uint16 (mask);
2006
2007 if (socket.ext_mapinfos)
2008 esl << uint16 (emask);
2009 1228
2010 unsigned char dummy; 1229 unsigned char dummy;
2011 unsigned char *last_ext = &dummy; 1230 unsigned char *last_ext = &dummy;
2012 1231
2013 /* Darkness changed */ 1232 /* Darkness changed */
… …
2025 sl << uint8 (255 - 64 * d); 1244 sl << uint8 (255 - 64 * d);
2026 } 1245 }
2027 1246
2028 lastcell.count = d; 1247 lastcell.count = d;
2029 1248
1249 mapspace &ms = m->at (nx, ny);
1250 ms.update ();
1251
2030 if (socket.extmap) 1252 if (socket.extmap)
2031 { 1253 {
2032 uint8 stat_hp = 0; 1254 uint8 stat_hp = 0;
2033 uint8 stat_width = 0; 1255 uint8 stat_width = 0;
2034 uint8 flags = 0; 1256 uint8 flags = 0;
2035 UUID player = 0; 1257 tag_t player = 0;
2036 1258
2037 // send hp information, if applicable 1259 // send hp information, if applicable
2038 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1260 if (object *op = ms.faces_obj [0])
1261 if (op->is_head () && !op->invisible)
2039 { 1262 {
2040 if (op->head || op->invisible) 1263 if (op->stats.maxhp > op->stats.hp
2041 ; // do not show 1264 && op->stats.maxhp > 0
2042 else if (op->type == PLAYER 1265 && (op->type == PLAYER
1266 || op->type == DOOR // does not work, have maxhp 0
2043 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1267 || 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 { 1268 {
2047 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1269 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2048 stat_width = op->arch->tail_x; 1270 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
2049 } 1271 }
2050 }
2051 1272
2052 if (op->msg && op->msg[0] == '@') 1273 if (op->has_dialogue ())
2053 flags |= 1; 1274 flags |= 1;
2054 1275
2055 if (op->type == PLAYER && op != pl) 1276 if (op->type == PLAYER)
2056 player = op->count; 1277 player = op->count;
2057 } 1278 }
2058 1279
2059 if (lastcell.stat_hp != stat_hp) 1280 if (lastcell.stat_hp != stat_hp)
2060 { 1281 {
2061 lastcell.stat_hp = stat_hp; 1282 lastcell.stat_hp = stat_hp;
2062 1283
… …
2081 1302
2082 mask |= 0x8; 1303 mask |= 0x8;
2083 *last_ext |= 0x80; 1304 *last_ext |= 0x80;
2084 last_ext = &sl[sl.length ()]; 1305 last_ext = &sl[sl.length ()];
2085 1306
2086 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1307 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
2087 } 1308 }
2088 1309
2089 if (lastcell.flags != flags) 1310 if (lastcell.flags != flags)
2090 { 1311 {
2091 lastcell.flags = flags; 1312 lastcell.flags = flags;
… …
2097 sl << uint8 (8) << uint8 (flags); 1318 sl << uint8 (8) << uint8 (flags);
2098 } 1319 }
2099 } 1320 }
2100 1321
2101 /* Floor face */ 1322 /* Floor face */
2102 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1323 if (update_space (sl, socket, ms, lastcell, 2))
2103 mask |= 0x4; 1324 mask |= 0x4;
2104 1325
2105 if (socket.EMI_smooth)
2106 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2107 emask |= 0x4;
2108
2109 /* Middle face */ 1326 /* Middle face */
2110 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1327 if (update_space (sl, socket, ms, lastcell, 1))
2111 mask |= 0x2; 1328 mask |= 0x2;
2112 1329
2113 if (socket.EMI_smooth) 1330 if (ms.player () == ob
2114 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1331 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
2115 emask |= 0x2;
2116
2117 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2118 { 1332 {
1333 // force player to be visible to himself if invisible
2119 if (lastcell.faces[0] != pl->face->number) 1334 if (lastcell.faces[0] != ob->face)
2120 { 1335 {
2121 lastcell.faces[0] = pl->face->number; 1336 lastcell.faces[0] = ob->face;
1337
2122 mask |= 0x1; 1338 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); 1339 sl << uint16 (ob->face);
1340
1341 socket.send_faces (ob);
2128 } 1342 }
2129 } 1343 }
2130 else
2131 {
2132 /* Top face */ 1344 /* Top face */
2133 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1345 else if (update_space (sl, socket, ms, lastcell, 0))
2134 mask |= 0x1; 1346 mask |= 0x1;
2135
2136 if (socket.EMI_smooth)
2137 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2138 emask |= 0x1;
2139 }
2140 1347
2141 /* Check to see if we are in fact sending anything for this 1348 /* Check to see if we are in fact sending anything for this
2142 * space by checking the mask. If so, update the mask. 1349 * space by checking the mask. If so, update the mask.
2143 * if not, reset the len to that from before adding the mask 1350 * if not, reset the len to that from before adding the mask
2144 * value, so we don't send those bits. 1351 * value, so we don't send those bits.
… …
2146 if (mask & 0xf) 1353 if (mask & 0xf)
2147 sl[oldlen + 1] = mask & 0xff; 1354 sl[oldlen + 1] = mask & 0xff;
2148 else 1355 else
2149 sl.reset (oldlen); 1356 sl.reset (oldlen);
2150 1357
1358 if (socket.ext_mapinfos)
1359 esl << uint16 (emask);
1360
1361 if (socket.EMI_smooth)
1362 {
1363 for (int layer = 2+1; layer--; )
1364 {
1365 object *ob = ms.faces_obj [layer];
1366
1367 // If there is no object for this space, or if the face for the object
1368 // is the blank face, set the smoothlevel to zero.
1369 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1370
1371 // We've gotten what face we want to use for the object. Now see if
1372 // if it has changed since we last sent it to the client.
1373 if (lastcell.smooth[layer] != smoothlevel)
1374 {
1375 lastcell.smooth[layer] = smoothlevel;
1376 esl << uint8 (smoothlevel);
1377 emask |= 1 << layer;
1378 }
1379 }
1380
2151 if (emask & 0xf) 1381 if (emask & 0xf)
2152 esl[eoldlen + 1] = emask & 0xff; 1382 esl[eoldlen + 1] = emask & 0xff;
2153 else 1383 else
2154 esl.reset (eoldlen); 1384 esl.reset (eoldlen);
1385 }
2155 } /* else this is a viewable space */ 1386 } /* else this is a viewable space */
2156 } /* for x loop */ 1387 } /* for x loop */
2157 } /* for y loop */ 1388 } /* for y loop */
1389
1390 socket.flush_fx ();
2158 1391
2159 /* Verify that we in fact do need to send this */ 1392 /* Verify that we in fact do need to send this */
2160 if (socket.ext_mapinfos) 1393 if (socket.ext_mapinfos)
2161 { 1394 {
2162 if (!(sl.length () > startlen || socket.sent_scroll)) 1395 if (!(sl.length () > startlen || socket.sent_scroll))
2163 { 1396 {
2164 /* No map data will follow, so don't say the client 1397 /* No map data will follow, so don't say the client
2165 * it doesn't need draw! 1398 * it doesn't need draw!
2166 */ 1399 */
2167 ewhatflag &= (~EMI_NOREDRAW); 1400 ewhatflag &= ~EMI_NOREDRAW;
2168 esl[ewhatstart + 1] = ewhatflag & 0xff; 1401 esl[ewhatstart + 1] = ewhatflag & 0xff;
2169 } 1402 }
2170 1403
2171 if (esl.length () > estartlen) 1404 if (esl.length () > estartlen)
2172 socket.send_packet (esl); 1405 socket.send_packet (esl);
… …
2177 socket.send_packet (sl); 1410 socket.send_packet (sl);
2178 socket.sent_scroll = 0; 1411 socket.sent_scroll = 0;
2179 } 1412 }
2180} 1413}
2181 1414
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/*****************************************************************************/ 1415/*****************************************************************************/
2246
2247/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1416/* 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 */ 1417/* a player. Of course, the client need to know the command to be able to */
2250
2251/* manage it ! */ 1418/* manage it ! */
2252
2253/*****************************************************************************/ 1419/*****************************************************************************/
2254void 1420void
2255send_plugin_custom_message (object *pl, char *buf) 1421send_plugin_custom_message (object *pl, char *buf)
2256{ 1422{
2257 pl->contr->socket->send_packet (buf); 1423 pl->contr->ns->send_packet (buf);
2258} 1424}
2259 1425
2260/** 1426/**
2261 * This sends the skill number to name mapping. We ignore 1427 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 1428 * the params - we always send the same info no matter what.
2263 */ 1429 */
2264void 1430void
2265send_skill_info (client_socket *ns, char *params) 1431send_skill_info (client *ns, char *params)
2266{ 1432{
2267 packet sl; 1433 packet sl;
2268 sl << "replyinfo skill_info\n"; 1434 sl << "replyinfo skill_info\n";
2269 1435
2270 for (int i = 1; i < NUM_SKILLS; i++) 1436 for (int i = 1; i < NUM_SKILLS; i++)
2271 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1437 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2272 1438
2273 if (sl.length () >= MAXSOCKBUF) 1439 if (sl.length () > MAXSOCKBUF)
2274 { 1440 {
2275 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1441 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2276 fatal (0); 1442 fatal (0);
2277 } 1443 }
2278 1444
… …
2282/** 1448/**
2283 * This sends the spell path to name mapping. We ignore 1449 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 1450 * the params - we always send the same info no matter what.
2285 */ 1451 */
2286void 1452void
2287send_spell_paths (client_socket * ns, char *params) 1453send_spell_paths (client * ns, char *params)
2288{ 1454{
2289 packet sl; 1455 packet sl;
2290 1456
2291 sl << "replyinfo spell_paths\n"; 1457 sl << "replyinfo spell_paths\n";
2292 1458
2293 for (int i = 0; i < NRSPELLPATHS; i++) 1459 for (int i = 0; i < NRSPELLPATHS; i++)
2294 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1460 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2295 1461
2296 if (sl.length () >= MAXSOCKBUF) 1462 if (sl.length () > MAXSOCKBUF)
2297 { 1463 {
2298 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2299 fatal (0); 1465 fatal (0);
2300 } 1466 }
2301 1467
… …
2307 * it then sends an updspell packet for each spell that has changed in this way 1473 * it then sends an updspell packet for each spell that has changed in this way
2308 */ 1474 */
2309void 1475void
2310esrv_update_spells (player *pl) 1476esrv_update_spells (player *pl)
2311{ 1477{
1478 if (!pl->ns)
1479 return;
1480
2312 if (!pl->socket->monitor_spells) 1481 if (!pl->ns->monitor_spells)
2313 return; 1482 return;
2314 1483
2315 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1484 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2316 { 1485 {
2317 if (spell->type == SPELL) 1486 if (spell->type == SPELL)
2318 { 1487 {
2319 int flags = 0; 1488 int flags = 0;
2320 1489
2321 /* check if we need to update it */ 1490 /* check if we need to update it */
2322 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1491 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2323 { 1492 {
2324 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1493 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2325 flags |= UPD_SP_MANA; 1494 flags |= UPD_SP_MANA;
2326 } 1495 }
2327 1496
2328 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1497 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2329 { 1498 {
2330 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1499 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2331 flags |= UPD_SP_GRACE; 1500 flags |= UPD_SP_GRACE;
2332 } 1501 }
2333 1502
2334 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1503 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2335 { 1504 {
2336 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1505 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2337 flags |= UPD_SP_DAMAGE; 1506 flags |= UPD_SP_DAMAGE;
2338 } 1507 }
2339 1508
2340 if (flags) 1509 if (flags)
2341 { 1510 {
… …
2343 1512
2344 sl << "updspell " 1513 sl << "updspell "
2345 << uint8 (flags) 1514 << uint8 (flags)
2346 << uint32 (spell->count); 1515 << uint32 (spell->count);
2347 1516
2348 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1517 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2349 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1518 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
2350 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1519 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
2351 1520
2352 pl->socket->send_packet (sl); 1521 pl->ns->send_packet (sl);
2353 } 1522 }
2354 } 1523 }
2355 } 1524 }
2356} 1525}
2357 1526
2358void 1527void
2359esrv_remove_spell (player *pl, object *spell) 1528esrv_remove_spell (player *pl, object *spell)
2360{ 1529{
2361 if (!pl->socket->monitor_spells) 1530 if (!pl->ns->monitor_spells)
2362 return; 1531 return;
2363 1532
2364 if (!pl || !spell || spell->env != pl->ob) 1533 if (!pl || !spell || spell->env != pl->ob)
2365 { 1534 {
2366 LOG (llevError, "Invalid call to esrv_remove_spell"); 1535 LOG (llevError, "Invalid call to esrv_remove_spell");
2367 return; 1536 return;
2368 } 1537 }
2369 1538
2370 packet sl; 1539 packet sl ("delspell");
2371 1540
2372 sl << "delspell "
2373 << uint32 (spell->count); 1541 sl << uint32 (spell->count);
2374 1542
2375 pl->socket->send_packet (sl); 1543 pl->ns->send_packet (sl);
2376} 1544}
2377 1545
2378/* appends the spell *spell to the Socklist we will send the data to. */ 1546/* appends the spell *spell to the Socklist we will send the data to. */
2379static void 1547static void
2380append_spell (player *pl, packet &sl, object *spell) 1548append_spell (player *pl, packet &sl, object *spell)
2381{ 1549{
2382 int len, i, skill = 0; 1550 int i, skill = 0;
2383 1551
2384 if (!(spell->name)) 1552 if (!(spell->name))
2385 { 1553 {
2386 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1554 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2387 return; 1555 return;
2388 } 1556 }
2389 1557
2390 /* store costs and damage in the object struct, to compare to later */ 1558 /* 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); 1559 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); 1560 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); 1561 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2394 1562
2395 /* figure out which skill it uses, if it uses one */ 1563 /* figure out which skill it uses, if it uses one */
2396 if (spell->skill) 1564 if (spell->skill)
2397 { 1565 {
2398 for (i = 1; i < NUM_SKILLS; i++) 1566 for (i = 1; i < NUM_SKILLS; i++)
… …
2401 skill = i + CS_STAT_SKILLINFO; 1569 skill = i + CS_STAT_SKILLINFO;
2402 break; 1570 break;
2403 } 1571 }
2404 } 1572 }
2405 1573
1574 // spells better have a face
1575 if (!spell->face)
1576 {
1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1578 spell->face = face_find ("burnout.x11", blank_face);
1579 }
1580
1581 pl->ns->send_face (spell->face);
1582
2406 /* send the current values */ 1583 /* send the current values */
2407 sl << uint32 (spell->count) 1584 sl << uint32 (spell->count)
2408 << uint16 (spell->level) 1585 << uint16 (spell->level)
2409 << uint16 (spell->casting_time) 1586 << uint16 (spell->casting_time)
2410 << uint16 (spell->last_sp) 1587 << uint16 (spell->cached_sp)
2411 << uint16 (spell->last_grace) 1588 << uint16 (spell->cached_grace)
2412 << uint16 (spell->last_eat) 1589 << uint16 (spell->cached_eat)
2413 << uint8 (skill) 1590 << uint8 (skill)
2414 << uint32 (spell->path_attuned) 1591 << uint32 (spell->path_attuned)
2415 << uint32 (spell->face ? spell->face->number : 0) 1592 << uint32 (spell->face)
2416 << data8 (spell->name) 1593 << data8 (spell->name)
2417 << data16 (spell->msg); 1594 << data16 (spell->msg);
2418} 1595}
2419 1596
2420/** 1597/**
… …
2428 { 1605 {
2429 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1606 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2430 return; 1607 return;
2431 } 1608 }
2432 1609
2433 if (!pl->socket->monitor_spells) 1610 if (!pl->ns->monitor_spells)
2434 return; 1611 return;
2435 1612
2436 packet sl; 1613 packet sl ("addspell");
2437
2438 sl << "addspell ";
2439 1614
2440 if (!spell) 1615 if (!spell)
2441 { 1616 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1617 for (spell = pl->ob->inv; spell; spell = spell->below)
2443 { 1618 {
2444 /* were we to simply keep appending data here, we could exceed 1619 /* were we to simply keep appending data here, we could exceed
2445 * MAXSOCKBUF if the player has enough spells to add, we know that 1620 * MAXSOCKBUF if the player has enough spells to add, we know that
2446 * append_spells will always append 19 data bytes, plus 4 length 1621 * 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 1622 * 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, 1623 * 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, 1624 * 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 1625 * we need to send what we already have, and restart packet formation
2451 */ 1626 */
1627 if (spell->type != SPELL)
1628 continue;
1629
2452 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1630 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2453 * to show add_spell is 26 bytes + 2 strings. However, the overun 1631 * 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 1632 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2455 * like it will fix this 1633 * like it will fix this
2456 */ 1634 */
2457 if (spell->type != SPELL)
2458 continue;
2459
2460 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1635 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2461 { 1636 {
1637 pl->ns->flush_fx ();
2462 pl->socket->send_packet (sl); 1638 pl->ns->send_packet (sl);
2463 1639
2464 sl.reset (); 1640 sl.reset ();
2465 sl << "addspell "; 1641 sl << "addspell ";
2466 } 1642 }
2467 1643
… …
2474 return; 1650 return;
2475 } 1651 }
2476 else 1652 else
2477 append_spell (pl, sl, spell); 1653 append_spell (pl, sl, spell);
2478 1654
2479 if (sl.length () >= MAXSOCKBUF) 1655 if (sl.length () > MAXSOCKBUF)
2480 { 1656 {
2481 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1657 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2482 fatal (0); 1658 fatal (0);
2483 } 1659 }
2484 1660
2485 /* finally, we can send the packet */ 1661 /* finally, we can send the packet */
1662 pl->ns->flush_fx ();
2486 pl->socket->send_packet (sl); 1663 pl->ns->send_packet (sl);
2487} 1664}
2488 1665

Diff Legend

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