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.164 by root, Fri Mar 26 00:59:22 2010 UTC vs.
Revision 1.193 by root, Wed Nov 16 23:42:03 2016 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,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25//+GPL 25//+GPL
26 26
… …
44 44
45#include <global.h> 45#include <global.h>
46#include <sproto.h> 46#include <sproto.h>
47 47
48#include <living.h> 48#include <living.h>
49#include <commands.h>
50 49
51/* 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,
52 * it should work here. 51 * it should work here.
53 */ 52 */
54#include <sys/types.h> 53#include <sys/types.h>
… …
66 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
67 * 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
68 * 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
69 * client. 68 * client.
70 */ 69 */
71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
77 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
78 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
79 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
80 -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,
81 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
82 -1, /* Internal */ 95 -1, /* Internal */
83 -1, /* life stealing */ 96 -1, /* life stealing */
84 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
85}; 98};
… …
133 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
134 147
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 149
137 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
138
139 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
141
142 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
143} 153}
144 154
145static void 155static void
146send_map_info (player *pl) 156send_map_info (player *pl)
… …
148 client &socket = *pl->ns; 158 client &socket = *pl->ns;
149 object *ob = pl->viewpoint; 159 object *ob = pl->viewpoint;
150 160
151 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
152 { 162 {
153 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
154 { 164 {
155 int flags = 0; 165 int flags = 0;
156 166
167 // due to historical glitches, the bit ordering and map index ordering differs
157 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
158 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
159 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
160 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;
161 175
162 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",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
165 } 179 }
… …
180 { 194 {
181 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));
182 socket.current_region = reg; 196 socket.current_region = reg;
183 } 197 }
184 198
185 // first try to aovid a full newmap on tiled map scrolls 199 // first try to avoid a full newmap on tiled map scrolls
186 if (socket.current_map != ob->map && !socket.force_newmap) 200 if (socket.current_map != ob->map && !socket.force_newmap)
187 { 201 {
188 rv_vector rv; 202 rv_vector rv;
189 203
190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
… …
229send_skill_info (client *ns, char *params) 243send_skill_info (client *ns, char *params)
230{ 244{
231 packet sl; 245 packet sl;
232 sl << "replyinfo skill_info\n"; 246 sl << "replyinfo skill_info\n";
233 247
234 for (int i = 1; i < NUM_SKILLS; i++) 248 for (int i = 0; i < skillvec.size (); ++i)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); 249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
236 250
237 if (sl.length () > MAXSOCKBUF) 251 if (sl.length () > MAXSOCKBUF)
238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 252 cleanup ("buffer overflow in send_skill_info!");
240 fatal (0);
241 }
242 253
243 ns->send_packet (sl); 254 ns->send_packet (sl);
244} 255}
245 256
246/** 257/**
… …
256 267
257 for (int i = 0; i < NRSPELLPATHS; i++) 268 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259 270
260 if (sl.length () > MAXSOCKBUF) 271 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 272 cleanup ("buffer overflow in send_spell_paths!");
263 fatal (0);
264 }
265 273
266 ns->send_packet (sl); 274 ns->send_packet (sl);
267} 275}
268 276
269/** 277/**
270 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
271 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
272 * that information. 280 * that information.
281 * requestinfo is completely deprecated, use resource exti request
282 * and the fxix or http protocols.
273 */ 283 */
274void 284void
275RequestInfo (char *buf, int len, client *ns) 285RequestInfo (char *buf, int len, client *ns)
276{ 286{
277 char *params; 287 char *params;
… …
337 347
338 while (*buf && map && max_distance) 348 while (*buf && map && max_distance)
339 { 349 {
340 int dir = *buf++ - '1'; 350 int dir = *buf++ - '1';
341 351
342 if (dir >= 0 && dir <= 3) 352 // due to historical glitches, the mapinfo index and tile index differs
353 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
354
355 // maybe we should only allow the four flat directions
356 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
343 { 357 {
358 dir = dirmap [dir];
359
344 if (!map->tile_path [dir]) 360 if (!map->tile_path [dir])
345 map = 0; 361 map = 0;
346 else if (map->tile_available (dir, false)) 362 else if (map->tile_available (dir, false))
347 { 363 {
348 maptile *neigh = map->tile_map [dir]; 364 maptile *neigh = map->tile_map [dir];
… …
371 send_packet_printf ("mapinfo %s nomap", token); 387 send_packet_printf ("mapinfo %s nomap", token);
372 else 388 else
373 { 389 {
374 int flags = 0; 390 int flags = 0;
375 391
392 // due to historical glitches, the bit ordering and map index ordering differs
376 if (map->tile_path[0]) flags |= 1; 393 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
377 if (map->tile_path[1]) flags |= 2; 394 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
378 if (map->tile_path[2]) flags |= 4; 395 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
379 if (map->tile_path[3]) flags |= 8; 396 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
397 // these two are debatable
398 if (map->tile_path [TILE_UP ]) flags |= 0x10;
399 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
380 400
381 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 401 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
382 } 402 }
383 403
384 return 1; 404 return 1;
… …
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 467 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 468}
449 469
450//+GPL 470//+GPL
451 471
452/*
453#define MSG_TYPE_BOOK 1
454#define MSG_TYPE_CARD 2
455#define MSG_TYPE_PAPER 3
456#define MSG_TYPE_SIGN 4
457#define MSG_TYPE_MONUMENT 5
458#define MSG_TYPE_SCRIPTED_DIALOG 6*/
459
460/** Reply to ExtendedInfos command */
461void
462ToggleExtendedText (char *buf, int len, client * ns)
463{
464 char cmdback[MAX_BUF];
465 char temp[10];
466 char command[50];
467 int info, nextinfo, i, flag;
468
469 cmdback[0] = '\0';
470
471 nextinfo = 0;
472 while (1)
473 {
474 /* 1. Extract an info */
475 info = nextinfo;
476
477 while ((info < len) && (buf [info] == ' '))
478 info++;
479
480 if (info >= len)
481 break;
482
483 nextinfo = info + 1;
484
485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
486 nextinfo++;
487
488 if (nextinfo - info >= 49) /*Erroneous info asked */
489 continue;
490
491 memcpy (command, buf + info, nextinfo - info);
492 command [nextinfo - info] = 0;
493
494 /* 2. Interpret info */
495 i = sscanf (command, "%d", &flag);
496
497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
498 ns->supported_readables |= (1 << flag);
499 /*3. Next info */
500 }
501
502 /* Send resulting state */
503 strcpy (cmdback, "ExtendedTextSet");
504
505 for (i = 0; i <= MSG_TYPE_LAST; i++)
506 if (ns->supported_readables & (1 << i))
507 {
508 strcat (cmdback, " ");
509 snprintf (temp, sizeof (temp), "%d", i);
510 strcat (cmdback, temp);
511 }
512
513 ns->send_packet (cmdback);
514}
515
516/** 472/**
517 * This handles the general commands from the client (ie, north, fire, cast, 473 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 474 * etc.)
519 */ 475 */
520void 476void
… …
540 * Cleaning up the input should probably be done first - all actions 496 * Cleaning up the input should probably be done first - all actions
541 * for the command that issued the count should be done before any other 497 * for the command that issued the count should be done before any other
542 * commands. 498 * commands.
543 */ 499 */
544 pl->count = 0; 500 pl->count = 0;
545}
546
547/**
548 * This handles the general commands from the client (ie, north, fire, cast,
549 * etc.). It is a lot like PlayerCmd above, but is called with the
550 * 'ncom' method which gives more information back to the client so it
551 * can throttle.
552 */
553void
554NewPlayerCmd (char *buf, int len, player *pl)
555{
556 if (len <= 6)
557 {
558 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
559 return;
560 }
561
562 uint16 cmdid = net_uint16 ((uint8 *)buf);
563 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
564
565 /* -1 is special - no repeat, but don't update */
566 if (repeat != -1)
567 pl->count = repeat;
568
569 buf += 6; //len -= 6;
570
571 execute_newserver_command (pl->ob, buf);
572
573 /* Perhaps something better should be done with a left over count.
574 * Cleaning up the input should probably be done first - all actions
575 * for the command that issued the count should be done before any other
576 * commands.
577 */
578 pl->count = 0;
579
580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
581 int time = pl->ob->has_active_speed ()
582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
584
585 /* Send confirmation of command execution now */
586 packet sl ("comc");
587 sl << uint16 (cmdid) << uint32 (time);
588 pl->ns->send_packet (sl);
589} 501}
590 502
591/** This is a reply to a previous query. */ 503/** This is a reply to a previous query. */
592void 504void
593ReplyCmd (char *buf, int len, client *ns) 505ReplyCmd (char *buf, int len, client *ns)
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 542 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 543 }
632} 544}
633 545
634/** 546/**
635 * Client tells its version. If there is a mismatch, we close the 547 * Client tells its version info.
636 * socket. In real life, all we should care about is the client having
637 * something older than the server. If we assume the client will be
638 * backwards compatible, having it be a later version should not be a
639 * problem.
640 */ 548 */
641void 549void
642VersionCmd (char *buf, int len, client * ns) 550VersionCmd (char *buf, int len, client *ns)
643{ 551{
644 if (!buf) 552 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
645 {
646 LOG (llevError, "CS: received corrupted version command\n");
647 return;
648 }
649
650 ns->cs_version = atoi (buf);
651 ns->sc_version = ns->cs_version;
652
653 LOG (llevDebug, "connection from client <%s>\n", buf);
654
655 //TODO: should log here just for statistics
656
657 //if (VERSION_CS != ns->cs_version)
658 // unchecked;
659
660 char *cp = strchr (buf + 1, ' ');
661 if (!cp)
662 return;
663
664 ns->sc_version = atoi (cp);
665
666 //if (VERSION_SC != ns->sc_version)
667 // unchecked;
668
669 cp = strchr (cp + 1, ' ');
670
671 if (cp)
672 {
673 ns->version = cp + 1;
674
675 if (ns->sc_version < 1026)
676 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
677 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
678 }
679} 553}
680 554
681/** sound related functions. */ 555/** sound related functions. */
682void 556void
683SetSound (char *buf, int len, client * ns) 557SetSound (char *buf, int len, client * ns)
… …
736static void 610static void
737rangetostring (player *pl, char *obuf) 611rangetostring (player *pl, char *obuf)
738{ 612{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 613 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 614
615#if 0
616 // print ranged/chosen_skill etc. objects every call
617 printf ("%s %s => %s (%s)\n",
618 pl->ranged_ob ? &pl->ranged_ob->name : "-",
619 pl->combat_ob ? &pl->combat_ob->name : "-",
620 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
621 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
622 );
623#endif
624
741 if (pl->ranged_ob) 625 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 626 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 627
744 if (pl->combat_ob) 628 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 629 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
790 * commands for now. 674 * commands for now.
791 */ 675 */
792void 676void
793esrv_update_stats (player *pl) 677esrv_update_stats (player *pl)
794{ 678{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 679 client *ns = pl->ns;
799 if (!ns) 680 if (!ns)
800 return; 681 return;
801 682
802 object *ob = pl->observe; 683 object *ob = pl->observe;
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 700 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 701 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 702 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 703 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 704
824 for (int s = 0; s < NUM_SKILLS; s++) 705 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob [s]) 706 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 707 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 708 {
828 ns->last_skill_exp [s] = skill->stats.exp; 709 ns->last_skill_exp [s] = skill->stats.exp;
829 710
830 /* Always send along the level if exp changes. This is only 711 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 712 * 1 extra byte, but keeps processing simpler.
832 */ 713 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 714 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 715 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 716 << uint64 (skill->stats.exp);
836 } 717 }
837 718
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 719 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
… …
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); 724 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 725 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); 726 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); 727 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 728
848 flags = 0; 729 int flags = (opl->fire_on ? SF_FIREON : 0)
849 730 | (opl->run_on ? SF_RUNON : 0);
850 if (opl->fire_on)
851 flags |= SF_FIREON;
852
853 if (opl->run_on)
854 flags |= SF_RUNON;
855 731
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 732 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 733
858 for (int i = 0; i < NROFATTACKS; i++) 734 for (int i = 0; i < NROFATTACKS; i++)
859 {
860 /* Skip ones we won't send */ 735 /* Skip ones we won't send */
861 if (atnr_cs_stat[i] == -1) 736 if (atnr_cs_stat[i] >= 0)
862 continue;
863
864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 737 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
865 }
866 738
867 if (pl->ns->monitor_spells) 739 if (pl->ns->monitor_spells)
868 { 740 {
869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 741 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
870 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 742 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
871 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 743 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
872 } 744 }
873 745
746 char buf[MAX_BUF];
874 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 747 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
875 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 748 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
876 set_title (ob, buf); 749 set_title (ob, buf);
877 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 750 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
878 751
… …
972 845
973 /* Nothing changed */ 846 /* Nothing changed */
974 return 0; 847 return 0;
975} 848}
976 849
977//-GPL
978
979// prefetch (and touch) all maps within a specific distancd
980static void
981prefetch_surrounding_maps (maptile *map, int distance)
982{
983 map->touch ();
984
985 if (--distance)
986 for (int dir = 4; dir--; )
987 if (const shstr &path = map->tile_path [dir])
988 if (maptile *&neigh = map->tile_map [dir])
989 prefetch_surrounding_maps (neigh, distance);
990 else
991 neigh = maptile::find_async (path, map);
992}
993
994// prefetch a generous area around the player
995static void
996prefetch_surrounding_maps (object *op)
997{
998 prefetch_surrounding_maps (op->map, 3);
999}
1000
1001//+GPL
1002
1003/** 850/**
1004 * Draws client map. 851 * Draws client map.
1005 */ 852 */
1006void 853void
1007draw_client_map (player *pl) 854draw_client_map (player *pl)
… …
1012 859
1013 /* If player is just joining the game, he isn't here yet, so the map 860 /* If player is just joining the game, he isn't here yet, so the map
1014 * can get swapped out. If so, don't try to send them a map. All will 861 * can get swapped out. If so, don't try to send them a map. All will
1015 * be OK once they really log in. 862 * be OK once they really log in.
1016 */ 863 */
1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 864 if (!ob->map || ob->map->state != MAP_ACTIVE)
1018 return; 865 return;
1019 866
1020 int startlen, oldlen; 867 int startlen, oldlen;
1021 868
1022 check_map_change (pl); 869 check_map_change (pl);
1023 prefetch_surrounding_maps (pl->ob); 870 pl->ob->prefetch_surrounding_maps ();
1024 871
1025 /* do LOS after calls to update_position */ 872 /* do LOS after calls to update_position */
1026 /* unfortunately, we need to udpate los when observing, currently */ 873 /* unfortunately, we need to udpate los when observing, currently */
1027 if (pl->do_los || pl->viewpoint != pl->ob) 874 if (pl->do_los || pl->viewpoint != pl->ob)
1028 { 875 {
… …
1053 * look like. 900 * look like.
1054 */ 901 */
1055 902
1056 client &socket = *pl->ns; 903 client &socket = *pl->ns;
1057 904
1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 905 packet sl ("map1a");
1059 906
1060 startlen = sl.length (); 907 startlen = sl.length ();
1061 908
1062 int hx = socket.mapx / 2; 909 int hx = socket.mapx / 2;
1063 int hy = socket.mapy / 2; 910 int hy = socket.mapy / 2;
… …
1155 { 1002 {
1156 if (op->stats.maxhp > op->stats.hp 1003 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0 1004 && op->stats.maxhp > 0
1158 && (op->type == PLAYER 1005 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0 1006 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER) 1007 || op->flag [FLAG_MONSTER]
1161 || QUERY_FLAG (op, FLAG_ALIVE) 1008 || op->flag [FLAG_ALIVE]
1162 || QUERY_FLAG (op, FLAG_GENERATOR))) 1009 || op->flag [FLAG_GENERATOR]))
1163 { 1010 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1011 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1165 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1012 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 } 1013 }
1167 1014
… …
1346 1193
1347/* appends the spell *spell to the Socklist we will send the data to. */ 1194/* appends the spell *spell to the Socklist we will send the data to. */
1348static void 1195static void
1349append_spell (player *pl, packet &sl, object *spell) 1196append_spell (player *pl, packet &sl, object *spell)
1350{ 1197{
1351 int i, skill = 0; 1198 int skill = 0;
1352 1199
1353 if (!(spell->name)) 1200 if (!(spell->name))
1354 { 1201 {
1355 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1202 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1356 return; 1203 return;
… …
1362 spell->cached_eat = casting_level (pl->ob, spell); 1209 spell->cached_eat = casting_level (pl->ob, spell);
1363 1210
1364 /* figure out which skill it uses, if it uses one */ 1211 /* figure out which skill it uses, if it uses one */
1365 if (spell->skill) 1212 if (spell->skill)
1366 if (object *tmp = pl->find_skill (spell->skill)) 1213 if (object *tmp = pl->find_skill (spell->skill))
1367 skill = tmp->subtype + CS_STAT_SKILLINFO; 1214 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1368 1215
1369 // spells better have a face 1216 // spells better have a face
1370 if (!spell->face) 1217 if (!spell->face)
1371 { 1218 {
1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1219 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1383 << uint16 (spell->cached_grace) 1230 << uint16 (spell->cached_grace)
1384 << uint16 (spell->cached_eat) 1231 << uint16 (spell->cached_eat)
1385 << uint8 (skill) 1232 << uint8 (skill)
1386 << uint32 (spell->path_attuned) 1233 << uint32 (spell->path_attuned)
1387 << uint32 (spell->face) 1234 << uint32 (spell->face)
1388 << data8 (spell->name) 1235 << data8 (spell->name);
1236
1237 if (pl->ns->monitor_spells < 2)
1389 << data16 (spell->msg); 1238 sl << data16 (spell->msg);
1390} 1239}
1391 1240
1392/** 1241/**
1393 * This tells the client to add the spell *ob, if *ob is NULL, then add 1242 * This tells the client to add the spell *ob, if *ob is NULL, then add
1394 * all spells in the player's inventory. 1243 * all spells in the player's inventory.
… …
1446 } 1295 }
1447 else 1296 else
1448 append_spell (pl, sl, spell); 1297 append_spell (pl, sl, spell);
1449 1298
1450 if (sl.length () > MAXSOCKBUF) 1299 if (sl.length () > MAXSOCKBUF)
1451 {
1452 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1300 cleanup ("buffer overflow in esrv_add_spells!");
1453 fatal (0);
1454 }
1455 1301
1456 /* finally, we can send the packet */ 1302 /* finally, we can send the packet */
1457 pl->ns->flush_fx (); 1303 pl->ns->flush_fx ();
1458 pl->ns->send_packet (sl); 1304 pl->ns->send_packet (sl);
1459} 1305}

Diff Legend

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