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.157 by root, Fri Nov 6 13:05:57 2009 UTC vs.
Revision 1.175 by root, Wed Apr 21 05:48:22 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.
… …
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 */
71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static 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};
… …
223 236
224/** 237/**
225 * This sends the skill number to name mapping. We ignore 238 * This sends the skill number to name mapping. We ignore
226 * the params - we always send the same info no matter what. 239 * the params - we always send the same info no matter what.
227 */ 240 */
228void 241static void
229send_skill_info (client *ns, char *params) 242send_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 { 251 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
240 fatal (0); 253 fatal (0);
… …
245 258
246/** 259/**
247 * This sends the spell path to name mapping. We ignore 260 * This sends the spell path to name mapping. We ignore
248 * the params - we always send the same info no matter what. 261 * the params - we always send the same info no matter what.
249 */ 262 */
250void 263static void
251send_spell_paths (client * ns, char *params) 264send_spell_paths (client * ns, char *params)
252{ 265{
253 packet sl; 266 packet sl;
254 267
255 sl << "replyinfo spell_paths\n"; 268 sl << "replyinfo spell_paths\n";
… …
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 460 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 461}
449 462
450//+GPL 463//+GPL
451 464
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 */
461void
462ToggleExtendedText (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/** 465/**
517 * 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,
518 * etc.) 467 * etc.)
519 */ 468 */
520void 469void
… …
576 * commands. 525 * commands.
577 */ 526 */
578 pl->count = 0; 527 pl->count = 0;
579 528
580 //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
581 int time = fabs (pl->ob->speed) < 0.001 530 int time = pl->ob->has_active_speed ()
582 ? time = MAX_TIME * 100
583 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 531 ? (int) (MAX_TIME / pl->ob->speed)
532 : MAX_TIME * 100;
584 533
585 /* Send confirmation of command execution now */ 534 /* Send confirmation of command execution now */
586 packet sl ("comc"); 535 packet sl ("comc");
587 sl << uint16 (cmdid) << uint32 (time); 536 sl << uint16 (cmdid) << uint32 (time);
588 pl->ns->send_packet (sl); 537 pl->ns->send_packet (sl);
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 579 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 580 }
632} 581}
633 582
634/** 583/**
635 * Client tells its version. If there is a mismatch, we close the 584 * 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 */ 585 */
641void 586void
642VersionCmd (char *buf, int len, client * ns) 587VersionCmd (char *buf, int len, client *ns)
643{ 588{
644 if (!buf) 589 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} 590}
680 591
681/** sound related functions. */ 592/** sound related functions. */
682void 593void
683SetSound (char *buf, int len, client * ns) 594SetSound (char *buf, int len, client * ns)
… …
736static void 647static void
737rangetostring (player *pl, char *obuf) 648rangetostring (player *pl, char *obuf)
738{ 649{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 650 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 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
741 if (pl->ranged_ob) 662 if (pl->ranged_ob)
742 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;
743 664
744 if (pl->combat_ob) 665 if (pl->combat_ob)
745 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;
… …
790 * commands for now. 711 * commands for now.
791 */ 712 */
792void 713void
793esrv_update_stats (player *pl) 714esrv_update_stats (player *pl)
794{ 715{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 716 client *ns = pl->ns;
799 if (!ns) 717 if (!ns)
800 return; 718 return;
801 719
802 object *ob = pl->observe; 720 object *ob = pl->observe;
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 737 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 738 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 739 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 740 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 741
824 for (int s = 0; s < NUM_SKILLS; s++) 742 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob [s]) 743 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 744 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 745 {
828 ns->last_skill_exp [s] = skill->stats.exp; 746 ns->last_skill_exp [s] = skill->stats.exp;
829 747
830 /* Always send along the level if exp changes. This is only 748 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 749 * 1 extra byte, but keeps processing simpler.
832 */ 750 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 751 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 752 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 753 << uint64 (skill->stats.exp);
836 } 754 }
837 755
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 756 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 757 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 758 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 759 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 760 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 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);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 762 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); 763 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); 764 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 765
848 flags = 0; 766 int flags = (opl->fire_on ? SF_FIREON : 0)
849 767 | (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 768
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 769 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 770
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 771 for (int i = 0; i < NROFATTACKS; i++)
862 {
863 /* Skip ones we won't send */ 772 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 773 if (atnr_cs_stat[i] >= 0)
865 continue;
866
867 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]);
868 }
869 775
870 if (pl->ns->monitor_spells) 776 if (pl->ns->monitor_spells)
871 { 777 {
872 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);
873 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);
874 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);
875 } 781 }
876 782
783 char buf[MAX_BUF];
877 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 */
878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 785 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879 set_title (ob, buf); 786 set_title (ob, buf);
880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 787 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881 788
… …
977 return 0; 884 return 0;
978} 885}
979 886
980//-GPL 887//-GPL
981 888
982// prefetch (and touch) all maps within a specific distancd 889// prefetch maps in an area of PREFETCH x PREFETCH around the player
983static void 890#define PREFETCH 40
984prefetch_surrounding_maps (maptile *map, int distance)
985{
986 map->touch ();
987
988 if (--distance)
989 for (int dir = 4; --dir; )
990 if (const shstr &path = map->tile_path [dir])
991 if (maptile *&neigh = map->tile_map [dir])
992 prefetch_surrounding_maps (neigh, distance);
993 else
994 neigh = maptile::find_async (path, map);
995}
996 891
997// prefetch a generous area around the player 892// prefetch a generous area around the player
998static void 893static void
999prefetch_surrounding_maps (object *op) 894prefetch_surrounding_maps (object *op)
1000{ 895{
1001 prefetch_surrounding_maps (op->map, 3); 896 for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
897 op->x - PREFETCH , op->y - PREFETCH ,
898 op->x + PREFETCH + 1, op->y + PREFETCH + 1);
899 rect->m;
900 ++rect)
901 rect->m->touch ();
1002} 902}
1003 903
1004//+GPL 904//+GPL
1005 905
1006/** 906/**
… …
1087 map_clearcell (&lastcell, -1); 987 map_clearcell (&lastcell, -1);
1088 } 988 }
1089 989
1090 continue; 990 continue;
1091 } 991 }
1092 992
1093 int d = pl->blocked_los_uc (dx, dy); 993 int d = pl->blocked_los_uc (dx, dy);
1094 994
1095 if (d > 3) 995 if (d > 3)
1096 { 996 {
1097 /* This block deals with spaces that are not visible for whatever 997 /* This block deals with spaces that are not visible for whatever
… …
1158 { 1058 {
1159 if (op->stats.maxhp > op->stats.hp 1059 if (op->stats.maxhp > op->stats.hp
1160 && op->stats.maxhp > 0 1060 && op->stats.maxhp > 0
1161 && (op->type == PLAYER 1061 && (op->type == PLAYER
1162 || op->type == DOOR // does not work, have maxhp 0 1062 || op->type == DOOR // does not work, have maxhp 0
1163 || QUERY_FLAG (op, FLAG_MONSTER) 1063 || op->flag [FLAG_MONSTER]
1164 || QUERY_FLAG (op, FLAG_ALIVE) 1064 || op->flag [FLAG_ALIVE]
1165 || QUERY_FLAG (op, FLAG_GENERATOR))) 1065 || op->flag [FLAG_GENERATOR]))
1166 { 1066 {
1167 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1067 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1168 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1068 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1169 } 1069 }
1170 1070
… …
1266 socket.send_packet (sl); 1166 socket.send_packet (sl);
1267 socket.sent_scroll = 0; 1167 socket.sent_scroll = 0;
1268 } 1168 }
1269} 1169}
1270 1170
1271/*****************************************************************************/
1272/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1273/* a player. Of course, the client need to know the command to be able to */
1274/* manage it ! */
1275/*****************************************************************************/
1276void
1277send_plugin_custom_message (object *pl, char *buf)
1278{
1279 pl->contr->ns->send_packet (buf);
1280}
1281
1282/** 1171/**
1283 * This looks for any spells the player may have that have changed their stats. 1172 * This looks for any spells the player may have that have changed their stats.
1284 * it then sends an updspell packet for each spell that has changed in this way 1173 * it then sends an updspell packet for each spell that has changed in this way
1285 */ 1174 */
1286void 1175void
1287esrv_update_spells (player *pl) 1176esrv_update_spells (player *pl)
1288{ 1177{
1289 if (!pl->ns) 1178 if (!pl->ns)
1290 return; 1179 return;
1291 1180
1181 pl->ns->update_spells = false;
1182
1292 if (!pl->ns->monitor_spells) 1183 if (!pl->ns->monitor_spells)
1293 return; 1184 return;
1294 1185
1295 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1186 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1296 {
1297 if (spell->type == SPELL) 1187 if (spell->type == SPELL)
1298 { 1188 {
1299 int flags = 0; 1189 int flags = 0;
1190 int val;
1300 1191
1301 /* check if we need to update it */ 1192 /* check if we need to update it */
1302 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1193 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1194 if (spell->cached_sp != val)
1303 { 1195 {
1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1196 spell->cached_sp = val;
1305 flags |= UPD_SP_MANA; 1197 flags |= UPD_SP_MANA;
1306 } 1198 }
1307 1199
1308 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1200 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1201 if (spell->cached_grace != val)
1309 { 1202 {
1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1203 spell->cached_grace = val;
1311 flags |= UPD_SP_GRACE; 1204 flags |= UPD_SP_GRACE;
1312 } 1205 }
1313 1206
1314 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1207 val = casting_level (pl->ob, spell);
1208 if (spell->cached_eat != val)
1315 { 1209 {
1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1210 spell->cached_eat = val;
1317 flags |= UPD_SP_DAMAGE; 1211 flags |= UPD_SP_LEVEL;
1318 } 1212 }
1319 1213
1320 if (flags) 1214 if (flags)
1321 { 1215 {
1322 packet sl; 1216 packet sl;
1323 1217
1324 sl << "updspell " 1218 sl << "updspell "
1325 << uint8 (flags) 1219 << uint8 (flags)
1326 << uint32 (spell->count); 1220 << uint32 (spell->count);
1327 1221
1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1222 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1223 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1224 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1331 1225
1332 pl->ns->send_packet (sl); 1226 pl->ns->send_packet (sl);
1333 } 1227 }
1334 } 1228 }
1335 }
1336} 1229}
1337 1230
1338void 1231void
1339esrv_remove_spell (player *pl, object *spell) 1232esrv_remove_spell (player *pl, object *spell)
1340{ 1233{
… …
1367 } 1260 }
1368 1261
1369 /* store costs and damage in the object struct, to compare to later */ 1262 /* store costs and damage in the object struct, to compare to later */
1370 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1263 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1264 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1265 spell->cached_eat = casting_level (pl->ob, spell);
1373 1266
1374 /* figure out which skill it uses, if it uses one */ 1267 /* figure out which skill it uses, if it uses one */
1375 if (spell->skill) 1268 if (spell->skill)
1376 if (object *tmp = pl->find_skill (spell->skill)) 1269 if (object *tmp = pl->find_skill (spell->skill))
1377 skill = tmp->subtype + CS_STAT_SKILLINFO; 1270 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1378 1271
1379 // spells better have a face 1272 // spells better have a face
1380 if (!spell->face) 1273 if (!spell->face)
1381 { 1274 {
1382 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1275 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);

Diff Legend

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