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

Diff Legend

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