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.151 by root, Tue Oct 13 18:22:44 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.
… …
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25//+GPL
26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
29 * \date 2003-12-02 31 * \date 2003-12-02
… …
42 44
43#include <global.h> 45#include <global.h>
44#include <sproto.h> 46#include <sproto.h>
45 47
46#include <living.h> 48#include <living.h>
47#include <commands.h>
48 49
49/* 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,
50 * it should work here. 51 * it should work here.
51 */ 52 */
52#include <sys/types.h> 53#include <sys/types.h>
… …
64 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
65 * 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
66 * 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
67 * client. 68 * client.
68 */ 69 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
75 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
76 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
77 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
78 -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,
79 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
80 -1, /* Internal */ 95 -1, /* Internal */
81 -1, /* life stealing */ 96 -1, /* life stealing */
82 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
83}; 98};
… …
131 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
132 147
133 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
134 149
135 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
136
137 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
139
140 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
141} 153}
142 154
143static void 155static void
144send_map_info (player *pl) 156send_map_info (player *pl)
145{ 157{
146 client &socket = *pl->ns; 158 client &socket = *pl->ns;
147 object *ob = pl->observe; 159 object *ob = pl->viewpoint;
148 160
149 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
150 { 162 {
151 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
152 { 164 {
153 int flags = 0; 165 int flags = 0;
154 166
167 // due to historical glitches, the bit ordering and map index ordering differs
155 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01;
156 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02;
157 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04;
158 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;
159 175
160 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",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
163 } 179 }
… …
169/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
170static void 186static void
171check_map_change (player *pl) 187check_map_change (player *pl)
172{ 188{
173 client &socket = *pl->ns; 189 client &socket = *pl->ns;
174 object *ob = pl->observe; 190 object *ob = pl->viewpoint;
175 191
176 region *reg = ob->region (); 192 region *reg = ob->region ();
177 if (socket.current_region != reg) 193 if (socket.current_region != reg)
178 { 194 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
… …
215 socket.floorbox_reset (); 231 socket.floorbox_reset ();
216 } 232 }
217 233
218 socket.current_x = ob->x; 234 socket.current_x = ob->x;
219 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);
220} 275}
221 276
222/** 277/**
223 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
224 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
… …
237 { 292 {
238 *params++ = 0; 293 *params++ = 0;
239 break; 294 break;
240 } 295 }
241 296
242 if (!strcmp (buf, "image_info"))
243 send_image_info (ns, params);
244 else if (!strcmp (buf, "image_sums"))
245 send_image_sums (ns, params);
246 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
247 send_skill_info (ns, params); 298 send_skill_info (ns, params);
248 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
249 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
250 else 301 else
251 { 302 {
… …
267ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
268{ 319{
269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270} 321}
271 322
323//-GPL
324
272void 325void
273client::mapinfo_queue_clear () 326client::mapinfo_queue_clear ()
274{ 327{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i); 329 free (*i);
… …
283{ 336{
284 char *token = buf; 337 char *token = buf;
285 buf += strlen (buf) + 9; 338 buf += strlen (buf) + 9;
286 339
287 // initial map and its origin 340 // initial map and its origin
288 maptile *map = pl->observe->map; 341 maptile *map = pl->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x; 342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y; 343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291 int max_distance = 8; // limit maximum path length to something generous 344 int max_distance = 8; // limit maximum path length to something generous
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;
… …
400AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
401{ 464{
402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403} 466}
404 467
405/* 468//+GPL
406#define MSG_TYPE_BOOK 1
407#define MSG_TYPE_CARD 2
408#define MSG_TYPE_PAPER 3
409#define MSG_TYPE_SIGN 4
410#define MSG_TYPE_MONUMENT 5
411#define MSG_TYPE_SCRIPTED_DIALOG 6*/
412
413/** Reply to ExtendedInfos command */
414void
415ToggleExtendedText (char *buf, int len, client * ns)
416{
417 char cmdback[MAX_BUF];
418 char temp[10];
419 char command[50];
420 int info, nextinfo, i, flag;
421
422 cmdback[0] = '\0';
423
424 nextinfo = 0;
425 while (1)
426 {
427 /* 1. Extract an info */
428 info = nextinfo;
429
430 while ((info < len) && (buf[info] == ' '))
431 info++;
432
433 if (info >= len)
434 break;
435
436 nextinfo = info + 1;
437
438 while ((nextinfo < len) && (buf[nextinfo] != ' '))
439 nextinfo++;
440
441 if (nextinfo - info >= 49) /*Erroneous info asked */
442 continue;
443
444 strncpy (command, &(buf[info]), nextinfo - info);
445 command[nextinfo - info] = '\0';
446 /* 2. Interpret info */
447 i = sscanf (command, "%d", &flag);
448
449 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
450 ns->supported_readables |= (1 << flag);
451 /*3. Next info */
452 }
453
454 /* Send resulting state */
455 strcpy (cmdback, "ExtendedTextSet");
456
457 for (i = 0; i <= MSG_TYPE_LAST; i++)
458 if (ns->supported_readables & (1 << i))
459 {
460 strcat (cmdback, " ");
461 snprintf (temp, sizeof (temp), "%d", i);
462 strcat (cmdback, temp);
463 }
464
465 ns->send_packet (cmdback);
466}
467 469
468/** 470/**
469 * 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,
470 * etc.) 472 * etc.)
471 */ 473 */
… …
528 * commands. 530 * commands.
529 */ 531 */
530 pl->count = 0; 532 pl->count = 0;
531 533
532 //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
533 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
534 ? time = MAX_TIME * 100
535 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
536 538
537 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
538 packet sl ("comc"); 540 packet sl ("comc");
539 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
540 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
582 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
583 } 585 }
584} 586}
585 587
586/** 588/**
587 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
588 * socket. In real life, all we should care about is the client having
589 * something older than the server. If we assume the client will be
590 * backwards compatible, having it be a later version should not be a
591 * problem.
592 */ 590 */
593void 591void
594VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
595{ 593{
596 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
597 {
598 LOG (llevError, "CS: received corrupted version command\n");
599 return;
600 }
601
602 ns->cs_version = atoi (buf);
603 ns->sc_version = ns->cs_version;
604
605 LOG (llevDebug, "connection from client <%s>\n", buf);
606
607 //TODO: should log here just for statistics
608
609 //if (VERSION_CS != ns->cs_version)
610 // unchecked;
611
612 char *cp = strchr (buf + 1, ' ');
613 if (!cp)
614 return;
615
616 ns->sc_version = atoi (cp);
617
618 //if (VERSION_SC != ns->sc_version)
619 // unchecked;
620
621 cp = strchr (cp + 1, ' ');
622
623 if (cp)
624 {
625 ns->version = cp + 1;
626
627 if (ns->sc_version < 1026)
628 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
629 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
630 }
631} 595}
632 596
633/** sound related functions. */ 597/** sound related functions. */
634void 598void
635SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
688static void 652static void
689rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
690{ 654{
691 dynbuf_text &buf = msg_dynbuf; buf.clear (); 655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
692 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
693 if (pl->ranged_ob) 667 if (pl->ranged_ob)
694 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;
695 669
696 if (pl->combat_ob) 670 if (pl->combat_ob)
697 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;
… …
742 * commands for now. 716 * commands for now.
743 */ 717 */
744void 718void
745esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
746{ 720{
747 char buf[MAX_BUF];
748 uint16 flags;
749
750 client *ns = pl->ns; 721 client *ns = pl->ns;
751 if (!ns) 722 if (!ns)
752 return; 723 return;
753 724
754 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
771 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
775 746
776 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
777 if (object *skill = opl->last_skill_ob [s]) 748 if (object *skill = opl->last_skill_ob [s])
778 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
779 { 750 {
780 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
781 752
782 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
783 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
784 */ 755 */
785 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
786 << uint8 (skill->level) 757 << uint8 (skill->level)
787 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
788 } 759 }
789 760
790 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
791 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
792 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
793 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
794 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
795 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);
796 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
797 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);
798 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);
799 770
800 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
801 772 | (opl->run_on ? SF_RUNON : 0);
802 if (opl->fire_on)
803 flags |= SF_FIREON;
804
805 if (opl->run_on)
806 flags |= SF_RUNON;
807 773
808 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
809 775
810 if (ns->sc_version < 1025)
811 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
812 else
813 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
814 {
815 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
816 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
817 continue;
818
819 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]);
820 }
821 780
822 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
823 { 782 {
824 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);
825 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);
826 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);
827 } 786 }
828 787
788 char buf[MAX_BUF];
829 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 */
830 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
831 set_title (ob, buf); 791 set_title (ob, buf);
832 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
833 793
… …
927 887
928 /* Nothing changed */ 888 /* Nothing changed */
929 return 0; 889 return 0;
930} 890}
931 891
932// prefetch (and touch) all maps within a specific distancd 892//-GPL
893
894// prefetch some flat area around the player
933static void 895static void
934prefetch_surrounding_maps (maptile *map, int distance) 896prefetch_surrounding_area (object *op, maptile *map, int range)
935{ 897{
936 map->touch (); 898 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
937 899 op->x - range , op->y - range ,
938 if (--distance) 900 op->x + range + 1, op->y + range + 1);
939 for (int dir = 4; --dir; ) 901 rect->m;
940 if (const shstr &path = map->tile_path [dir]) 902 ++rect)
941 if (maptile *&neigh = map->tile_map [dir]) 903 {
942 prefetch_surrounding_maps (neigh, distance); 904 rect->m->touch ();
943 else 905 rect->m->activate ();
944 neigh = maptile::find_async (path, map); 906 }
945} 907}
946 908
947// prefetch a generous area around the player 909// prefetch a generous area around the player, also up and down
948static void 910void
949prefetch_surrounding_maps (object *op) 911object::prefetch_surrounding_maps ()
950{ 912{
951 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);
952} 920}
921
922//+GPL
953 923
954/** 924/**
955 * Draws client map. 925 * Draws client map.
956 */ 926 */
957void 927void
958draw_client_map (player *pl) 928draw_client_map (player *pl)
959{ 929{
960 object *ob = pl->observe; 930 object *ob = pl->viewpoint;
961 if (!ob->active) 931 if (!pl->observe->active)
962 return; 932 return;
963 933
964 /* 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
965 * 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
966 * be OK once they really log in. 936 * be OK once they really log in.
967 */ 937 */
968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 938 if (!ob->map || ob->map->state != MAP_ACTIVE)
969 return; 939 return;
970 940
971 int startlen, oldlen; 941 int startlen, oldlen;
972 942
973 check_map_change (pl); 943 check_map_change (pl);
974 prefetch_surrounding_maps (pl->ob); 944 pl->ob->prefetch_surrounding_maps ();
975 945
976 /* do LOS after calls to update_position */ 946 /* do LOS after calls to update_position */
977 /* unfortunately, we need to udpate los when observing, currently */ 947 /* unfortunately, we need to udpate los when observing, currently */
978 if (pl->do_los || pl->observe != pl->ob) 948 if (pl->do_los || pl->viewpoint != pl->ob)
979 { 949 {
980 pl->do_los = 0; 950 pl->do_los = 0;
981 pl->update_los (); 951 pl->update_los ();
982 } 952 }
983 953
… …
1004 * look like. 974 * look like.
1005 */ 975 */
1006 976
1007 client &socket = *pl->ns; 977 client &socket = *pl->ns;
1008 978
1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 979 packet sl ("map1a");
1010 980
1011 startlen = sl.length (); 981 startlen = sl.length ();
1012 982
1013 int hx = socket.mapx / 2; 983 int hx = socket.mapx / 2;
1014 int hy = socket.mapy / 2; 984 int hy = socket.mapy / 2;
… …
1035 map_clearcell (&lastcell, -1); 1005 map_clearcell (&lastcell, -1);
1036 } 1006 }
1037 1007
1038 continue; 1008 continue;
1039 } 1009 }
1040 1010
1041 int d = pl->blocked_los_uc (dx, dy); 1011 int d = pl->blocked_los_uc (dx, dy);
1042 1012
1043 if (d > 3) 1013 if (d > 3)
1044 { 1014 {
1045 /* This block deals with spaces that are not visible for whatever 1015 /* This block deals with spaces that are not visible for whatever
… …
1106 { 1076 {
1107 if (op->stats.maxhp > op->stats.hp 1077 if (op->stats.maxhp > op->stats.hp
1108 && op->stats.maxhp > 0 1078 && op->stats.maxhp > 0
1109 && (op->type == PLAYER 1079 && (op->type == PLAYER
1110 || op->type == DOOR // does not work, have maxhp 0 1080 || op->type == DOOR // does not work, have maxhp 0
1111 || QUERY_FLAG (op, FLAG_MONSTER) 1081 || op->flag [FLAG_MONSTER]
1112 || QUERY_FLAG (op, FLAG_ALIVE) 1082 || op->flag [FLAG_ALIVE]
1113 || QUERY_FLAG (op, FLAG_GENERATOR))) 1083 || op->flag [FLAG_GENERATOR]))
1114 { 1084 {
1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1085 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1116 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
1117 } 1087 }
1118 1088
… …
1214 socket.send_packet (sl); 1184 socket.send_packet (sl);
1215 socket.sent_scroll = 0; 1185 socket.sent_scroll = 0;
1216 } 1186 }
1217} 1187}
1218 1188
1219/*****************************************************************************/
1220/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1221/* a player. Of course, the client need to know the command to be able to */
1222/* manage it ! */
1223/*****************************************************************************/
1224void
1225send_plugin_custom_message (object *pl, char *buf)
1226{
1227 pl->contr->ns->send_packet (buf);
1228}
1229
1230/**
1231 * This sends the skill number to name mapping. We ignore
1232 * the params - we always send the same info no matter what.
1233 */
1234void
1235send_skill_info (client *ns, char *params)
1236{
1237 packet sl;
1238 sl << "replyinfo skill_info\n";
1239
1240 for (int i = 1; i < NUM_SKILLS; i++)
1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1242
1243 if (sl.length () > MAXSOCKBUF)
1244 {
1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1246 fatal (0);
1247 }
1248
1249 ns->send_packet (sl);
1250}
1251
1252/**
1253 * This sends the spell path to name mapping. We ignore
1254 * the params - we always send the same info no matter what.
1255 */
1256void
1257send_spell_paths (client * ns, char *params)
1258{
1259 packet sl;
1260
1261 sl << "replyinfo spell_paths\n";
1262
1263 for (int i = 0; i < NRSPELLPATHS; i++)
1264 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1265
1266 if (sl.length () > MAXSOCKBUF)
1267 {
1268 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1269 fatal (0);
1270 }
1271
1272 ns->send_packet (sl);
1273}
1274
1275/** 1189/**
1276 * 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.
1277 * 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
1278 */ 1192 */
1279void 1193void
1280esrv_update_spells (player *pl) 1194esrv_update_spells (player *pl)
1281{ 1195{
1282 if (!pl->ns) 1196 if (!pl->ns)
1283 return; 1197 return;
1284 1198
1199 pl->ns->update_spells = false;
1200
1285 if (!pl->ns->monitor_spells) 1201 if (!pl->ns->monitor_spells)
1286 return; 1202 return;
1287 1203
1288 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1204 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1289 {
1290 if (spell->type == SPELL) 1205 if (spell->type == SPELL)
1291 { 1206 {
1292 int flags = 0; 1207 int flags = 0;
1208 int val;
1293 1209
1294 /* check if we need to update it */ 1210 /* check if we need to update it */
1295 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)
1296 { 1213 {
1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1214 spell->cached_sp = val;
1298 flags |= UPD_SP_MANA; 1215 flags |= UPD_SP_MANA;
1299 } 1216 }
1300 1217
1301 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)
1302 { 1220 {
1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1221 spell->cached_grace = val;
1304 flags |= UPD_SP_GRACE; 1222 flags |= UPD_SP_GRACE;
1305 } 1223 }
1306 1224
1307 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)
1308 { 1227 {
1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1228 spell->cached_eat = val;
1310 flags |= UPD_SP_DAMAGE; 1229 flags |= UPD_SP_LEVEL;
1311 } 1230 }
1312 1231
1313 if (flags) 1232 if (flags)
1314 { 1233 {
1315 packet sl; 1234 packet sl;
1316 1235
1317 sl << "updspell " 1236 sl << "updspell "
1318 << uint8 (flags) 1237 << uint8 (flags)
1319 << uint32 (spell->count); 1238 << uint32 (spell->count);
1320 1239
1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1240 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1241 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1242 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1324 1243
1325 pl->ns->send_packet (sl); 1244 pl->ns->send_packet (sl);
1326 } 1245 }
1327 } 1246 }
1328 }
1329} 1247}
1330 1248
1331void 1249void
1332esrv_remove_spell (player *pl, object *spell) 1250esrv_remove_spell (player *pl, object *spell)
1333{ 1251{
… …
1360 } 1278 }
1361 1279
1362 /* 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 */
1363 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);
1364 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);
1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1283 spell->cached_eat = casting_level (pl->ob, spell);
1366 1284
1367 /* figure out which skill it uses, if it uses one */ 1285 /* figure out which skill it uses, if it uses one */
1368 if (spell->skill) 1286 if (spell->skill)
1369 if (object *tmp = pl->find_skill (spell->skill)) 1287 if (object *tmp = pl->find_skill (spell->skill))
1370 skill = tmp->subtype + CS_STAT_SKILLINFO; 1288 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1371 1289
1372 // spells better have a face 1290 // spells better have a face
1373 if (!spell->face) 1291 if (!spell->face)
1374 { 1292 {
1375 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);
… …
1449 } 1367 }
1450 else 1368 else
1451 append_spell (pl, sl, spell); 1369 append_spell (pl, sl, spell);
1452 1370
1453 if (sl.length () > MAXSOCKBUF) 1371 if (sl.length () > MAXSOCKBUF)
1454 {
1455 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1372 cleanup ("buffer overflow in esrv_add_spells!");
1456 fatal (0);
1457 }
1458 1373
1459 /* finally, we can send the packet */ 1374 /* finally, we can send the packet */
1460 pl->ns->flush_fx (); 1375 pl->ns->flush_fx ();
1461 pl->ns->send_packet (sl); 1376 pl->ns->send_packet (sl);
1462} 1377}
1463 1378
1379//-GPL
1380

Diff Legend

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