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.196 by root, Sun Nov 18 00:37:11 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * 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 6 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * 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 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25//+GPL 26//+GPL
26 27
… …
28 * \file 29 * \file
29 * Client handling. 30 * Client handling.
30 * 31 *
31 * \date 2003-12-02 32 * \date 2003-12-02
32 * 33 *
33 * This file implements all of the goo on the server side for handling 34 * This file implements all of the goo on the server side for handling
34 * clients. It's got a bunch of global variables for keeping track of 35 * clients. It's got a bunch of global variables for keeping track of
35 * each of the clients. 36 * each of the clients.
36 * 37 *
37 * Note: All functions that are used to process data from the client 38 * Note: All functions that are used to process data from the client
38 * have the prototype of (char *data, int datalen, int client_num). This 39 * have the prototype of (char *data, int datalen, int client_num). This
39 * way, we can use one dispatch table. 40 * way, we can use one dispatch table.
40 * 41 *
… …
44 45
45#include <global.h> 46#include <global.h>
46#include <sproto.h> 47#include <sproto.h>
47 48
48#include <living.h> 49#include <living.h>
49#include <commands.h>
50 50
51/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
52 * it should work here. 52 * it should work here.
53 */ 53 */
54#include <sys/types.h> 54#include <sys/types.h>
… …
66 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
67 * program to the value we use when sending STATS command to the 67 * 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 68 * client. If a value is -1, then we don't send that to the
69 * client. 69 * client.
70 */ 70 */
71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] =
72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72{
73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_PHYS,
74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_MAG,
75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_FIRE,
76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_ELEC,
77 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 77 CS_STAT_RES_COLD,
78 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 78 CS_STAT_RES_CONF,
79 -1 /* Chaos */ , -1 /* Counterspell */ , 79 CS_STAT_RES_ACID,
80 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD, 80 CS_STAT_RES_DRAIN,
81 -1 /* weaponmagic */,
82 CS_STAT_RES_GHOSTHIT,
83 CS_STAT_RES_POISON,
84 CS_STAT_RES_SLOW,
85 CS_STAT_RES_PARA,
86 CS_STAT_TURN_UNDEAD,
87 CS_STAT_RES_FEAR,
88 -1 /* Cancellation */,
89 CS_STAT_RES_DEPLETE,
90 CS_STAT_RES_DEATH,
91 -1 /* Chaos */,
92 -1 /* Counterspell */,
93 -1 /* Godpower */,
94 CS_STAT_RES_HOLYWORD,
81 CS_STAT_RES_BLIND, 95 CS_STAT_RES_BLIND,
82 -1, /* Internal */ 96 -1, /* Internal */
83 -1, /* life stealing */ 97 -1, /* life stealing */
84 -1 /* Disease - not fully done yet */ 98 -1 /* Disease - not fully done yet */
85}; 99};
… …
133 pl->ns->mapinfo_queue_clear (); 147 pl->ns->mapinfo_queue_clear ();
134 148
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 149 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 150
137 pl->ns->force_newmap = false; 151 pl->ns->force_newmap = false;
138
139 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 152 pl->ns->send_packet ("newmap");
141
142 pl->ns->floorbox_reset (); 153 pl->ns->floorbox_reset ();
143} 154}
144 155
145static void 156static void
146send_map_info (player *pl) 157send_map_info (player *pl)
… …
148 client &socket = *pl->ns; 159 client &socket = *pl->ns;
149 object *ob = pl->viewpoint; 160 object *ob = pl->viewpoint;
150 161
151 if (socket.mapinfocmd) 162 if (socket.mapinfocmd)
152 { 163 {
153 if (ob->map && ob->map->path[0]) 164 if (ob->map && ob->map->path)
154 { 165 {
155 int flags = 0; 166 int flags = 0;
156 167
168 // due to historical glitches, the bit ordering and map index ordering differs
157 if (ob->map->tile_path[0]) flags |= 1; 169 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
158 if (ob->map->tile_path[1]) flags |= 2; 170 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
159 if (ob->map->tile_path[2]) flags |= 4; 171 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
160 if (ob->map->tile_path[3]) flags |= 8; 172 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
173 // these two are debatable
174 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
175 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
161 176
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 177 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 178 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path); 179 ob->map->width, ob->map->height, &ob->map->path);
165 } 180 }
… …
180 { 195 {
181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 196 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
182 socket.current_region = reg; 197 socket.current_region = reg;
183 } 198 }
184 199
185 // first try to aovid a full newmap on tiled map scrolls 200 // first try to avoid a full newmap on tiled map scrolls
186 if (socket.current_map != ob->map && !socket.force_newmap) 201 if (socket.current_map != ob->map && !socket.force_newmap)
187 { 202 {
188 rv_vector rv; 203 rv_vector rv;
189 204
190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 205 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
… …
229send_skill_info (client *ns, char *params) 244send_skill_info (client *ns, char *params)
230{ 245{
231 packet sl; 246 packet sl;
232 sl << "replyinfo skill_info\n"; 247 sl << "replyinfo skill_info\n";
233 248
234 for (int i = 1; i < NUM_SKILLS; i++) 249 for (int i = 0; i < skillvec.size (); ++i)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); 250 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
236 251
237 if (sl.length () > MAXSOCKBUF) 252 if (sl.length () > MAXSOCKBUF)
238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 253 cleanup ("buffer overflow in send_skill_info!");
240 fatal (0);
241 }
242 254
243 ns->send_packet (sl); 255 ns->send_packet (sl);
244} 256}
245 257
246/** 258/**
… …
256 268
257 for (int i = 0; i < NRSPELLPATHS; i++) 269 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 270 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259 271
260 if (sl.length () > MAXSOCKBUF) 272 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 273 cleanup ("buffer overflow in send_spell_paths!");
263 fatal (0);
264 }
265 274
266 ns->send_packet (sl); 275 ns->send_packet (sl);
267} 276}
268 277
269/** 278/**
270 * RequestInfo is sort of a meta command. There is some specific 279 * RequestInfo is sort of a meta command. There is some specific
271 * request of information, but we call other functions to provide 280 * request of information, but we call other functions to provide
272 * that information. 281 * that information.
282 * requestinfo is completely deprecated, use resource exti request
283 * and the fxix or http protocols.
273 */ 284 */
274void 285void
275RequestInfo (char *buf, int len, client *ns) 286RequestInfo (char *buf, int len, client *ns)
276{ 287{
277 char *params; 288 char *params;
… …
315//-GPL 326//-GPL
316 327
317void 328void
318client::mapinfo_queue_clear () 329client::mapinfo_queue_clear ()
319{ 330{
320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 331 for (auto &&i : mapinfo_queue)
321 free (*i); 332 free (i);
322 333
323 mapinfo_queue.clear (); 334 mapinfo_queue.clear ();
324} 335}
325 336
326bool 337bool
… …
337 348
338 while (*buf && map && max_distance) 349 while (*buf && map && max_distance)
339 { 350 {
340 int dir = *buf++ - '1'; 351 int dir = *buf++ - '1';
341 352
342 if (dir >= 0 && dir <= 3) 353 // due to historical glitches, the mapinfo index and tile index differs
354 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
355
356 // maybe we should only allow the four flat directions
357 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
343 { 358 {
359 dir = dirmap [dir];
360
344 if (!map->tile_path [dir]) 361 if (!map->tile_path [dir])
345 map = 0; 362 map = 0;
346 else if (map->tile_available (dir, false)) 363 else if (map->tile_available (dir, false))
347 { 364 {
348 maptile *neigh = map->tile_map [dir]; 365 maptile *neigh = map->tile_map [dir];
… …
371 send_packet_printf ("mapinfo %s nomap", token); 388 send_packet_printf ("mapinfo %s nomap", token);
372 else 389 else
373 { 390 {
374 int flags = 0; 391 int flags = 0;
375 392
393 // due to historical glitches, the bit ordering and map index ordering differs
376 if (map->tile_path[0]) flags |= 1; 394 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
377 if (map->tile_path[1]) flags |= 2; 395 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
378 if (map->tile_path[2]) flags |= 4; 396 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
379 if (map->tile_path[3]) flags |= 8; 397 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
398 // these two are debatable
399 if (map->tile_path [TILE_UP ]) flags |= 0x10;
400 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
380 401
381 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 402 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
382 } 403 }
383 404
384 return 1; 405 return 1;
… …
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 468 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 469}
449 470
450//+GPL 471//+GPL
451 472
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/** 473/**
517 * This handles the general commands from the client (ie, north, fire, cast, 474 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 475 * etc.)
519 */ 476 */
520void 477void
… …
540 * Cleaning up the input should probably be done first - all actions 497 * 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 498 * for the command that issued the count should be done before any other
542 * commands. 499 * commands.
543 */ 500 */
544 pl->count = 0; 501 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} 502}
590 503
591/** This is a reply to a previous query. */ 504/** This is a reply to a previous query. */
592void 505void
593ReplyCmd (char *buf, int len, client *ns) 506ReplyCmd (char *buf, int len, client *ns)
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 543 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 544 }
632} 545}
633 546
634/** 547/**
635 * Client tells its version. If there is a mismatch, we close the 548 * 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 */ 549 */
641void 550void
642VersionCmd (char *buf, int len, client * ns) 551VersionCmd (char *buf, int len, client *ns)
643{ 552{
644 if (!buf) 553 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} 554}
680 555
681/** sound related functions. */ 556/** sound related functions. */
682void 557void
683SetSound (char *buf, int len, client * ns) 558SetSound (char *buf, int len, client * ns)
… …
736static void 611static void
737rangetostring (player *pl, char *obuf) 612rangetostring (player *pl, char *obuf)
738{ 613{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 614 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 615
616#if 0
617 // print ranged/chosen_skill etc. objects every call
618 printf ("%s %s => %s (%s)\n",
619 pl->ranged_ob ? &pl->ranged_ob->name : "-",
620 pl->combat_ob ? &pl->combat_ob->name : "-",
621 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
622 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
623 );
624#endif
625
741 if (pl->ranged_ob) 626 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 627 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 628
744 if (pl->combat_ob) 629 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 630 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
790 * commands for now. 675 * commands for now.
791 */ 676 */
792void 677void
793esrv_update_stats (player *pl) 678esrv_update_stats (player *pl)
794{ 679{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 680 client *ns = pl->ns;
799 if (!ns) 681 if (!ns)
800 return; 682 return;
801 683
802 object *ob = pl->observe; 684 object *ob = pl->observe;
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 701 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 702 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 703 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 704 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 705
824 for (int s = 0; s < NUM_SKILLS; s++) 706 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob [s]) 707 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 708 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 709 {
828 ns->last_skill_exp [s] = skill->stats.exp; 710 ns->last_skill_exp [s] = skill->stats.exp;
829 711
830 /* Always send along the level if exp changes. This is only 712 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 713 * 1 extra byte, but keeps processing simpler.
832 */ 714 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 715 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 716 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 717 << uint64 (skill->stats.exp);
836 } 718 }
837 719
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 720 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
… …
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); 725 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 726 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); 727 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); 728 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 729
848 flags = 0; 730 int flags = (opl->fire_on ? SF_FIREON : 0)
849 731 | (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 732
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 733 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 734
858 for (int i = 0; i < NROFATTACKS; i++) 735 for (int i = 0; i < NROFATTACKS; i++)
859 {
860 /* Skip ones we won't send */ 736 /* Skip ones we won't send */
861 if (atnr_cs_stat[i] == -1) 737 if (atnr_cs_stat[i] >= 0)
862 continue;
863
864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 738 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
865 }
866 739
867 if (pl->ns->monitor_spells) 740 if (pl->ns->monitor_spells)
868 { 741 {
869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 742 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); 743 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); 744 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
872 } 745 }
873 746
747 char buf[MAX_BUF];
874 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 748 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
875 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 749 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
876 set_title (ob, buf); 750 set_title (ob, buf);
877 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 751 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
878 752
… …
972 846
973 /* Nothing changed */ 847 /* Nothing changed */
974 return 0; 848 return 0;
975} 849}
976 850
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/** 851/**
1004 * Draws client map. 852 * Draws client map.
1005 */ 853 */
1006void 854void
1007draw_client_map (player *pl) 855draw_client_map (player *pl)
… …
1012 860
1013 /* If player is just joining the game, he isn't here yet, so the map 861 /* 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 862 * can get swapped out. If so, don't try to send them a map. All will
1015 * be OK once they really log in. 863 * be OK once they really log in.
1016 */ 864 */
1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 865 if (!ob->map || ob->map->state != MAP_ACTIVE)
1018 return; 866 return;
1019 867
1020 int startlen, oldlen; 868 int startlen, oldlen;
1021 869
1022 check_map_change (pl); 870 check_map_change (pl);
1023 prefetch_surrounding_maps (pl->ob); 871 pl->ob->prefetch_surrounding_maps ();
1024 872
1025 /* do LOS after calls to update_position */ 873 /* do LOS after calls to update_position */
1026 /* unfortunately, we need to udpate los when observing, currently */ 874 /* unfortunately, we need to udpate los when observing, currently */
1027 if (pl->do_los || pl->viewpoint != pl->ob) 875 if (pl->do_los || pl->viewpoint != pl->ob)
1028 { 876 {
… …
1053 * look like. 901 * look like.
1054 */ 902 */
1055 903
1056 client &socket = *pl->ns; 904 client &socket = *pl->ns;
1057 905
1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 906 packet sl ("map1a");
1059 907
1060 startlen = sl.length (); 908 startlen = sl.length ();
1061 909
1062 int hx = socket.mapx / 2; 910 int hx = socket.mapx / 2;
1063 int hy = socket.mapy / 2; 911 int hy = socket.mapy / 2;
… …
1093 { 941 {
1094 /* This block deals with spaces that are not visible for whatever 942 /* This block deals with spaces that are not visible for whatever
1095 * reason. Still may need to send the head for this space. 943 * reason. Still may need to send the head for this space.
1096 */ 944 */
1097 if (lastcell.count != -1 945 if (lastcell.count != -1
1098 || lastcell.faces[0] 946 || lastcell.faces[0]
1099 || lastcell.faces[1] 947 || lastcell.faces[1]
1100 || lastcell.faces[2] 948 || lastcell.faces[2]
1101 || lastcell.stat_hp 949 || lastcell.stat_hp
1102 || lastcell.flags 950 || lastcell.flags
1103 || lastcell.player) 951 || lastcell.player)
1104 sl << uint16 (mask); 952 sl << uint16 (mask);
1105 953
1106 /* properly clear a previously sent big face */ 954 /* properly clear a previously sent big face */
1107 map_clearcell (&lastcell, -1); 955 map_clearcell (&lastcell, -1);
… …
1155 { 1003 {
1156 if (op->stats.maxhp > op->stats.hp 1004 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0 1005 && op->stats.maxhp > 0
1158 && (op->type == PLAYER 1006 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0 1007 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER) 1008 || op->flag [FLAG_MONSTER]
1161 || QUERY_FLAG (op, FLAG_ALIVE) 1009 || op->flag [FLAG_ALIVE]
1162 || QUERY_FLAG (op, FLAG_GENERATOR))) 1010 || op->flag [FLAG_GENERATOR]))
1163 { 1011 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1012 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 1013 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 } 1014 }
1167 1015
… …
1346 1194
1347/* appends the spell *spell to the Socklist we will send the data to. */ 1195/* appends the spell *spell to the Socklist we will send the data to. */
1348static void 1196static void
1349append_spell (player *pl, packet &sl, object *spell) 1197append_spell (player *pl, packet &sl, object *spell)
1350{ 1198{
1351 int i, skill = 0; 1199 int skill = 0;
1352 1200
1353 if (!(spell->name)) 1201 if (!(spell->name))
1354 { 1202 {
1355 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1203 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1356 return; 1204 return;
… …
1362 spell->cached_eat = casting_level (pl->ob, spell); 1210 spell->cached_eat = casting_level (pl->ob, spell);
1363 1211
1364 /* figure out which skill it uses, if it uses one */ 1212 /* figure out which skill it uses, if it uses one */
1365 if (spell->skill) 1213 if (spell->skill)
1366 if (object *tmp = pl->find_skill (spell->skill)) 1214 if (object *tmp = pl->find_skill (spell->skill))
1367 skill = tmp->subtype + CS_STAT_SKILLINFO; 1215 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1368 1216
1369 // spells better have a face 1217 // spells better have a face
1370 if (!spell->face) 1218 if (!spell->face)
1371 { 1219 {
1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1220 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1383 << uint16 (spell->cached_grace) 1231 << uint16 (spell->cached_grace)
1384 << uint16 (spell->cached_eat) 1232 << uint16 (spell->cached_eat)
1385 << uint8 (skill) 1233 << uint8 (skill)
1386 << uint32 (spell->path_attuned) 1234 << uint32 (spell->path_attuned)
1387 << uint32 (spell->face) 1235 << uint32 (spell->face)
1388 << data8 (spell->name) 1236 << data8 (spell->name);
1237
1238 if (pl->ns->monitor_spells < 2)
1389 << data16 (spell->msg); 1239 sl << data16 (spell->msg);
1390} 1240}
1391 1241
1392/** 1242/**
1393 * This tells the client to add the spell *ob, if *ob is NULL, then add 1243 * This tells the client to add the spell *ob, if *ob is NULL, then add
1394 * all spells in the player's inventory. 1244 * all spells in the player's inventory.
1395 */ 1245 */
1396void 1246void
1397esrv_add_spells (player *pl, object *spell) 1247esrv_add_spells (player *pl, object *spell)
1398{ 1248{
… …
1409 1259
1410 if (!spell) 1260 if (!spell)
1411 { 1261 {
1412 for (spell = pl->ob->inv; spell; spell = spell->below) 1262 for (spell = pl->ob->inv; spell; spell = spell->below)
1413 { 1263 {
1414 /* were we to simply keep appending data here, we could exceed 1264 /* were we to simply keep appending data here, we could exceed
1415 * MAXSOCKBUF if the player has enough spells to add, we know that 1265 * MAXSOCKBUF if the player has enough spells to add, we know that
1416 * append_spells will always append 19 data bytes, plus 4 length 1266 * append_spells will always append 19 data bytes, plus 4 length
1417 * bytes and 3 strings (because that is the spec) so we need to 1267 * bytes and 3 strings (because that is the spec) so we need to
1418 * check that the length of those 3 strings, plus the 23 bytes, 1268 * check that the length of those 3 strings, plus the 23 bytes,
1419 * won't take us over the length limit for the socket, if it does, 1269 * won't take us over the length limit for the socket, if it does,
1420 * we need to send what we already have, and restart packet formation 1270 * we need to send what we already have, and restart packet formation
1421 */ 1271 */
1422 if (spell->type != SPELL) 1272 if (spell->type != SPELL)
1423 continue; 1273 continue;
1424 1274
1425 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1275 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
… …
1446 } 1296 }
1447 else 1297 else
1448 append_spell (pl, sl, spell); 1298 append_spell (pl, sl, spell);
1449 1299
1450 if (sl.length () > MAXSOCKBUF) 1300 if (sl.length () > MAXSOCKBUF)
1451 {
1452 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1301 cleanup ("buffer overflow in esrv_add_spells!");
1453 fatal (0);
1454 }
1455 1302
1456 /* finally, we can send the packet */ 1303 /* finally, we can send the packet */
1457 pl->ns->flush_fx (); 1304 pl->ns->flush_fx ();
1458 pl->ns->send_packet (sl); 1305 pl->ns->send_packet (sl);
1459} 1306}

Diff Legend

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