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.153 by root, Wed Nov 4 13:46:37 2009 UTC vs.
Revision 1.174 by root, Thu Apr 15 00:40:34 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
… …
263ExtiCmd (char *buf, int len, client *ns) 323ExtiCmd (char *buf, int len, client *ns)
264{ 324{
265 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 325 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
266} 326}
267 327
328//-GPL
329
268void 330void
269client::mapinfo_queue_clear () 331client::mapinfo_queue_clear ()
270{ 332{
271 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 333 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
272 free (*i); 334 free (*i);
… …
279{ 341{
280 char *token = buf; 342 char *token = buf;
281 buf += strlen (buf) + 9; 343 buf += strlen (buf) + 9;
282 344
283 // initial map and its origin 345 // initial map and its origin
284 maptile *map = pl->observe->map; 346 maptile *map = pl->viewpoint->map;
285 int mapx = pl->ns->mapx / 2 - pl->observe->x; 347 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
286 int mapy = pl->ns->mapy / 2 - pl->observe->y; 348 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
287 int max_distance = 8; // limit maximum path length to something generous 349 int max_distance = 8; // limit maximum path length to something generous
288 350
289 while (*buf && map && max_distance) 351 while (*buf && map && max_distance)
290 { 352 {
291 int dir = *buf++ - '1'; 353 int dir = *buf++ - '1';
… …
396AddMeCmd (char *buf, int len, client *ns) 458AddMeCmd (char *buf, int len, client *ns)
397{ 459{
398 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 460 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
399} 461}
400 462
401/* 463//+GPL
402#define MSG_TYPE_BOOK 1
403#define MSG_TYPE_CARD 2
404#define MSG_TYPE_PAPER 3
405#define MSG_TYPE_SIGN 4
406#define MSG_TYPE_MONUMENT 5
407#define MSG_TYPE_SCRIPTED_DIALOG 6*/
408
409/** Reply to ExtendedInfos command */
410void
411ToggleExtendedText (char *buf, int len, client * ns)
412{
413 char cmdback[MAX_BUF];
414 char temp[10];
415 char command[50];
416 int info, nextinfo, i, flag;
417
418 cmdback[0] = '\0';
419
420 nextinfo = 0;
421 while (1)
422 {
423 /* 1. Extract an info */
424 info = nextinfo;
425
426 while ((info < len) && (buf [info] == ' '))
427 info++;
428
429 if (info >= len)
430 break;
431
432 nextinfo = info + 1;
433
434 while ((nextinfo < len) && (buf [nextinfo] != ' '))
435 nextinfo++;
436
437 if (nextinfo - info >= 49) /*Erroneous info asked */
438 continue;
439
440 memcpy (command, buf + info, nextinfo - info);
441 command [nextinfo - info] = 0;
442
443 /* 2. Interpret info */
444 i = sscanf (command, "%d", &flag);
445
446 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
447 ns->supported_readables |= (1 << flag);
448 /*3. Next info */
449 }
450
451 /* Send resulting state */
452 strcpy (cmdback, "ExtendedTextSet");
453
454 for (i = 0; i <= MSG_TYPE_LAST; i++)
455 if (ns->supported_readables & (1 << i))
456 {
457 strcat (cmdback, " ");
458 snprintf (temp, sizeof (temp), "%d", i);
459 strcat (cmdback, temp);
460 }
461
462 ns->send_packet (cmdback);
463}
464 464
465/** 465/**
466 * 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,
467 * etc.) 467 * etc.)
468 */ 468 */
… …
525 * commands. 525 * commands.
526 */ 526 */
527 pl->count = 0; 527 pl->count = 0;
528 528
529 //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
530 int time = fabs (pl->ob->speed) < 0.001 530 int time = pl->ob->has_active_speed ()
531 ? time = MAX_TIME * 100
532 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 531 ? (int) (MAX_TIME / pl->ob->speed)
532 : MAX_TIME * 100;
533 533
534 /* Send confirmation of command execution now */ 534 /* Send confirmation of command execution now */
535 packet sl ("comc"); 535 packet sl ("comc");
536 sl << uint16 (cmdid) << uint32 (time); 536 sl << uint16 (cmdid) << uint32 (time);
537 pl->ns->send_packet (sl); 537 pl->ns->send_packet (sl);
… …
579 LOG (llevError, "Unknown input state: %d\n", ns->state); 579 LOG (llevError, "Unknown input state: %d\n", ns->state);
580 } 580 }
581} 581}
582 582
583/** 583/**
584 * Client tells its version. If there is a mismatch, we close the 584 * Client tells its version info.
585 * socket. In real life, all we should care about is the client having
586 * something older than the server. If we assume the client will be
587 * backwards compatible, having it be a later version should not be a
588 * problem.
589 */ 585 */
590void 586void
591VersionCmd (char *buf, int len, client * ns) 587VersionCmd (char *buf, int len, client *ns)
592{ 588{
593 if (!buf) 589 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
594 {
595 LOG (llevError, "CS: received corrupted version command\n");
596 return;
597 }
598
599 ns->cs_version = atoi (buf);
600 ns->sc_version = ns->cs_version;
601
602 LOG (llevDebug, "connection from client <%s>\n", buf);
603
604 //TODO: should log here just for statistics
605
606 //if (VERSION_CS != ns->cs_version)
607 // unchecked;
608
609 char *cp = strchr (buf + 1, ' ');
610 if (!cp)
611 return;
612
613 ns->sc_version = atoi (cp);
614
615 //if (VERSION_SC != ns->sc_version)
616 // unchecked;
617
618 cp = strchr (cp + 1, ' ');
619
620 if (cp)
621 {
622 ns->version = cp + 1;
623
624 if (ns->sc_version < 1026)
625 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
626 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
627 }
628} 590}
629 591
630/** sound related functions. */ 592/** sound related functions. */
631void 593void
632SetSound (char *buf, int len, client * ns) 594SetSound (char *buf, int len, client * ns)
… …
685static void 647static void
686rangetostring (player *pl, char *obuf) 648rangetostring (player *pl, char *obuf)
687{ 649{
688 dynbuf_text &buf = msg_dynbuf; buf.clear (); 650 dynbuf_text &buf = msg_dynbuf; buf.clear ();
689 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
661
690 if (pl->ranged_ob) 662 if (pl->ranged_ob)
691 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;
692 664
693 if (pl->combat_ob) 665 if (pl->combat_ob)
694 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 666 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
739 * commands for now. 711 * commands for now.
740 */ 712 */
741void 713void
742esrv_update_stats (player *pl) 714esrv_update_stats (player *pl)
743{ 715{
744 char buf[MAX_BUF];
745 uint16 flags;
746
747 client *ns = pl->ns; 716 client *ns = pl->ns;
748 if (!ns) 717 if (!ns)
749 return; 718 return;
750 719
751 object *ob = pl->observe; 720 object *ob = pl->observe;
… …
768 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 737 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
769 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 738 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
770 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 739 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
771 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 740 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
772 741
773 for (int s = 0; s < NUM_SKILLS; s++) 742 for (int s = 0; s < CS_NUM_SKILLS; s++)
774 if (object *skill = opl->last_skill_ob [s]) 743 if (object *skill = opl->last_skill_ob [s])
775 if (skill->stats.exp != ns->last_skill_exp [s]) 744 if (skill->stats.exp != ns->last_skill_exp [s])
776 { 745 {
777 ns->last_skill_exp [s] = skill->stats.exp; 746 ns->last_skill_exp [s] = skill->stats.exp;
778 747
779 /* Always send along the level if exp changes. This is only 748 /* Always send along the level if exp changes. This is only
780 * 1 extra byte, but keeps processing simpler. 749 * 1 extra byte, but keeps processing simpler.
781 */ 750 */
782 sl << uint8 (s + CS_STAT_SKILLINFO) 751 sl << uint8 (CS_STAT_SKILLINFO + s)
783 << uint8 (skill->level) 752 << uint8 (skill->level)
784 << uint64 (skill->stats.exp); 753 << uint64 (skill->stats.exp);
785 } 754 }
786 755
787 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 756 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
788 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 757 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
789 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 758 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
790 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 759 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
791 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 760 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
792 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 761 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
793 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 762 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
794 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 763 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
795 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 764 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
796 765
797 flags = 0; 766 int flags = (opl->fire_on ? SF_FIREON : 0)
798 767 | (opl->run_on ? SF_RUNON : 0);
799 if (opl->fire_on)
800 flags |= SF_FIREON;
801
802 if (opl->run_on)
803 flags |= SF_RUNON;
804 768
805 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 769 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
806 770
807 if (ns->sc_version < 1025)
808 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
809 else
810 for (int i = 0; i < NROFATTACKS; i++) 771 for (int i = 0; i < NROFATTACKS; i++)
811 {
812 /* Skip ones we won't send */ 772 /* Skip ones we won't send */
813 if (atnr_cs_stat[i] == -1) 773 if (atnr_cs_stat[i] >= 0)
814 continue;
815
816 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 774 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
817 }
818 775
819 if (pl->ns->monitor_spells) 776 if (pl->ns->monitor_spells)
820 { 777 {
821 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 778 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
822 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 779 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
823 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 780 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
824 } 781 }
825 782
783 char buf[MAX_BUF];
826 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 784 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
827 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 785 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
828 set_title (ob, buf); 786 set_title (ob, buf);
829 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 787 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
830 788
… …
924 882
925 /* Nothing changed */ 883 /* Nothing changed */
926 return 0; 884 return 0;
927} 885}
928 886
887//-GPL
888
929// prefetch (and touch) all maps within a specific distancd 889// prefetch (and touch) all maps within a specific distancd
930static void 890static void
931prefetch_surrounding_maps (maptile *map, int distance) 891prefetch_surrounding_maps (maptile *map, int distance)
932{ 892{
933 map->touch (); 893 map->touch ();
934 894
935 if (--distance) 895 if (--distance)
936 for (int dir = 4; --dir; ) 896 for (int dir = 4; dir--; )
937 if (const shstr &path = map->tile_path [dir]) 897 if (const shstr &path = map->tile_path [dir])
938 if (maptile *&neigh = map->tile_map [dir]) 898 if (maptile *&neigh = map->tile_map [dir])
939 prefetch_surrounding_maps (neigh, distance); 899 prefetch_surrounding_maps (neigh, distance);
940 else 900 else
941 neigh = maptile::find_async (path, map); 901 neigh = maptile::find_async (path, map);
… …
946prefetch_surrounding_maps (object *op) 906prefetch_surrounding_maps (object *op)
947{ 907{
948 prefetch_surrounding_maps (op->map, 3); 908 prefetch_surrounding_maps (op->map, 3);
949} 909}
950 910
911//+GPL
912
951/** 913/**
952 * Draws client map. 914 * Draws client map.
953 */ 915 */
954void 916void
955draw_client_map (player *pl) 917draw_client_map (player *pl)
956{ 918{
957 object *ob = pl->observe; 919 object *ob = pl->viewpoint;
958 if (!ob->active) 920 if (!pl->observe->active)
959 return; 921 return;
960 922
961 /* If player is just joining the game, he isn't here yet, so the map 923 /* If player is just joining the game, he isn't here yet, so the map
962 * can get swapped out. If so, don't try to send them a map. All will 924 * can get swapped out. If so, don't try to send them a map. All will
963 * be OK once they really log in. 925 * be OK once they really log in.
… …
970 check_map_change (pl); 932 check_map_change (pl);
971 prefetch_surrounding_maps (pl->ob); 933 prefetch_surrounding_maps (pl->ob);
972 934
973 /* do LOS after calls to update_position */ 935 /* do LOS after calls to update_position */
974 /* unfortunately, we need to udpate los when observing, currently */ 936 /* unfortunately, we need to udpate los when observing, currently */
975 if (pl->do_los || pl->observe != pl->ob) 937 if (pl->do_los || pl->viewpoint != pl->ob)
976 { 938 {
977 pl->do_los = 0; 939 pl->do_los = 0;
978 pl->update_los (); 940 pl->update_los ();
979 } 941 }
980 942
… …
1032 map_clearcell (&lastcell, -1); 994 map_clearcell (&lastcell, -1);
1033 } 995 }
1034 996
1035 continue; 997 continue;
1036 } 998 }
1037 999
1038 int d = pl->blocked_los_uc (dx, dy); 1000 int d = pl->blocked_los_uc (dx, dy);
1039 1001
1040 if (d > 3) 1002 if (d > 3)
1041 { 1003 {
1042 /* This block deals with spaces that are not visible for whatever 1004 /* This block deals with spaces that are not visible for whatever
… …
1103 { 1065 {
1104 if (op->stats.maxhp > op->stats.hp 1066 if (op->stats.maxhp > op->stats.hp
1105 && op->stats.maxhp > 0 1067 && op->stats.maxhp > 0
1106 && (op->type == PLAYER 1068 && (op->type == PLAYER
1107 || op->type == DOOR // does not work, have maxhp 0 1069 || op->type == DOOR // does not work, have maxhp 0
1108 || QUERY_FLAG (op, FLAG_MONSTER) 1070 || op->flag [FLAG_MONSTER]
1109 || QUERY_FLAG (op, FLAG_ALIVE) 1071 || op->flag [FLAG_ALIVE]
1110 || QUERY_FLAG (op, FLAG_GENERATOR))) 1072 || op->flag [FLAG_GENERATOR]))
1111 { 1073 {
1112 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1074 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1113 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1075 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1114 } 1076 }
1115 1077
… …
1211 socket.send_packet (sl); 1173 socket.send_packet (sl);
1212 socket.sent_scroll = 0; 1174 socket.sent_scroll = 0;
1213 } 1175 }
1214} 1176}
1215 1177
1216/*****************************************************************************/
1217/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1218/* a player. Of course, the client need to know the command to be able to */
1219/* manage it ! */
1220/*****************************************************************************/
1221void
1222send_plugin_custom_message (object *pl, char *buf)
1223{
1224 pl->contr->ns->send_packet (buf);
1225}
1226
1227/**
1228 * This sends the skill number to name mapping. We ignore
1229 * the params - we always send the same info no matter what.
1230 */
1231void
1232send_skill_info (client *ns, char *params)
1233{
1234 packet sl;
1235 sl << "replyinfo skill_info\n";
1236
1237 for (int i = 1; i < NUM_SKILLS; i++)
1238 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1239
1240 if (sl.length () > MAXSOCKBUF)
1241 {
1242 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1243 fatal (0);
1244 }
1245
1246 ns->send_packet (sl);
1247}
1248
1249/**
1250 * This sends the spell path to name mapping. We ignore
1251 * the params - we always send the same info no matter what.
1252 */
1253void
1254send_spell_paths (client * ns, char *params)
1255{
1256 packet sl;
1257
1258 sl << "replyinfo spell_paths\n";
1259
1260 for (int i = 0; i < NRSPELLPATHS; i++)
1261 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1262
1263 if (sl.length () > MAXSOCKBUF)
1264 {
1265 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1266 fatal (0);
1267 }
1268
1269 ns->send_packet (sl);
1270}
1271
1272/** 1178/**
1273 * This looks for any spells the player may have that have changed their stats. 1179 * This looks for any spells the player may have that have changed their stats.
1274 * it then sends an updspell packet for each spell that has changed in this way 1180 * it then sends an updspell packet for each spell that has changed in this way
1275 */ 1181 */
1276void 1182void
1277esrv_update_spells (player *pl) 1183esrv_update_spells (player *pl)
1278{ 1184{
1279 if (!pl->ns) 1185 if (!pl->ns)
1280 return; 1186 return;
1281 1187
1188 pl->ns->update_spells = false;
1189
1282 if (!pl->ns->monitor_spells) 1190 if (!pl->ns->monitor_spells)
1283 return; 1191 return;
1284 1192
1285 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1193 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1286 {
1287 if (spell->type == SPELL) 1194 if (spell->type == SPELL)
1288 { 1195 {
1289 int flags = 0; 1196 int flags = 0;
1197 int val;
1290 1198
1291 /* check if we need to update it */ 1199 /* check if we need to update it */
1292 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1200 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1201 if (spell->cached_sp != val)
1293 { 1202 {
1294 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1203 spell->cached_sp = val;
1295 flags |= UPD_SP_MANA; 1204 flags |= UPD_SP_MANA;
1296 } 1205 }
1297 1206
1298 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1207 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1208 if (spell->cached_grace != val)
1299 { 1209 {
1300 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1210 spell->cached_grace = val;
1301 flags |= UPD_SP_GRACE; 1211 flags |= UPD_SP_GRACE;
1302 } 1212 }
1303 1213
1304 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1214 val = casting_level (pl->ob, spell);
1215 if (spell->cached_eat != val)
1305 { 1216 {
1306 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1217 spell->cached_eat = val;
1307 flags |= UPD_SP_DAMAGE; 1218 flags |= UPD_SP_LEVEL;
1308 } 1219 }
1309 1220
1310 if (flags) 1221 if (flags)
1311 { 1222 {
1312 packet sl; 1223 packet sl;
1313 1224
1314 sl << "updspell " 1225 sl << "updspell "
1315 << uint8 (flags) 1226 << uint8 (flags)
1316 << uint32 (spell->count); 1227 << uint32 (spell->count);
1317 1228
1318 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1229 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1319 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1230 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1320 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1231 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1321 1232
1322 pl->ns->send_packet (sl); 1233 pl->ns->send_packet (sl);
1323 } 1234 }
1324 } 1235 }
1325 }
1326} 1236}
1327 1237
1328void 1238void
1329esrv_remove_spell (player *pl, object *spell) 1239esrv_remove_spell (player *pl, object *spell)
1330{ 1240{
… …
1357 } 1267 }
1358 1268
1359 /* store costs and damage in the object struct, to compare to later */ 1269 /* store costs and damage in the object struct, to compare to later */
1360 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1270 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1361 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1271 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1362 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1272 spell->cached_eat = casting_level (pl->ob, spell);
1363 1273
1364 /* figure out which skill it uses, if it uses one */ 1274 /* figure out which skill it uses, if it uses one */
1365 if (spell->skill) 1275 if (spell->skill)
1366 if (object *tmp = pl->find_skill (spell->skill)) 1276 if (object *tmp = pl->find_skill (spell->skill))
1367 skill = tmp->subtype + CS_STAT_SKILLINFO; 1277 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1368 1278
1369 // spells better have a face 1279 // spells better have a face
1370 if (!spell->face) 1280 if (!spell->face)
1371 { 1281 {
1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1282 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1456 /* finally, we can send the packet */ 1366 /* finally, we can send the packet */
1457 pl->ns->flush_fx (); 1367 pl->ns->flush_fx ();
1458 pl->ns->send_packet (sl); 1368 pl->ns->send_packet (sl);
1459} 1369}
1460 1370
1371//-GPL
1372

Diff Legend

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