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 Mark Wedel |
5 | * Copyright (©) 2001 Mark Wedel |
6 | * Copyright (©) 1992 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 |
… | |
… | |
44 | |
44 | |
45 | #include <global.h> |
45 | #include <global.h> |
46 | #include <sproto.h> |
46 | #include <sproto.h> |
47 | |
47 | |
48 | #include <living.h> |
48 | #include <living.h> |
49 | #include <commands.h> |
|
|
50 | |
49 | |
51 | /* 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, |
52 | * it should work here. |
51 | * it should work here. |
53 | */ |
52 | */ |
54 | #include <sys/types.h> |
53 | #include <sys/types.h> |
… | |
… | |
66 | * This table translates the attack numbers as used within the |
65 | * This table translates the attack numbers as used within the |
67 | * 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 |
68 | * 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 |
69 | * client. |
68 | * client. |
70 | */ |
69 | */ |
71 | static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, |
70 | static short atnr_cs_stat[NROFATTACKS] = |
72 | CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, |
71 | { |
73 | CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, |
72 | CS_STAT_RES_PHYS, |
74 | CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , |
73 | CS_STAT_RES_MAG, |
75 | CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, |
74 | CS_STAT_RES_FIRE, |
76 | CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, |
75 | CS_STAT_RES_ELEC, |
77 | CS_STAT_RES_FEAR, -1 /* Cancellation */ , |
76 | CS_STAT_RES_COLD, |
78 | CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, |
77 | CS_STAT_RES_CONF, |
79 | -1 /* Chaos */ , -1 /* Counterspell */ , |
78 | CS_STAT_RES_ACID, |
80 | -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, |
81 | CS_STAT_RES_BLIND, |
94 | CS_STAT_RES_BLIND, |
82 | -1, /* Internal */ |
95 | -1, /* Internal */ |
83 | -1, /* life stealing */ |
96 | -1, /* life stealing */ |
84 | -1 /* Disease - not fully done yet */ |
97 | -1 /* Disease - not fully done yet */ |
85 | }; |
98 | }; |
… | |
… | |
229 | send_skill_info (client *ns, char *params) |
242 | send_skill_info (client *ns, char *params) |
230 | { |
243 | { |
231 | packet sl; |
244 | packet sl; |
232 | sl << "replyinfo skill_info\n"; |
245 | sl << "replyinfo skill_info\n"; |
233 | |
246 | |
234 | for (int i = 1; i < NUM_SKILLS; i++) |
247 | for (int i = 0; i < skillvec.size (); ++i) |
235 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); |
248 | sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name); |
236 | |
249 | |
237 | if (sl.length () > MAXSOCKBUF) |
250 | if (sl.length () > MAXSOCKBUF) |
238 | { |
|
|
239 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
251 | cleanup ("buffer overflow in send_skill_info!"); |
240 | fatal (0); |
|
|
241 | } |
|
|
242 | |
252 | |
243 | ns->send_packet (sl); |
253 | ns->send_packet (sl); |
244 | } |
254 | } |
245 | |
255 | |
246 | /** |
256 | /** |
… | |
… | |
256 | |
266 | |
257 | for (int i = 0; i < NRSPELLPATHS; i++) |
267 | for (int i = 0; i < NRSPELLPATHS; i++) |
258 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
268 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
259 | |
269 | |
260 | if (sl.length () > MAXSOCKBUF) |
270 | if (sl.length () > MAXSOCKBUF) |
261 | { |
|
|
262 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
271 | cleanup ("buffer overflow in send_spell_paths!"); |
263 | fatal (0); |
|
|
264 | } |
|
|
265 | |
272 | |
266 | ns->send_packet (sl); |
273 | ns->send_packet (sl); |
267 | } |
274 | } |
268 | |
275 | |
269 | /** |
276 | /** |
… | |
… | |
447 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
454 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
448 | } |
455 | } |
449 | |
456 | |
450 | //+GPL |
457 | //+GPL |
451 | |
458 | |
452 | /* |
|
|
453 | #define MSG_TYPE_BOOK 1 |
|
|
454 | #define MSG_TYPE_CARD 2 |
|
|
455 | #define MSG_TYPE_PAPER 3 |
|
|
456 | #define MSG_TYPE_SIGN 4 |
|
|
457 | #define MSG_TYPE_MONUMENT 5 |
|
|
458 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
|
|
459 | |
|
|
460 | /** Reply to ExtendedInfos command */ |
|
|
461 | void |
|
|
462 | ToggleExtendedText (char *buf, int len, client * ns) |
|
|
463 | { |
|
|
464 | char cmdback[MAX_BUF]; |
|
|
465 | char temp[10]; |
|
|
466 | char command[50]; |
|
|
467 | int info, nextinfo, i, flag; |
|
|
468 | |
|
|
469 | cmdback[0] = '\0'; |
|
|
470 | |
|
|
471 | nextinfo = 0; |
|
|
472 | while (1) |
|
|
473 | { |
|
|
474 | /* 1. Extract an info */ |
|
|
475 | info = nextinfo; |
|
|
476 | |
|
|
477 | while ((info < len) && (buf [info] == ' ')) |
|
|
478 | info++; |
|
|
479 | |
|
|
480 | if (info >= len) |
|
|
481 | break; |
|
|
482 | |
|
|
483 | nextinfo = info + 1; |
|
|
484 | |
|
|
485 | while ((nextinfo < len) && (buf [nextinfo] != ' ')) |
|
|
486 | nextinfo++; |
|
|
487 | |
|
|
488 | if (nextinfo - info >= 49) /*Erroneous info asked */ |
|
|
489 | continue; |
|
|
490 | |
|
|
491 | memcpy (command, buf + info, nextinfo - info); |
|
|
492 | command [nextinfo - info] = 0; |
|
|
493 | |
|
|
494 | /* 2. Interpret info */ |
|
|
495 | i = sscanf (command, "%d", &flag); |
|
|
496 | |
|
|
497 | if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) |
|
|
498 | ns->supported_readables |= (1 << flag); |
|
|
499 | /*3. Next info */ |
|
|
500 | } |
|
|
501 | |
|
|
502 | /* Send resulting state */ |
|
|
503 | strcpy (cmdback, "ExtendedTextSet"); |
|
|
504 | |
|
|
505 | for (i = 0; i <= MSG_TYPE_LAST; i++) |
|
|
506 | if (ns->supported_readables & (1 << i)) |
|
|
507 | { |
|
|
508 | strcat (cmdback, " "); |
|
|
509 | snprintf (temp, sizeof (temp), "%d", i); |
|
|
510 | strcat (cmdback, temp); |
|
|
511 | } |
|
|
512 | |
|
|
513 | ns->send_packet (cmdback); |
|
|
514 | } |
|
|
515 | |
|
|
516 | /** |
459 | /** |
517 | * This handles the general commands from the client (ie, north, fire, cast, |
460 | * This handles the general commands from the client (ie, north, fire, cast, |
518 | * etc.) |
461 | * etc.) |
519 | */ |
462 | */ |
520 | void |
463 | void |
… | |
… | |
630 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
573 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
631 | } |
574 | } |
632 | } |
575 | } |
633 | |
576 | |
634 | /** |
577 | /** |
635 | * Client tells its version. If there is a mismatch, we close the |
578 | * Client tells its version info. |
636 | * socket. In real life, all we should care about is the client having |
|
|
637 | * something older than the server. If we assume the client will be |
|
|
638 | * backwards compatible, having it be a later version should not be a |
|
|
639 | * problem. |
|
|
640 | */ |
579 | */ |
641 | void |
580 | void |
642 | VersionCmd (char *buf, int len, client * ns) |
581 | VersionCmd (char *buf, int len, client *ns) |
643 | { |
582 | { |
644 | if (!buf) |
583 | INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len)); |
645 | { |
|
|
646 | LOG (llevError, "CS: received corrupted version command\n"); |
|
|
647 | return; |
|
|
648 | } |
|
|
649 | |
|
|
650 | ns->cs_version = atoi (buf); |
|
|
651 | ns->sc_version = ns->cs_version; |
|
|
652 | |
|
|
653 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
654 | |
|
|
655 | //TODO: should log here just for statistics |
|
|
656 | |
|
|
657 | //if (VERSION_CS != ns->cs_version) |
|
|
658 | // unchecked; |
|
|
659 | |
|
|
660 | char *cp = strchr (buf + 1, ' '); |
|
|
661 | if (!cp) |
|
|
662 | return; |
|
|
663 | |
|
|
664 | ns->sc_version = atoi (cp); |
|
|
665 | |
|
|
666 | //if (VERSION_SC != ns->sc_version) |
|
|
667 | // unchecked; |
|
|
668 | |
|
|
669 | cp = strchr (cp + 1, ' '); |
|
|
670 | |
|
|
671 | if (cp) |
|
|
672 | { |
|
|
673 | ns->version = cp + 1; |
|
|
674 | |
|
|
675 | if (ns->sc_version < 1026) |
|
|
676 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
|
|
677 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
|
|
678 | } |
|
|
679 | } |
584 | } |
680 | |
585 | |
681 | /** sound related functions. */ |
586 | /** sound related functions. */ |
682 | void |
587 | void |
683 | SetSound (char *buf, int len, client * ns) |
588 | SetSound (char *buf, int len, client * ns) |
… | |
… | |
736 | static void |
641 | static void |
737 | rangetostring (player *pl, char *obuf) |
642 | rangetostring (player *pl, char *obuf) |
738 | { |
643 | { |
739 | dynbuf_text &buf = msg_dynbuf; buf.clear (); |
644 | dynbuf_text &buf = msg_dynbuf; buf.clear (); |
740 | |
645 | |
|
|
646 | #if 0 |
|
|
647 | // print ranged/chosen_skill etc. objects every call |
|
|
648 | printf ("%s %s => %s (%s)\n", |
|
|
649 | pl->ranged_ob ? &pl->ranged_ob->name : "-", |
|
|
650 | pl->combat_ob ? &pl->combat_ob->name : "-", |
|
|
651 | pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-", |
|
|
652 | pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-" |
|
|
653 | ); |
|
|
654 | #endif |
|
|
655 | |
741 | if (pl->ranged_ob) |
656 | if (pl->ranged_ob) |
742 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
657 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
743 | |
658 | |
744 | if (pl->combat_ob) |
659 | if (pl->combat_ob) |
745 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
660 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
… | |
… | |
790 | * commands for now. |
705 | * commands for now. |
791 | */ |
706 | */ |
792 | void |
707 | void |
793 | esrv_update_stats (player *pl) |
708 | esrv_update_stats (player *pl) |
794 | { |
709 | { |
795 | char buf[MAX_BUF]; |
|
|
796 | uint16 flags; |
|
|
797 | |
|
|
798 | client *ns = pl->ns; |
710 | client *ns = pl->ns; |
799 | if (!ns) |
711 | if (!ns) |
800 | return; |
712 | return; |
801 | |
713 | |
802 | object *ob = pl->observe; |
714 | object *ob = pl->observe; |
… | |
… | |
819 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
731 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
820 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
732 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
821 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
733 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
822 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
734 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
823 | |
735 | |
824 | for (int s = 0; s < NUM_SKILLS; s++) |
736 | for (int s = 0; s < CS_NUM_SKILLS; s++) |
825 | if (object *skill = opl->last_skill_ob [s]) |
737 | if (object *skill = opl->last_skill_ob [s]) |
826 | if (skill->stats.exp != ns->last_skill_exp [s]) |
738 | if (skill->stats.exp != ns->last_skill_exp [s]) |
827 | { |
739 | { |
828 | ns->last_skill_exp [s] = skill->stats.exp; |
740 | ns->last_skill_exp [s] = skill->stats.exp; |
829 | |
741 | |
830 | /* Always send along the level if exp changes. This is only |
742 | /* Always send along the level if exp changes. This is only |
831 | * 1 extra byte, but keeps processing simpler. |
743 | * 1 extra byte, but keeps processing simpler. |
832 | */ |
744 | */ |
833 | sl << uint8 (s + CS_STAT_SKILLINFO) |
745 | sl << uint8 (CS_STAT_SKILLINFO + s) |
834 | << uint8 (skill->level) |
746 | << uint8 (skill->level) |
835 | << uint64 (skill->stats.exp); |
747 | << uint64 (skill->stats.exp); |
836 | } |
748 | } |
837 | |
749 | |
838 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
750 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
… | |
… | |
843 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); |
755 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); |
844 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
756 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
845 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK); |
757 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK); |
846 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
758 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
847 | |
759 | |
848 | flags = 0; |
760 | int flags = (opl->fire_on ? SF_FIREON : 0) |
849 | |
761 | | (opl->run_on ? SF_RUNON : 0); |
850 | if (opl->fire_on) |
|
|
851 | flags |= SF_FIREON; |
|
|
852 | |
|
|
853 | if (opl->run_on) |
|
|
854 | flags |= SF_RUNON; |
|
|
855 | |
762 | |
856 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
763 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
857 | |
764 | |
858 | for (int i = 0; i < NROFATTACKS; i++) |
765 | for (int i = 0; i < NROFATTACKS; i++) |
859 | { |
|
|
860 | /* Skip ones we won't send */ |
766 | /* Skip ones we won't send */ |
861 | if (atnr_cs_stat[i] == -1) |
767 | if (atnr_cs_stat[i] >= 0) |
862 | continue; |
|
|
863 | |
|
|
864 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
768 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
865 | } |
|
|
866 | |
769 | |
867 | if (pl->ns->monitor_spells) |
770 | if (pl->ns->monitor_spells) |
868 | { |
771 | { |
869 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
772 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
870 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
773 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
871 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
774 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
872 | } |
775 | } |
873 | |
776 | |
|
|
777 | char buf[MAX_BUF]; |
874 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
778 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
875 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
779 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
876 | set_title (ob, buf); |
780 | set_title (ob, buf); |
877 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
781 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
878 | |
782 | |
… | |
… | |
974 | return 0; |
878 | return 0; |
975 | } |
879 | } |
976 | |
880 | |
977 | //-GPL |
881 | //-GPL |
978 | |
882 | |
979 | // prefetch (and touch) all maps within a specific distancd |
883 | // prefetch maps in an area of PREFETCH x PREFETCH around the player |
980 | static void |
884 | #define PREFETCH 40 |
981 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
982 | { |
|
|
983 | map->touch (); |
|
|
984 | |
|
|
985 | if (--distance) |
|
|
986 | for (int dir = 4; dir--; ) |
|
|
987 | if (const shstr &path = map->tile_path [dir]) |
|
|
988 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
989 | prefetch_surrounding_maps (neigh, distance); |
|
|
990 | else |
|
|
991 | neigh = maptile::find_async (path, map); |
|
|
992 | } |
|
|
993 | |
885 | |
994 | // prefetch a generous area around the player |
886 | // prefetch a generous area around the player |
995 | static void |
887 | static void |
996 | prefetch_surrounding_maps (object *op) |
888 | prefetch_surrounding_maps (object *op) |
997 | { |
889 | { |
998 | prefetch_surrounding_maps (op->map, 3); |
890 | for (maprect *rect = op->map->split_to_tiles (mapwalk_buf, |
|
|
891 | op->x - PREFETCH , op->y - PREFETCH , |
|
|
892 | op->x + PREFETCH + 1, op->y + PREFETCH + 1); |
|
|
893 | rect->m; |
|
|
894 | ++rect) |
|
|
895 | rect->m->touch (); |
999 | } |
896 | } |
1000 | |
897 | |
1001 | //+GPL |
898 | //+GPL |
1002 | |
899 | |
1003 | /** |
900 | /** |
… | |
… | |
1155 | { |
1052 | { |
1156 | if (op->stats.maxhp > op->stats.hp |
1053 | if (op->stats.maxhp > op->stats.hp |
1157 | && op->stats.maxhp > 0 |
1054 | && op->stats.maxhp > 0 |
1158 | && (op->type == PLAYER |
1055 | && (op->type == PLAYER |
1159 | || op->type == DOOR // does not work, have maxhp 0 |
1056 | || op->type == DOOR // does not work, have maxhp 0 |
1160 | || QUERY_FLAG (op, FLAG_MONSTER) |
1057 | || op->flag [FLAG_MONSTER] |
1161 | || QUERY_FLAG (op, FLAG_ALIVE) |
1058 | || op->flag [FLAG_ALIVE] |
1162 | || QUERY_FLAG (op, FLAG_GENERATOR))) |
1059 | || op->flag [FLAG_GENERATOR])) |
1163 | { |
1060 | { |
1164 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1061 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1165 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1062 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1166 | } |
1063 | } |
1167 | |
1064 | |
… | |
… | |
1362 | spell->cached_eat = casting_level (pl->ob, spell); |
1259 | spell->cached_eat = casting_level (pl->ob, spell); |
1363 | |
1260 | |
1364 | /* figure out which skill it uses, if it uses one */ |
1261 | /* figure out which skill it uses, if it uses one */ |
1365 | if (spell->skill) |
1262 | if (spell->skill) |
1366 | if (object *tmp = pl->find_skill (spell->skill)) |
1263 | if (object *tmp = pl->find_skill (spell->skill)) |
1367 | skill = tmp->subtype + CS_STAT_SKILLINFO; |
1264 | skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp); |
1368 | |
1265 | |
1369 | // spells better have a face |
1266 | // spells better have a face |
1370 | if (!spell->face) |
1267 | if (!spell->face) |
1371 | { |
1268 | { |
1372 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1269 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
… | |
… | |
1446 | } |
1343 | } |
1447 | else |
1344 | else |
1448 | append_spell (pl, sl, spell); |
1345 | append_spell (pl, sl, spell); |
1449 | |
1346 | |
1450 | if (sl.length () > MAXSOCKBUF) |
1347 | if (sl.length () > MAXSOCKBUF) |
1451 | { |
|
|
1452 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1348 | cleanup ("buffer overflow in esrv_add_spells!"); |
1453 | fatal (0); |
|
|
1454 | } |
|
|
1455 | |
1349 | |
1456 | /* finally, we can send the packet */ |
1350 | /* finally, we can send the packet */ |
1457 | pl->ns->flush_fx (); |
1351 | pl->ns->flush_fx (); |
1458 | pl->ns->send_packet (sl); |
1352 | pl->ns->send_packet (sl); |
1459 | } |
1353 | } |