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.145 by root, Fri Dec 26 10:44:17 2008 UTC vs.
Revision 1.172 by root, Thu Apr 15 00:36:51 2010 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 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};
… …
141 157
142static void 158static void
143send_map_info (player *pl) 159send_map_info (player *pl)
144{ 160{
145 client &socket = *pl->ns; 161 client &socket = *pl->ns;
146 object *ob = pl->observe; 162 object *ob = pl->viewpoint;
147 163
148 if (socket.mapinfocmd) 164 if (socket.mapinfocmd)
149 { 165 {
150 if (ob->map && ob->map->path[0]) 166 if (ob->map && ob->map->path[0])
151 { 167 {
… …
168/** check for map/region change and send new map data */ 184/** check for map/region change and send new map data */
169static void 185static void
170check_map_change (player *pl) 186check_map_change (player *pl)
171{ 187{
172 client &socket = *pl->ns; 188 client &socket = *pl->ns;
173 object *ob = pl->observe; 189 object *ob = pl->viewpoint;
174 190
175 region *reg = ob->region (); 191 region *reg = ob->region ();
176 if (socket.current_region != reg) 192 if (socket.current_region != reg)
177 { 193 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 194 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) 224 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 { 225 {
210 int dx = ob->x - socket.current_x; 226 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y; 227 int dy = ob->y - socket.current_y;
212 228
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); 229 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218 socket.floorbox_reset (); 230 socket.floorbox_reset ();
219 }
220 } 231 }
221 232
222 socket.current_x = ob->x; 233 socket.current_x = ob->x;
223 socket.current_y = ob->y; 234 socket.current_y = ob->y;
235}
236
237/**
238 * This sends the skill number to name mapping. We ignore
239 * the params - we always send the same info no matter what.
240 */
241static void
242send_skill_info (client *ns, char *params)
243{
244 packet sl;
245 sl << "replyinfo skill_info\n";
246
247 for (int i = 0; i < skillvec.size (); ++i)
248 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
249
250 if (sl.length () > MAXSOCKBUF)
251 {
252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
253 fatal (0);
254 }
255
256 ns->send_packet (sl);
257}
258
259/**
260 * This sends the spell path to name mapping. We ignore
261 * the params - we always send the same info no matter what.
262 */
263static void
264send_spell_paths (client * ns, char *params)
265{
266 packet sl;
267
268 sl << "replyinfo spell_paths\n";
269
270 for (int i = 0; i < NRSPELLPATHS; i++)
271 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
272
273 if (sl.length () > MAXSOCKBUF)
274 {
275 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
276 fatal (0);
277 }
278
279 ns->send_packet (sl);
224} 280}
225 281
226/** 282/**
227 * RequestInfo is sort of a meta command. There is some specific 283 * RequestInfo is sort of a meta command. There is some specific
228 * request of information, but we call other functions to provide 284 * request of information, but we call other functions to provide
… …
241 { 297 {
242 *params++ = 0; 298 *params++ = 0;
243 break; 299 break;
244 } 300 }
245 301
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")) 302 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 303 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 304 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 305 send_spell_paths (ns, params);
254 else 306 else
255 { 307 {
… …
271ExtiCmd (char *buf, int len, client *ns) 323ExtiCmd (char *buf, int len, client *ns)
272{ 324{
273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 325 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274} 326}
275 327
328//-GPL
329
276void 330void
277client::mapinfo_queue_clear () 331client::mapinfo_queue_clear ()
278{ 332{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 333 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i); 334 free (*i);
… …
287{ 341{
288 char *token = buf; 342 char *token = buf;
289 buf += strlen (buf) + 9; 343 buf += strlen (buf) + 9;
290 344
291 // initial map and its origin 345 // initial map and its origin
292 maptile *map = pl->observe->map; 346 maptile *map = pl->viewpoint->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x; 347 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y; 348 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295 int max_distance = 8; // limit maximum path length to something generous 349 int max_distance = 8; // limit maximum path length to something generous
296 350
297 while (*buf && map && max_distance) 351 while (*buf && map && max_distance)
298 { 352 {
299 int dir = *buf++ - '1'; 353 int dir = *buf++ - '1';
… …
404AddMeCmd (char *buf, int len, client *ns) 458AddMeCmd (char *buf, int len, client *ns)
405{ 459{
406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 460 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407} 461}
408 462
409/* 463//+GPL
410#define MSG_TYPE_BOOK 1
411#define MSG_TYPE_CARD 2
412#define MSG_TYPE_PAPER 3
413#define MSG_TYPE_SIGN 4
414#define MSG_TYPE_MONUMENT 5
415#define MSG_TYPE_SCRIPTED_DIALOG 6*/
416
417/** Reply to ExtendedInfos command */
418void
419ToggleExtendedText (char *buf, int len, client * ns)
420{
421 char cmdback[MAX_BUF];
422 char temp[10];
423 char command[50];
424 int info, nextinfo, i, flag;
425
426 cmdback[0] = '\0';
427
428 nextinfo = 0;
429 while (1)
430 {
431 /* 1. Extract an info */
432 info = nextinfo;
433
434 while ((info < len) && (buf[info] == ' '))
435 info++;
436
437 if (info >= len)
438 break;
439
440 nextinfo = info + 1;
441
442 while ((nextinfo < len) && (buf[nextinfo] != ' '))
443 nextinfo++;
444
445 if (nextinfo - info >= 49) /*Erroneous info asked */
446 continue;
447
448 strncpy (command, &(buf[info]), nextinfo - info);
449 command[nextinfo - info] = '\0';
450 /* 2. Interpret info */
451 i = sscanf (command, "%d", &flag);
452
453 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454 ns->supported_readables |= (1 << flag);
455 /*3. Next info */
456 }
457
458 /* Send resulting state */
459 strcpy (cmdback, "ExtendedTextSet");
460
461 for (i = 0; i <= MSG_TYPE_LAST; i++)
462 if (ns->supported_readables & (1 << i))
463 {
464 strcat (cmdback, " ");
465 snprintf (temp, sizeof (temp), "%d", i);
466 strcat (cmdback, temp);
467 }
468
469 ns->send_packet (cmdback);
470}
471 464
472/** 465/**
473 * This handles the general commands from the client (ie, north, fire, cast, 466 * This handles the general commands from the client (ie, north, fire, cast,
474 * etc.) 467 * etc.)
475 */ 468 */
… …
488 return; 481 return;
489 482
490 buf++; 483 buf++;
491 } 484 }
492 485
493 execute_newserver_command (pl->ob, (char *) buf); 486 execute_newserver_command (pl->ob, (char *)buf);
494 487
495 /* Perhaps something better should be done with a left over count. 488 /* Perhaps something better should be done with a left over count.
496 * Cleaning up the input should probably be done first - all actions 489 * Cleaning up the input should probably be done first - all actions
497 * for the command that issued the count should be done before any other 490 * for the command that issued the count should be done before any other
498 * commands. 491 * commands.
… …
532 * commands. 525 * commands.
533 */ 526 */
534 pl->count = 0; 527 pl->count = 0;
535 528
536 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 529 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
537 int time = fabs (pl->ob->speed) < 0.001 530 int time = pl->ob->has_active_speed ()
538 ? time = MAX_TIME * 100
539 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 531 ? (int) (MAX_TIME / pl->ob->speed)
532 : MAX_TIME * 100;
540 533
541 /* Send confirmation of command execution now */ 534 /* Send confirmation of command execution now */
542 packet sl ("comc"); 535 packet sl ("comc");
543 sl << uint16 (cmdid) << uint32 (time); 536 sl << uint16 (cmdid) << uint32 (time);
544 pl->ns->send_packet (sl); 537 pl->ns->send_packet (sl);
… …
586 LOG (llevError, "Unknown input state: %d\n", ns->state); 579 LOG (llevError, "Unknown input state: %d\n", ns->state);
587 } 580 }
588} 581}
589 582
590/** 583/**
591 * Client tells its version. If there is a mismatch, we close the 584 * Client tells its version info.
592 * socket. In real life, all we should care about is the client having
593 * something older than the server. If we assume the client will be
594 * backwards compatible, having it be a later version should not be a
595 * problem.
596 */ 585 */
597void 586void
598VersionCmd (char *buf, int len, client * ns) 587VersionCmd (char *buf, int len, client *ns)
599{ 588{
600 if (!buf) 589 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
601 {
602 LOG (llevError, "CS: received corrupted version command\n");
603 return;
604 }
605
606 ns->cs_version = atoi (buf);
607 ns->sc_version = ns->cs_version;
608
609 LOG (llevDebug, "connection from client <%s>\n", buf);
610
611 //TODO: should log here just for statistics
612
613 //if (VERSION_CS != ns->cs_version)
614 // unchecked;
615
616 char *cp = strchr (buf + 1, ' ');
617 if (!cp)
618 return;
619
620 ns->sc_version = atoi (cp);
621
622 //if (VERSION_SC != ns->sc_version)
623 // unchecked;
624
625 cp = strchr (cp + 1, ' ');
626
627 if (cp)
628 {
629 ns->version = cp + 1;
630
631 if (ns->sc_version < 1026)
632 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
633 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
634 }
635} 590}
636 591
637/** sound related functions. */ 592/** sound related functions. */
638void 593void
639SetSound (char *buf, int len, client * ns) 594SetSound (char *buf, int len, client * ns)
… …
690 * Get player's current range attack in obuf. 645 * Get player's current range attack in obuf.
691 */ 646 */
692static void 647static void
693rangetostring (player *pl, char *obuf) 648rangetostring (player *pl, char *obuf)
694{ 649{
695 dynbuf_text buf; 650 dynbuf_text &buf = msg_dynbuf; buf.clear ();
651
652#if 0
653 // print ranged/chosen_skill etc. objects every call
654 printf ("%s %s => %s (%s)\n",
655 pl->ranged_ob ? &pl->ranged_ob->name : "-",
656 pl->combat_ob ? &pl->combat_ob->name : "-",
657 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
658 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
659 );
660#endif
696 661
697 if (pl->ranged_ob) 662 if (pl->ranged_ob)
698 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 663 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
699 664
700 if (pl->combat_ob) 665 if (pl->combat_ob)
… …
775 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 740 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
776 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 741 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
777 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 742 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
778 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 743 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
779 744
780 for (int s = 0; s < NUM_SKILLS; s++) 745 for (int s = 0; s < CS_NUM_SKILLS; s++)
781 if (object *skill = opl->last_skill_ob [s]) 746 if (object *skill = opl->last_skill_ob [s])
782 if (skill->stats.exp != ns->last_skill_exp [s]) 747 if (skill->stats.exp != ns->last_skill_exp [s])
783 { 748 {
784 ns->last_skill_exp [s] = skill->stats.exp; 749 ns->last_skill_exp [s] = skill->stats.exp;
785 750
786 /* Always send along the level if exp changes. This is only 751 /* Always send along the level if exp changes. This is only
787 * 1 extra byte, but keeps processing simpler. 752 * 1 extra byte, but keeps processing simpler.
788 */ 753 */
789 sl << uint8 (s + CS_STAT_SKILLINFO) 754 sl << uint8 (CS_STAT_SKILLINFO + s)
790 << uint8 (skill->level) 755 << uint8 (skill->level)
791 << uint64 (skill->stats.exp); 756 << uint64 (skill->stats.exp);
792 } 757 }
793 758
794 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 759 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
795 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 760 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
796 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 761 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
797 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 762 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
798 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 763 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
799 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 764 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
800 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 765 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
801 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 766 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
802 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 767 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
803 768
804 flags = 0; 769 flags = (opl->fire_on ? SF_FIREON : 0)
805 770 | (opl->run_on ? SF_RUNON : 0);
806 if (opl->fire_on)
807 flags |= SF_FIREON;
808
809 if (opl->run_on)
810 flags |= SF_RUNON;
811 771
812 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 772 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
813 773
814 if (ns->sc_version < 1025)
815 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
816 else
817 for (int i = 0; i < NROFATTACKS; i++) 774 for (int i = 0; i < NROFATTACKS; i++)
818 { 775 {
819 /* Skip ones we won't send */ 776 /* Skip ones we won't send */
820 if (atnr_cs_stat[i] == -1) 777 if (atnr_cs_stat[i] == -1)
821 continue; 778 continue;
822 779
823 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 780 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
824 } 781 }
825 782
826 if (pl->ns->monitor_spells) 783 if (pl->ns->monitor_spells)
827 { 784 {
828 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 785 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
829 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 786 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
931 888
932 /* Nothing changed */ 889 /* Nothing changed */
933 return 0; 890 return 0;
934} 891}
935 892
893//-GPL
894
936// prefetch (and touch) all maps within a specific distancd 895// prefetch (and touch) all maps within a specific distancd
937static void 896static void
938prefetch_surrounding_maps (maptile *map, int distance) 897prefetch_surrounding_maps (maptile *map, int distance)
939{ 898{
940 map->last_access = runtime; 899 map->touch ();
941 900
942 if (--distance) 901 if (--distance)
943 for (int dir = 4; --dir; ) 902 for (int dir = 4; dir--; )
944 if (const shstr &path = map->tile_path [dir]) 903 if (const shstr &path = map->tile_path [dir])
945 if (maptile *&neigh = map->tile_map [dir]) 904 if (maptile *&neigh = map->tile_map [dir])
946 prefetch_surrounding_maps (neigh, distance); 905 prefetch_surrounding_maps (neigh, distance);
947 else 906 else
948 neigh = maptile::find_async (path, map); 907 neigh = maptile::find_async (path, map);
… …
953prefetch_surrounding_maps (object *op) 912prefetch_surrounding_maps (object *op)
954{ 913{
955 prefetch_surrounding_maps (op->map, 3); 914 prefetch_surrounding_maps (op->map, 3);
956} 915}
957 916
917//+GPL
918
958/** 919/**
959 * Draws client map. 920 * Draws client map.
960 */ 921 */
961void 922void
962draw_client_map (player *pl) 923draw_client_map (player *pl)
963{ 924{
964 object *ob = pl->observe; 925 object *ob = pl->viewpoint;
965 if (!ob->active) 926 if (!pl->observe->active)
966 return; 927 return;
967 928
968 /* If player is just joining the game, he isn't here yet, so the map 929 /* If player is just joining the game, he isn't here yet, so the map
969 * can get swapped out. If so, don't try to send them a map. All will 930 * can get swapped out. If so, don't try to send them a map. All will
970 * be OK once they really log in. 931 * be OK once they really log in.
… …
977 check_map_change (pl); 938 check_map_change (pl);
978 prefetch_surrounding_maps (pl->ob); 939 prefetch_surrounding_maps (pl->ob);
979 940
980 /* do LOS after calls to update_position */ 941 /* do LOS after calls to update_position */
981 /* unfortunately, we need to udpate los when observing, currently */ 942 /* unfortunately, we need to udpate los when observing, currently */
982 if (pl->do_los || pl->observe != pl->ob) 943 if (pl->do_los || pl->viewpoint != pl->ob)
983 { 944 {
984 pl->do_los = 0; 945 pl->do_los = 0;
985 pl->update_los (); 946 pl->update_los ();
986 } 947 }
987 948
… …
1039 map_clearcell (&lastcell, -1); 1000 map_clearcell (&lastcell, -1);
1040 } 1001 }
1041 1002
1042 continue; 1003 continue;
1043 } 1004 }
1044 1005
1045 int d = pl->blocked_los_uc (dx, dy); 1006 int d = pl->blocked_los_uc (dx, dy);
1046 1007
1047 if (d > 3) 1008 if (d > 3)
1048 { 1009 {
1049 /* This block deals with spaces that are not visible for whatever 1010 /* This block deals with spaces that are not visible for whatever
… …
1082 1043
1083 unsigned char dummy; 1044 unsigned char dummy;
1084 unsigned char *last_ext = &dummy; 1045 unsigned char *last_ext = &dummy;
1085 1046
1086 /* Darkness changed */ 1047 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness) 1048 if (lastcell.count != d)
1088 { 1049 {
1089 mask |= 0x8; 1050 mask |= 0x8;
1090 1051
1091 if (socket.extmap) 1052 *last_ext |= 0x80;
1053 last_ext = &sl[sl.length ()];
1054 sl << uint8 (d);
1055 }
1056
1057 lastcell.count = d;
1058
1059 mapspace &ms = m->at (nx, ny);
1060 ms.update ();
1061
1062 // extmap handling
1063 uint8 stat_hp = 0;
1064 uint8 stat_width = 0;
1065 uint8 flags = 0;
1066 tag_t player = 0;
1067
1068 // send hp information, if applicable
1069 if (object *op = ms.faces_obj [0])
1070 if (op->is_head () && !op->invisible)
1071 {
1072 if (op->stats.maxhp > op->stats.hp
1073 && op->stats.maxhp > 0
1074 && (op->type == PLAYER
1075 || op->type == DOOR // does not work, have maxhp 0
1076 || op->flag [FLAG_MONSTER]
1077 || op->flag [FLAG_ALIVE]
1078 || op->flag [FLAG_GENERATOR]))
1079 {
1080 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1081 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1082 }
1083
1084 if (expect_false (op->has_dialogue ()))
1085 flags |= 1;
1086
1087 if (expect_false (op->type == PLAYER))
1088 player = op == ob ? pl->ob->count
1089 : op == pl->ob ? ob->count
1090 : op->count;
1091 }
1092
1093 if (expect_false (lastcell.stat_hp != stat_hp))
1094 {
1095 lastcell.stat_hp = stat_hp;
1096
1097 mask |= 0x8;
1098 *last_ext |= 0x80;
1099 last_ext = &sl[sl.length ()];
1100
1101 sl << uint8 (5) << uint8 (stat_hp);
1102
1103 if (stat_width > 1)
1092 { 1104 {
1093 *last_ext |= 0x80; 1105 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()]; 1106 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100 1107
1101 lastcell.count = d;
1102
1103 mapspace &ms = m->at (nx, ny);
1104 ms.update ();
1105
1106 if (expect_true (socket.extmap))
1107 {
1108 uint8 stat_hp = 0;
1109 uint8 stat_width = 0;
1110 uint8 flags = 0;
1111 tag_t player = 0;
1112
1113 // send hp information, if applicable
1114 if (object *op = ms.faces_obj [0])
1115 if (op->is_head () && !op->invisible)
1116 {
1117 if (op->stats.maxhp > op->stats.hp
1118 && op->stats.maxhp > 0
1119 && (op->type == PLAYER
1120 || op->type == DOOR // does not work, have maxhp 0
1121 || QUERY_FLAG (op, FLAG_MONSTER)
1122 || QUERY_FLAG (op, FLAG_ALIVE)
1123 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 {
1125 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127 }
1128
1129 if (expect_false (op->has_dialogue ()))
1130 flags |= 1;
1131
1132 if (expect_false (op->type == PLAYER))
1133 player = op == ob ? pl->ob->count
1134 : op == pl->ob ? ob->count
1135 : op->count;
1136 }
1137
1138 if (expect_false (lastcell.stat_hp != stat_hp))
1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1145
1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1149 {
1150 *last_ext |= 0x80;
1151 last_ext = &sl[sl.length ()];
1152
1153 sl << uint8 (6) << uint8 (stat_width); 1108 sl << uint8 (6) << uint8 (stat_width);
1154 }
1155 }
1156
1157 if (expect_false (lastcell.player != player))
1158 {
1159 lastcell.player = player;
1160
1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1164
1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1175
1176 sl << uint8 (8) << uint8 (flags);
1177 } 1109 }
1178 } 1110 }
1111
1112 if (expect_false (lastcell.player != player))
1113 {
1114 lastcell.player = player;
1115
1116 mask |= 0x8;
1117 *last_ext |= 0x80;
1118 last_ext = &sl[sl.length ()];
1119
1120 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1121 }
1122
1123 if (expect_false (lastcell.flags != flags))
1124 {
1125 lastcell.flags = flags;
1126
1127 mask |= 0x8;
1128 *last_ext |= 0x80;
1129 last_ext = &sl[sl.length ()];
1130
1131 sl << uint8 (8) << uint8 (flags);
1132 }
1133
1134 // faces
1179 1135
1180 /* Floor face */ 1136 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2)) 1137 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4; 1138 mask |= 0x4;
1183 1139
… …
1223 socket.send_packet (sl); 1179 socket.send_packet (sl);
1224 socket.sent_scroll = 0; 1180 socket.sent_scroll = 0;
1225 } 1181 }
1226} 1182}
1227 1183
1228/*****************************************************************************/
1229/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1230/* a player. Of course, the client need to know the command to be able to */
1231/* manage it ! */
1232/*****************************************************************************/
1233void
1234send_plugin_custom_message (object *pl, char *buf)
1235{
1236 pl->contr->ns->send_packet (buf);
1237}
1238
1239/**
1240 * This sends the skill number to name mapping. We ignore
1241 * the params - we always send the same info no matter what.
1242 */
1243void
1244send_skill_info (client *ns, char *params)
1245{
1246 packet sl;
1247 sl << "replyinfo skill_info\n";
1248
1249 for (int i = 1; i < NUM_SKILLS; i++)
1250 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1251
1252 if (sl.length () > MAXSOCKBUF)
1253 {
1254 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1255 fatal (0);
1256 }
1257
1258 ns->send_packet (sl);
1259}
1260
1261/**
1262 * This sends the spell path to name mapping. We ignore
1263 * the params - we always send the same info no matter what.
1264 */
1265void
1266send_spell_paths (client * ns, char *params)
1267{
1268 packet sl;
1269
1270 sl << "replyinfo spell_paths\n";
1271
1272 for (int i = 0; i < NRSPELLPATHS; i++)
1273 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1274
1275 if (sl.length () > MAXSOCKBUF)
1276 {
1277 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1278 fatal (0);
1279 }
1280
1281 ns->send_packet (sl);
1282}
1283
1284/** 1184/**
1285 * This looks for any spells the player may have that have changed their stats. 1185 * This looks for any spells the player may have that have changed their stats.
1286 * it then sends an updspell packet for each spell that has changed in this way 1186 * it then sends an updspell packet for each spell that has changed in this way
1287 */ 1187 */
1288void 1188void
1289esrv_update_spells (player *pl) 1189esrv_update_spells (player *pl)
1290{ 1190{
1291 if (!pl->ns) 1191 if (!pl->ns)
1292 return; 1192 return;
1293 1193
1194 pl->ns->update_spells = false;
1195
1294 if (!pl->ns->monitor_spells) 1196 if (!pl->ns->monitor_spells)
1295 return; 1197 return;
1296 1198
1297 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1199 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1298 {
1299 if (spell->type == SPELL) 1200 if (spell->type == SPELL)
1300 { 1201 {
1301 int flags = 0; 1202 int flags = 0;
1203 int val;
1302 1204
1303 /* check if we need to update it */ 1205 /* check if we need to update it */
1304 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1206 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1207 if (spell->cached_sp != val)
1305 { 1208 {
1306 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1209 spell->cached_sp = val;
1307 flags |= UPD_SP_MANA; 1210 flags |= UPD_SP_MANA;
1308 } 1211 }
1309 1212
1310 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1213 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1214 if (spell->cached_grace != val)
1311 { 1215 {
1312 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1216 spell->cached_grace = val;
1313 flags |= UPD_SP_GRACE; 1217 flags |= UPD_SP_GRACE;
1314 } 1218 }
1315 1219
1316 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1220 val = casting_level (pl->ob, spell);
1221 if (spell->cached_eat != val)
1317 { 1222 {
1318 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1223 spell->cached_eat = val;
1319 flags |= UPD_SP_DAMAGE; 1224 flags |= UPD_SP_LEVEL;
1320 } 1225 }
1321 1226
1322 if (flags) 1227 if (flags)
1323 { 1228 {
1324 packet sl; 1229 packet sl;
1325 1230
1326 sl << "updspell " 1231 sl << "updspell "
1327 << uint8 (flags) 1232 << uint8 (flags)
1328 << uint32 (spell->count); 1233 << uint32 (spell->count);
1329 1234
1330 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1235 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1331 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1236 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1332 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1237 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1333 1238
1334 pl->ns->send_packet (sl); 1239 pl->ns->send_packet (sl);
1335 } 1240 }
1336 } 1241 }
1337 }
1338} 1242}
1339 1243
1340void 1244void
1341esrv_remove_spell (player *pl, object *spell) 1245esrv_remove_spell (player *pl, object *spell)
1342{ 1246{
… …
1369 } 1273 }
1370 1274
1371 /* store costs and damage in the object struct, to compare to later */ 1275 /* store costs and damage in the object struct, to compare to later */
1372 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1276 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1373 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1277 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1374 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1278 spell->cached_eat = casting_level (pl->ob, spell);
1375 1279
1376 /* figure out which skill it uses, if it uses one */ 1280 /* figure out which skill it uses, if it uses one */
1377 if (spell->skill) 1281 if (spell->skill)
1378 if (object *tmp = pl->find_skill (spell->skill)) 1282 if (object *tmp = pl->find_skill (spell->skill))
1379 skill = tmp->subtype + CS_STAT_SKILLINFO; 1283 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1380 1284
1381 // spells better have a face 1285 // spells better have a face
1382 if (!spell->face) 1286 if (!spell->face)
1383 { 1287 {
1384 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1288 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1468 /* finally, we can send the packet */ 1372 /* finally, we can send the packet */
1469 pl->ns->flush_fx (); 1373 pl->ns->flush_fx ();
1470 pl->ns->send_packet (sl); 1374 pl->ns->send_packet (sl);
1471} 1375}
1472 1376
1377//-GPL
1378

Diff Legend

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