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.160 by root, Mon Nov 9 18:47:56 2009 UTC vs.
Revision 1.177 by root, Sat Oct 16 22:51:52 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};
… …
133 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
134 147
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 149
137 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
138
139 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
141
142 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
143} 153}
144 154
145static void 155static void
146send_map_info (player *pl) 156send_map_info (player *pl)
… …
229send_skill_info (client *ns, char *params) 239send_skill_info (client *ns, char *params)
230{ 240{
231 packet sl; 241 packet sl;
232 sl << "replyinfo skill_info\n"; 242 sl << "replyinfo skill_info\n";
233 243
234 for (int i = 1; i < NUM_SKILLS; i++) 244 for (int i = 0; i < skillvec.size (); ++i)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); 245 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
236 246
237 if (sl.length () > MAXSOCKBUF) 247 if (sl.length () > MAXSOCKBUF)
238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 248 cleanup ("buffer overflow in send_skill_info!");
240 fatal (0);
241 }
242 249
243 ns->send_packet (sl); 250 ns->send_packet (sl);
244} 251}
245 252
246/** 253/**
… …
256 263
257 for (int i = 0; i < NRSPELLPATHS; i++) 264 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 265 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259 266
260 if (sl.length () > MAXSOCKBUF) 267 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 268 cleanup ("buffer overflow in send_spell_paths!");
263 fatal (0);
264 }
265 269
266 ns->send_packet (sl); 270 ns->send_packet (sl);
267} 271}
268 272
269/** 273/**
… …
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 451 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 452}
449 453
450//+GPL 454//+GPL
451 455
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/** 456/**
517 * This handles the general commands from the client (ie, north, fire, cast, 457 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 458 * etc.)
519 */ 459 */
520void 460void
… …
577 */ 517 */
578 pl->count = 0; 518 pl->count = 0;
579 519
580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 520 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
581 int time = pl->ob->has_active_speed () 521 int time = pl->ob->has_active_speed ()
582 ? (int) (MAX_TIME / fabs (pl->ob->speed)) 522 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100; 523 : MAX_TIME * 100;
584 524
585 /* Send confirmation of command execution now */ 525 /* Send confirmation of command execution now */
586 packet sl ("comc"); 526 packet sl ("comc");
587 sl << uint16 (cmdid) << uint32 (time); 527 sl << uint16 (cmdid) << uint32 (time);
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 570 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 571 }
632} 572}
633 573
634/** 574/**
635 * Client tells its version. If there is a mismatch, we close the 575 * 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 */ 576 */
641void 577void
642VersionCmd (char *buf, int len, client * ns) 578VersionCmd (char *buf, int len, client *ns)
643{ 579{
644 if (!buf) 580 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} 581}
680 582
681/** sound related functions. */ 583/** sound related functions. */
682void 584void
683SetSound (char *buf, int len, client * ns) 585SetSound (char *buf, int len, client * ns)
… …
736static void 638static void
737rangetostring (player *pl, char *obuf) 639rangetostring (player *pl, char *obuf)
738{ 640{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 641 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 642
643#if 0
644 // print ranged/chosen_skill etc. objects every call
645 printf ("%s %s => %s (%s)\n",
646 pl->ranged_ob ? &pl->ranged_ob->name : "-",
647 pl->combat_ob ? &pl->combat_ob->name : "-",
648 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
649 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
650 );
651#endif
652
741 if (pl->ranged_ob) 653 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 654 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 655
744 if (pl->combat_ob) 656 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 657 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
790 * commands for now. 702 * commands for now.
791 */ 703 */
792void 704void
793esrv_update_stats (player *pl) 705esrv_update_stats (player *pl)
794{ 706{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 707 client *ns = pl->ns;
799 if (!ns) 708 if (!ns)
800 return; 709 return;
801 710
802 object *ob = pl->observe; 711 object *ob = pl->observe;
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 728 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 729 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 730 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 731 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 732
824 for (int s = 0; s < NUM_SKILLS; s++) 733 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob [s]) 734 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 735 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 736 {
828 ns->last_skill_exp [s] = skill->stats.exp; 737 ns->last_skill_exp [s] = skill->stats.exp;
829 738
830 /* Always send along the level if exp changes. This is only 739 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 740 * 1 extra byte, but keeps processing simpler.
832 */ 741 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 742 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 743 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 744 << uint64 (skill->stats.exp);
836 } 745 }
837 746
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 747 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
… …
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); 752 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 753 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); 754 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); 755 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 756
848 flags = 0; 757 int flags = (opl->fire_on ? SF_FIREON : 0)
849 758 | (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 759
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 760 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 761
858 for (int i = 0; i < NROFATTACKS; i++) 762 for (int i = 0; i < NROFATTACKS; i++)
859 {
860 /* Skip ones we won't send */ 763 /* Skip ones we won't send */
861 if (atnr_cs_stat[i] == -1) 764 if (atnr_cs_stat[i] >= 0)
862 continue;
863
864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 765 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
865 }
866 766
867 if (pl->ns->monitor_spells) 767 if (pl->ns->monitor_spells)
868 { 768 {
869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 769 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); 770 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); 771 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
872 } 772 }
873 773
774 char buf[MAX_BUF];
874 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 775 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
875 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 776 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
876 set_title (ob, buf); 777 set_title (ob, buf);
877 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 778 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
878 779
… …
974 return 0; 875 return 0;
975} 876}
976 877
977//-GPL 878//-GPL
978 879
979// prefetch (and touch) all maps within a specific distancd 880// prefetch maps in an area of PREFETCH x PREFETCH around the player
980static void 881#define PREFETCH 40
981prefetch_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 882
994// prefetch a generous area around the player 883// prefetch a generous area around the player
995static void 884static void
996prefetch_surrounding_maps (object *op) 885prefetch_surrounding_maps (object *op)
997{ 886{
998 prefetch_surrounding_maps (op->map, 3); 887 for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
888 op->x - PREFETCH , op->y - PREFETCH ,
889 op->x + PREFETCH + 1, op->y + PREFETCH + 1);
890 rect->m;
891 ++rect)
892 rect->m->touch ();
999} 893}
1000 894
1001//+GPL 895//+GPL
1002 896
1003/** 897/**
… …
1053 * look like. 947 * look like.
1054 */ 948 */
1055 949
1056 client &socket = *pl->ns; 950 client &socket = *pl->ns;
1057 951
1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 952 packet sl ("map1a");
1059 953
1060 startlen = sl.length (); 954 startlen = sl.length ();
1061 955
1062 int hx = socket.mapx / 2; 956 int hx = socket.mapx / 2;
1063 int hy = socket.mapy / 2; 957 int hy = socket.mapy / 2;
… …
1084 map_clearcell (&lastcell, -1); 978 map_clearcell (&lastcell, -1);
1085 } 979 }
1086 980
1087 continue; 981 continue;
1088 } 982 }
1089 983
1090 int d = pl->blocked_los_uc (dx, dy); 984 int d = pl->blocked_los_uc (dx, dy);
1091 985
1092 if (d > 3) 986 if (d > 3)
1093 { 987 {
1094 /* This block deals with spaces that are not visible for whatever 988 /* This block deals with spaces that are not visible for whatever
… …
1155 { 1049 {
1156 if (op->stats.maxhp > op->stats.hp 1050 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0 1051 && op->stats.maxhp > 0
1158 && (op->type == PLAYER 1052 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0 1053 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER) 1054 || op->flag [FLAG_MONSTER]
1161 || QUERY_FLAG (op, FLAG_ALIVE) 1055 || op->flag [FLAG_ALIVE]
1162 || QUERY_FLAG (op, FLAG_GENERATOR))) 1056 || op->flag [FLAG_GENERATOR]))
1163 { 1057 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1058 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 1059 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 } 1060 }
1167 1061
… …
1279 1173
1280 if (!pl->ns->monitor_spells) 1174 if (!pl->ns->monitor_spells)
1281 return; 1175 return;
1282 1176
1283 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1177 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1284 {
1285 if (spell->type == SPELL) 1178 if (spell->type == SPELL)
1286 { 1179 {
1287 int flags = 0; 1180 int flags = 0;
1181 int val;
1288 1182
1289 /* check if we need to update it */ 1183 /* check if we need to update it */
1290 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1184 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1185 if (spell->cached_sp != val)
1291 { 1186 {
1292 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1187 spell->cached_sp = val;
1293 flags |= UPD_SP_MANA; 1188 flags |= UPD_SP_MANA;
1294 } 1189 }
1295 1190
1296 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1191 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1192 if (spell->cached_grace != val)
1297 { 1193 {
1298 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1194 spell->cached_grace = val;
1299 flags |= UPD_SP_GRACE; 1195 flags |= UPD_SP_GRACE;
1300 } 1196 }
1301 1197
1302 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1198 val = casting_level (pl->ob, spell);
1199 if (spell->cached_eat != val)
1303 { 1200 {
1304 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1201 spell->cached_eat = val;
1305 flags |= UPD_SP_DAMAGE; 1202 flags |= UPD_SP_LEVEL;
1306 } 1203 }
1307 1204
1308 if (flags) 1205 if (flags)
1309 { 1206 {
1310 packet sl; 1207 packet sl;
1311 1208
1312 sl << "updspell " 1209 sl << "updspell "
1313 << uint8 (flags) 1210 << uint8 (flags)
1314 << uint32 (spell->count); 1211 << uint32 (spell->count);
1315 1212
1316 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1213 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1317 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1214 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1318 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1215 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1319 1216
1320 pl->ns->send_packet (sl); 1217 pl->ns->send_packet (sl);
1321 } 1218 }
1322 } 1219 }
1323 }
1324} 1220}
1325 1221
1326void 1222void
1327esrv_remove_spell (player *pl, object *spell) 1223esrv_remove_spell (player *pl, object *spell)
1328{ 1224{
… …
1355 } 1251 }
1356 1252
1357 /* store costs and damage in the object struct, to compare to later */ 1253 /* store costs and damage in the object struct, to compare to later */
1358 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1254 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1359 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1255 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1360 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1256 spell->cached_eat = casting_level (pl->ob, spell);
1361 1257
1362 /* figure out which skill it uses, if it uses one */ 1258 /* figure out which skill it uses, if it uses one */
1363 if (spell->skill) 1259 if (spell->skill)
1364 if (object *tmp = pl->find_skill (spell->skill)) 1260 if (object *tmp = pl->find_skill (spell->skill))
1365 skill = tmp->subtype + CS_STAT_SKILLINFO; 1261 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1366 1262
1367 // spells better have a face 1263 // spells better have a face
1368 if (!spell->face) 1264 if (!spell->face)
1369 { 1265 {
1370 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1266 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1444 } 1340 }
1445 else 1341 else
1446 append_spell (pl, sl, spell); 1342 append_spell (pl, sl, spell);
1447 1343
1448 if (sl.length () > MAXSOCKBUF) 1344 if (sl.length () > MAXSOCKBUF)
1449 {
1450 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1345 cleanup ("buffer overflow in esrv_add_spells!");
1451 fatal (0);
1452 }
1453 1346
1454 /* finally, we can send the packet */ 1347 /* finally, we can send the packet */
1455 pl->ns->flush_fx (); 1348 pl->ns->flush_fx ();
1456 pl->ns->send_packet (sl); 1349 pl->ns->send_packet (sl);
1457} 1350}

Diff Legend

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