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.161 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 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,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)
… …
148 client &socket = *pl->ns; 158 client &socket = *pl->ns;
149 object *ob = pl->viewpoint; 159 object *ob = pl->viewpoint;
150 160
151 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
152 { 162 {
153 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
154 { 164 {
155 int flags = 0; 165 int flags = 0;
156 166
167 // due to historical glitches, the bit ordering and map index ordering differs
157 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01;
158 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02;
159 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04;
160 if (ob->map->tile_path[3]) flags |= 8; 171 if (ob->map->tile_path[TILE_WEST ]) flags |= 0x08;
172 // these two are debatable
173 if (ob->map->tile_path[TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path[TILE_DOWN ]) flags |= 0x20;
161 175
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
165 } 179 }
… …
229send_skill_info (client *ns, char *params) 243send_skill_info (client *ns, char *params)
230{ 244{
231 packet sl; 245 packet sl;
232 sl << "replyinfo skill_info\n"; 246 sl << "replyinfo skill_info\n";
233 247
234 for (int i = 1; i < NUM_SKILLS; i++) 248 for (int i = 0; i < skillvec.size (); ++i)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); 249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
236 250
237 if (sl.length () > MAXSOCKBUF) 251 if (sl.length () > MAXSOCKBUF)
238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 252 cleanup ("buffer overflow in send_skill_info!");
240 fatal (0);
241 }
242 253
243 ns->send_packet (sl); 254 ns->send_packet (sl);
244} 255}
245 256
246/** 257/**
… …
256 267
257 for (int i = 0; i < NRSPELLPATHS; i++) 268 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259 270
260 if (sl.length () > MAXSOCKBUF) 271 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 272 cleanup ("buffer overflow in send_spell_paths!");
263 fatal (0);
264 }
265 273
266 ns->send_packet (sl); 274 ns->send_packet (sl);
267} 275}
268 276
269/** 277/**
… …
337 345
338 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
339 { 347 {
340 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
341 349
342 if (dir >= 0 && dir <= 3) 350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352
353 // maybe we should only allow the four flat directions
354 if (dir >= 0 && dir < array_length (dirmap))
343 { 355 {
356 dir = dirmap [dir];
357
344 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
345 map = 0; 359 map = 0;
346 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
347 { 361 {
348 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
371 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
372 else 386 else
373 { 387 {
374 int flags = 0; 388 int flags = 0;
375 389
390 // due to historical glitches, the bit ordering and map index ordering differs
376 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path[TILE_NORTH]) flags |= 0x01;
377 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path[TILE_EAST ]) flags |= 0x02;
378 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
379 if (map->tile_path[3]) flags |= 8; 394 if (map->tile_path[TILE_WEST ]) flags |= 0x08;
395 // these two are debatable
396 if (map->tile_path[TILE_UP ]) flags |= 0x10;
397 if (map->tile_path[TILE_DOWN ]) flags |= 0x20;
380 398
381 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
382 } 400 }
383 401
384 return 1; 402 return 1;
… …
446{ 464{
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 466}
449 467
450//+GPL 468//+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 469
516/** 470/**
517 * This handles the general commands from the client (ie, north, fire, cast, 471 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 472 * etc.)
519 */ 473 */
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 585 }
632} 586}
633 587
634/** 588/**
635 * Client tells its version. If there is a mismatch, we close the 589 * 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 */ 590 */
641void 591void
642VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
643{ 593{
644 if (!buf) 594 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} 595}
680 596
681/** sound related functions. */ 597/** sound related functions. */
682void 598void
683SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
736static void 652static void
737rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
738{ 654{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 656
657#if 0
658 // print ranged/chosen_skill etc. objects every call
659 printf ("%s %s => %s (%s)\n",
660 pl->ranged_ob ? &pl->ranged_ob->name : "-",
661 pl->combat_ob ? &pl->combat_ob->name : "-",
662 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
663 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
664 );
665#endif
666
741 if (pl->ranged_ob) 667 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 668 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 669
744 if (pl->combat_ob) 670 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 671 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
… …
790 * commands for now. 716 * commands for now.
791 */ 717 */
792void 718void
793esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
794{ 720{
795 char buf[MAX_BUF];
796 uint16 flags;
797
798 client *ns = pl->ns; 721 client *ns = pl->ns;
799 if (!ns) 722 if (!ns)
800 return; 723 return;
801 724
802 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 746
824 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob [s]) 748 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 750 {
828 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
829 752
830 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
832 */ 755 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 757 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
836 } 759 }
837 760
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
… …
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); 766 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 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); 768 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); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 770
848 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
849 772 | (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 773
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 775
858 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
859 {
860 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
861 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
862 continue;
863
864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 779 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
865 }
866 780
867 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
868 { 782 {
869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 783 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); 784 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); 785 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
872 } 786 }
873 787
788 char buf[MAX_BUF];
874 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 789 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
875 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
876 set_title (ob, buf); 791 set_title (ob, buf);
877 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
878 793
… …
974 return 0; 889 return 0;
975} 890}
976 891
977//-GPL 892//-GPL
978 893
979// prefetch (and touch) all maps within a specific distancd 894// prefetch some flat area around the player
980static void 895static void
981prefetch_surrounding_maps (maptile *map, int distance) 896prefetch_surrounding_area (object *op, maptile *map, int range)
982{ 897{
983 map->touch (); 898 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
984 899 op->x - range , op->y - range ,
985 if (--distance) 900 op->x + range + 1, op->y + range + 1);
986 for (int dir = 4; --dir; ) 901 rect->m;
987 if (const shstr &path = map->tile_path [dir]) 902 ++rect)
988 if (maptile *&neigh = map->tile_map [dir]) 903 {
989 prefetch_surrounding_maps (neigh, distance); 904 rect->m->touch ();
990 else 905 rect->m->activate ();
991 neigh = maptile::find_async (path, map); 906 }
992} 907}
993 908
994// prefetch a generous area around the player 909// prefetch a generous area around the player, also up and down
995static void 910void
996prefetch_surrounding_maps (object *op) 911object::prefetch_surrounding_maps ()
997{ 912{
998 prefetch_surrounding_maps (op->map, 3); 913 prefetch_surrounding_area (this, map, 40);
914
915 if (maptile *m = map->tile_available (TILE_DOWN))
916 prefetch_surrounding_area (this, m, 20);
917
918 if (maptile *m = map->tile_available (TILE_UP))
919 prefetch_surrounding_area (this, m, 20);
999} 920}
1000 921
1001//+GPL 922//+GPL
1002 923
1003/** 924/**
… …
1012 933
1013 /* If player is just joining the game, he isn't here yet, so the map 934 /* 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 935 * can get swapped out. If so, don't try to send them a map. All will
1015 * be OK once they really log in. 936 * be OK once they really log in.
1016 */ 937 */
1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 938 if (!ob->map || ob->map->state != MAP_ACTIVE)
1018 return; 939 return;
1019 940
1020 int startlen, oldlen; 941 int startlen, oldlen;
1021 942
1022 check_map_change (pl); 943 check_map_change (pl);
1023 prefetch_surrounding_maps (pl->ob); 944 pl->ob->prefetch_surrounding_maps ();
1024 945
1025 /* do LOS after calls to update_position */ 946 /* do LOS after calls to update_position */
1026 /* unfortunately, we need to udpate los when observing, currently */ 947 /* unfortunately, we need to udpate los when observing, currently */
1027 if (pl->do_los || pl->viewpoint != pl->ob) 948 if (pl->do_los || pl->viewpoint != pl->ob)
1028 { 949 {
… …
1053 * look like. 974 * look like.
1054 */ 975 */
1055 976
1056 client &socket = *pl->ns; 977 client &socket = *pl->ns;
1057 978
1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 979 packet sl ("map1a");
1059 980
1060 startlen = sl.length (); 981 startlen = sl.length ();
1061 982
1062 int hx = socket.mapx / 2; 983 int hx = socket.mapx / 2;
1063 int hy = socket.mapy / 2; 984 int hy = socket.mapy / 2;
… …
1084 map_clearcell (&lastcell, -1); 1005 map_clearcell (&lastcell, -1);
1085 } 1006 }
1086 1007
1087 continue; 1008 continue;
1088 } 1009 }
1089 1010
1090 int d = pl->blocked_los_uc (dx, dy); 1011 int d = pl->blocked_los_uc (dx, dy);
1091 1012
1092 if (d > 3) 1013 if (d > 3)
1093 { 1014 {
1094 /* This block deals with spaces that are not visible for whatever 1015 /* This block deals with spaces that are not visible for whatever
… …
1155 { 1076 {
1156 if (op->stats.maxhp > op->stats.hp 1077 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0 1078 && op->stats.maxhp > 0
1158 && (op->type == PLAYER 1079 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0 1080 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER) 1081 || op->flag [FLAG_MONSTER]
1161 || QUERY_FLAG (op, FLAG_ALIVE) 1082 || op->flag [FLAG_ALIVE]
1162 || QUERY_FLAG (op, FLAG_GENERATOR))) 1083 || op->flag [FLAG_GENERATOR]))
1163 { 1084 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1085 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 1086 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 } 1087 }
1167 1088
… …
1279 1200
1280 if (!pl->ns->monitor_spells) 1201 if (!pl->ns->monitor_spells)
1281 return; 1202 return;
1282 1203
1283 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1204 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1284 {
1285 if (spell->type == SPELL) 1205 if (spell->type == SPELL)
1286 { 1206 {
1287 int flags = 0; 1207 int flags = 0;
1208 int val;
1288 1209
1289 /* check if we need to update it */ 1210 /* check if we need to update it */
1290 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1211 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1212 if (spell->cached_sp != val)
1291 { 1213 {
1292 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1214 spell->cached_sp = val;
1293 flags |= UPD_SP_MANA; 1215 flags |= UPD_SP_MANA;
1294 } 1216 }
1295 1217
1296 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1218 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1219 if (spell->cached_grace != val)
1297 { 1220 {
1298 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1221 spell->cached_grace = val;
1299 flags |= UPD_SP_GRACE; 1222 flags |= UPD_SP_GRACE;
1300 } 1223 }
1301 1224
1302 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1225 val = casting_level (pl->ob, spell);
1226 if (spell->cached_eat != val)
1303 { 1227 {
1304 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1228 spell->cached_eat = val;
1305 flags |= UPD_SP_DAMAGE; 1229 flags |= UPD_SP_LEVEL;
1306 } 1230 }
1307 1231
1308 if (flags) 1232 if (flags)
1309 { 1233 {
1310 packet sl; 1234 packet sl;
1311 1235
1312 sl << "updspell " 1236 sl << "updspell "
1313 << uint8 (flags) 1237 << uint8 (flags)
1314 << uint32 (spell->count); 1238 << uint32 (spell->count);
1315 1239
1316 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1240 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1317 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1241 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1318 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1242 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1319 1243
1320 pl->ns->send_packet (sl); 1244 pl->ns->send_packet (sl);
1321 } 1245 }
1322 } 1246 }
1323 }
1324} 1247}
1325 1248
1326void 1249void
1327esrv_remove_spell (player *pl, object *spell) 1250esrv_remove_spell (player *pl, object *spell)
1328{ 1251{
… …
1355 } 1278 }
1356 1279
1357 /* store costs and damage in the object struct, to compare to later */ 1280 /* 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); 1281 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); 1282 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); 1283 spell->cached_eat = casting_level (pl->ob, spell);
1361 1284
1362 /* figure out which skill it uses, if it uses one */ 1285 /* figure out which skill it uses, if it uses one */
1363 if (spell->skill) 1286 if (spell->skill)
1364 if (object *tmp = pl->find_skill (spell->skill)) 1287 if (object *tmp = pl->find_skill (spell->skill))
1365 skill = tmp->subtype + CS_STAT_SKILLINFO; 1288 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1366 1289
1367 // spells better have a face 1290 // spells better have a face
1368 if (!spell->face) 1291 if (!spell->face)
1369 { 1292 {
1370 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1293 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1444 } 1367 }
1445 else 1368 else
1446 append_spell (pl, sl, spell); 1369 append_spell (pl, sl, spell);
1447 1370
1448 if (sl.length () > MAXSOCKBUF) 1371 if (sl.length () > MAXSOCKBUF)
1449 {
1450 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1372 cleanup ("buffer overflow in esrv_add_spells!");
1451 fatal (0);
1452 }
1453 1373
1454 /* finally, we can send the packet */ 1374 /* finally, we can send the packet */
1455 pl->ns->flush_fx (); 1375 pl->ns->flush_fx ();
1456 pl->ns->send_packet (sl); 1376 pl->ns->send_packet (sl);
1457} 1377}

Diff Legend

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