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.164 by root, Fri Mar 26 00:59:22 2010 UTC vs.
Revision 1.181 by root, Wed May 4 07:41:14 2011 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,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
44 44
45#include <global.h> 45#include <global.h>
46#include <sproto.h> 46#include <sproto.h>
47 47
48#include <living.h> 48#include <living.h>
49#include <commands.h>
50 49
51/* This block is basically taken from socket.c - I assume if it works there, 50/* This block is basically taken from socket.c - I assume if it works there,
52 * it should work here. 51 * it should work here.
53 */ 52 */
54#include <sys/types.h> 53#include <sys/types.h>
… …
66 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
67 * program to the value we use when sending STATS command to the 66 * program to the value we use when sending STATS command to the
68 * client. If a value is -1, then we don't send that to the 67 * client. If a value is -1, then we don't send that to the
69 * client. 68 * client.
70 */ 69 */
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)
… …
152 { 162 {
153 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path[0])
154 { 164 {
155 int flags = 0; 165 int flags = 0;
156 166
157 if (ob->map->tile_path[0]) flags |= 1; 167 if (ob->map->tile_path[0]) flags |= 0x01;
158 if (ob->map->tile_path[1]) flags |= 2; 168 if (ob->map->tile_path[1]) flags |= 0x02;
159 if (ob->map->tile_path[2]) flags |= 4; 169 if (ob->map->tile_path[2]) flags |= 0x04;
160 if (ob->map->tile_path[3]) flags |= 8; 170 if (ob->map->tile_path[3]) flags |= 0x08;
171 // these two are debatable
172 if (ob->map->tile_path[4]) flags |= 0x10;
173 if (ob->map->tile_path[5]) flags |= 0x20;
161 174
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 175 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 176 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path); 177 ob->map->width, ob->map->height, &ob->map->path);
165 } 178 }
… …
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 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 251 cleanup ("buffer overflow in send_skill_info!");
240 fatal (0);
241 }
242 252
243 ns->send_packet (sl); 253 ns->send_packet (sl);
244} 254}
245 255
246/** 256/**
… …
256 266
257 for (int i = 0; i < NRSPELLPATHS; i++) 267 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259 269
260 if (sl.length () > MAXSOCKBUF) 270 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 271 cleanup ("buffer overflow in send_spell_paths!");
263 fatal (0);
264 }
265 272
266 ns->send_packet (sl); 273 ns->send_packet (sl);
267} 274}
268 275
269/** 276/**
… …
337 344
338 while (*buf && map && max_distance) 345 while (*buf && map && max_distance)
339 { 346 {
340 int dir = *buf++ - '1'; 347 int dir = *buf++ - '1';
341 348
349 // maybe we should only allow the four flat directions
342 if (dir >= 0 && dir <= 3) 350 if (dir >= 0 && dir < TILE_NUM)
343 { 351 {
344 if (!map->tile_path [dir]) 352 if (!map->tile_path [dir])
345 map = 0; 353 map = 0;
346 else if (map->tile_available (dir, false)) 354 else if (map->tile_available (dir, false))
347 { 355 {
… …
371 send_packet_printf ("mapinfo %s nomap", token); 379 send_packet_printf ("mapinfo %s nomap", token);
372 else 380 else
373 { 381 {
374 int flags = 0; 382 int flags = 0;
375 383
376 if (map->tile_path[0]) flags |= 1; 384 if (map->tile_path[0]) flags |= 0x01;
377 if (map->tile_path[1]) flags |= 2; 385 if (map->tile_path[1]) flags |= 0x02;
378 if (map->tile_path[2]) flags |= 4; 386 if (map->tile_path[2]) flags |= 0x04;
379 if (map->tile_path[3]) flags |= 8; 387 if (map->tile_path[3]) flags |= 0x08;
388 // these two are debatable
389 if (map->tile_path[4]) flags |= 0x10;
390 if (map->tile_path[5]) flags |= 0x20;
380 391
381 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 392 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
382 } 393 }
383 394
384 return 1; 395 return 1;
… …
446{ 457{
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 458 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 459}
449 460
450//+GPL 461//+GPL
451
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 462
516/** 463/**
517 * This handles the general commands from the client (ie, north, fire, cast, 464 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 465 * etc.)
519 */ 466 */
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 577 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 578 }
632} 579}
633 580
634/** 581/**
635 * Client tells its version. If there is a mismatch, we close the 582 * 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 */ 583 */
641void 584void
642VersionCmd (char *buf, int len, client * ns) 585VersionCmd (char *buf, int len, client *ns)
643{ 586{
644 if (!buf) 587 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} 588}
680 589
681/** sound related functions. */ 590/** sound related functions. */
682void 591void
683SetSound (char *buf, int len, client * ns) 592SetSound (char *buf, int len, client * ns)
… …
736static void 645static void
737rangetostring (player *pl, char *obuf) 646rangetostring (player *pl, char *obuf)
738{ 647{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 648 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 649
650#if 0
651 // print ranged/chosen_skill etc. objects every call
652 printf ("%s %s => %s (%s)\n",
653 pl->ranged_ob ? &pl->ranged_ob->name : "-",
654 pl->combat_ob ? &pl->combat_ob->name : "-",
655 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
656 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
657 );
658#endif
659
741 if (pl->ranged_ob) 660 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 661 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 662
744 if (pl->combat_ob) 663 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 664 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
790 * commands for now. 709 * commands for now.
791 */ 710 */
792void 711void
793esrv_update_stats (player *pl) 712esrv_update_stats (player *pl)
794{ 713{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 714 client *ns = pl->ns;
799 if (!ns) 715 if (!ns)
800 return; 716 return;
801 717
802 object *ob = pl->observe; 718 object *ob = pl->observe;
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 735 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 736 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 737 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 738 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 739
824 for (int s = 0; s < NUM_SKILLS; s++) 740 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob [s]) 741 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 742 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 743 {
828 ns->last_skill_exp [s] = skill->stats.exp; 744 ns->last_skill_exp [s] = skill->stats.exp;
829 745
830 /* Always send along the level if exp changes. This is only 746 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 747 * 1 extra byte, but keeps processing simpler.
832 */ 748 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 749 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 750 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 751 << uint64 (skill->stats.exp);
836 } 752 }
837 753
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 754 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
… …
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); 759 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 760 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); 761 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); 762 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 763
848 flags = 0; 764 int flags = (opl->fire_on ? SF_FIREON : 0)
849 765 | (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 766
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 767 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 768
858 for (int i = 0; i < NROFATTACKS; i++) 769 for (int i = 0; i < NROFATTACKS; i++)
859 {
860 /* Skip ones we won't send */ 770 /* Skip ones we won't send */
861 if (atnr_cs_stat[i] == -1) 771 if (atnr_cs_stat[i] >= 0)
862 continue;
863
864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 772 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
865 }
866 773
867 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
868 { 775 {
869 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);
870 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);
871 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 778 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
872 } 779 }
873 780
781 char buf[MAX_BUF];
874 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 782 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
875 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 783 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
876 set_title (ob, buf); 784 set_title (ob, buf);
877 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 785 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
878 786
… …
974 return 0; 882 return 0;
975} 883}
976 884
977//-GPL 885//-GPL
978 886
979// prefetch (and touch) all maps within a specific distancd 887// prefetch some flat area around the player
980static void 888static void
981prefetch_surrounding_maps (maptile *map, int distance) 889prefetch_surrounding_area (object *op, maptile *map, int range)
982{ 890{
983 map->touch (); 891 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
984 892 op->x - range , op->y - range ,
985 if (--distance) 893 op->x + range + 1, op->y + range + 1);
986 for (int dir = 4; dir--; ) 894 rect->m;
987 if (const shstr &path = map->tile_path [dir]) 895 ++rect)
988 if (maptile *&neigh = map->tile_map [dir]) 896 {
989 prefetch_surrounding_maps (neigh, distance); 897 rect->m->touch ();
990 else 898 rect->m->activate ();
991 neigh = maptile::find_async (path, map); 899 }
992} 900}
993 901
994// prefetch a generous area around the player 902// prefetch a generous area around the player, also up and down
995static void 903void
996prefetch_surrounding_maps (object *op) 904object::prefetch_surrounding_maps ()
997{ 905{
998 prefetch_surrounding_maps (op->map, 3); 906 prefetch_surrounding_area (this, map, 40);
907
908 if (maptile *m = map->tile_available (TILE_DOWN))
909 prefetch_surrounding_area (this, m, 20);
910
911 if (maptile *m = map->tile_available (TILE_UP))
912 prefetch_surrounding_area (this, m, 20);
999} 913}
1000 914
1001//+GPL 915//+GPL
1002 916
1003/** 917/**
… …
1012 926
1013 /* If player is just joining the game, he isn't here yet, so the map 927 /* If player is just joining the game, he isn't here yet, so the map
1014 * can get swapped out. If so, don't try to send them a map. All will 928 * can get swapped out. If so, don't try to send them a map. All will
1015 * be OK once they really log in. 929 * be OK once they really log in.
1016 */ 930 */
1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 931 if (!ob->map || ob->map->state != MAP_ACTIVE)
1018 return; 932 return;
1019 933
1020 int startlen, oldlen; 934 int startlen, oldlen;
1021 935
1022 check_map_change (pl); 936 check_map_change (pl);
1023 prefetch_surrounding_maps (pl->ob); 937 pl->ob->prefetch_surrounding_maps ();
1024 938
1025 /* do LOS after calls to update_position */ 939 /* do LOS after calls to update_position */
1026 /* unfortunately, we need to udpate los when observing, currently */ 940 /* unfortunately, we need to udpate los when observing, currently */
1027 if (pl->do_los || pl->viewpoint != pl->ob) 941 if (pl->do_los || pl->viewpoint != pl->ob)
1028 { 942 {
… …
1053 * look like. 967 * look like.
1054 */ 968 */
1055 969
1056 client &socket = *pl->ns; 970 client &socket = *pl->ns;
1057 971
1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 972 packet sl ("map1a");
1059 973
1060 startlen = sl.length (); 974 startlen = sl.length ();
1061 975
1062 int hx = socket.mapx / 2; 976 int hx = socket.mapx / 2;
1063 int hy = socket.mapy / 2; 977 int hy = socket.mapy / 2;
… …
1155 { 1069 {
1156 if (op->stats.maxhp > op->stats.hp 1070 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0 1071 && op->stats.maxhp > 0
1158 && (op->type == PLAYER 1072 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0 1073 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER) 1074 || op->flag [FLAG_MONSTER]
1161 || QUERY_FLAG (op, FLAG_ALIVE) 1075 || op->flag [FLAG_ALIVE]
1162 || QUERY_FLAG (op, FLAG_GENERATOR))) 1076 || op->flag [FLAG_GENERATOR]))
1163 { 1077 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1078 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 1079 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 } 1080 }
1167 1081
… …
1362 spell->cached_eat = casting_level (pl->ob, spell); 1276 spell->cached_eat = casting_level (pl->ob, spell);
1363 1277
1364 /* figure out which skill it uses, if it uses one */ 1278 /* figure out which skill it uses, if it uses one */
1365 if (spell->skill) 1279 if (spell->skill)
1366 if (object *tmp = pl->find_skill (spell->skill)) 1280 if (object *tmp = pl->find_skill (spell->skill))
1367 skill = tmp->subtype + CS_STAT_SKILLINFO; 1281 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1368 1282
1369 // spells better have a face 1283 // spells better have a face
1370 if (!spell->face) 1284 if (!spell->face)
1371 { 1285 {
1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1286 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1446 } 1360 }
1447 else 1361 else
1448 append_spell (pl, sl, spell); 1362 append_spell (pl, sl, spell);
1449 1363
1450 if (sl.length () > MAXSOCKBUF) 1364 if (sl.length () > MAXSOCKBUF)
1451 {
1452 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1365 cleanup ("buffer overflow in esrv_add_spells!");
1453 fatal (0);
1454 }
1455 1366
1456 /* finally, we can send the packet */ 1367 /* finally, we can send the packet */
1457 pl->ns->flush_fx (); 1368 pl->ns->flush_fx ();
1458 pl->ns->send_packet (sl); 1369 pl->ns->send_packet (sl);
1459} 1370}

Diff Legend

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