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.119 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.169 by root, Thu Apr 8 17:36:54 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
24
25//+GPL
23 26
24/** 27/**
25 * \file 28 * \file
26 * Client handling. 29 * Client handling.
27 * 30 *
… …
41 44
42#include <global.h> 45#include <global.h>
43#include <sproto.h> 46#include <sproto.h>
44 47
45#include <living.h> 48#include <living.h>
46#include <commands.h>
47 49
48/* This block is basically taken from socket.c - I assume if it works there, 50/* This block is basically taken from socket.c - I assume if it works there,
49 * it should work here. 51 * it should work here.
50 */ 52 */
51#include <sys/types.h> 53#include <sys/types.h>
… …
63 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
64 * program to the value we use when sending STATS command to the 66 * program to the value we use when sending STATS command to the
65 * client. If a value is -1, then we don't send that to the 67 * client. If a value is -1, then we don't send that to the
66 * client. 68 * client.
67 */ 69 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
98 */ 100 */
99 mx = ns->mapx; 101 mx = ns->mapx;
100 my = ns->mapy; 102 my = ns->mapy;
101 103
102 /* the x and y here are coordinates for the new map, i.e. if we moved 104 /* the x and y here are coordinates for the new map, i.e. if we moved
103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 105 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104 * if the destination x or y coordinate is outside the viewable 106 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 107 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 108 * are preserved, and the check_head thinks it needs to clear them.
107 */ 109 */
108 for (x = 0; x < mx; x++) 110 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 111 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 112 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 113 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 116 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 118 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 120
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 121 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 122
125 /* Make sure that the next "map1" command will be sent (even if it is 123 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 124 * empty).
… …
141 pl->ns->send_packet ("newmap"); 139 pl->ns->send_packet ("newmap");
142 140
143 pl->ns->floorbox_reset (); 141 pl->ns->floorbox_reset ();
144} 142}
145 143
144static void
145send_map_info (player *pl)
146{
147 client &socket = *pl->ns;
148 object *ob = pl->viewpoint;
149
150 if (socket.mapinfocmd)
151 {
152 if (ob->map && ob->map->path[0])
153 {
154 int flags = 0;
155
156 if (ob->map->tile_path[0]) flags |= 1;
157 if (ob->map->tile_path[1]) flags |= 2;
158 if (ob->map->tile_path[2]) flags |= 4;
159 if (ob->map->tile_path[3]) flags |= 8;
160
161 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
162 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
163 ob->map->width, ob->map->height, &ob->map->path);
164 }
165 else
166 socket.send_packet ("mapinfo current");
167 }
168}
169
146/** check for map/region change and send new map data */ 170/** check for map/region change and send new map data */
147static void 171static void
148check_map_change (player *pl) 172check_map_change (player *pl)
149{ 173{
150 client &socket = *pl->ns; 174 client &socket = *pl->ns;
151 object *ob = pl->observe; 175 object *ob = pl->viewpoint;
176
177 region *reg = ob->region ();
178 if (socket.current_region != reg)
179 {
180 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
181 socket.current_region = reg;
182 }
183
184 // first try to aovid a full newmap on tiled map scrolls
185 if (socket.current_map != ob->map && !socket.force_newmap)
186 {
187 rv_vector rv;
188
189 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
190
191 // manhattan distance is very handy here
192 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
193 {
194 socket.current_map = ob->map;
195 socket.current_x = ob->x;
196 socket.current_y = ob->y;
197
198 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
199 socket.floorbox_reset ();
200 send_map_info (pl);
201 }
202 }
152 203
153 if (socket.current_map != ob->map || socket.force_newmap) 204 if (socket.current_map != ob->map || socket.force_newmap)
154 { 205 {
155 clear_map (pl); 206 clear_map (pl);
156 socket.current_map = ob->map; 207 socket.current_map = ob->map;
157 208 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
172 }
173 else
174 socket.send_packet ("mapinfo current");
175 }
176 } 209 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 210 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 211 {
179 int dx = ob->x - socket.current_x; 212 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 213 int dy = ob->y - socket.current_y;
181 214
182 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
183 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184 else
185 {
186 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 215 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 216 socket.floorbox_reset ();
188 }
189 } 217 }
190 218
191 socket.current_x = ob->x; 219 socket.current_x = ob->x;
192 socket.current_y = ob->y; 220 socket.current_y = ob->y;
221}
193 222
194 region *reg = ob->region (); 223/**
195 if (socket.current_region != reg) 224 * This sends the skill number to name mapping. We ignore
196 { 225 * the params - we always send the same info no matter what.
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 226 */
198 socket.current_region = reg; 227static void
228send_skill_info (client *ns, char *params)
229{
230 packet sl;
231 sl << "replyinfo skill_info\n";
232
233 for (int i = 1; i < NUM_SKILLS; i++)
234 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
235
236 if (sl.length () > MAXSOCKBUF)
199 } 237 {
238 LOG (llevError, "Buffer overflow in send_skill_info!\n");
239 fatal (0);
240 }
241
242 ns->send_packet (sl);
243}
244
245/**
246 * This sends the spell path to name mapping. We ignore
247 * the params - we always send the same info no matter what.
248 */
249static void
250send_spell_paths (client * ns, char *params)
251{
252 packet sl;
253
254 sl << "replyinfo spell_paths\n";
255
256 for (int i = 0; i < NRSPELLPATHS; i++)
257 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
258
259 if (sl.length () > MAXSOCKBUF)
260 {
261 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
262 fatal (0);
263 }
264
265 ns->send_packet (sl);
200} 266}
201 267
202/** 268/**
203 * RequestInfo is sort of a meta command. There is some specific 269 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 270 * request of information, but we call other functions to provide
… …
217 { 283 {
218 *params++ = 0; 284 *params++ = 0;
219 break; 285 break;
220 } 286 }
221 287
222 if (!strcmp (buf, "image_info"))
223 send_image_info (ns, params);
224 else if (!strcmp (buf, "image_sums"))
225 send_image_sums (ns, params);
226 else if (!strcmp (buf, "skill_info")) 288 if (!strcmp (buf, "skill_info"))
227 send_skill_info (ns, params); 289 send_skill_info (ns, params);
228 else if (!strcmp (buf, "spell_paths")) 290 else if (!strcmp (buf, "spell_paths"))
229 send_spell_paths (ns, params); 291 send_spell_paths (ns, params);
230 else 292 else
231 { 293 {
… …
247ExtiCmd (char *buf, int len, client *ns) 309ExtiCmd (char *buf, int len, client *ns)
248{ 310{
249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 311 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250} 312}
251 313
314//-GPL
315
252void 316void
253client::mapinfo_queue_clear () 317client::mapinfo_queue_clear ()
254{ 318{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 319 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i); 320 free (*i);
… …
263{ 327{
264 char *token = buf; 328 char *token = buf;
265 buf += strlen (buf) + 9; 329 buf += strlen (buf) + 9;
266 330
267 // initial map and its origin 331 // initial map and its origin
268 maptile *map = pl->ob->map; 332 maptile *map = pl->viewpoint->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x; 333 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->y; 334 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271 int max_distance = 8; // limit maximum path length to something generous 335 int max_distance = 8; // limit maximum path length to something generous
272 336
273 while (*buf && map && max_distance) 337 while (*buf && map && max_distance)
274 { 338 {
275 int dir = *buf++ - '1'; 339 int dir = *buf++ - '1';
276 340
277 if (dir >= 0 && dir <= 3) 341 if (dir >= 0 && dir <= 3)
278 { 342 {
279 if (!map->tile_path [dir]) 343 if (!map->tile_path [dir])
280 map = 0; 344 map = 0;
281 else if (map->tile_available (dir)) 345 else if (map->tile_available (dir, false))
282 { 346 {
283 maptile *neigh = map->tile_map [dir]; 347 maptile *neigh = map->tile_map [dir];
284 348
285 switch (dir) 349 switch (dir)
286 { 350 {
… …
300 max_distance = 0; 364 max_distance = 0;
301 } 365 }
302 366
303 if (!max_distance) 367 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token); 368 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path[0]) 369 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token); 370 send_packet_printf ("mapinfo %s nomap", token);
307 else 371 else
308 { 372 {
309 int flags = 0; 373 int flags = 0;
310 374
… …
380AddMeCmd (char *buf, int len, client *ns) 444AddMeCmd (char *buf, int len, client *ns)
381{ 445{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 446 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 447}
384 448
385/** Reply to ExtendedInfos command */ 449//+GPL
386void
387ToggleExtendedInfos (char *buf, int len, client * ns)
388{
389 char cmdback[MAX_BUF];
390 char command[50];
391 int info, nextinfo;
392
393 cmdback[0] = '\0';
394 nextinfo = 0;
395
396 while (1)
397 {
398 /* 1. Extract an info */
399 info = nextinfo;
400
401 while ((info < len) && (buf[info] == ' '))
402 info++;
403
404 if (info >= len)
405 break;
406
407 nextinfo = info + 1;
408
409 while ((nextinfo < len) && (buf[nextinfo] != ' '))
410 nextinfo++;
411
412 if (nextinfo - info >= 49) /*Erroneous info asked */
413 continue;
414
415 strncpy (command, &(buf[info]), nextinfo - info);
416
417 /* 2. Interpret info */
418 if (!strcmp ("smooth", command))
419 /* Toggle smoothing */
420 ns->EMI_smooth = !ns->EMI_smooth;
421 else
422 /*bad value */;
423
424 /*3. Next info */
425 }
426
427 strcpy (cmdback, "ExtendedInfoSet");
428
429 if (ns->EMI_smooth)
430 {
431 strcat (cmdback, " ");
432 strcat (cmdback, "smoothing");
433 }
434
435 ns->send_packet (cmdback);
436}
437 450
438/* 451/*
439#define MSG_TYPE_BOOK 1 452#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2 453#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3 454#define MSG_TYPE_PAPER 3
… …
458 while (1) 471 while (1)
459 { 472 {
460 /* 1. Extract an info */ 473 /* 1. Extract an info */
461 info = nextinfo; 474 info = nextinfo;
462 475
463 while ((info < len) && (buf[info] == ' ')) 476 while ((info < len) && (buf [info] == ' '))
464 info++; 477 info++;
465 478
466 if (info >= len) 479 if (info >= len)
467 break; 480 break;
468 481
469 nextinfo = info + 1; 482 nextinfo = info + 1;
470 483
471 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 484 while ((nextinfo < len) && (buf [nextinfo] != ' '))
472 nextinfo++; 485 nextinfo++;
473 486
474 if (nextinfo - info >= 49) /*Erroneous info asked */ 487 if (nextinfo - info >= 49) /*Erroneous info asked */
475 continue; 488 continue;
476 489
477 strncpy (command, &(buf[info]), nextinfo - info); 490 memcpy (command, buf + info, nextinfo - info);
478 command[nextinfo - info] = '\0'; 491 command [nextinfo - info] = 0;
492
479 /* 2. Interpret info */ 493 /* 2. Interpret info */
480 i = sscanf (command, "%d", &flag); 494 i = sscanf (command, "%d", &flag);
481 495
482 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 496 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483 ns->supported_readables |= (1 << flag); 497 ns->supported_readables |= (1 << flag);
… …
517 return; 531 return;
518 532
519 buf++; 533 buf++;
520 } 534 }
521 535
522 execute_newserver_command (pl->ob, (char *) buf); 536 execute_newserver_command (pl->ob, (char *)buf);
523 537
524 /* Perhaps something better should be done with a left over count. 538 /* Perhaps something better should be done with a left over count.
525 * Cleaning up the input should probably be done first - all actions 539 * Cleaning up the input should probably be done first - all actions
526 * for the command that issued the count should be done before any other 540 * for the command that issued the count should be done before any other
527 * commands. 541 * commands.
… …
561 * commands. 575 * commands.
562 */ 576 */
563 pl->count = 0; 577 pl->count = 0;
564 578
565 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 579 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
566 int time = fabs (pl->ob->speed) < 0.001 580 int time = pl->ob->has_active_speed ()
567 ? time = MAX_TIME * 100
568 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 581 ? (int) (MAX_TIME / pl->ob->speed)
582 : MAX_TIME * 100;
569 583
570 /* Send confirmation of command execution now */ 584 /* Send confirmation of command execution now */
571 packet sl ("comc"); 585 packet sl ("comc");
572 sl << uint16 (cmdid) << uint32 (time); 586 sl << uint16 (cmdid) << uint32 (time);
573 pl->ns->send_packet (sl); 587 pl->ns->send_packet (sl);
… …
615 LOG (llevError, "Unknown input state: %d\n", ns->state); 629 LOG (llevError, "Unknown input state: %d\n", ns->state);
616 } 630 }
617} 631}
618 632
619/** 633/**
620 * Client tells its version. If there is a mismatch, we close the 634 * Client tells its version info.
621 * socket. In real life, all we should care about is the client having
622 * something older than the server. If we assume the client will be
623 * backwards compatible, having it be a later version should not be a
624 * problem.
625 */ 635 */
626void 636void
627VersionCmd (char *buf, int len, client * ns) 637VersionCmd (char *buf, int len, client *ns)
628{ 638{
629 if (!buf) 639 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
630 {
631 LOG (llevError, "CS: received corrupted version command\n");
632 return;
633 }
634
635 ns->cs_version = atoi (buf);
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
642 //if (VERSION_CS != ns->cs_version)
643 // unchecked;
644
645 char *cp = strchr (buf + 1, ' ');
646 if (!cp)
647 return;
648
649 ns->sc_version = atoi (cp);
650
651 //if (VERSION_SC != ns->sc_version)
652 // unchecked;
653
654 cp = strchr (cp + 1, ' ');
655
656 if (cp)
657 {
658 ns->version = cp + 1;
659
660 if (ns->sc_version < 1026)
661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
663 }
664} 640}
665 641
666/** sound related functions. */ 642/** sound related functions. */
667void 643void
668SetSound (char *buf, int len, client * ns) 644SetSound (char *buf, int len, client * ns)
… …
686 * syntax is: move (to) (tag) (nrof) 662 * syntax is: move (to) (tag) (nrof)
687 */ 663 */
688void 664void
689MoveCmd (char *buf, int len, player *pl) 665MoveCmd (char *buf, int len, player *pl)
690{ 666{
691 int vals[3], i; 667 int to, tag, nrof;
692 668
693 /* A little funky here. We only cycle for 2 records, because 669 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694 * we obviously are not going to find a space after the third
695 * record. Perhaps we should just replace this with a
696 * sscanf?
697 */
698 for (i = 0; i < 2; i++)
699 { 670 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 671 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 672 return;
706 }
707
708 buf++;
709 } 673 }
710 674
711 vals[2] = atoi (buf); 675 esrv_move_object (pl->ob, to, tag, nrof);
712
713/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715} 676}
716 677
717/****************************************************************************** 678/******************************************************************************
718 * 679 *
719 * Start of commands the server sends to the client. 680 * Start of commands the server sends to the client.
… …
734 * Get player's current range attack in obuf. 695 * Get player's current range attack in obuf.
735 */ 696 */
736static void 697static void
737rangetostring (player *pl, char *obuf) 698rangetostring (player *pl, char *obuf)
738{ 699{
739 dynbuf_text buf; 700 dynbuf_text &buf = msg_dynbuf; buf.clear ();
701
702#if 0
703 // print ranged/chosen_skill etc. objects every call
704 printf ("%s %s => %s (%s)\n",
705 pl->ranged_ob ? &pl->ranged_ob->name : "-",
706 pl->combat_ob ? &pl->combat_ob->name : "-",
707 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
708 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
709 );
710#endif
740 711
741 if (pl->ranged_ob) 712 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 713 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 714
744 if (pl->combat_ob) 715 if (pl->combat_ob)
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 791 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 792 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 793 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 794
824 for (int s = 0; s < NUM_SKILLS; s++) 795 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 796 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 797 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 798 {
828 ns->last_skill_exp [s] = skill->stats.exp; 799 ns->last_skill_exp [s] = skill->stats.exp;
829 800
830 /* Always send along the level if exp changes. This is only 801 /* Always send along the level if exp changes. This is only
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 809 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 810 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 811 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 812 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 813 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 814 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 815 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); 816 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); 817 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 818
848 flags = 0; 819 flags = 0;
849 820
850 if (opl->fire_on) 821 if (opl->fire_on)
… …
853 if (opl->run_on) 824 if (opl->run_on)
854 flags |= SF_RUNON; 825 flags |= SF_RUNON;
855 826
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 827 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 828
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 829 for (int i = 0; i < NROFATTACKS; i++)
862 { 830 {
863 /* Skip ones we won't send */ 831 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 832 if (atnr_cs_stat[i] == -1)
865 continue; 833 continue;
866 834
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 835 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 } 836 }
869 837
870 if (pl->ns->monitor_spells) 838 if (pl->ns->monitor_spells)
871 { 839 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 840 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 841 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
886 854
887/** 855/**
888 * Tells the client that here is a player it should start using. 856 * Tells the client that here is a player it should start using.
889 */ 857 */
890void 858void
891esrv_new_player (player *pl, uint32 weight) 859esrv_new_player (player *pl)
892{ 860{
861 sint32 weight = pl->ob->client_weight ();
862
893 packet sl ("player"); 863 packet sl ("player");
894 864
895 sl << uint32 (pl->ob->count) 865 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 866 << uint32 (weight)
897 << uint32 (pl->ob->face) 867 << uint32 (pl->ob->face)
898 << data8 (pl->ob->name); 868 << data8 (pl->ob->name);
899 869
900 pl->ns->last_weight = weight; 870 pl->ns->last_weight = weight;
901 pl->ns->send_packet (sl); 871 pl->ns->send_packet (sl);
902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903} 872}
904 873
905/****************************************************************************** 874/******************************************************************************
906 * 875 *
907 * Start of map related commands. 876 * Start of map related commands.
… …
974 943
975 /* Nothing changed */ 944 /* Nothing changed */
976 return 0; 945 return 0;
977} 946}
978 947
979/** 948//-GPL
980 * Returns the size of a data for a map square as returned by
981 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
982 * available.
983 */
984int
985getExtendedMapInfoSize (client * ns)
986{
987 int result = 0;
988
989 if (ns->ext_mapinfos)
990 {
991 if (ns->EMI_smooth)
992 result += 1; /*One byte for smoothlevel */
993 }
994
995 return result;
996}
997 949
998// prefetch (and touch) all maps within a specific distancd 950// prefetch (and touch) all maps within a specific distancd
999static void 951static void
1000prefetch_surrounding_maps (maptile *map, int distance) 952prefetch_surrounding_maps (maptile *map, int distance)
1001{ 953{
1002 map->last_access = runtime; 954 map->touch ();
1003 955
1004 if (--distance) 956 if (--distance)
1005 for (int dir = 4; --dir; ) 957 for (int dir = 4; dir--; )
1006 if (const shstr &path = map->tile_path [dir]) 958 if (const shstr &path = map->tile_path [dir])
1007 if (maptile *&neigh = map->tile_map [dir]) 959 if (maptile *&neigh = map->tile_map [dir])
1008 prefetch_surrounding_maps (neigh, distance); 960 prefetch_surrounding_maps (neigh, distance);
1009 else 961 else
1010 neigh = maptile::find_async (path, map); 962 neigh = maptile::find_async (path, map);
… …
1015prefetch_surrounding_maps (object *op) 967prefetch_surrounding_maps (object *op)
1016{ 968{
1017 prefetch_surrounding_maps (op->map, 3); 969 prefetch_surrounding_maps (op->map, 3);
1018} 970}
1019 971
972//+GPL
973
1020/** 974/**
1021 * Draws client map. 975 * Draws client map.
1022 */ 976 */
1023void 977void
1024draw_client_map (player *pl) 978draw_client_map (player *pl)
1025{ 979{
1026 object *ob = pl->observe; 980 object *ob = pl->viewpoint;
1027 if (!ob->active) 981 if (!pl->observe->active)
1028 return; 982 return;
1029
1030 maptile *plmap = ob->map;
1031 983
1032 /* If player is just joining the game, he isn't here yet, so the map 984 /* 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 985 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in. 986 * be OK once they really log in.
1035 */ 987 */
1036 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 988 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1037 return; 989 return;
1038 990
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1040 int estartlen, eoldlen; 991 int startlen, oldlen;
1041 uint8 eentrysize;
1042 uint16 ewhatstart, ewhatflag;
1043 uint8 extendedinfos;
1044 992
1045 check_map_change (pl); 993 check_map_change (pl);
1046 prefetch_surrounding_maps (pl->ob); 994 prefetch_surrounding_maps (pl->ob);
1047 995
1048 /* do LOS after calls to update_position */ 996 /* do LOS after calls to update_position */
1049 if (ob != pl->ob) 997 /* unfortunately, we need to udpate los when observing, currently */
1050 clear_los (pl); 998 if (pl->do_los || pl->viewpoint != pl->ob)
1051 else if (pl->do_los)
1052 { 999 {
1053 update_los (ob);
1054 pl->do_los = 0; 1000 pl->do_los = 0;
1001 pl->update_los ();
1055 } 1002 }
1056 1003
1057 /** 1004 /**
1058 * This function uses the new map1 protocol command to send the map 1005 * 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 1006 * to the client. It is necessary because the old map command supports
… …
1078 */ 1025 */
1079 1026
1080 client &socket = *pl->ns; 1027 client &socket = *pl->ns;
1081 1028
1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1029 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1083 packet esl;
1084 1030
1085 startlen = sl.length (); 1031 startlen = sl.length ();
1086 1032
1087 /*Extendedmapinfo structure initialisation */ 1033 int hx = socket.mapx / 2;
1088 if (socket.ext_mapinfos) 1034 int hy = socket.mapy / 2;
1089 {
1090 extendedinfos = EMI_NOREDRAW;
1091 1035
1092 if (socket.EMI_smooth) 1036 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1093 extendedinfos |= EMI_SMOOTH; 1037 int ax = dx + hx;
1038 int ay = dy + hy;
1094 1039
1095 ewhatstart = esl.length (); 1040 int mask = (ax << 10) | (ay << 4);
1096 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1041 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1097 could need to be taken away */
1098 eentrysize = getExtendedMapInfoSize (&socket);
1099 esl << "mapextended "
1100 << uint8 (extendedinfos)
1101 << uint8 (eentrysize);
1102 1042
1103 estartlen = esl.length (); 1043 /* If the coordinates are not valid, or it is too dark to see,
1104 } 1044 * we tell the client as such
1105
1106 /* x,y are the real map locations. ax, ay are viewport relative
1107 * locations.
1108 */ 1045 */
1109 ay = 0; 1046 if (!m)
1110
1111 /* We could do this logic as conditionals in the if statement,
1112 * but that started to get a bit messy to look at.
1113 */
1114 max_x = ob->x + (socket.mapx + 1) / 2;
1115 max_y = ob->y + (socket.mapy + 1) / 2;
1116
1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1118 { 1047 {
1119 sint16 nx, ny; 1048 /* space is out of map. Update space and clear values
1120 maptile *m = 0; 1049 * if this hasn't already been done. If the space is out
1121 1050 * of the map, it shouldn't have a head.
1122 ax = 0; 1051 */
1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1052 if (lastcell.count != -1)
1124 { 1053 {
1125 // check to see if we can simply go one right quickly 1054 sl << uint16 (mask);
1055 map_clearcell (&lastcell, -1);
1126 ++nx; 1056 }
1127 if (m && nx >= m->width) 1057
1058 continue;
1059 }
1060
1061 int d = pl->blocked_los_uc (dx, dy);
1062
1063 if (d > 3)
1064 {
1065 /* This block deals with spaces that are not visible for whatever
1066 * reason. Still may need to send the head for this space.
1067 */
1068 if (lastcell.count != -1
1069 || lastcell.faces[0]
1070 || lastcell.faces[1]
1071 || lastcell.faces[2]
1072 || lastcell.stat_hp
1073 || lastcell.flags
1074 || lastcell.player)
1075 sl << uint16 (mask);
1076
1077 /* properly clear a previously sent big face */
1078 map_clearcell (&lastcell, -1);
1079 }
1080 else
1081 {
1082 /* In this block, the space is visible.
1083 */
1084
1085 /* Rather than try to figure out what everything that we might
1086 * need to send is, then form the packet after that,
1087 * we presume that we will in fact form a packet, and update
1088 * the bits by what we do actually send. If we send nothing,
1089 * we just back out sl.length () to the old value, and no harm
1090 * is done.
1091 * I think this is simpler than doing a bunch of checks to see
1092 * what if anything we need to send, setting the bits, then
1093 * doing those checks again to add the real data.
1094 */
1095 oldlen = sl.length ();
1096
1097 sl << uint16 (mask);
1098
1099 unsigned char dummy;
1100 unsigned char *last_ext = &dummy;
1101
1102 /* Darkness changed */
1103 if (lastcell.count != d)
1104 {
1128 m = 0; 1105 mask |= 0x8;
1129 1106
1130 if (!m) 1107 *last_ext |= 0x80;
1108 last_ext = &sl[sl.length ()];
1109 sl << uint8 (d);
1110 }
1111
1112 lastcell.count = d;
1113
1114 mapspace &ms = m->at (nx, ny);
1115 ms.update ();
1116
1117 // extmap handling
1118 uint8 stat_hp = 0;
1119 uint8 stat_width = 0;
1120 uint8 flags = 0;
1121 tag_t player = 0;
1122
1123 // send hp information, if applicable
1124 if (object *op = ms.faces_obj [0])
1125 if (op->is_head () && !op->invisible)
1131 { 1126 {
1132 nx = x; ny = y; m = plmap; 1127 if (op->stats.maxhp > op->stats.hp
1133 1128 && op->stats.maxhp > 0
1134 if (!xy_normalise (m, nx, ny)) 1129 && (op->type == PLAYER
1130 || op->type == DOOR // does not work, have maxhp 0
1131 || QUERY_FLAG (op, FLAG_MONSTER)
1132 || QUERY_FLAG (op, FLAG_ALIVE)
1133 || QUERY_FLAG (op, FLAG_GENERATOR)))
1135 m = 0; 1134 {
1135 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1136 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1137 }
1138
1139 if (expect_false (op->has_dialogue ()))
1140 flags |= 1;
1141
1142 if (expect_false (op->type == PLAYER))
1143 player = op == ob ? pl->ob->count
1144 : op == pl->ob ? ob->count
1145 : op->count;
1136 } 1146 }
1137 1147
1138 int emask, mask; 1148 if (expect_false (lastcell.stat_hp != stat_hp))
1139 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1140
1141 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1142
1143 /* If the coordinates are not valid, or it is too dark to see,
1144 * we tell the client as such
1145 */
1146 if (!m)
1147 { 1149 {
1148 /* space is out of map. Update space and clear values 1150 lastcell.stat_hp = stat_hp;
1149 * if this hasn't already been done. If the space is out 1151
1150 * of the map, it shouldn't have a head 1152 mask |= 0x8;
1151 */ 1153 *last_ext |= 0x80;
1152 if (lastcell.count != -1) 1154 last_ext = &sl[sl.length ()];
1155
1156 sl << uint8 (5) << uint8 (stat_hp);
1157
1158 if (stat_width > 1)
1153 { 1159 {
1154 sl << uint16 (mask);
1155 map_clearcell (&lastcell, -1);
1156 }
1157
1158 continue;
1159 }
1160
1161 m->touch ();
1162
1163 int d = pl->blocked_los[ax][ay];
1164
1165 if (d > 3)
1166 {
1167
1168 int need_send = 0, count;
1169
1170 /* This block deals with spaces that are not visible for whatever
1171 * reason. Still may need to send the head for this space.
1172 */
1173
1174 oldlen = sl.length ();
1175
1176 sl << uint16 (mask);
1177
1178 if (lastcell.count != -1)
1179 need_send = 1;
1180
1181 count = -1;
1182
1183 /* properly clear a previously sent big face */
1184 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1185 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1186 need_send = 1;
1187
1188 map_clearcell (&lastcell, count);
1189
1190 if ((mask & 0xf) || need_send)
1191 sl[oldlen + 1] = mask & 0xff;
1192 else
1193 sl.reset (oldlen);
1194 }
1195 else
1196 {
1197 /* In this block, the space is visible.
1198 */
1199
1200 /* Rather than try to figure out what everything that we might
1201 * need to send is, then form the packet after that,
1202 * we presume that we will in fact form a packet, and update
1203 * the bits by what we do actually send. If we send nothing,
1204 * we just back out sl.length () to the old value, and no harm
1205 * is done.
1206 * I think this is simpler than doing a bunch of checks to see
1207 * what if anything we need to send, setting the bits, then
1208 * doing those checks again to add the real data.
1209 */
1210 oldlen = sl.length ();
1211 eoldlen = esl.length ();
1212
1213 sl << uint16 (mask);
1214
1215 unsigned char dummy;
1216 unsigned char *last_ext = &dummy;
1217
1218 /* Darkness changed */
1219 if (lastcell.count != d && socket.darkness)
1220 {
1221 mask |= 0x8;
1222
1223 if (socket.extmap)
1224 {
1225 *last_ext |= 0x80; 1160 *last_ext |= 0x80;
1226 last_ext = &sl[sl.length ()]; 1161 last_ext = &sl[sl.length ()];
1227 sl << uint8 (d); 1162
1228 } 1163 sl << uint8 (6) << uint8 (stat_width);
1229 else
1230 sl << uint8 (255 - 64 * d);
1231 } 1164 }
1165 }
1232 1166
1233 lastcell.count = d; 1167 if (expect_false (lastcell.player != player))
1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1238 if (socket.extmap)
1239 { 1168 {
1240 uint8 stat_hp = 0; 1169 lastcell.player = player;
1241 uint8 stat_width = 0;
1242 uint8 flags = 0;
1243 tag_t player = 0;
1244 1170
1245 // send hp information, if applicable
1246 if (object *op = ms.faces_obj [0])
1247 {
1248 if (op->head || op->invisible)
1249 ; // do not show
1250 else if (op->type == PLAYER
1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1252 {
1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1254 {
1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257 }
1258 }
1259
1260 if (op->msg && op->msg[0] == '@')
1261 flags |= 1;
1262
1263 if (op->type == PLAYER && op != ob)
1264 player = op->count;
1265 }
1266
1267 if (lastcell.stat_hp != stat_hp)
1268 {
1269 lastcell.stat_hp = stat_hp;
1270
1271 mask |= 0x8; 1171 mask |= 0x8;
1272 *last_ext |= 0x80; 1172 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()]; 1173 last_ext = &sl[sl.length ()];
1274 1174
1275 sl << uint8 (5) << uint8 (stat_hp);
1276
1277 if (stat_width > 1)
1278 {
1279 *last_ext |= 0x80;
1280 last_ext = &sl[sl.length ()];
1281
1282 sl << uint8 (6) << uint8 (stat_width);
1283 }
1284 }
1285
1286 if (lastcell.player != player)
1287 {
1288 lastcell.player = player;
1289
1290 mask |= 0x8;
1291 *last_ext |= 0x80;
1292 last_ext = &sl[sl.length ()];
1293
1294 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1175 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1295 } 1176 }
1296 1177
1297 if (lastcell.flags != flags) 1178 if (expect_false (lastcell.flags != flags))
1298 { 1179 {
1299 lastcell.flags = flags; 1180 lastcell.flags = flags;
1300 1181
1301 mask |= 0x8; 1182 mask |= 0x8;
1302 *last_ext |= 0x80; 1183 *last_ext |= 0x80;
1303 last_ext = &sl[sl.length ()]; 1184 last_ext = &sl[sl.length ()];
1304 1185
1305 sl << uint8 (8) << uint8 (flags); 1186 sl << uint8 (8) << uint8 (flags);
1306 }
1307 } 1187 }
1308 1188
1189 // faces
1190
1309 /* Floor face */ 1191 /* Floor face */
1310 if (update_space (sl, socket, ms, lastcell, 2)) 1192 if (update_space (sl, socket, ms, lastcell, 2))
1311 mask |= 0x4; 1193 mask |= 0x4;
1312 1194
1313 /* Middle face */ 1195 /* Middle face */
1314 if (update_space (sl, socket, ms, lastcell, 1)) 1196 if (update_space (sl, socket, ms, lastcell, 1))
1315 mask |= 0x2; 1197 mask |= 0x2;
1316 1198
1199 if (expect_false (ob->invisible)
1200 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1317 if (ms.player () == ob 1201 && ms.player () == ob)
1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1319 { 1202 {
1320 // force player to be visible to himself if invisible 1203 // force player to be visible to himself if invisible
1321 if (lastcell.faces[0] != ob->face) 1204 if (lastcell.faces[0] != ob->face)
1322 { 1205 {
1323 lastcell.faces[0] = ob->face; 1206 lastcell.faces[0] = ob->face;
1324 1207
1325 mask |= 0x1;
1326 sl << uint16 (ob->face);
1327
1328 socket.send_faces (ob);
1329 }
1330 }
1331 /* Top face */
1332 else if (update_space (sl, socket, ms, lastcell, 0))
1333 mask |= 0x1; 1208 mask |= 0x1;
1209 sl << uint16 (ob->face);
1334 1210
1211 socket.send_faces (ob);
1212 }
1213 }
1214 /* Top face */
1215 else if (update_space (sl, socket, ms, lastcell, 0))
1216 mask |= 0x1;
1217
1335 /* Check to see if we are in fact sending anything for this 1218 /* Check to see if we are in fact sending anything for this
1336 * space by checking the mask. If so, update the mask. 1219 * space by checking the mask. If so, update the mask.
1337 * if not, reset the len to that from before adding the mask 1220 * if not, reset the len to that from before adding the mask
1338 * value, so we don't send those bits. 1221 * value, so we don't send those bits.
1339 */ 1222 */
1340 if (mask & 0xf) 1223 if (mask & 0xf)
1341 sl[oldlen + 1] = mask & 0xff; 1224 sl[oldlen + 1] = mask & 0xff;
1342 else 1225 else
1343 sl.reset (oldlen); 1226 sl.reset (oldlen);
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
1368 if (emask & 0xf)
1369 esl[eoldlen + 1] = emask & 0xff;
1370 else
1371 esl.reset (eoldlen);
1372 }
1373 } /* else this is a viewable space */ 1227 } /* else this is a viewable space */
1374 } /* for x loop */ 1228 ordered_mapwalk_end
1375 } /* for y loop */
1376 1229
1377 socket.flush_fx (); 1230 socket.flush_fx ();
1378
1379 /* Verify that we in fact do need to send this */
1380 if (socket.ext_mapinfos)
1381 {
1382 if (!(sl.length () > startlen || socket.sent_scroll))
1383 {
1384 /* No map data will follow, so don't say the client
1385 * it doesn't need draw!
1386 */
1387 ewhatflag &= ~EMI_NOREDRAW;
1388 esl[ewhatstart + 1] = ewhatflag & 0xff;
1389 }
1390
1391 if (esl.length () > estartlen)
1392 socket.send_packet (esl);
1393 }
1394 1231
1395 if (sl.length () > startlen || socket.sent_scroll) 1232 if (sl.length () > startlen || socket.sent_scroll)
1396 { 1233 {
1397 socket.send_packet (sl); 1234 socket.send_packet (sl);
1398 socket.sent_scroll = 0; 1235 socket.sent_scroll = 0;
1399 } 1236 }
1400} 1237}
1401 1238
1402/*****************************************************************************/
1403/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1404/* a player. Of course, the client need to know the command to be able to */
1405/* manage it ! */
1406/*****************************************************************************/
1407void
1408send_plugin_custom_message (object *pl, char *buf)
1409{
1410 pl->contr->ns->send_packet (buf);
1411}
1412
1413/**
1414 * This sends the skill number to name mapping. We ignore
1415 * the params - we always send the same info no matter what.
1416 */
1417void
1418send_skill_info (client *ns, char *params)
1419{
1420 packet sl;
1421 sl << "replyinfo skill_info\n";
1422
1423 for (int i = 1; i < NUM_SKILLS; i++)
1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1425
1426 if (sl.length () > MAXSOCKBUF)
1427 {
1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1429 fatal (0);
1430 }
1431
1432 ns->send_packet (sl);
1433}
1434
1435/**
1436 * This sends the spell path to name mapping. We ignore
1437 * the params - we always send the same info no matter what.
1438 */
1439void
1440send_spell_paths (client * ns, char *params)
1441{
1442 packet sl;
1443
1444 sl << "replyinfo spell_paths\n";
1445
1446 for (int i = 0; i < NRSPELLPATHS; i++)
1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1448
1449 if (sl.length () > MAXSOCKBUF)
1450 {
1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1452 fatal (0);
1453 }
1454
1455 ns->send_packet (sl);
1456}
1457
1458/** 1239/**
1459 * This looks for any spells the player may have that have changed their stats. 1240 * This looks for any spells the player may have that have changed their stats.
1460 * it then sends an updspell packet for each spell that has changed in this way 1241 * it then sends an updspell packet for each spell that has changed in this way
1461 */ 1242 */
1462void 1243void
1463esrv_update_spells (player *pl) 1244esrv_update_spells (player *pl)
1464{ 1245{
1465 if (!pl->ns) 1246 if (!pl->ns)
1466 return; 1247 return;
1467 1248
1249 pl->ns->update_spells = false;
1250
1468 if (!pl->ns->monitor_spells) 1251 if (!pl->ns->monitor_spells)
1469 return; 1252 return;
1470 1253
1471 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1254 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1472 {
1473 if (spell->type == SPELL) 1255 if (spell->type == SPELL)
1474 { 1256 {
1475 int flags = 0; 1257 int flags = 0;
1258 int val;
1476 1259
1477 /* check if we need to update it */ 1260 /* check if we need to update it */
1478 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1261 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1262 if (spell->cached_sp != val)
1479 { 1263 {
1480 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1264 spell->cached_sp = val;
1481 flags |= UPD_SP_MANA; 1265 flags |= UPD_SP_MANA;
1482 } 1266 }
1483 1267
1484 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1268 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1269 if (spell->cached_grace != val)
1485 { 1270 {
1486 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1271 spell->cached_grace = val;
1487 flags |= UPD_SP_GRACE; 1272 flags |= UPD_SP_GRACE;
1488 } 1273 }
1489 1274
1490 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1275 val = casting_level (pl->ob, spell);
1276 if (spell->cached_eat != val)
1491 { 1277 {
1492 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1278 spell->cached_eat = val;
1493 flags |= UPD_SP_DAMAGE; 1279 flags |= UPD_SP_LEVEL;
1494 } 1280 }
1495 1281
1496 if (flags) 1282 if (flags)
1497 { 1283 {
1498 packet sl; 1284 packet sl;
1499 1285
1500 sl << "updspell " 1286 sl << "updspell "
1501 << uint8 (flags) 1287 << uint8 (flags)
1502 << uint32 (spell->count); 1288 << uint32 (spell->count);
1503 1289
1504 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1290 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1505 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1291 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1506 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1292 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1507 1293
1508 pl->ns->send_packet (sl); 1294 pl->ns->send_packet (sl);
1509 } 1295 }
1510 } 1296 }
1511 }
1512} 1297}
1513 1298
1514void 1299void
1515esrv_remove_spell (player *pl, object *spell) 1300esrv_remove_spell (player *pl, object *spell)
1516{ 1301{
… …
1541 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1326 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1542 return; 1327 return;
1543 } 1328 }
1544 1329
1545 /* store costs and damage in the object struct, to compare to later */ 1330 /* store costs and damage in the object struct, to compare to later */
1546 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1331 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1547 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1332 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1548 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1333 spell->cached_eat = casting_level (pl->ob, spell);
1549 1334
1550 /* figure out which skill it uses, if it uses one */ 1335 /* figure out which skill it uses, if it uses one */
1551 if (spell->skill) 1336 if (spell->skill)
1552 { 1337 if (object *tmp = pl->find_skill (spell->skill))
1553 for (i = 1; i < NUM_SKILLS; i++)
1554 if (!strcmp (spell->skill, skill_names[i]))
1555 {
1556 skill = i + CS_STAT_SKILLINFO; 1338 skill = tmp->subtype + CS_STAT_SKILLINFO;
1557 break;
1558 }
1559 }
1560 1339
1561 // spells better have a face 1340 // spells better have a face
1562 if (!spell->face) 1341 if (!spell->face)
1563 { 1342 {
1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1343 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1569 1348
1570 /* send the current values */ 1349 /* send the current values */
1571 sl << uint32 (spell->count) 1350 sl << uint32 (spell->count)
1572 << uint16 (spell->level) 1351 << uint16 (spell->level)
1573 << uint16 (spell->casting_time) 1352 << uint16 (spell->casting_time)
1574 << uint16 (spell->last_sp) 1353 << uint16 (spell->cached_sp)
1575 << uint16 (spell->last_grace) 1354 << uint16 (spell->cached_grace)
1576 << uint16 (spell->last_eat) 1355 << uint16 (spell->cached_eat)
1577 << uint8 (skill) 1356 << uint8 (skill)
1578 << uint32 (spell->path_attuned) 1357 << uint32 (spell->path_attuned)
1579 << uint32 (spell->face) 1358 << uint32 (spell->face)
1580 << data8 (spell->name) 1359 << data8 (spell->name)
1581 << data16 (spell->msg); 1360 << data16 (spell->msg);
… …
1648 /* finally, we can send the packet */ 1427 /* finally, we can send the packet */
1649 pl->ns->flush_fx (); 1428 pl->ns->flush_fx ();
1650 pl->ns->send_packet (sl); 1429 pl->ns->send_packet (sl);
1651} 1430}
1652 1431
1432//-GPL
1433

Diff Legend

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