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.41 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC

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

Diff Legend

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