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.29 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.113 by root, Mon Jul 2 02:29:34 2007 UTC

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

Diff Legend

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