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.166 by root, Fri Apr 2 03:41:25 2010 UTC vs.
Revision 1.176 by root, Thu Apr 29 15:59:10 2010 UTC

… …
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};
… …
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/**
… …
447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 454 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
448} 455}
449 456
450//+GPL 457//+GPL
451 458
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
516/** 459/**
517 * This handles the general commands from the client (ie, north, fire, cast, 460 * This handles the general commands from the client (ie, north, fire, cast,
518 * etc.) 461 * etc.)
519 */ 462 */
520void 463void
… …
630 LOG (llevError, "Unknown input state: %d\n", ns->state); 573 LOG (llevError, "Unknown input state: %d\n", ns->state);
631 } 574 }
632} 575}
633 576
634/** 577/**
635 * Client tells its version. If there is a mismatch, we close the 578 * 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 */ 579 */
641void 580void
642VersionCmd (char *buf, int len, client * ns) 581VersionCmd (char *buf, int len, client *ns)
643{ 582{
644 if (!buf) 583 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} 584}
680 585
681/** sound related functions. */ 586/** sound related functions. */
682void 587void
683SetSound (char *buf, int len, client * ns) 588SetSound (char *buf, int len, client * ns)
… …
736static void 641static void
737rangetostring (player *pl, char *obuf) 642rangetostring (player *pl, char *obuf)
738{ 643{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 644 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 645
646#if 0
647 // print ranged/chosen_skill etc. objects every call
741 printf ("%s %s => %s (%s)\n",//D 648 printf ("%s %s => %s (%s)\n",
742 pl->ranged_ob ? &pl->ranged_ob->name : "-", 649 pl->ranged_ob ? &pl->ranged_ob->name : "-",
743 pl->combat_ob ? &pl->combat_ob->name : "-", 650 pl->combat_ob ? &pl->combat_ob->name : "-",
744 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-", 651 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
745 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-" 652 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
746 ); 653 );
654#endif
747 655
748 if (pl->ranged_ob) 656 if (pl->ranged_ob)
749 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 657 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
750 658
751 if (pl->combat_ob) 659 if (pl->combat_ob)
… …
797 * commands for now. 705 * commands for now.
798 */ 706 */
799void 707void
800esrv_update_stats (player *pl) 708esrv_update_stats (player *pl)
801{ 709{
802 char buf[MAX_BUF];
803 uint16 flags;
804
805 client *ns = pl->ns; 710 client *ns = pl->ns;
806 if (!ns) 711 if (!ns)
807 return; 712 return;
808 713
809 object *ob = pl->observe; 714 object *ob = pl->observe;
… …
826 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 731 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
827 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 732 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
828 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 733 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
829 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 734 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
830 735
831 for (int s = 0; s < NUM_SKILLS; s++) 736 for (int s = 0; s < CS_NUM_SKILLS; s++)
832 if (object *skill = opl->last_skill_ob [s]) 737 if (object *skill = opl->last_skill_ob [s])
833 if (skill->stats.exp != ns->last_skill_exp [s]) 738 if (skill->stats.exp != ns->last_skill_exp [s])
834 { 739 {
835 ns->last_skill_exp [s] = skill->stats.exp; 740 ns->last_skill_exp [s] = skill->stats.exp;
836 741
837 /* Always send along the level if exp changes. This is only 742 /* Always send along the level if exp changes. This is only
838 * 1 extra byte, but keeps processing simpler. 743 * 1 extra byte, but keeps processing simpler.
839 */ 744 */
840 sl << uint8 (s + CS_STAT_SKILLINFO) 745 sl << uint8 (CS_STAT_SKILLINFO + s)
841 << uint8 (skill->level) 746 << uint8 (skill->level)
842 << uint64 (skill->stats.exp); 747 << uint64 (skill->stats.exp);
843 } 748 }
844 749
845 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 750 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
… …
850 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); 755 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
851 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 756 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
852 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK); 757 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
853 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 758 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
854 759
855 flags = 0; 760 int flags = (opl->fire_on ? SF_FIREON : 0)
856 761 | (opl->run_on ? SF_RUNON : 0);
857 if (opl->fire_on)
858 flags |= SF_FIREON;
859
860 if (opl->run_on)
861 flags |= SF_RUNON;
862 762
863 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 763 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
864 764
865 for (int i = 0; i < NROFATTACKS; i++) 765 for (int i = 0; i < NROFATTACKS; i++)
866 {
867 /* Skip ones we won't send */ 766 /* Skip ones we won't send */
868 if (atnr_cs_stat[i] == -1) 767 if (atnr_cs_stat[i] >= 0)
869 continue;
870
871 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 768 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
872 }
873 769
874 if (pl->ns->monitor_spells) 770 if (pl->ns->monitor_spells)
875 { 771 {
876 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 772 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
877 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 773 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
878 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 774 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
879 } 775 }
880 776
777 char buf[MAX_BUF];
881 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 778 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
882 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 779 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
883 set_title (ob, buf); 780 set_title (ob, buf);
884 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 781 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
885 782
… …
981 return 0; 878 return 0;
982} 879}
983 880
984//-GPL 881//-GPL
985 882
986// prefetch (and touch) all maps within a specific distancd 883// prefetch maps in an area of PREFETCH x PREFETCH around the player
987static void 884#define PREFETCH 40
988prefetch_surrounding_maps (maptile *map, int distance)
989{
990 map->touch ();
991
992 if (--distance)
993 for (int dir = 4; dir--; )
994 if (const shstr &path = map->tile_path [dir])
995 if (maptile *&neigh = map->tile_map [dir])
996 prefetch_surrounding_maps (neigh, distance);
997 else
998 neigh = maptile::find_async (path, map);
999}
1000 885
1001// prefetch a generous area around the player 886// prefetch a generous area around the player
1002static void 887static void
1003prefetch_surrounding_maps (object *op) 888prefetch_surrounding_maps (object *op)
1004{ 889{
1005 prefetch_surrounding_maps (op->map, 3); 890 for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
891 op->x - PREFETCH , op->y - PREFETCH ,
892 op->x + PREFETCH + 1, op->y + PREFETCH + 1);
893 rect->m;
894 ++rect)
895 rect->m->touch ();
1006} 896}
1007 897
1008//+GPL 898//+GPL
1009 899
1010/** 900/**
… …
1162 { 1052 {
1163 if (op->stats.maxhp > op->stats.hp 1053 if (op->stats.maxhp > op->stats.hp
1164 && op->stats.maxhp > 0 1054 && op->stats.maxhp > 0
1165 && (op->type == PLAYER 1055 && (op->type == PLAYER
1166 || op->type == DOOR // does not work, have maxhp 0 1056 || op->type == DOOR // does not work, have maxhp 0
1167 || QUERY_FLAG (op, FLAG_MONSTER) 1057 || op->flag [FLAG_MONSTER]
1168 || QUERY_FLAG (op, FLAG_ALIVE) 1058 || op->flag [FLAG_ALIVE]
1169 || QUERY_FLAG (op, FLAG_GENERATOR))) 1059 || op->flag [FLAG_GENERATOR]))
1170 { 1060 {
1171 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1061 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1172 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1062 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1173 } 1063 }
1174 1064
… …
1369 spell->cached_eat = casting_level (pl->ob, spell); 1259 spell->cached_eat = casting_level (pl->ob, spell);
1370 1260
1371 /* figure out which skill it uses, if it uses one */ 1261 /* figure out which skill it uses, if it uses one */
1372 if (spell->skill) 1262 if (spell->skill)
1373 if (object *tmp = pl->find_skill (spell->skill)) 1263 if (object *tmp = pl->find_skill (spell->skill))
1374 skill = tmp->subtype + CS_STAT_SKILLINFO; 1264 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1375 1265
1376 // spells better have a face 1266 // spells better have a face
1377 if (!spell->face) 1267 if (!spell->face)
1378 { 1268 {
1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1269 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1453 } 1343 }
1454 else 1344 else
1455 append_spell (pl, sl, spell); 1345 append_spell (pl, sl, spell);
1456 1346
1457 if (sl.length () > MAXSOCKBUF) 1347 if (sl.length () > MAXSOCKBUF)
1458 {
1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1348 cleanup ("buffer overflow in esrv_add_spells!");
1460 fatal (0);
1461 }
1462 1349
1463 /* finally, we can send the packet */ 1350 /* finally, we can send the packet */
1464 pl->ns->flush_fx (); 1351 pl->ns->flush_fx ();
1465 pl->ns->send_packet (sl); 1352 pl->ns->send_packet (sl);
1466} 1353}

Diff Legend

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