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.152 by root, Tue Oct 20 07:18:11 2009 UTC vs.
Revision 1.173 by root, Thu Apr 15 00:37:24 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 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.
… …
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
26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
29 * \date 2003-12-02 31 * \date 2003-12-02
… …
42 44
43#include <global.h> 45#include <global.h>
44#include <sproto.h> 46#include <sproto.h>
45 47
46#include <living.h> 48#include <living.h>
47#include <commands.h>
48 49
49/* 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,
50 * it should work here. 51 * it should work here.
51 */ 52 */
52#include <sys/types.h> 53#include <sys/types.h>
… …
64 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
65 * 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
66 * 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
67 * client. 68 * client.
68 */ 69 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
75 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
76 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
77 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
78 -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,
79 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
80 -1, /* Internal */ 95 -1, /* Internal */
81 -1, /* life stealing */ 96 -1, /* life stealing */
82 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
83}; 98};
… …
142 157
143static void 158static void
144send_map_info (player *pl) 159send_map_info (player *pl)
145{ 160{
146 client &socket = *pl->ns; 161 client &socket = *pl->ns;
147 object *ob = pl->observe; 162 object *ob = pl->viewpoint;
148 163
149 if (socket.mapinfocmd) 164 if (socket.mapinfocmd)
150 { 165 {
151 if (ob->map && ob->map->path[0]) 166 if (ob->map && ob->map->path[0])
152 { 167 {
… …
169/** check for map/region change and send new map data */ 184/** check for map/region change and send new map data */
170static void 185static void
171check_map_change (player *pl) 186check_map_change (player *pl)
172{ 187{
173 client &socket = *pl->ns; 188 client &socket = *pl->ns;
174 object *ob = pl->observe; 189 object *ob = pl->viewpoint;
175 190
176 region *reg = ob->region (); 191 region *reg = ob->region ();
177 if (socket.current_region != reg) 192 if (socket.current_region != reg)
178 { 193 {
179 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));
… …
215 socket.floorbox_reset (); 230 socket.floorbox_reset ();
216 } 231 }
217 232
218 socket.current_x = ob->x; 233 socket.current_x = ob->x;
219 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);
220} 280}
221 281
222/** 282/**
223 * RequestInfo is sort of a meta command. There is some specific 283 * RequestInfo is sort of a meta command. There is some specific
224 * request of information, but we call other functions to provide 284 * request of information, but we call other functions to provide
… …
237 { 297 {
238 *params++ = 0; 298 *params++ = 0;
239 break; 299 break;
240 } 300 }
241 301
242 if (!strcmp (buf, "image_info"))
243 send_image_info (ns, params);
244 else if (!strcmp (buf, "image_sums"))
245 send_image_sums (ns, params);
246 else if (!strcmp (buf, "skill_info")) 302 if (!strcmp (buf, "skill_info"))
247 send_skill_info (ns, params); 303 send_skill_info (ns, params);
248 else if (!strcmp (buf, "spell_paths")) 304 else if (!strcmp (buf, "spell_paths"))
249 send_spell_paths (ns, params); 305 send_spell_paths (ns, params);
250 else 306 else
251 { 307 {
… …
267ExtiCmd (char *buf, int len, client *ns) 323ExtiCmd (char *buf, int len, client *ns)
268{ 324{
269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 325 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270} 326}
271 327
328//-GPL
329
272void 330void
273client::mapinfo_queue_clear () 331client::mapinfo_queue_clear ()
274{ 332{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 333 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i); 334 free (*i);
… …
283{ 341{
284 char *token = buf; 342 char *token = buf;
285 buf += strlen (buf) + 9; 343 buf += strlen (buf) + 9;
286 344
287 // initial map and its origin 345 // initial map and its origin
288 maptile *map = pl->observe->map; 346 maptile *map = pl->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x; 347 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y; 348 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291 int max_distance = 8; // limit maximum path length to something generous 349 int max_distance = 8; // limit maximum path length to something generous
292 350
293 while (*buf && map && max_distance) 351 while (*buf && map && max_distance)
294 { 352 {
295 int dir = *buf++ - '1'; 353 int dir = *buf++ - '1';
… …
400AddMeCmd (char *buf, int len, client *ns) 458AddMeCmd (char *buf, int len, client *ns)
401{ 459{
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 460 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 461}
404 462
405/* 463//+GPL
406#define MSG_TYPE_BOOK 1
407#define MSG_TYPE_CARD 2
408#define MSG_TYPE_PAPER 3
409#define MSG_TYPE_SIGN 4
410#define MSG_TYPE_MONUMENT 5
411#define MSG_TYPE_SCRIPTED_DIALOG 6*/
412
413/** Reply to ExtendedInfos command */
414void
415ToggleExtendedText (char *buf, int len, client * ns)
416{
417 char cmdback[MAX_BUF];
418 char temp[10];
419 char command[50];
420 int info, nextinfo, i, flag;
421
422 cmdback[0] = '\0';
423
424 nextinfo = 0;
425 while (1)
426 {
427 /* 1. Extract an info */
428 info = nextinfo;
429
430 while ((info < len) && (buf [info] == ' '))
431 info++;
432
433 if (info >= len)
434 break;
435
436 nextinfo = info + 1;
437
438 while ((nextinfo < len) && (buf [nextinfo] != ' '))
439 nextinfo++;
440
441 if (nextinfo - info >= 49) /*Erroneous info asked */
442 continue;
443
444 memcpy (command, buf + info, nextinfo - info);
445 command [nextinfo - info] = 0;
446
447 /* 2. Interpret info */
448 i = sscanf (command, "%d", &flag);
449
450 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
451 ns->supported_readables |= (1 << flag);
452 /*3. Next info */
453 }
454
455 /* Send resulting state */
456 strcpy (cmdback, "ExtendedTextSet");
457
458 for (i = 0; i <= MSG_TYPE_LAST; i++)
459 if (ns->supported_readables & (1 << i))
460 {
461 strcat (cmdback, " ");
462 snprintf (temp, sizeof (temp), "%d", i);
463 strcat (cmdback, temp);
464 }
465
466 ns->send_packet (cmdback);
467}
468 464
469/** 465/**
470 * 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,
471 * etc.) 467 * etc.)
472 */ 468 */
… …
529 * commands. 525 * commands.
530 */ 526 */
531 pl->count = 0; 527 pl->count = 0;
532 528
533 //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
534 int time = fabs (pl->ob->speed) < 0.001 530 int time = pl->ob->has_active_speed ()
535 ? time = MAX_TIME * 100
536 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 531 ? (int) (MAX_TIME / pl->ob->speed)
532 : MAX_TIME * 100;
537 533
538 /* Send confirmation of command execution now */ 534 /* Send confirmation of command execution now */
539 packet sl ("comc"); 535 packet sl ("comc");
540 sl << uint16 (cmdid) << uint32 (time); 536 sl << uint16 (cmdid) << uint32 (time);
541 pl->ns->send_packet (sl); 537 pl->ns->send_packet (sl);
… …
583 LOG (llevError, "Unknown input state: %d\n", ns->state); 579 LOG (llevError, "Unknown input state: %d\n", ns->state);
584 } 580 }
585} 581}
586 582
587/** 583/**
588 * Client tells its version. If there is a mismatch, we close the 584 * Client tells its version info.
589 * socket. In real life, all we should care about is the client having
590 * something older than the server. If we assume the client will be
591 * backwards compatible, having it be a later version should not be a
592 * problem.
593 */ 585 */
594void 586void
595VersionCmd (char *buf, int len, client * ns) 587VersionCmd (char *buf, int len, client *ns)
596{ 588{
597 if (!buf) 589 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
598 {
599 LOG (llevError, "CS: received corrupted version command\n");
600 return;
601 }
602
603 ns->cs_version = atoi (buf);
604 ns->sc_version = ns->cs_version;
605
606 LOG (llevDebug, "connection from client <%s>\n", buf);
607
608 //TODO: should log here just for statistics
609
610 //if (VERSION_CS != ns->cs_version)
611 // unchecked;
612
613 char *cp = strchr (buf + 1, ' ');
614 if (!cp)
615 return;
616
617 ns->sc_version = atoi (cp);
618
619 //if (VERSION_SC != ns->sc_version)
620 // unchecked;
621
622 cp = strchr (cp + 1, ' ');
623
624 if (cp)
625 {
626 ns->version = cp + 1;
627
628 if (ns->sc_version < 1026)
629 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
630 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
631 }
632} 590}
633 591
634/** sound related functions. */ 592/** sound related functions. */
635void 593void
636SetSound (char *buf, int len, client * ns) 594SetSound (char *buf, int len, client * ns)
… …
688 */ 646 */
689static void 647static void
690rangetostring (player *pl, char *obuf) 648rangetostring (player *pl, char *obuf)
691{ 649{
692 dynbuf_text &buf = msg_dynbuf; buf.clear (); 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
693 661
694 if (pl->ranged_ob) 662 if (pl->ranged_ob)
695 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;
696 664
697 if (pl->combat_ob) 665 if (pl->combat_ob)
… …
772 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 740 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
773 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 741 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
774 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 742 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
775 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 743 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
776 744
777 for (int s = 0; s < NUM_SKILLS; s++) 745 for (int s = 0; s < CS_NUM_SKILLS; s++)
778 if (object *skill = opl->last_skill_ob [s]) 746 if (object *skill = opl->last_skill_ob [s])
779 if (skill->stats.exp != ns->last_skill_exp [s]) 747 if (skill->stats.exp != ns->last_skill_exp [s])
780 { 748 {
781 ns->last_skill_exp [s] = skill->stats.exp; 749 ns->last_skill_exp [s] = skill->stats.exp;
782 750
783 /* Always send along the level if exp changes. This is only 751 /* Always send along the level if exp changes. This is only
784 * 1 extra byte, but keeps processing simpler. 752 * 1 extra byte, but keeps processing simpler.
785 */ 753 */
786 sl << uint8 (s + CS_STAT_SKILLINFO) 754 sl << uint8 (CS_STAT_SKILLINFO + s)
787 << uint8 (skill->level) 755 << uint8 (skill->level)
788 << uint64 (skill->stats.exp); 756 << uint64 (skill->stats.exp);
789 } 757 }
790 758
791 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 759 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
792 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 760 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
793 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 761 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
794 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 762 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
795 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 763 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
796 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);
797 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 765 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
798 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);
799 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);
800 768
801 flags = 0; 769 flags = (opl->fire_on ? SF_FIREON : 0)
802 770 | (opl->run_on ? SF_RUNON : 0);
803 if (opl->fire_on)
804 flags |= SF_FIREON;
805
806 if (opl->run_on)
807 flags |= SF_RUNON;
808 771
809 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 772 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
810 773
811 if (ns->sc_version < 1025)
812 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
813 else
814 for (int i = 0; i < NROFATTACKS; i++) 774 for (int i = 0; i < NROFATTACKS; i++)
815 {
816 /* Skip ones we won't send */ 775 /* Skip ones we won't send */
817 if (atnr_cs_stat[i] == -1) 776 if (atnr_cs_stat[i] >= 0)
818 continue;
819
820 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 777 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
821 }
822 778
823 if (pl->ns->monitor_spells) 779 if (pl->ns->monitor_spells)
824 { 780 {
825 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 781 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
826 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 782 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
928 884
929 /* Nothing changed */ 885 /* Nothing changed */
930 return 0; 886 return 0;
931} 887}
932 888
889//-GPL
890
933// prefetch (and touch) all maps within a specific distancd 891// prefetch (and touch) all maps within a specific distancd
934static void 892static void
935prefetch_surrounding_maps (maptile *map, int distance) 893prefetch_surrounding_maps (maptile *map, int distance)
936{ 894{
937 map->touch (); 895 map->touch ();
938 896
939 if (--distance) 897 if (--distance)
940 for (int dir = 4; --dir; ) 898 for (int dir = 4; dir--; )
941 if (const shstr &path = map->tile_path [dir]) 899 if (const shstr &path = map->tile_path [dir])
942 if (maptile *&neigh = map->tile_map [dir]) 900 if (maptile *&neigh = map->tile_map [dir])
943 prefetch_surrounding_maps (neigh, distance); 901 prefetch_surrounding_maps (neigh, distance);
944 else 902 else
945 neigh = maptile::find_async (path, map); 903 neigh = maptile::find_async (path, map);
… …
950prefetch_surrounding_maps (object *op) 908prefetch_surrounding_maps (object *op)
951{ 909{
952 prefetch_surrounding_maps (op->map, 3); 910 prefetch_surrounding_maps (op->map, 3);
953} 911}
954 912
913//+GPL
914
955/** 915/**
956 * Draws client map. 916 * Draws client map.
957 */ 917 */
958void 918void
959draw_client_map (player *pl) 919draw_client_map (player *pl)
960{ 920{
961 object *ob = pl->observe; 921 object *ob = pl->viewpoint;
962 if (!ob->active) 922 if (!pl->observe->active)
963 return; 923 return;
964 924
965 /* If player is just joining the game, he isn't here yet, so the map 925 /* If player is just joining the game, he isn't here yet, so the map
966 * can get swapped out. If so, don't try to send them a map. All will 926 * can get swapped out. If so, don't try to send them a map. All will
967 * be OK once they really log in. 927 * be OK once they really log in.
… …
974 check_map_change (pl); 934 check_map_change (pl);
975 prefetch_surrounding_maps (pl->ob); 935 prefetch_surrounding_maps (pl->ob);
976 936
977 /* do LOS after calls to update_position */ 937 /* do LOS after calls to update_position */
978 /* unfortunately, we need to udpate los when observing, currently */ 938 /* unfortunately, we need to udpate los when observing, currently */
979 if (pl->do_los || pl->observe != pl->ob) 939 if (pl->do_los || pl->viewpoint != pl->ob)
980 { 940 {
981 pl->do_los = 0; 941 pl->do_los = 0;
982 pl->update_los (); 942 pl->update_los ();
983 } 943 }
984 944
… …
1036 map_clearcell (&lastcell, -1); 996 map_clearcell (&lastcell, -1);
1037 } 997 }
1038 998
1039 continue; 999 continue;
1040 } 1000 }
1041 1001
1042 int d = pl->blocked_los_uc (dx, dy); 1002 int d = pl->blocked_los_uc (dx, dy);
1043 1003
1044 if (d > 3) 1004 if (d > 3)
1045 { 1005 {
1046 /* This block deals with spaces that are not visible for whatever 1006 /* This block deals with spaces that are not visible for whatever
… …
1107 { 1067 {
1108 if (op->stats.maxhp > op->stats.hp 1068 if (op->stats.maxhp > op->stats.hp
1109 && op->stats.maxhp > 0 1069 && op->stats.maxhp > 0
1110 && (op->type == PLAYER 1070 && (op->type == PLAYER
1111 || op->type == DOOR // does not work, have maxhp 0 1071 || op->type == DOOR // does not work, have maxhp 0
1112 || QUERY_FLAG (op, FLAG_MONSTER) 1072 || op->flag [FLAG_MONSTER]
1113 || QUERY_FLAG (op, FLAG_ALIVE) 1073 || op->flag [FLAG_ALIVE]
1114 || QUERY_FLAG (op, FLAG_GENERATOR))) 1074 || op->flag [FLAG_GENERATOR]))
1115 { 1075 {
1116 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1076 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1117 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1077 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1118 } 1078 }
1119 1079
… …
1215 socket.send_packet (sl); 1175 socket.send_packet (sl);
1216 socket.sent_scroll = 0; 1176 socket.sent_scroll = 0;
1217 } 1177 }
1218} 1178}
1219 1179
1220/*****************************************************************************/
1221/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1222/* a player. Of course, the client need to know the command to be able to */
1223/* manage it ! */
1224/*****************************************************************************/
1225void
1226send_plugin_custom_message (object *pl, char *buf)
1227{
1228 pl->contr->ns->send_packet (buf);
1229}
1230
1231/**
1232 * This sends the skill number to name mapping. We ignore
1233 * the params - we always send the same info no matter what.
1234 */
1235void
1236send_skill_info (client *ns, char *params)
1237{
1238 packet sl;
1239 sl << "replyinfo skill_info\n";
1240
1241 for (int i = 1; i < NUM_SKILLS; i++)
1242 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1243
1244 if (sl.length () > MAXSOCKBUF)
1245 {
1246 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1247 fatal (0);
1248 }
1249
1250 ns->send_packet (sl);
1251}
1252
1253/**
1254 * This sends the spell path to name mapping. We ignore
1255 * the params - we always send the same info no matter what.
1256 */
1257void
1258send_spell_paths (client * ns, char *params)
1259{
1260 packet sl;
1261
1262 sl << "replyinfo spell_paths\n";
1263
1264 for (int i = 0; i < NRSPELLPATHS; i++)
1265 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1266
1267 if (sl.length () > MAXSOCKBUF)
1268 {
1269 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1270 fatal (0);
1271 }
1272
1273 ns->send_packet (sl);
1274}
1275
1276/** 1180/**
1277 * This looks for any spells the player may have that have changed their stats. 1181 * This looks for any spells the player may have that have changed their stats.
1278 * it then sends an updspell packet for each spell that has changed in this way 1182 * it then sends an updspell packet for each spell that has changed in this way
1279 */ 1183 */
1280void 1184void
1281esrv_update_spells (player *pl) 1185esrv_update_spells (player *pl)
1282{ 1186{
1283 if (!pl->ns) 1187 if (!pl->ns)
1284 return; 1188 return;
1285 1189
1190 pl->ns->update_spells = false;
1191
1286 if (!pl->ns->monitor_spells) 1192 if (!pl->ns->monitor_spells)
1287 return; 1193 return;
1288 1194
1289 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1195 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1290 {
1291 if (spell->type == SPELL) 1196 if (spell->type == SPELL)
1292 { 1197 {
1293 int flags = 0; 1198 int flags = 0;
1199 int val;
1294 1200
1295 /* check if we need to update it */ 1201 /* check if we need to update it */
1296 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1202 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1203 if (spell->cached_sp != val)
1297 { 1204 {
1298 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1205 spell->cached_sp = val;
1299 flags |= UPD_SP_MANA; 1206 flags |= UPD_SP_MANA;
1300 } 1207 }
1301 1208
1302 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1209 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1210 if (spell->cached_grace != val)
1303 { 1211 {
1304 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1212 spell->cached_grace = val;
1305 flags |= UPD_SP_GRACE; 1213 flags |= UPD_SP_GRACE;
1306 } 1214 }
1307 1215
1308 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1216 val = casting_level (pl->ob, spell);
1217 if (spell->cached_eat != val)
1309 { 1218 {
1310 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1219 spell->cached_eat = val;
1311 flags |= UPD_SP_DAMAGE; 1220 flags |= UPD_SP_LEVEL;
1312 } 1221 }
1313 1222
1314 if (flags) 1223 if (flags)
1315 { 1224 {
1316 packet sl; 1225 packet sl;
1317 1226
1318 sl << "updspell " 1227 sl << "updspell "
1319 << uint8 (flags) 1228 << uint8 (flags)
1320 << uint32 (spell->count); 1229 << uint32 (spell->count);
1321 1230
1322 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1231 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1323 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1232 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1324 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1233 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1325 1234
1326 pl->ns->send_packet (sl); 1235 pl->ns->send_packet (sl);
1327 } 1236 }
1328 } 1237 }
1329 }
1330} 1238}
1331 1239
1332void 1240void
1333esrv_remove_spell (player *pl, object *spell) 1241esrv_remove_spell (player *pl, object *spell)
1334{ 1242{
… …
1361 } 1269 }
1362 1270
1363 /* store costs and damage in the object struct, to compare to later */ 1271 /* store costs and damage in the object struct, to compare to later */
1364 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1272 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1365 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1273 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1366 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1274 spell->cached_eat = casting_level (pl->ob, spell);
1367 1275
1368 /* figure out which skill it uses, if it uses one */ 1276 /* figure out which skill it uses, if it uses one */
1369 if (spell->skill) 1277 if (spell->skill)
1370 if (object *tmp = pl->find_skill (spell->skill)) 1278 if (object *tmp = pl->find_skill (spell->skill))
1371 skill = tmp->subtype + CS_STAT_SKILLINFO; 1279 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1372 1280
1373 // spells better have a face 1281 // spells better have a face
1374 if (!spell->face) 1282 if (!spell->face)
1375 { 1283 {
1376 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1284 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1460 /* finally, we can send the packet */ 1368 /* finally, we can send the packet */
1461 pl->ns->flush_fx (); 1369 pl->ns->flush_fx ();
1462 pl->ns->send_packet (sl); 1370 pl->ns->send_packet (sl);
1463} 1371}
1464 1372
1373//-GPL
1374

Diff Legend

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