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.143 by root, Tue Dec 23 06:58:24 2008 UTC vs.
Revision 1.186 by root, Tue Jan 3 11:25:37 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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 * Deliantra 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 <support@deliantra.net> 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] =
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
74 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
75 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
76 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
77 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD, 79 CS_STAT_RES_DRAIN,
80 -1 /* weaponmagic */,
81 CS_STAT_RES_GHOSTHIT,
82 CS_STAT_RES_POISON,
83 CS_STAT_RES_SLOW,
84 CS_STAT_RES_PARA,
85 CS_STAT_TURN_UNDEAD,
86 CS_STAT_RES_FEAR,
87 -1 /* Cancellation */,
88 CS_STAT_RES_DEPLETE,
89 CS_STAT_RES_DEATH,
90 -1 /* Chaos */,
91 -1 /* Counterspell */,
92 -1 /* Godpower */,
93 CS_STAT_RES_HOLYWORD,
78 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
79 -1, /* Internal */ 95 -1, /* Internal */
80 -1, /* life stealing */ 96 -1, /* life stealing */
81 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
82}; 98};
… …
130 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
131 147
132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133 149
134 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
135
136 if (pl->ns->newmapcmd == 1)
137 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
138
139 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
140} 153}
141 154
142static void 155static void
143send_map_info (player *pl) 156send_map_info (player *pl)
144{ 157{
145 client &socket = *pl->ns; 158 client &socket = *pl->ns;
146 object *ob = pl->observe; 159 object *ob = pl->viewpoint;
147 160
148 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
149 { 162 {
150 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
151 { 164 {
152 int flags = 0; 165 int flags = 0;
153 166
167 // due to historical glitches, the bit ordering and map index ordering differs
154 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
155 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
156 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
157 if (ob->map->tile_path[3]) flags |= 8; 171 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
172 // these two are debatable
173 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
158 175
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
162 } 179 }
… …
168/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
169static void 186static void
170check_map_change (player *pl) 187check_map_change (player *pl)
171{ 188{
172 client &socket = *pl->ns; 189 client &socket = *pl->ns;
173 object *ob = pl->observe; 190 object *ob = pl->viewpoint;
174 191
175 region *reg = ob->region (); 192 region *reg = ob->region ();
176 if (socket.current_region != reg) 193 if (socket.current_region != reg)
177 { 194 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
… …
208 else if (socket.current_x != ob->x || socket.current_y != ob->y) 225 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 { 226 {
210 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
212 229
213 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
214 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215 else
216 {
217 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 230 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218 socket.floorbox_reset (); 231 socket.floorbox_reset ();
219 }
220 } 232 }
221 233
222 socket.current_x = ob->x; 234 socket.current_x = ob->x;
223 socket.current_y = ob->y; 235 socket.current_y = ob->y;
236}
237
238/**
239 * This sends the skill number to name mapping. We ignore
240 * the params - we always send the same info no matter what.
241 */
242static void
243send_skill_info (client *ns, char *params)
244{
245 packet sl;
246 sl << "replyinfo skill_info\n";
247
248 for (int i = 0; i < skillvec.size (); ++i)
249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
250
251 if (sl.length () > MAXSOCKBUF)
252 cleanup ("buffer overflow in send_skill_info!");
253
254 ns->send_packet (sl);
255}
256
257/**
258 * This sends the spell path to name mapping. We ignore
259 * the params - we always send the same info no matter what.
260 */
261static void
262send_spell_paths (client * ns, char *params)
263{
264 packet sl;
265
266 sl << "replyinfo spell_paths\n";
267
268 for (int i = 0; i < NRSPELLPATHS; i++)
269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
270
271 if (sl.length () > MAXSOCKBUF)
272 cleanup ("buffer overflow in send_spell_paths!");
273
274 ns->send_packet (sl);
224} 275}
225 276
226/** 277/**
227 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
228 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
… …
241 { 292 {
242 *params++ = 0; 293 *params++ = 0;
243 break; 294 break;
244 } 295 }
245 296
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 298 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
254 else 301 else
255 { 302 {
… …
271ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
272{ 319{
273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274} 321}
275 322
323//-GPL
324
276void 325void
277client::mapinfo_queue_clear () 326client::mapinfo_queue_clear ()
278{ 327{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i); 329 free (*i);
… …
287{ 336{
288 char *token = buf; 337 char *token = buf;
289 buf += strlen (buf) + 9; 338 buf += strlen (buf) + 9;
290 339
291 // initial map and its origin 340 // initial map and its origin
292 maptile *map = pl->observe->map; 341 maptile *map = pl->viewpoint->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x; 342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y; 343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295 int max_distance = 8; // limit maximum path length to something generous 344 int max_distance = 8; // limit maximum path length to something generous
296 345
297 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
298 { 347 {
299 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
300 349
301 if (dir >= 0 && dir <= 3) 350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352
353 // maybe we should only allow the four flat directions
354 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
302 { 355 {
356 dir = dirmap [dir];
357
303 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
304 map = 0; 359 map = 0;
305 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
306 { 361 {
307 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
330 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
331 else 386 else
332 { 387 {
333 int flags = 0; 388 int flags = 0;
334 389
390 // due to historical glitches, the bit ordering and map index ordering differs
335 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
336 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
337 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
338 if (map->tile_path[3]) flags |= 8; 394 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
395 // these two are debatable
396 if (map->tile_path [TILE_UP ]) flags |= 0x10;
397 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
339 398
340 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 } 400 }
342 401
343 return 1; 402 return 1;
… …
404AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
405{ 464{
406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407} 466}
408 467
409/** Reply to ExtendedInfos command */ 468//+GPL
410void
411ToggleExtendedInfos (char *buf, int len, client * ns)
412{
413 char cmdback[MAX_BUF];
414 char command[50];
415 int info, nextinfo;
416
417 cmdback[0] = '\0';
418 nextinfo = 0;
419
420 while (1)
421 {
422 /* 1. Extract an info */
423 info = nextinfo;
424
425 while ((info < len) && (buf[info] == ' '))
426 info++;
427
428 if (info >= len)
429 break;
430
431 nextinfo = info + 1;
432
433 while ((nextinfo < len) && (buf[nextinfo] != ' '))
434 nextinfo++;
435
436 if (nextinfo - info >= 49) /*Erroneous info asked */
437 continue;
438
439 strncpy (command, &(buf[info]), nextinfo - info);
440
441 /* 2. Interpret info */
442 if (!strcmp ("smooth", command))
443 /* Toggle smoothing */
444 ns->EMI_smooth = !ns->EMI_smooth;
445 else
446 /*bad value */;
447
448 /*3. Next info */
449 }
450
451 strcpy (cmdback, "ExtendedInfoSet");
452
453 if (ns->EMI_smooth)
454 {
455 strcat (cmdback, " ");
456 strcat (cmdback, "smoothing");
457 }
458
459 ns->send_packet (cmdback);
460}
461
462/*
463#define MSG_TYPE_BOOK 1
464#define MSG_TYPE_CARD 2
465#define MSG_TYPE_PAPER 3
466#define MSG_TYPE_SIGN 4
467#define MSG_TYPE_MONUMENT 5
468#define MSG_TYPE_SCRIPTED_DIALOG 6*/
469
470/** Reply to ExtendedInfos command */
471void
472ToggleExtendedText (char *buf, int len, client * ns)
473{
474 char cmdback[MAX_BUF];
475 char temp[10];
476 char command[50];
477 int info, nextinfo, i, flag;
478
479 cmdback[0] = '\0';
480
481 nextinfo = 0;
482 while (1)
483 {
484 /* 1. Extract an info */
485 info = nextinfo;
486
487 while ((info < len) && (buf[info] == ' '))
488 info++;
489
490 if (info >= len)
491 break;
492
493 nextinfo = info + 1;
494
495 while ((nextinfo < len) && (buf[nextinfo] != ' '))
496 nextinfo++;
497
498 if (nextinfo - info >= 49) /*Erroneous info asked */
499 continue;
500
501 strncpy (command, &(buf[info]), nextinfo - info);
502 command[nextinfo - info] = '\0';
503 /* 2. Interpret info */
504 i = sscanf (command, "%d", &flag);
505
506 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
507 ns->supported_readables |= (1 << flag);
508 /*3. Next info */
509 }
510
511 /* Send resulting state */
512 strcpy (cmdback, "ExtendedTextSet");
513
514 for (i = 0; i <= MSG_TYPE_LAST; i++)
515 if (ns->supported_readables & (1 << i))
516 {
517 strcat (cmdback, " ");
518 snprintf (temp, sizeof (temp), "%d", i);
519 strcat (cmdback, temp);
520 }
521
522 ns->send_packet (cmdback);
523}
524 469
525/** 470/**
526 * This handles the general commands from the client (ie, north, fire, cast, 471 * This handles the general commands from the client (ie, north, fire, cast,
527 * etc.) 472 * etc.)
528 */ 473 */
… …
541 return; 486 return;
542 487
543 buf++; 488 buf++;
544 } 489 }
545 490
546 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
547 492
548 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
549 * Cleaning up the input should probably be done first - all actions 494 * Cleaning up the input should probably be done first - all actions
550 * for the command that issued the count should be done before any other 495 * for the command that issued the count should be done before any other
551 * commands. 496 * commands.
… …
585 * commands. 530 * commands.
586 */ 531 */
587 pl->count = 0; 532 pl->count = 0;
588 533
589 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 534 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
590 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
591 ? time = MAX_TIME * 100
592 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
593 538
594 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
595 packet sl ("comc"); 540 packet sl ("comc");
596 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
597 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
639 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
640 } 585 }
641} 586}
642 587
643/** 588/**
644 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
645 * socket. In real life, all we should care about is the client having
646 * something older than the server. If we assume the client will be
647 * backwards compatible, having it be a later version should not be a
648 * problem.
649 */ 590 */
650void 591void
651VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
652{ 593{
653 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
654 {
655 LOG (llevError, "CS: received corrupted version command\n");
656 return;
657 }
658
659 ns->cs_version = atoi (buf);
660 ns->sc_version = ns->cs_version;
661
662 LOG (llevDebug, "connection from client <%s>\n", buf);
663
664 //TODO: should log here just for statistics
665
666 //if (VERSION_CS != ns->cs_version)
667 // unchecked;
668
669 char *cp = strchr (buf + 1, ' ');
670 if (!cp)
671 return;
672
673 ns->sc_version = atoi (cp);
674
675 //if (VERSION_SC != ns->sc_version)
676 // unchecked;
677
678 cp = strchr (cp + 1, ' ');
679
680 if (cp)
681 {
682 ns->version = cp + 1;
683
684 if (ns->sc_version < 1026)
685 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
686 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
687 }
688} 595}
689 596
690/** sound related functions. */ 597/** sound related functions. */
691void 598void
692SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
743 * Get player's current range attack in obuf. 650 * Get player's current range attack in obuf.
744 */ 651 */
745static void 652static void
746rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
747{ 654{
748 dynbuf_text buf; 655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
656
657#if 0
658 // print ranged/chosen_skill etc. objects every call
659 printf ("%s %s => %s (%s)\n",
660 pl->ranged_ob ? &pl->ranged_ob->name : "-",
661 pl->combat_ob ? &pl->combat_ob->name : "-",
662 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
663 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
664 );
665#endif
749 666
750 if (pl->ranged_ob) 667 if (pl->ranged_ob)
751 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 668 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752 669
753 if (pl->combat_ob) 670 if (pl->combat_ob)
… …
799 * commands for now. 716 * commands for now.
800 */ 717 */
801void 718void
802esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
803{ 720{
804 char buf[MAX_BUF];
805 uint16 flags;
806
807 client *ns = pl->ns; 721 client *ns = pl->ns;
808 if (!ns) 722 if (!ns)
809 return; 723 return;
810 724
811 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
828 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
832 746
833 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
834 if (object *skill = opl->last_skill_ob [s]) 748 if (object *skill = opl->last_skill_ob [s])
835 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
836 { 750 {
837 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
838 752
839 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
840 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
841 */ 755 */
842 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
843 << uint8 (skill->level) 757 << uint8 (skill->level)
844 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
845 } 759 }
846 760
847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 766 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
854 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 768 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
855 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
856 770
857 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
858 772 | (opl->run_on ? SF_RUNON : 0);
859 if (opl->fire_on)
860 flags |= SF_FIREON;
861
862 if (opl->run_on)
863 flags |= SF_RUNON;
864 773
865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
866 775
867 if (ns->sc_version < 1025)
868 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
869 else
870 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
871 {
872 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
873 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
874 continue;
875
876 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 779 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
877 }
878 780
879 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
880 { 782 {
881 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 783 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
882 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 784 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
883 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 785 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
884 } 786 }
885 787
788 char buf[MAX_BUF];
886 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 789 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
887 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
888 set_title (ob, buf); 791 set_title (ob, buf);
889 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
890 793
… …
985 /* Nothing changed */ 888 /* Nothing changed */
986 return 0; 889 return 0;
987} 890}
988 891
989/** 892/**
990 * Returns the size of a data for a map square as returned by
991 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
992 * available.
993 */
994int
995getExtendedMapInfoSize (client * ns)
996{
997 int result = 0;
998
999 if (ns->ext_mapinfos)
1000 {
1001 if (ns->EMI_smooth)
1002 result += 1; /*One byte for smoothlevel */
1003 }
1004
1005 return result;
1006}
1007
1008// prefetch (and touch) all maps within a specific distancd
1009static void
1010prefetch_surrounding_maps (maptile *map, int distance)
1011{
1012 map->last_access = runtime;
1013
1014 if (--distance)
1015 for (int dir = 4; --dir; )
1016 if (const shstr &path = map->tile_path [dir])
1017 if (maptile *&neigh = map->tile_map [dir])
1018 prefetch_surrounding_maps (neigh, distance);
1019 else
1020 neigh = maptile::find_async (path, map);
1021}
1022
1023// prefetch a generous area around the player
1024static void
1025prefetch_surrounding_maps (object *op)
1026{
1027 prefetch_surrounding_maps (op->map, 3);
1028}
1029
1030/**
1031 * Draws client map. 893 * Draws client map.
1032 */ 894 */
1033void 895void
1034draw_client_map (player *pl) 896draw_client_map (player *pl)
1035{ 897{
1036 object *ob = pl->observe; 898 object *ob = pl->viewpoint;
1037 if (!ob->active) 899 if (!pl->observe->active)
1038 return; 900 return;
1039 901
1040 /* If player is just joining the game, he isn't here yet, so the map 902 /* If player is just joining the game, he isn't here yet, so the map
1041 * can get swapped out. If so, don't try to send them a map. All will 903 * can get swapped out. If so, don't try to send them a map. All will
1042 * be OK once they really log in. 904 * be OK once they really log in.
1043 */ 905 */
1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
1045 return; 907 return;
1046 908
1047 int startlen, oldlen; 909 int startlen, oldlen;
1048 int estartlen, eoldlen;
1049 uint8 eentrysize;
1050 uint16 ewhatstart, ewhatflag;
1051 uint8 extendedinfos;
1052 910
1053 check_map_change (pl); 911 check_map_change (pl);
1054 prefetch_surrounding_maps (pl->ob); 912 pl->ob->prefetch_surrounding_maps ();
1055 913
1056 /* do LOS after calls to update_position */ 914 /* do LOS after calls to update_position */
1057 /* unfortunately, we need to udpate los when observing, currently */ 915 /* unfortunately, we need to udpate los when observing, currently */
1058 if (pl->do_los || pl->observe != pl->ob) 916 if (pl->do_los || pl->viewpoint != pl->ob)
1059 { 917 {
1060 pl->do_los = 0; 918 pl->do_los = 0;
1061 pl->update_los (); 919 pl->update_los ();
1062 } 920 }
1063 921
… …
1084 * look like. 942 * look like.
1085 */ 943 */
1086 944
1087 client &socket = *pl->ns; 945 client &socket = *pl->ns;
1088 946
1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 947 packet sl ("map1a");
1090 packet esl;
1091 948
1092 startlen = sl.length (); 949 startlen = sl.length ();
1093 950
1094 /*Extendedmapinfo structure initialisation */
1095 if (socket.ext_mapinfos)
1096 {
1097 extendedinfos = EMI_NOREDRAW;
1098
1099 if (socket.EMI_smooth)
1100 extendedinfos |= EMI_SMOOTH;
1101
1102 ewhatstart = esl.length ();
1103 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1104 could need to be taken away */
1105 eentrysize = getExtendedMapInfoSize (&socket);
1106 esl << "mapextended "
1107 << uint8 (extendedinfos)
1108 << uint8 (eentrysize);
1109
1110 estartlen = esl.length ();
1111 }
1112
1113 /* We could do this logic as conditionals in the if statement,
1114 * but that started to get a bit messy to look at.
1115 */
1116 int hx = socket.mapx / 2; 951 int hx = socket.mapx / 2;
1117 int hy = socket.mapy / 2; 952 int hy = socket.mapy / 2;
1118 953
1119 for (int dx = -hx; dx <= hx; dx++) 954 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
955 int ax = dx + hx;
956 int ay = dy + hy;
957
958 int mask = (ax << 10) | (ay << 4);
959 MapCell &lastcell = socket.lastmap.cells[ax][ay];
960
961 /* If the coordinates are not valid, or it is too dark to see,
962 * we tell the client as such
963 */
964 if (!m)
1120 { 965 {
1121 sint16 nx, ny; 966 /* space is out of map. Update space and clear values
1122 maptile *m = 0; 967 * if this hasn't already been done. If the space is out
1123 968 * of the map, it shouldn't have a head.
1124 for (int dy = -hy; dy <= hy; dy++) 969 */
970 if (lastcell.count != -1)
1125 { 971 {
1126 // check to see if we can simply go one down quickly 972 sl << uint16 (mask);
1127 if (m && ++ny >= m->height) 973 map_clearcell (&lastcell, -1);
974 }
975
976 continue;
977 }
978
979 int d = pl->blocked_los_uc (dx, dy);
980
981 if (d > 3)
982 {
983 /* This block deals with spaces that are not visible for whatever
984 * reason. Still may need to send the head for this space.
985 */
986 if (lastcell.count != -1
987 || lastcell.faces[0]
988 || lastcell.faces[1]
989 || lastcell.faces[2]
990 || lastcell.stat_hp
991 || lastcell.flags
992 || lastcell.player)
993 sl << uint16 (mask);
994
995 /* properly clear a previously sent big face */
996 map_clearcell (&lastcell, -1);
997 }
998 else
999 {
1000 /* In this block, the space is visible.
1001 */
1002
1003 /* Rather than try to figure out what everything that we might
1004 * need to send is, then form the packet after that,
1005 * we presume that we will in fact form a packet, and update
1006 * the bits by what we do actually send. If we send nothing,
1007 * we just back out sl.length () to the old value, and no harm
1008 * is done.
1009 * I think this is simpler than doing a bunch of checks to see
1010 * what if anything we need to send, setting the bits, then
1011 * doing those checks again to add the real data.
1012 */
1013 oldlen = sl.length ();
1014
1015 sl << uint16 (mask);
1016
1017 unsigned char dummy;
1018 unsigned char *last_ext = &dummy;
1019
1020 /* Darkness changed */
1021 if (lastcell.count != d)
1022 {
1128 m = 0; 1023 mask |= 0x8;
1129 1024
1130 // no, so do it the slow way 1025 *last_ext |= 0x80;
1131 if (!m) 1026 last_ext = &sl[sl.length ()];
1027 sl << uint8 (d);
1028 }
1029
1030 lastcell.count = d;
1031
1032 mapspace &ms = m->at (nx, ny);
1033 ms.update ();
1034
1035 // extmap handling
1036 uint8 stat_hp = 0;
1037 uint8 stat_width = 0;
1038 uint8 flags = 0;
1039 tag_t player = 0;
1040
1041 // send hp information, if applicable
1042 if (object *op = ms.faces_obj [0])
1043 if (op->is_head () && !op->invisible)
1132 { 1044 {
1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map; 1045 if (op->stats.maxhp > op->stats.hp
1134 1046 && op->stats.maxhp > 0
1135 if (xy_normalise (m, nx, ny)) 1047 && (op->type == PLAYER
1136 m->touch (); 1048 || op->type == DOOR // does not work, have maxhp 0
1137 else 1049 || op->flag [FLAG_MONSTER]
1050 || op->flag [FLAG_ALIVE]
1051 || op->flag [FLAG_GENERATOR]))
1138 m = 0; 1052 {
1053 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1054 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1055 }
1056
1057 if (expect_false (op->has_dialogue ()))
1058 flags |= 1;
1059
1060 if (expect_false (op->type == PLAYER))
1061 player = op == ob ? pl->ob->count
1062 : op == pl->ob ? ob->count
1063 : op->count;
1139 } 1064 }
1140 1065
1141 int ax = dx + hx; 1066 if (expect_false (lastcell.stat_hp != stat_hp))
1142 int ay = dy + hy;
1143
1144 int emask, mask;
1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1146
1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1148
1149 /* If the coordinates are not valid, or it is too dark to see,
1150 * we tell the client as such
1151 */
1152 if (!m)
1153 { 1067 {
1154 /* space is out of map. Update space and clear values 1068 lastcell.stat_hp = stat_hp;
1155 * if this hasn't already been done. If the space is out 1069
1156 * of the map, it shouldn't have a head. 1070 mask |= 0x8;
1157 */ 1071 *last_ext |= 0x80;
1158 if (lastcell.count != -1) 1072 last_ext = &sl[sl.length ()];
1073
1074 sl << uint8 (5) << uint8 (stat_hp);
1075
1076 if (stat_width > 1)
1159 { 1077 {
1160 sl << uint16 (mask);
1161 map_clearcell (&lastcell, -1);
1162 }
1163
1164 continue;
1165 }
1166
1167 int d = pl->blocked_los_uc (dx, dy);
1168
1169 if (d > 3)
1170 {
1171 int need_send = 0, count;
1172
1173 /* This block deals with spaces that are not visible for whatever
1174 * reason. Still may need to send the head for this space.
1175 */
1176
1177 oldlen = sl.length ();
1178
1179 sl << uint16 (mask);
1180
1181 if (lastcell.count != -1)
1182 need_send = 1;
1183
1184 count = -1;
1185
1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1188 need_send = 1;
1189
1190 /* properly clear a previously sent big face */
1191 map_clearcell (&lastcell, count);
1192
1193 if ((mask & 0xf) || need_send)
1194 sl[oldlen + 1] = mask & 0xff;
1195 else
1196 sl.reset (oldlen);
1197 }
1198 else
1199 {
1200 /* In this block, the space is visible.
1201 */
1202
1203 /* Rather than try to figure out what everything that we might
1204 * need to send is, then form the packet after that,
1205 * we presume that we will in fact form a packet, and update
1206 * the bits by what we do actually send. If we send nothing,
1207 * we just back out sl.length () to the old value, and no harm
1208 * is done.
1209 * I think this is simpler than doing a bunch of checks to see
1210 * what if anything we need to send, setting the bits, then
1211 * doing those checks again to add the real data.
1212 */
1213 oldlen = sl.length ();
1214 eoldlen = esl.length ();
1215
1216 sl << uint16 (mask);
1217
1218 unsigned char dummy;
1219 unsigned char *last_ext = &dummy;
1220
1221 /* Darkness changed */
1222 if (lastcell.count != d && socket.darkness)
1223 {
1224 mask |= 0x8;
1225
1226 if (socket.extmap)
1227 {
1228 *last_ext |= 0x80; 1078 *last_ext |= 0x80;
1229 last_ext = &sl[sl.length ()]; 1079 last_ext = &sl[sl.length ()];
1230 sl << uint8 (d); 1080
1231 } 1081 sl << uint8 (6) << uint8 (stat_width);
1232 else
1233 sl << uint8 (255 - 64 * d);
1234 } 1082 }
1083 }
1235 1084
1236 lastcell.count = d; 1085 if (expect_false (lastcell.player != player))
1237
1238 mapspace &ms = m->at (nx, ny);
1239 ms.update ();
1240
1241 if (socket.extmap)
1242 { 1086 {
1243 uint8 stat_hp = 0; 1087 lastcell.player = player;
1244 uint8 stat_width = 0;
1245 uint8 flags = 0;
1246 tag_t player = 0;
1247 1088
1248 // send hp information, if applicable
1249 if (object *op = ms.faces_obj [0])
1250 if (op->is_head () && !op->invisible)
1251 {
1252 if (op->stats.maxhp > op->stats.hp
1253 && op->stats.maxhp > 0
1254 && (op->type == PLAYER
1255 || op->type == DOOR // does not work, have maxhp 0
1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1259 {
1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1262 }
1263
1264 if (op->has_dialogue ())
1265 flags |= 1;
1266
1267 if (op->type == PLAYER)
1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1271 }
1272
1273 if (lastcell.stat_hp != stat_hp)
1274 {
1275 lastcell.stat_hp = stat_hp;
1276
1277 mask |= 0x8; 1089 mask |= 0x8;
1278 *last_ext |= 0x80; 1090 *last_ext |= 0x80;
1279 last_ext = &sl[sl.length ()]; 1091 last_ext = &sl[sl.length ()];
1280 1092
1281 sl << uint8 (5) << uint8 (stat_hp);
1282
1283 if (stat_width > 1)
1284 {
1285 *last_ext |= 0x80;
1286 last_ext = &sl[sl.length ()];
1287
1288 sl << uint8 (6) << uint8 (stat_width);
1289 }
1290 }
1291
1292 if (lastcell.player != player)
1293 {
1294 lastcell.player = player;
1295
1296 mask |= 0x8;
1297 *last_ext |= 0x80;
1298 last_ext = &sl[sl.length ()];
1299
1300 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1093 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1301 } 1094 }
1302 1095
1303 if (lastcell.flags != flags) 1096 if (expect_false (lastcell.flags != flags))
1304 { 1097 {
1305 lastcell.flags = flags; 1098 lastcell.flags = flags;
1306 1099
1307 mask |= 0x8; 1100 mask |= 0x8;
1308 *last_ext |= 0x80; 1101 *last_ext |= 0x80;
1309 last_ext = &sl[sl.length ()]; 1102 last_ext = &sl[sl.length ()];
1310 1103
1311 sl << uint8 (8) << uint8 (flags); 1104 sl << uint8 (8) << uint8 (flags);
1312 }
1313 } 1105 }
1314 1106
1107 // faces
1108
1315 /* Floor face */ 1109 /* Floor face */
1316 if (update_space (sl, socket, ms, lastcell, 2)) 1110 if (update_space (sl, socket, ms, lastcell, 2))
1317 mask |= 0x4; 1111 mask |= 0x4;
1318 1112
1319 /* Middle face */ 1113 /* Middle face */
1320 if (update_space (sl, socket, ms, lastcell, 1)) 1114 if (update_space (sl, socket, ms, lastcell, 1))
1321 mask |= 0x2; 1115 mask |= 0x2;
1322 1116
1323 if (ob->invisible 1117 if (expect_false (ob->invisible)
1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7) 1118 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1325 && ms.player () == ob) 1119 && ms.player () == ob)
1326 { 1120 {
1327 // force player to be visible to himself if invisible 1121 // force player to be visible to himself if invisible
1328 if (lastcell.faces[0] != ob->face) 1122 if (lastcell.faces[0] != ob->face)
1329 { 1123 {
1330 lastcell.faces[0] = ob->face; 1124 lastcell.faces[0] = ob->face;
1331 1125
1332 mask |= 0x1;
1333 sl << uint16 (ob->face);
1334
1335 socket.send_faces (ob);
1336 }
1337 }
1338 /* Top face */
1339 else if (update_space (sl, socket, ms, lastcell, 0))
1340 mask |= 0x1; 1126 mask |= 0x1;
1127 sl << uint16 (ob->face);
1341 1128
1129 socket.send_faces (ob);
1130 }
1131 }
1132 /* Top face */
1133 else if (update_space (sl, socket, ms, lastcell, 0))
1134 mask |= 0x1;
1135
1342 /* Check to see if we are in fact sending anything for this 1136 /* Check to see if we are in fact sending anything for this
1343 * space by checking the mask. If so, update the mask. 1137 * space by checking the mask. If so, update the mask.
1344 * if not, reset the len to that from before adding the mask 1138 * if not, reset the len to that from before adding the mask
1345 * value, so we don't send those bits. 1139 * value, so we don't send those bits.
1346 */ 1140 */
1347 if (mask & 0xf) 1141 if (mask & 0xf)
1348 sl[oldlen + 1] = mask & 0xff; 1142 sl[oldlen + 1] = mask & 0xff;
1349 else 1143 else
1350 sl.reset (oldlen); 1144 sl.reset (oldlen);
1351
1352 if (socket.ext_mapinfos)
1353 esl << uint16 (emask);
1354
1355 if (socket.EMI_smooth)
1356 {
1357 for (int layer = 2+1; layer--; )
1358 {
1359 object *ob = ms.faces_obj [layer];
1360
1361 // If there is no object for this space, or if the face for the object
1362 // is the blank face, set the smoothlevel to zero.
1363 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1364
1365 // We've gotten what face we want to use for the object. Now see if
1366 // if it has changed since we last sent it to the client.
1367 if (lastcell.smooth[layer] != smoothlevel)
1368 {
1369 lastcell.smooth[layer] = smoothlevel;
1370 esl << uint8 (smoothlevel);
1371 emask |= 1 << layer;
1372 }
1373 }
1374
1375 if (emask & 0xf)
1376 esl[eoldlen + 1] = emask & 0xff;
1377 else
1378 esl.reset (eoldlen);
1379 }
1380 } /* else this is a viewable space */ 1145 } /* else this is a viewable space */
1381 } /* for x loop */ 1146 ordered_mapwalk_end
1382 } /* for y loop */
1383 1147
1384 socket.flush_fx (); 1148 socket.flush_fx ();
1385
1386 /* Verify that we in fact do need to send this */
1387 if (socket.ext_mapinfos)
1388 {
1389 if (!(sl.length () > startlen || socket.sent_scroll))
1390 {
1391 /* No map data will follow, so don't say the client
1392 * it doesn't need draw!
1393 */
1394 ewhatflag &= ~EMI_NOREDRAW;
1395 esl[ewhatstart + 1] = ewhatflag & 0xff;
1396 }
1397
1398 if (esl.length () > estartlen)
1399 socket.send_packet (esl);
1400 }
1401 1149
1402 if (sl.length () > startlen || socket.sent_scroll) 1150 if (sl.length () > startlen || socket.sent_scroll)
1403 { 1151 {
1404 socket.send_packet (sl); 1152 socket.send_packet (sl);
1405 socket.sent_scroll = 0; 1153 socket.sent_scroll = 0;
1406 } 1154 }
1407} 1155}
1408 1156
1409/*****************************************************************************/
1410/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1411/* a player. Of course, the client need to know the command to be able to */
1412/* manage it ! */
1413/*****************************************************************************/
1414void
1415send_plugin_custom_message (object *pl, char *buf)
1416{
1417 pl->contr->ns->send_packet (buf);
1418}
1419
1420/**
1421 * This sends the skill number to name mapping. We ignore
1422 * the params - we always send the same info no matter what.
1423 */
1424void
1425send_skill_info (client *ns, char *params)
1426{
1427 packet sl;
1428 sl << "replyinfo skill_info\n";
1429
1430 for (int i = 1; i < NUM_SKILLS; i++)
1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1432
1433 if (sl.length () > MAXSOCKBUF)
1434 {
1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1436 fatal (0);
1437 }
1438
1439 ns->send_packet (sl);
1440}
1441
1442/**
1443 * This sends the spell path to name mapping. We ignore
1444 * the params - we always send the same info no matter what.
1445 */
1446void
1447send_spell_paths (client * ns, char *params)
1448{
1449 packet sl;
1450
1451 sl << "replyinfo spell_paths\n";
1452
1453 for (int i = 0; i < NRSPELLPATHS; i++)
1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1455
1456 if (sl.length () > MAXSOCKBUF)
1457 {
1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1459 fatal (0);
1460 }
1461
1462 ns->send_packet (sl);
1463}
1464
1465/** 1157/**
1466 * This looks for any spells the player may have that have changed their stats. 1158 * This looks for any spells the player may have that have changed their stats.
1467 * it then sends an updspell packet for each spell that has changed in this way 1159 * it then sends an updspell packet for each spell that has changed in this way
1468 */ 1160 */
1469void 1161void
1470esrv_update_spells (player *pl) 1162esrv_update_spells (player *pl)
1471{ 1163{
1472 if (!pl->ns) 1164 if (!pl->ns)
1473 return; 1165 return;
1474 1166
1167 pl->ns->update_spells = false;
1168
1475 if (!pl->ns->monitor_spells) 1169 if (!pl->ns->monitor_spells)
1476 return; 1170 return;
1477 1171
1478 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1172 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1479 {
1480 if (spell->type == SPELL) 1173 if (spell->type == SPELL)
1481 { 1174 {
1482 int flags = 0; 1175 int flags = 0;
1176 int val;
1483 1177
1484 /* check if we need to update it */ 1178 /* check if we need to update it */
1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1179 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1180 if (spell->cached_sp != val)
1486 { 1181 {
1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1182 spell->cached_sp = val;
1488 flags |= UPD_SP_MANA; 1183 flags |= UPD_SP_MANA;
1489 } 1184 }
1490 1185
1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1186 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1187 if (spell->cached_grace != val)
1492 { 1188 {
1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1189 spell->cached_grace = val;
1494 flags |= UPD_SP_GRACE; 1190 flags |= UPD_SP_GRACE;
1495 } 1191 }
1496 1192
1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1193 val = casting_level (pl->ob, spell);
1194 if (spell->cached_eat != val)
1498 { 1195 {
1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1196 spell->cached_eat = val;
1500 flags |= UPD_SP_DAMAGE; 1197 flags |= UPD_SP_LEVEL;
1501 } 1198 }
1502 1199
1503 if (flags) 1200 if (flags)
1504 { 1201 {
1505 packet sl; 1202 packet sl;
1506 1203
1507 sl << "updspell " 1204 sl << "updspell "
1508 << uint8 (flags) 1205 << uint8 (flags)
1509 << uint32 (spell->count); 1206 << uint32 (spell->count);
1510 1207
1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1208 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1209 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1210 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1514 1211
1515 pl->ns->send_packet (sl); 1212 pl->ns->send_packet (sl);
1516 } 1213 }
1517 } 1214 }
1518 }
1519} 1215}
1520 1216
1521void 1217void
1522esrv_remove_spell (player *pl, object *spell) 1218esrv_remove_spell (player *pl, object *spell)
1523{ 1219{
… …
1550 } 1246 }
1551 1247
1552 /* store costs and damage in the object struct, to compare to later */ 1248 /* store costs and damage in the object struct, to compare to later */
1553 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1249 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1554 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1250 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1251 spell->cached_eat = casting_level (pl->ob, spell);
1556 1252
1557 /* figure out which skill it uses, if it uses one */ 1253 /* figure out which skill it uses, if it uses one */
1558 if (spell->skill) 1254 if (spell->skill)
1559 if (object *tmp = pl->find_skill (spell->skill)) 1255 if (object *tmp = pl->find_skill (spell->skill))
1560 skill = tmp->subtype + CS_STAT_SKILLINFO; 1256 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1561 1257
1562 // spells better have a face 1258 // spells better have a face
1563 if (!spell->face) 1259 if (!spell->face)
1564 { 1260 {
1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1261 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1639 } 1335 }
1640 else 1336 else
1641 append_spell (pl, sl, spell); 1337 append_spell (pl, sl, spell);
1642 1338
1643 if (sl.length () > MAXSOCKBUF) 1339 if (sl.length () > MAXSOCKBUF)
1644 {
1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1340 cleanup ("buffer overflow in esrv_add_spells!");
1646 fatal (0);
1647 }
1648 1341
1649 /* finally, we can send the packet */ 1342 /* finally, we can send the packet */
1650 pl->ns->flush_fx (); 1343 pl->ns->flush_fx ();
1651 pl->ns->send_packet (sl); 1344 pl->ns->send_packet (sl);
1652} 1345}
1653 1346
1347//-GPL
1348

Diff Legend

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