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.43 by root, Sat Dec 16 20:16:37 2006 UTC vs.
Revision 1.120 by root, Fri Aug 24 00:40:31 2007 UTC

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

Diff Legend

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