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.146 by root, Sat Dec 27 01:25:00 2008 UTC vs.
Revision 1.171 by root, Sun Apr 11 00:34:07 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] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
141 143
142static void 144static void
143send_map_info (player *pl) 145send_map_info (player *pl)
144{ 146{
145 client &socket = *pl->ns; 147 client &socket = *pl->ns;
146 object *ob = pl->observe; 148 object *ob = pl->viewpoint;
147 149
148 if (socket.mapinfocmd) 150 if (socket.mapinfocmd)
149 { 151 {
150 if (ob->map && ob->map->path[0]) 152 if (ob->map && ob->map->path[0])
151 { 153 {
… …
168/** check for map/region change and send new map data */ 170/** check for map/region change and send new map data */
169static void 171static void
170check_map_change (player *pl) 172check_map_change (player *pl)
171{ 173{
172 client &socket = *pl->ns; 174 client &socket = *pl->ns;
173 object *ob = pl->observe; 175 object *ob = pl->viewpoint;
174 176
175 region *reg = ob->region (); 177 region *reg = ob->region ();
176 if (socket.current_region != reg) 178 if (socket.current_region != reg)
177 { 179 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 180 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
… …
214 socket.floorbox_reset (); 216 socket.floorbox_reset ();
215 } 217 }
216 218
217 socket.current_x = ob->x; 219 socket.current_x = ob->x;
218 socket.current_y = ob->y; 220 socket.current_y = ob->y;
221}
222
223/**
224 * This sends the skill number to name mapping. We ignore
225 * the params - we always send the same info no matter what.
226 */
227static void
228send_skill_info (client *ns, char *params)
229{
230 packet sl;
231 sl << "replyinfo skill_info\n";
232
233 for (int i = 1; i < NUM_SKILLS; i++)
234 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
235
236 if (sl.length () > MAXSOCKBUF)
237 {
238 LOG (llevError, "Buffer overflow in send_skill_info!\n");
239 fatal (0);
240 }
241
242 ns->send_packet (sl);
243}
244
245/**
246 * This sends the spell path to name mapping. We ignore
247 * the params - we always send the same info no matter what.
248 */
249static void
250send_spell_paths (client * ns, char *params)
251{
252 packet sl;
253
254 sl << "replyinfo spell_paths\n";
255
256 for (int i = 0; i < NRSPELLPATHS; i++)
257 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
258
259 if (sl.length () > MAXSOCKBUF)
260 {
261 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
262 fatal (0);
263 }
264
265 ns->send_packet (sl);
219} 266}
220 267
221/** 268/**
222 * RequestInfo is sort of a meta command. There is some specific 269 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 270 * request of information, but we call other functions to provide
… …
236 { 283 {
237 *params++ = 0; 284 *params++ = 0;
238 break; 285 break;
239 } 286 }
240 287
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")) 288 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 289 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 290 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 291 send_spell_paths (ns, params);
249 else 292 else
250 { 293 {
… …
266ExtiCmd (char *buf, int len, client *ns) 309ExtiCmd (char *buf, int len, client *ns)
267{ 310{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 311 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 312}
270 313
314//-GPL
315
271void 316void
272client::mapinfo_queue_clear () 317client::mapinfo_queue_clear ()
273{ 318{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 319 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 320 free (*i);
… …
282{ 327{
283 char *token = buf; 328 char *token = buf;
284 buf += strlen (buf) + 9; 329 buf += strlen (buf) + 9;
285 330
286 // initial map and its origin 331 // initial map and its origin
287 maptile *map = pl->observe->map; 332 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 333 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 334 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 335 int max_distance = 8; // limit maximum path length to something generous
291 336
292 while (*buf && map && max_distance) 337 while (*buf && map && max_distance)
293 { 338 {
294 int dir = *buf++ - '1'; 339 int dir = *buf++ - '1';
… …
399AddMeCmd (char *buf, int len, client *ns) 444AddMeCmd (char *buf, int len, client *ns)
400{ 445{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 446 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 447}
403 448
404/* 449//+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 450
467/** 451/**
468 * This handles the general commands from the client (ie, north, fire, cast, 452 * This handles the general commands from the client (ie, north, fire, cast,
469 * etc.) 453 * etc.)
470 */ 454 */
… …
483 return; 467 return;
484 468
485 buf++; 469 buf++;
486 } 470 }
487 471
488 execute_newserver_command (pl->ob, (char *) buf); 472 execute_newserver_command (pl->ob, (char *)buf);
489 473
490 /* Perhaps something better should be done with a left over count. 474 /* Perhaps something better should be done with a left over count.
491 * Cleaning up the input should probably be done first - all actions 475 * 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 476 * for the command that issued the count should be done before any other
493 * commands. 477 * commands.
… …
527 * commands. 511 * commands.
528 */ 512 */
529 pl->count = 0; 513 pl->count = 0;
530 514
531 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 515 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
532 int time = fabs (pl->ob->speed) < 0.001 516 int time = pl->ob->has_active_speed ()
533 ? time = MAX_TIME * 100
534 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 517 ? (int) (MAX_TIME / pl->ob->speed)
518 : MAX_TIME * 100;
535 519
536 /* Send confirmation of command execution now */ 520 /* Send confirmation of command execution now */
537 packet sl ("comc"); 521 packet sl ("comc");
538 sl << uint16 (cmdid) << uint32 (time); 522 sl << uint16 (cmdid) << uint32 (time);
539 pl->ns->send_packet (sl); 523 pl->ns->send_packet (sl);
… …
581 LOG (llevError, "Unknown input state: %d\n", ns->state); 565 LOG (llevError, "Unknown input state: %d\n", ns->state);
582 } 566 }
583} 567}
584 568
585/** 569/**
586 * Client tells its version. If there is a mismatch, we close the 570 * 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 */ 571 */
592void 572void
593VersionCmd (char *buf, int len, client * ns) 573VersionCmd (char *buf, int len, client *ns)
594{ 574{
595 if (!buf) 575 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} 576}
631 577
632/** sound related functions. */ 578/** sound related functions. */
633void 579void
634SetSound (char *buf, int len, client * ns) 580SetSound (char *buf, int len, client * ns)
… …
685 * Get player's current range attack in obuf. 631 * Get player's current range attack in obuf.
686 */ 632 */
687static void 633static void
688rangetostring (player *pl, char *obuf) 634rangetostring (player *pl, char *obuf)
689{ 635{
690 dynbuf_text buf; 636 dynbuf_text &buf = msg_dynbuf; buf.clear ();
637
638#if 0
639 // print ranged/chosen_skill etc. objects every call
640 printf ("%s %s => %s (%s)\n",
641 pl->ranged_ob ? &pl->ranged_ob->name : "-",
642 pl->combat_ob ? &pl->combat_ob->name : "-",
643 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
644 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
645 );
646#endif
691 647
692 if (pl->ranged_ob) 648 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 649 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694 650
695 if (pl->combat_ob) 651 if (pl->combat_ob)
… …
789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 745 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 746 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 747 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 748 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 749 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 750 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 751 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); 752 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); 753 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798 754
799 flags = 0; 755 flags = 0;
800 756
801 if (opl->fire_on) 757 if (opl->fire_on)
… …
804 if (opl->run_on) 760 if (opl->run_on)
805 flags |= SF_RUNON; 761 flags |= SF_RUNON;
806 762
807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 763 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
808 764
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++) 765 for (int i = 0; i < NROFATTACKS; i++)
813 { 766 {
814 /* Skip ones we won't send */ 767 /* Skip ones we won't send */
815 if (atnr_cs_stat[i] == -1) 768 if (atnr_cs_stat[i] == -1)
816 continue; 769 continue;
817 770
818 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 771 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
819 } 772 }
820 773
821 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
822 { 775 {
823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 776 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); 777 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
926 879
927 /* Nothing changed */ 880 /* Nothing changed */
928 return 0; 881 return 0;
929} 882}
930 883
884//-GPL
885
931// prefetch (and touch) all maps within a specific distancd 886// prefetch (and touch) all maps within a specific distancd
932static void 887static void
933prefetch_surrounding_maps (maptile *map, int distance) 888prefetch_surrounding_maps (maptile *map, int distance)
934{ 889{
935 map->last_access = runtime; 890 map->touch ();
936 891
937 if (--distance) 892 if (--distance)
938 for (int dir = 4; --dir; ) 893 for (int dir = 4; dir--; )
939 if (const shstr &path = map->tile_path [dir]) 894 if (const shstr &path = map->tile_path [dir])
940 if (maptile *&neigh = map->tile_map [dir]) 895 if (maptile *&neigh = map->tile_map [dir])
941 prefetch_surrounding_maps (neigh, distance); 896 prefetch_surrounding_maps (neigh, distance);
942 else 897 else
943 neigh = maptile::find_async (path, map); 898 neigh = maptile::find_async (path, map);
… …
948prefetch_surrounding_maps (object *op) 903prefetch_surrounding_maps (object *op)
949{ 904{
950 prefetch_surrounding_maps (op->map, 3); 905 prefetch_surrounding_maps (op->map, 3);
951} 906}
952 907
908//+GPL
909
953/** 910/**
954 * Draws client map. 911 * Draws client map.
955 */ 912 */
956void 913void
957draw_client_map (player *pl) 914draw_client_map (player *pl)
958{ 915{
959 object *ob = pl->observe; 916 object *ob = pl->viewpoint;
960 if (!ob->active) 917 if (!pl->observe->active)
961 return; 918 return;
962 919
963 /* If player is just joining the game, he isn't here yet, so the map 920 /* 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 921 * can get swapped out. If so, don't try to send them a map. All will
965 * be OK once they really log in. 922 * be OK once they really log in.
… …
972 check_map_change (pl); 929 check_map_change (pl);
973 prefetch_surrounding_maps (pl->ob); 930 prefetch_surrounding_maps (pl->ob);
974 931
975 /* do LOS after calls to update_position */ 932 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */ 933 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob) 934 if (pl->do_los || pl->viewpoint != pl->ob)
978 { 935 {
979 pl->do_los = 0; 936 pl->do_los = 0;
980 pl->update_los (); 937 pl->update_los ();
981 } 938 }
982 939
… …
1034 map_clearcell (&lastcell, -1); 991 map_clearcell (&lastcell, -1);
1035 } 992 }
1036 993
1037 continue; 994 continue;
1038 } 995 }
1039 996
1040 int d = pl->blocked_los_uc (dx, dy); 997 int d = pl->blocked_los_uc (dx, dy);
1041 998
1042 if (d > 3) 999 if (d > 3)
1043 { 1000 {
1044 /* This block deals with spaces that are not visible for whatever 1001 /* This block deals with spaces that are not visible for whatever
… …
1081 /* Darkness changed */ 1038 /* Darkness changed */
1082 if (lastcell.count != d) 1039 if (lastcell.count != d)
1083 { 1040 {
1084 mask |= 0x8; 1041 mask |= 0x8;
1085 1042
1086 if (socket.extmap) 1043 *last_ext |= 0x80;
1044 last_ext = &sl[sl.length ()];
1045 sl << uint8 (d);
1046 }
1047
1048 lastcell.count = d;
1049
1050 mapspace &ms = m->at (nx, ny);
1051 ms.update ();
1052
1053 // extmap handling
1054 uint8 stat_hp = 0;
1055 uint8 stat_width = 0;
1056 uint8 flags = 0;
1057 tag_t player = 0;
1058
1059 // send hp information, if applicable
1060 if (object *op = ms.faces_obj [0])
1061 if (op->is_head () && !op->invisible)
1062 {
1063 if (op->stats.maxhp > op->stats.hp
1064 && op->stats.maxhp > 0
1065 && (op->type == PLAYER
1066 || op->type == DOOR // does not work, have maxhp 0
1067 || op->flag [FLAG_MONSTER]
1068 || op->flag [FLAG_ALIVE]
1069 || op->flag [FLAG_GENERATOR]))
1070 {
1071 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1072 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1073 }
1074
1075 if (expect_false (op->has_dialogue ()))
1076 flags |= 1;
1077
1078 if (expect_false (op->type == PLAYER))
1079 player = op == ob ? pl->ob->count
1080 : op == pl->ob ? ob->count
1081 : op->count;
1082 }
1083
1084 if (expect_false (lastcell.stat_hp != stat_hp))
1085 {
1086 lastcell.stat_hp = stat_hp;
1087
1088 mask |= 0x8;
1089 *last_ext |= 0x80;
1090 last_ext = &sl[sl.length ()];
1091
1092 sl << uint8 (5) << uint8 (stat_hp);
1093
1094 if (stat_width > 1)
1087 { 1095 {
1088 *last_ext |= 0x80; 1096 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()]; 1097 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095 1098
1096 lastcell.count = d;
1097
1098 mapspace &ms = m->at (nx, ny);
1099 ms.update ();
1100
1101 if (expect_true (socket.extmap))
1102 {
1103 uint8 stat_hp = 0;
1104 uint8 stat_width = 0;
1105 uint8 flags = 0;
1106 tag_t player = 0;
1107
1108 // send hp information, if applicable
1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1111 {
1112 if (op->stats.maxhp > op->stats.hp
1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1123
1124 if (expect_false (op->has_dialogue ()))
1125 flags |= 1;
1126
1127 if (expect_false (op->type == PLAYER))
1128 player = op == ob ? pl->ob->count
1129 : op == pl->ob ? ob->count
1130 : op->count;
1131 }
1132
1133 if (expect_false (lastcell.stat_hp != stat_hp))
1134 {
1135 lastcell.stat_hp = stat_hp;
1136
1137 mask |= 0x8;
1138 *last_ext |= 0x80;
1139 last_ext = &sl[sl.length ()];
1140
1141 sl << uint8 (5) << uint8 (stat_hp);
1142
1143 if (stat_width > 1)
1144 {
1145 *last_ext |= 0x80;
1146 last_ext = &sl[sl.length ()];
1147
1148 sl << uint8 (6) << uint8 (stat_width); 1099 sl << uint8 (6) << uint8 (stat_width);
1149 }
1150 }
1151
1152 if (expect_false (lastcell.player != player))
1153 {
1154 lastcell.player = player;
1155
1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1159
1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1170
1171 sl << uint8 (8) << uint8 (flags);
1172 } 1100 }
1173 } 1101 }
1102
1103 if (expect_false (lastcell.player != player))
1104 {
1105 lastcell.player = player;
1106
1107 mask |= 0x8;
1108 *last_ext |= 0x80;
1109 last_ext = &sl[sl.length ()];
1110
1111 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1112 }
1113
1114 if (expect_false (lastcell.flags != flags))
1115 {
1116 lastcell.flags = flags;
1117
1118 mask |= 0x8;
1119 *last_ext |= 0x80;
1120 last_ext = &sl[sl.length ()];
1121
1122 sl << uint8 (8) << uint8 (flags);
1123 }
1124
1125 // faces
1174 1126
1175 /* Floor face */ 1127 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2)) 1128 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4; 1129 mask |= 0x4;
1178 1130
… …
1218 socket.send_packet (sl); 1170 socket.send_packet (sl);
1219 socket.sent_scroll = 0; 1171 socket.sent_scroll = 0;
1220 } 1172 }
1221} 1173}
1222 1174
1223/*****************************************************************************/
1224/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1225/* a player. Of course, the client need to know the command to be able to */
1226/* manage it ! */
1227/*****************************************************************************/
1228void
1229send_plugin_custom_message (object *pl, char *buf)
1230{
1231 pl->contr->ns->send_packet (buf);
1232}
1233
1234/**
1235 * This sends the skill number to name mapping. We ignore
1236 * the params - we always send the same info no matter what.
1237 */
1238void
1239send_skill_info (client *ns, char *params)
1240{
1241 packet sl;
1242 sl << "replyinfo skill_info\n";
1243
1244 for (int i = 1; i < NUM_SKILLS; i++)
1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1246
1247 if (sl.length () > MAXSOCKBUF)
1248 {
1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1250 fatal (0);
1251 }
1252
1253 ns->send_packet (sl);
1254}
1255
1256/**
1257 * This sends the spell path to name mapping. We ignore
1258 * the params - we always send the same info no matter what.
1259 */
1260void
1261send_spell_paths (client * ns, char *params)
1262{
1263 packet sl;
1264
1265 sl << "replyinfo spell_paths\n";
1266
1267 for (int i = 0; i < NRSPELLPATHS; i++)
1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1269
1270 if (sl.length () > MAXSOCKBUF)
1271 {
1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1273 fatal (0);
1274 }
1275
1276 ns->send_packet (sl);
1277}
1278
1279/** 1175/**
1280 * This looks for any spells the player may have that have changed their stats. 1176 * This looks for any spells the player may have that have changed their stats.
1281 * it then sends an updspell packet for each spell that has changed in this way 1177 * it then sends an updspell packet for each spell that has changed in this way
1282 */ 1178 */
1283void 1179void
1284esrv_update_spells (player *pl) 1180esrv_update_spells (player *pl)
1285{ 1181{
1286 if (!pl->ns) 1182 if (!pl->ns)
1287 return; 1183 return;
1288 1184
1185 pl->ns->update_spells = false;
1186
1289 if (!pl->ns->monitor_spells) 1187 if (!pl->ns->monitor_spells)
1290 return; 1188 return;
1291 1189
1292 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1190 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1293 {
1294 if (spell->type == SPELL) 1191 if (spell->type == SPELL)
1295 { 1192 {
1296 int flags = 0; 1193 int flags = 0;
1194 int val;
1297 1195
1298 /* check if we need to update it */ 1196 /* check if we need to update it */
1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1197 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1198 if (spell->cached_sp != val)
1300 { 1199 {
1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1200 spell->cached_sp = val;
1302 flags |= UPD_SP_MANA; 1201 flags |= UPD_SP_MANA;
1303 } 1202 }
1304 1203
1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1204 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1205 if (spell->cached_grace != val)
1306 { 1206 {
1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1207 spell->cached_grace = val;
1308 flags |= UPD_SP_GRACE; 1208 flags |= UPD_SP_GRACE;
1309 } 1209 }
1310 1210
1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1211 val = casting_level (pl->ob, spell);
1212 if (spell->cached_eat != val)
1312 { 1213 {
1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1214 spell->cached_eat = val;
1314 flags |= UPD_SP_DAMAGE; 1215 flags |= UPD_SP_LEVEL;
1315 } 1216 }
1316 1217
1317 if (flags) 1218 if (flags)
1318 { 1219 {
1319 packet sl; 1220 packet sl;
1320 1221
1321 sl << "updspell " 1222 sl << "updspell "
1322 << uint8 (flags) 1223 << uint8 (flags)
1323 << uint32 (spell->count); 1224 << uint32 (spell->count);
1324 1225
1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1226 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1227 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1228 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1328 1229
1329 pl->ns->send_packet (sl); 1230 pl->ns->send_packet (sl);
1330 } 1231 }
1331 } 1232 }
1332 }
1333} 1233}
1334 1234
1335void 1235void
1336esrv_remove_spell (player *pl, object *spell) 1236esrv_remove_spell (player *pl, object *spell)
1337{ 1237{
… …
1364 } 1264 }
1365 1265
1366 /* store costs and damage in the object struct, to compare to later */ 1266 /* store costs and damage in the object struct, to compare to later */
1367 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1267 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1368 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1268 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1269 spell->cached_eat = casting_level (pl->ob, spell);
1370 1270
1371 /* figure out which skill it uses, if it uses one */ 1271 /* figure out which skill it uses, if it uses one */
1372 if (spell->skill) 1272 if (spell->skill)
1373 if (object *tmp = pl->find_skill (spell->skill)) 1273 if (object *tmp = pl->find_skill (spell->skill))
1374 skill = tmp->subtype + CS_STAT_SKILLINFO; 1274 skill = tmp->subtype + CS_STAT_SKILLINFO;
… …
1463 /* finally, we can send the packet */ 1363 /* finally, we can send the packet */
1464 pl->ns->flush_fx (); 1364 pl->ns->flush_fx ();
1465 pl->ns->send_packet (sl); 1365 pl->ns->send_packet (sl);
1466} 1366}
1467 1367
1368//-GPL
1369

Diff Legend

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