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.155 by root, Thu Nov 5 16:03:07 2009 UTC vs.
Revision 1.174 by root, Thu Apr 15 00:40:34 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
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 */
71short 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};
… …
220 socket.current_x = ob->x; 233 socket.current_x = ob->x;
221 socket.current_y = ob->y; 234 socket.current_y = ob->y;
222} 235}
223 236
224/** 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);
280}
281
282/**
225 * RequestInfo is sort of a meta command. There is some specific 283 * RequestInfo is sort of a meta command. There is some specific
226 * request of information, but we call other functions to provide 284 * request of information, but we call other functions to provide
227 * that information. 285 * that information.
228 */ 286 */
229void 287void
… …
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 460 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 461}
404 462
405//+GPL 463//+GPL
406 464
407/*
408#define MSG_TYPE_BOOK 1
409#define MSG_TYPE_CARD 2
410#define MSG_TYPE_PAPER 3
411#define MSG_TYPE_SIGN 4
412#define MSG_TYPE_MONUMENT 5
413#define MSG_TYPE_SCRIPTED_DIALOG 6*/
414
415/** Reply to ExtendedInfos command */
416void
417ToggleExtendedText (char *buf, int len, client * ns)
418{
419 char cmdback[MAX_BUF];
420 char temp[10];
421 char command[50];
422 int info, nextinfo, i, flag;
423
424 cmdback[0] = '\0';
425
426 nextinfo = 0;
427 while (1)
428 {
429 /* 1. Extract an info */
430 info = nextinfo;
431
432 while ((info < len) && (buf [info] == ' '))
433 info++;
434
435 if (info >= len)
436 break;
437
438 nextinfo = info + 1;
439
440 while ((nextinfo < len) && (buf [nextinfo] != ' '))
441 nextinfo++;
442
443 if (nextinfo - info >= 49) /*Erroneous info asked */
444 continue;
445
446 memcpy (command, buf + info, nextinfo - info);
447 command [nextinfo - info] = 0;
448
449 /* 2. Interpret info */
450 i = sscanf (command, "%d", &flag);
451
452 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
453 ns->supported_readables |= (1 << flag);
454 /*3. Next info */
455 }
456
457 /* Send resulting state */
458 strcpy (cmdback, "ExtendedTextSet");
459
460 for (i = 0; i <= MSG_TYPE_LAST; i++)
461 if (ns->supported_readables & (1 << i))
462 {
463 strcat (cmdback, " ");
464 snprintf (temp, sizeof (temp), "%d", i);
465 strcat (cmdback, temp);
466 }
467
468 ns->send_packet (cmdback);
469}
470
471/** 465/**
472 * 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,
473 * etc.) 467 * etc.)
474 */ 468 */
475void 469void
… …
531 * commands. 525 * commands.
532 */ 526 */
533 pl->count = 0; 527 pl->count = 0;
534 528
535 //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
536 int time = fabs (pl->ob->speed) < 0.001 530 int time = pl->ob->has_active_speed ()
537 ? time = MAX_TIME * 100
538 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 531 ? (int) (MAX_TIME / pl->ob->speed)
532 : MAX_TIME * 100;
539 533
540 /* Send confirmation of command execution now */ 534 /* Send confirmation of command execution now */
541 packet sl ("comc"); 535 packet sl ("comc");
542 sl << uint16 (cmdid) << uint32 (time); 536 sl << uint16 (cmdid) << uint32 (time);
543 pl->ns->send_packet (sl); 537 pl->ns->send_packet (sl);
… …
585 LOG (llevError, "Unknown input state: %d\n", ns->state); 579 LOG (llevError, "Unknown input state: %d\n", ns->state);
586 } 580 }
587} 581}
588 582
589/** 583/**
590 * Client tells its version. If there is a mismatch, we close the 584 * Client tells its version info.
591 * socket. In real life, all we should care about is the client having
592 * something older than the server. If we assume the client will be
593 * backwards compatible, having it be a later version should not be a
594 * problem.
595 */ 585 */
596void 586void
597VersionCmd (char *buf, int len, client * ns) 587VersionCmd (char *buf, int len, client *ns)
598{ 588{
599 if (!buf) 589 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
600 {
601 LOG (llevError, "CS: received corrupted version command\n");
602 return;
603 }
604
605 ns->cs_version = atoi (buf);
606 ns->sc_version = ns->cs_version;
607
608 LOG (llevDebug, "connection from client <%s>\n", buf);
609
610 //TODO: should log here just for statistics
611
612 //if (VERSION_CS != ns->cs_version)
613 // unchecked;
614
615 char *cp = strchr (buf + 1, ' ');
616 if (!cp)
617 return;
618
619 ns->sc_version = atoi (cp);
620
621 //if (VERSION_SC != ns->sc_version)
622 // unchecked;
623
624 cp = strchr (cp + 1, ' ');
625
626 if (cp)
627 {
628 ns->version = cp + 1;
629
630 if (ns->sc_version < 1026)
631 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
632 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
633 }
634} 590}
635 591
636/** sound related functions. */ 592/** sound related functions. */
637void 593void
638SetSound (char *buf, int len, client * ns) 594SetSound (char *buf, int len, client * ns)
… …
691static void 647static void
692rangetostring (player *pl, char *obuf) 648rangetostring (player *pl, char *obuf)
693{ 649{
694 dynbuf_text &buf = msg_dynbuf; buf.clear (); 650 dynbuf_text &buf = msg_dynbuf; buf.clear ();
695 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
696 if (pl->ranged_ob) 662 if (pl->ranged_ob)
697 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;
698 664
699 if (pl->combat_ob) 665 if (pl->combat_ob)
700 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;
… …
745 * commands for now. 711 * commands for now.
746 */ 712 */
747void 713void
748esrv_update_stats (player *pl) 714esrv_update_stats (player *pl)
749{ 715{
750 char buf[MAX_BUF];
751 uint16 flags;
752
753 client *ns = pl->ns; 716 client *ns = pl->ns;
754 if (!ns) 717 if (!ns)
755 return; 718 return;
756 719
757 object *ob = pl->observe; 720 object *ob = pl->observe;
… …
774 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 737 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
775 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 738 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
776 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 739 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
777 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 740 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
778 741
779 for (int s = 0; s < NUM_SKILLS; s++) 742 for (int s = 0; s < CS_NUM_SKILLS; s++)
780 if (object *skill = opl->last_skill_ob [s]) 743 if (object *skill = opl->last_skill_ob [s])
781 if (skill->stats.exp != ns->last_skill_exp [s]) 744 if (skill->stats.exp != ns->last_skill_exp [s])
782 { 745 {
783 ns->last_skill_exp [s] = skill->stats.exp; 746 ns->last_skill_exp [s] = skill->stats.exp;
784 747
785 /* Always send along the level if exp changes. This is only 748 /* Always send along the level if exp changes. This is only
786 * 1 extra byte, but keeps processing simpler. 749 * 1 extra byte, but keeps processing simpler.
787 */ 750 */
788 sl << uint8 (s + CS_STAT_SKILLINFO) 751 sl << uint8 (CS_STAT_SKILLINFO + s)
789 << uint8 (skill->level) 752 << uint8 (skill->level)
790 << uint64 (skill->stats.exp); 753 << uint64 (skill->stats.exp);
791 } 754 }
792 755
793 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 756 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
794 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 757 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
795 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 758 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
796 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 759 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
797 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 760 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
798 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);
799 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 762 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
800 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);
801 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);
802 765
803 flags = 0; 766 int flags = (opl->fire_on ? SF_FIREON : 0)
804 767 | (opl->run_on ? SF_RUNON : 0);
805 if (opl->fire_on)
806 flags |= SF_FIREON;
807
808 if (opl->run_on)
809 flags |= SF_RUNON;
810 768
811 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 769 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
812 770
813 if (ns->sc_version < 1025)
814 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
815 else
816 for (int i = 0; i < NROFATTACKS; i++) 771 for (int i = 0; i < NROFATTACKS; i++)
817 {
818 /* Skip ones we won't send */ 772 /* Skip ones we won't send */
819 if (atnr_cs_stat[i] == -1) 773 if (atnr_cs_stat[i] >= 0)
820 continue;
821
822 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]);
823 }
824 775
825 if (pl->ns->monitor_spells) 776 if (pl->ns->monitor_spells)
826 { 777 {
827 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);
828 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);
829 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);
830 } 781 }
831 782
783 char buf[MAX_BUF];
832 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 */
833 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 785 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
834 set_title (ob, buf); 786 set_title (ob, buf);
835 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 787 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
836 788
… …
939prefetch_surrounding_maps (maptile *map, int distance) 891prefetch_surrounding_maps (maptile *map, int distance)
940{ 892{
941 map->touch (); 893 map->touch ();
942 894
943 if (--distance) 895 if (--distance)
944 for (int dir = 4; --dir; ) 896 for (int dir = 4; dir--; )
945 if (const shstr &path = map->tile_path [dir]) 897 if (const shstr &path = map->tile_path [dir])
946 if (maptile *&neigh = map->tile_map [dir]) 898 if (maptile *&neigh = map->tile_map [dir])
947 prefetch_surrounding_maps (neigh, distance); 899 prefetch_surrounding_maps (neigh, distance);
948 else 900 else
949 neigh = maptile::find_async (path, map); 901 neigh = maptile::find_async (path, map);
… …
1042 map_clearcell (&lastcell, -1); 994 map_clearcell (&lastcell, -1);
1043 } 995 }
1044 996
1045 continue; 997 continue;
1046 } 998 }
1047 999
1048 int d = pl->blocked_los_uc (dx, dy); 1000 int d = pl->blocked_los_uc (dx, dy);
1049 1001
1050 if (d > 3) 1002 if (d > 3)
1051 { 1003 {
1052 /* This block deals with spaces that are not visible for whatever 1004 /* This block deals with spaces that are not visible for whatever
… …
1113 { 1065 {
1114 if (op->stats.maxhp > op->stats.hp 1066 if (op->stats.maxhp > op->stats.hp
1115 && op->stats.maxhp > 0 1067 && op->stats.maxhp > 0
1116 && (op->type == PLAYER 1068 && (op->type == PLAYER
1117 || op->type == DOOR // does not work, have maxhp 0 1069 || op->type == DOOR // does not work, have maxhp 0
1118 || QUERY_FLAG (op, FLAG_MONSTER) 1070 || op->flag [FLAG_MONSTER]
1119 || QUERY_FLAG (op, FLAG_ALIVE) 1071 || op->flag [FLAG_ALIVE]
1120 || QUERY_FLAG (op, FLAG_GENERATOR))) 1072 || op->flag [FLAG_GENERATOR]))
1121 { 1073 {
1122 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1074 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1123 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
1124 } 1076 }
1125 1077
… …
1221 socket.send_packet (sl); 1173 socket.send_packet (sl);
1222 socket.sent_scroll = 0; 1174 socket.sent_scroll = 0;
1223 } 1175 }
1224} 1176}
1225 1177
1226/*****************************************************************************/
1227/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1228/* a player. Of course, the client need to know the command to be able to */
1229/* manage it ! */
1230/*****************************************************************************/
1231void
1232send_plugin_custom_message (object *pl, char *buf)
1233{
1234 pl->contr->ns->send_packet (buf);
1235}
1236
1237/**
1238 * This sends the skill number to name mapping. We ignore
1239 * the params - we always send the same info no matter what.
1240 */
1241void
1242send_skill_info (client *ns, char *params)
1243{
1244 packet sl;
1245 sl << "replyinfo skill_info\n";
1246
1247 for (int i = 1; i < NUM_SKILLS; i++)
1248 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1249
1250 if (sl.length () > MAXSOCKBUF)
1251 {
1252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1253 fatal (0);
1254 }
1255
1256 ns->send_packet (sl);
1257}
1258
1259/**
1260 * This sends the spell path to name mapping. We ignore
1261 * the params - we always send the same info no matter what.
1262 */
1263void
1264send_spell_paths (client * ns, char *params)
1265{
1266 packet sl;
1267
1268 sl << "replyinfo spell_paths\n";
1269
1270 for (int i = 0; i < NRSPELLPATHS; i++)
1271 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1272
1273 if (sl.length () > MAXSOCKBUF)
1274 {
1275 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1276 fatal (0);
1277 }
1278
1279 ns->send_packet (sl);
1280}
1281
1282/** 1178/**
1283 * 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.
1284 * 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
1285 */ 1181 */
1286void 1182void
1287esrv_update_spells (player *pl) 1183esrv_update_spells (player *pl)
1288{ 1184{
1289 if (!pl->ns) 1185 if (!pl->ns)
1290 return; 1186 return;
1291 1187
1188 pl->ns->update_spells = false;
1189
1292 if (!pl->ns->monitor_spells) 1190 if (!pl->ns->monitor_spells)
1293 return; 1191 return;
1294 1192
1295 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1193 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1296 {
1297 if (spell->type == SPELL) 1194 if (spell->type == SPELL)
1298 { 1195 {
1299 int flags = 0; 1196 int flags = 0;
1197 int val;
1300 1198
1301 /* check if we need to update it */ 1199 /* check if we need to update it */
1302 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)
1303 { 1202 {
1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1203 spell->cached_sp = val;
1305 flags |= UPD_SP_MANA; 1204 flags |= UPD_SP_MANA;
1306 } 1205 }
1307 1206
1308 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)
1309 { 1209 {
1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1210 spell->cached_grace = val;
1311 flags |= UPD_SP_GRACE; 1211 flags |= UPD_SP_GRACE;
1312 } 1212 }
1313 1213
1314 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)
1315 { 1216 {
1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1217 spell->cached_eat = val;
1317 flags |= UPD_SP_DAMAGE; 1218 flags |= UPD_SP_LEVEL;
1318 } 1219 }
1319 1220
1320 if (flags) 1221 if (flags)
1321 { 1222 {
1322 packet sl; 1223 packet sl;
1323 1224
1324 sl << "updspell " 1225 sl << "updspell "
1325 << uint8 (flags) 1226 << uint8 (flags)
1326 << uint32 (spell->count); 1227 << uint32 (spell->count);
1327 1228
1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1229 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1230 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1231 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1331 1232
1332 pl->ns->send_packet (sl); 1233 pl->ns->send_packet (sl);
1333 } 1234 }
1334 } 1235 }
1335 }
1336} 1236}
1337 1237
1338void 1238void
1339esrv_remove_spell (player *pl, object *spell) 1239esrv_remove_spell (player *pl, object *spell)
1340{ 1240{
… …
1367 } 1267 }
1368 1268
1369 /* 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 */
1370 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);
1371 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);
1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1272 spell->cached_eat = casting_level (pl->ob, spell);
1373 1273
1374 /* figure out which skill it uses, if it uses one */ 1274 /* figure out which skill it uses, if it uses one */
1375 if (spell->skill) 1275 if (spell->skill)
1376 if (object *tmp = pl->find_skill (spell->skill)) 1276 if (object *tmp = pl->find_skill (spell->skill))
1377 skill = tmp->subtype + CS_STAT_SKILLINFO; 1277 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1378 1278
1379 // spells better have a face 1279 // spells better have a face
1380 if (!spell->face) 1280 if (!spell->face)
1381 { 1281 {
1382 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);

Diff Legend

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