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.156 by root, Fri Nov 6 12:49:19 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 }
… …
217 socket.floorbox_reset (); 231 socket.floorbox_reset ();
218 } 232 }
219 233
220 socket.current_x = ob->x; 234 socket.current_x = ob->x;
221 socket.current_y = ob->y; 235 socket.current_y = ob->y;
236}
237
238/**
239 * This sends the skill number to name mapping. We ignore
240 * the params - we always send the same info no matter what.
241 */
242static void
243send_skill_info (client *ns, char *params)
244{
245 packet sl;
246 sl << "replyinfo skill_info\n";
247
248 for (int i = 0; i < skillvec.size (); ++i)
249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
250
251 if (sl.length () > MAXSOCKBUF)
252 cleanup ("buffer overflow in send_skill_info!");
253
254 ns->send_packet (sl);
255}
256
257/**
258 * This sends the spell path to name mapping. We ignore
259 * the params - we always send the same info no matter what.
260 */
261static void
262send_spell_paths (client * ns, char *params)
263{
264 packet sl;
265
266 sl << "replyinfo spell_paths\n";
267
268 for (int i = 0; i < NRSPELLPATHS; i++)
269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
270
271 if (sl.length () > MAXSOCKBUF)
272 cleanup ("buffer overflow in send_spell_paths!");
273
274 ns->send_packet (sl);
222} 275}
223 276
224/** 277/**
225 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
226 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
… …
292 345
293 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
294 { 347 {
295 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
296 349
297 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))
298 { 355 {
356 dir = dirmap [dir];
357
299 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
300 map = 0; 359 map = 0;
301 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
302 { 361 {
303 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
326 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
327 else 386 else
328 { 387 {
329 int flags = 0; 388 int flags = 0;
330 389
390 // due to historical glitches, the bit ordering and map index ordering differs
331 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path[TILE_NORTH]) flags |= 0x01;
332 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path[TILE_EAST ]) flags |= 0x02;
333 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
334 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;
335 398
336 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);
337 } 400 }
338 401
339 return 1; 402 return 1;
… …
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 466}
404 467
405//+GPL 468//+GPL
406 469
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/** 470/**
472 * 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,
473 * etc.) 472 * etc.)
474 */ 473 */
475void 474void
… …
531 * commands. 530 * commands.
532 */ 531 */
533 pl->count = 0; 532 pl->count = 0;
534 533
535 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 534 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
536 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
537 ? time = MAX_TIME * 100
538 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
539 538
540 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
541 packet sl ("comc"); 540 packet sl ("comc");
542 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
543 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
585 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
586 } 585 }
587} 586}
588 587
589/** 588/**
590 * Client tells its version. If there is a mismatch, we close the 589 * 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 */ 590 */
596void 591void
597VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
598{ 593{
599 if (!buf) 594 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} 595}
635 596
636/** sound related functions. */ 597/** sound related functions. */
637void 598void
638SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
691static void 652static void
692rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
693{ 654{
694 dynbuf_text &buf = msg_dynbuf; buf.clear (); 655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
695 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
696 if (pl->ranged_ob) 667 if (pl->ranged_ob)
697 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;
698 669
699 if (pl->combat_ob) 670 if (pl->combat_ob)
700 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;
… …
745 * commands for now. 716 * commands for now.
746 */ 717 */
747void 718void
748esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
749{ 720{
750 char buf[MAX_BUF];
751 uint16 flags;
752
753 client *ns = pl->ns; 721 client *ns = pl->ns;
754 if (!ns) 722 if (!ns)
755 return; 723 return;
756 724
757 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
774 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
775 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
776 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
777 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
778 746
779 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
780 if (object *skill = opl->last_skill_ob [s]) 748 if (object *skill = opl->last_skill_ob [s])
781 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
782 { 750 {
783 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
784 752
785 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
786 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
787 */ 755 */
788 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
789 << uint8 (skill->level) 757 << uint8 (skill->level)
790 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
791 } 759 }
792 760
793 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
794 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
795 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
796 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
797 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
798 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);
799 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 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); 768 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); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
802 770
803 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
804 772 | (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 773
811 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
812 775
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++) 776 for (int i = 0; i < NROFATTACKS; i++)
817 {
818 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
819 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
820 continue;
821
822 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]);
823 }
824 780
825 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
826 { 782 {
827 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);
828 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);
829 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);
830 } 786 }
831 787
788 char buf[MAX_BUF];
832 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 */
833 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
834 set_title (ob, buf); 791 set_title (ob, buf);
835 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
836 793
… …
932 return 0; 889 return 0;
933} 890}
934 891
935//-GPL 892//-GPL
936 893
937// prefetch (and touch) all maps within a specific distancd 894// prefetch some flat area around the player
938static void 895static void
939prefetch_surrounding_maps (maptile *map, int distance) 896prefetch_surrounding_area (object *op, maptile *map, int range)
940{ 897{
941 map->touch (); 898 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
942 899 op->x - range , op->y - range ,
943 if (--distance) 900 op->x + range + 1, op->y + range + 1);
944 for (int dir = 4; --dir; ) 901 rect->m;
945 if (const shstr &path = map->tile_path [dir]) 902 ++rect)
946 if (maptile *&neigh = map->tile_map [dir]) 903 {
947 prefetch_surrounding_maps (neigh, distance); 904 rect->m->touch ();
948 else 905 rect->m->activate ();
949 neigh = maptile::find_async (path, map); 906 }
950} 907}
951 908
952// prefetch a generous area around the player 909// prefetch a generous area around the player, also up and down
953static void 910void
954prefetch_surrounding_maps (object *op) 911object::prefetch_surrounding_maps ()
955{ 912{
956 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);
957} 920}
958 921
959//+GPL 922//+GPL
960 923
961/** 924/**
… …
970 933
971 /* 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
972 * 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
973 * be OK once they really log in. 936 * be OK once they really log in.
974 */ 937 */
975 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 938 if (!ob->map || ob->map->state != MAP_ACTIVE)
976 return; 939 return;
977 940
978 int startlen, oldlen; 941 int startlen, oldlen;
979 942
980 check_map_change (pl); 943 check_map_change (pl);
981 prefetch_surrounding_maps (pl->ob); 944 pl->ob->prefetch_surrounding_maps ();
982 945
983 /* do LOS after calls to update_position */ 946 /* do LOS after calls to update_position */
984 /* unfortunately, we need to udpate los when observing, currently */ 947 /* unfortunately, we need to udpate los when observing, currently */
985 if (pl->do_los || pl->viewpoint != pl->ob) 948 if (pl->do_los || pl->viewpoint != pl->ob)
986 { 949 {
… …
1011 * look like. 974 * look like.
1012 */ 975 */
1013 976
1014 client &socket = *pl->ns; 977 client &socket = *pl->ns;
1015 978
1016 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 979 packet sl ("map1a");
1017 980
1018 startlen = sl.length (); 981 startlen = sl.length ();
1019 982
1020 int hx = socket.mapx / 2; 983 int hx = socket.mapx / 2;
1021 int hy = socket.mapy / 2; 984 int hy = socket.mapy / 2;
… …
1042 map_clearcell (&lastcell, -1); 1005 map_clearcell (&lastcell, -1);
1043 } 1006 }
1044 1007
1045 continue; 1008 continue;
1046 } 1009 }
1047 1010
1048 int d = pl->blocked_los_uc (dx, dy); 1011 int d = pl->blocked_los_uc (dx, dy);
1049 1012
1050 if (d > 3) 1013 if (d > 3)
1051 { 1014 {
1052 /* This block deals with spaces that are not visible for whatever 1015 /* This block deals with spaces that are not visible for whatever
… …
1113 { 1076 {
1114 if (op->stats.maxhp > op->stats.hp 1077 if (op->stats.maxhp > op->stats.hp
1115 && op->stats.maxhp > 0 1078 && op->stats.maxhp > 0
1116 && (op->type == PLAYER 1079 && (op->type == PLAYER
1117 || op->type == DOOR // does not work, have maxhp 0 1080 || op->type == DOOR // does not work, have maxhp 0
1118 || QUERY_FLAG (op, FLAG_MONSTER) 1081 || op->flag [FLAG_MONSTER]
1119 || QUERY_FLAG (op, FLAG_ALIVE) 1082 || op->flag [FLAG_ALIVE]
1120 || QUERY_FLAG (op, FLAG_GENERATOR))) 1083 || op->flag [FLAG_GENERATOR]))
1121 { 1084 {
1122 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1085 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 1086 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1124 } 1087 }
1125 1088
… …
1221 socket.send_packet (sl); 1184 socket.send_packet (sl);
1222 socket.sent_scroll = 0; 1185 socket.sent_scroll = 0;
1223 } 1186 }
1224} 1187}
1225 1188
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/** 1189/**
1283 * This looks for any spells the player may have that have changed their stats. 1190 * 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 1191 * it then sends an updspell packet for each spell that has changed in this way
1285 */ 1192 */
1286void 1193void
1287esrv_update_spells (player *pl) 1194esrv_update_spells (player *pl)
1288{ 1195{
1289 if (!pl->ns) 1196 if (!pl->ns)
1290 return; 1197 return;
1291 1198
1199 pl->ns->update_spells = false;
1200
1292 if (!pl->ns->monitor_spells) 1201 if (!pl->ns->monitor_spells)
1293 return; 1202 return;
1294 1203
1295 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1204 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1296 {
1297 if (spell->type == SPELL) 1205 if (spell->type == SPELL)
1298 { 1206 {
1299 int flags = 0; 1207 int flags = 0;
1208 int val;
1300 1209
1301 /* check if we need to update it */ 1210 /* check if we need to update it */
1302 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)
1303 { 1213 {
1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1214 spell->cached_sp = val;
1305 flags |= UPD_SP_MANA; 1215 flags |= UPD_SP_MANA;
1306 } 1216 }
1307 1217
1308 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)
1309 { 1220 {
1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1221 spell->cached_grace = val;
1311 flags |= UPD_SP_GRACE; 1222 flags |= UPD_SP_GRACE;
1312 } 1223 }
1313 1224
1314 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)
1315 { 1227 {
1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1228 spell->cached_eat = val;
1317 flags |= UPD_SP_DAMAGE; 1229 flags |= UPD_SP_LEVEL;
1318 } 1230 }
1319 1231
1320 if (flags) 1232 if (flags)
1321 { 1233 {
1322 packet sl; 1234 packet sl;
1323 1235
1324 sl << "updspell " 1236 sl << "updspell "
1325 << uint8 (flags) 1237 << uint8 (flags)
1326 << uint32 (spell->count); 1238 << uint32 (spell->count);
1327 1239
1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1240 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1241 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1242 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1331 1243
1332 pl->ns->send_packet (sl); 1244 pl->ns->send_packet (sl);
1333 } 1245 }
1334 } 1246 }
1335 }
1336} 1247}
1337 1248
1338void 1249void
1339esrv_remove_spell (player *pl, object *spell) 1250esrv_remove_spell (player *pl, object *spell)
1340{ 1251{
… …
1367 } 1278 }
1368 1279
1369 /* 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 */
1370 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);
1371 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);
1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1283 spell->cached_eat = casting_level (pl->ob, spell);
1373 1284
1374 /* figure out which skill it uses, if it uses one */ 1285 /* figure out which skill it uses, if it uses one */
1375 if (spell->skill) 1286 if (spell->skill)
1376 if (object *tmp = pl->find_skill (spell->skill)) 1287 if (object *tmp = pl->find_skill (spell->skill))
1377 skill = tmp->subtype + CS_STAT_SKILLINFO; 1288 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1378 1289
1379 // spells better have a face 1290 // spells better have a face
1380 if (!spell->face) 1291 if (!spell->face)
1381 { 1292 {
1382 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);
… …
1456 } 1367 }
1457 else 1368 else
1458 append_spell (pl, sl, spell); 1369 append_spell (pl, sl, spell);
1459 1370
1460 if (sl.length () > MAXSOCKBUF) 1371 if (sl.length () > MAXSOCKBUF)
1461 {
1462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1372 cleanup ("buffer overflow in esrv_add_spells!");
1463 fatal (0);
1464 }
1465 1373
1466 /* finally, we can send the packet */ 1374 /* finally, we can send the packet */
1467 pl->ns->flush_fx (); 1375 pl->ns->flush_fx ();
1468 pl->ns->send_packet (sl); 1376 pl->ns->send_packet (sl);
1469} 1377}

Diff Legend

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