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.146 by root, Sat Dec 27 01:25:00 2008 UTC vs.
Revision 1.180 by root, Tue May 3 11:23:48 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
22 */ 23 */
24
25//+GPL
23 26
24/** 27/**
25 * \file 28 * \file
26 * Client handling. 29 * Client handling.
27 * 30 *
… …
41 44
42#include <global.h> 45#include <global.h>
43#include <sproto.h> 46#include <sproto.h>
44 47
45#include <living.h> 48#include <living.h>
46#include <commands.h>
47 49
48/* 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,
49 * it should work here. 51 * it should work here.
50 */ 52 */
51#include <sys/types.h> 53#include <sys/types.h>
… …
63 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
64 * 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
65 * 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
66 * client. 68 * client.
67 */ 69 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
74 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
75 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
76 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
77 -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,
78 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
79 -1, /* Internal */ 95 -1, /* Internal */
80 -1, /* life stealing */ 96 -1, /* life stealing */
81 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
82}; 98};
… …
130 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
131 147
132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133 149
134 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
135
136 if (pl->ns->newmapcmd == 1)
137 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
138
139 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
140} 153}
141 154
142static void 155static void
143send_map_info (player *pl) 156send_map_info (player *pl)
144{ 157{
145 client &socket = *pl->ns; 158 client &socket = *pl->ns;
146 object *ob = pl->observe; 159 object *ob = pl->viewpoint;
147 160
148 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
149 { 162 {
150 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path[0])
151 { 164 {
152 int flags = 0; 165 int flags = 0;
153 166
154 if (ob->map->tile_path[0]) flags |= 1; 167 if (ob->map->tile_path[0]) flags |= 0x01;
155 if (ob->map->tile_path[1]) flags |= 2; 168 if (ob->map->tile_path[1]) flags |= 0x02;
156 if (ob->map->tile_path[2]) flags |= 4; 169 if (ob->map->tile_path[2]) flags |= 0x04;
157 if (ob->map->tile_path[3]) flags |= 8; 170 if (ob->map->tile_path[3]) flags |= 0x08;
171 // these two are debatable
172 if (ob->map->tile_path[4]) flags |= 0x10;
173 if (ob->map->tile_path[5]) flags |= 0x20;
158 174
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", 175 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 176 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path); 177 ob->map->width, ob->map->height, &ob->map->path);
162 } 178 }
… …
168/** check for map/region change and send new map data */ 184/** check for map/region change and send new map data */
169static void 185static void
170check_map_change (player *pl) 186check_map_change (player *pl)
171{ 187{
172 client &socket = *pl->ns; 188 client &socket = *pl->ns;
173 object *ob = pl->observe; 189 object *ob = pl->viewpoint;
174 190
175 region *reg = ob->region (); 191 region *reg = ob->region ();
176 if (socket.current_region != reg) 192 if (socket.current_region != reg)
177 { 193 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 194 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
… …
214 socket.floorbox_reset (); 230 socket.floorbox_reset ();
215 } 231 }
216 232
217 socket.current_x = ob->x; 233 socket.current_x = ob->x;
218 socket.current_y = ob->y; 234 socket.current_y = ob->y;
235}
236
237/**
238 * This sends the skill number to name mapping. We ignore
239 * the params - we always send the same info no matter what.
240 */
241static void
242send_skill_info (client *ns, char *params)
243{
244 packet sl;
245 sl << "replyinfo skill_info\n";
246
247 for (int i = 0; i < skillvec.size (); ++i)
248 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
249
250 if (sl.length () > MAXSOCKBUF)
251 cleanup ("buffer overflow in send_skill_info!");
252
253 ns->send_packet (sl);
254}
255
256/**
257 * This sends the spell path to name mapping. We ignore
258 * the params - we always send the same info no matter what.
259 */
260static void
261send_spell_paths (client * ns, char *params)
262{
263 packet sl;
264
265 sl << "replyinfo spell_paths\n";
266
267 for (int i = 0; i < NRSPELLPATHS; i++)
268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
269
270 if (sl.length () > MAXSOCKBUF)
271 cleanup ("buffer overflow in send_spell_paths!");
272
273 ns->send_packet (sl);
219} 274}
220 275
221/** 276/**
222 * RequestInfo is sort of a meta command. There is some specific 277 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 278 * request of information, but we call other functions to provide
… …
236 { 291 {
237 *params++ = 0; 292 *params++ = 0;
238 break; 293 break;
239 } 294 }
240 295
241 if (!strcmp (buf, "image_info"))
242 send_image_info (ns, params);
243 else if (!strcmp (buf, "image_sums"))
244 send_image_sums (ns, params);
245 else if (!strcmp (buf, "skill_info")) 296 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 297 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 298 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 299 send_spell_paths (ns, params);
249 else 300 else
250 { 301 {
… …
266ExtiCmd (char *buf, int len, client *ns) 317ExtiCmd (char *buf, int len, client *ns)
267{ 318{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 319 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 320}
270 321
322//-GPL
323
271void 324void
272client::mapinfo_queue_clear () 325client::mapinfo_queue_clear ()
273{ 326{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 327 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 328 free (*i);
… …
282{ 335{
283 char *token = buf; 336 char *token = buf;
284 buf += strlen (buf) + 9; 337 buf += strlen (buf) + 9;
285 338
286 // initial map and its origin 339 // initial map and its origin
287 maptile *map = pl->observe->map; 340 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 341 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 342 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 343 int max_distance = 8; // limit maximum path length to something generous
291 344
292 while (*buf && map && max_distance) 345 while (*buf && map && max_distance)
293 { 346 {
294 int dir = *buf++ - '1'; 347 int dir = *buf++ - '1';
295 348
349 // maybe we should only allow the four flat directions
296 if (dir >= 0 && dir <= 3) 350 if (dir >= 0 && dir < TILE_NUM)
297 { 351 {
298 if (!map->tile_path [dir]) 352 if (!map->tile_path [dir])
299 map = 0; 353 map = 0;
300 else if (map->tile_available (dir, false)) 354 else if (map->tile_available (dir, false))
301 { 355 {
… …
325 send_packet_printf ("mapinfo %s nomap", token); 379 send_packet_printf ("mapinfo %s nomap", token);
326 else 380 else
327 { 381 {
328 int flags = 0; 382 int flags = 0;
329 383
330 if (map->tile_path[0]) flags |= 1; 384 if (map->tile_path[0]) flags |= 0x01;
331 if (map->tile_path[1]) flags |= 2; 385 if (map->tile_path[1]) flags |= 0x02;
332 if (map->tile_path[2]) flags |= 4; 386 if (map->tile_path[2]) flags |= 0x04;
333 if (map->tile_path[3]) flags |= 8; 387 if (map->tile_path[3]) flags |= 0x08;
388 // these two are debatable
389 if (map->tile_path[4]) flags |= 0x10;
390 if (map->tile_path[5]) flags |= 0x20;
334 391
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 392 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 } 393 }
337 394
338 return 1; 395 return 1;
… …
399AddMeCmd (char *buf, int len, client *ns) 456AddMeCmd (char *buf, int len, client *ns)
400{ 457{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 458 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 459}
403 460
404/* 461//+GPL
405#define MSG_TYPE_BOOK 1
406#define MSG_TYPE_CARD 2
407#define MSG_TYPE_PAPER 3
408#define MSG_TYPE_SIGN 4
409#define MSG_TYPE_MONUMENT 5
410#define MSG_TYPE_SCRIPTED_DIALOG 6*/
411
412/** Reply to ExtendedInfos command */
413void
414ToggleExtendedText (char *buf, int len, client * ns)
415{
416 char cmdback[MAX_BUF];
417 char temp[10];
418 char command[50];
419 int info, nextinfo, i, flag;
420
421 cmdback[0] = '\0';
422
423 nextinfo = 0;
424 while (1)
425 {
426 /* 1. Extract an info */
427 info = nextinfo;
428
429 while ((info < len) && (buf[info] == ' '))
430 info++;
431
432 if (info >= len)
433 break;
434
435 nextinfo = info + 1;
436
437 while ((nextinfo < len) && (buf[nextinfo] != ' '))
438 nextinfo++;
439
440 if (nextinfo - info >= 49) /*Erroneous info asked */
441 continue;
442
443 strncpy (command, &(buf[info]), nextinfo - info);
444 command[nextinfo - info] = '\0';
445 /* 2. Interpret info */
446 i = sscanf (command, "%d", &flag);
447
448 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
449 ns->supported_readables |= (1 << flag);
450 /*3. Next info */
451 }
452
453 /* Send resulting state */
454 strcpy (cmdback, "ExtendedTextSet");
455
456 for (i = 0; i <= MSG_TYPE_LAST; i++)
457 if (ns->supported_readables & (1 << i))
458 {
459 strcat (cmdback, " ");
460 snprintf (temp, sizeof (temp), "%d", i);
461 strcat (cmdback, temp);
462 }
463
464 ns->send_packet (cmdback);
465}
466 462
467/** 463/**
468 * This handles the general commands from the client (ie, north, fire, cast, 464 * This handles the general commands from the client (ie, north, fire, cast,
469 * etc.) 465 * etc.)
470 */ 466 */
… …
483 return; 479 return;
484 480
485 buf++; 481 buf++;
486 } 482 }
487 483
488 execute_newserver_command (pl->ob, (char *) buf); 484 execute_newserver_command (pl->ob, (char *)buf);
489 485
490 /* Perhaps something better should be done with a left over count. 486 /* Perhaps something better should be done with a left over count.
491 * Cleaning up the input should probably be done first - all actions 487 * Cleaning up the input should probably be done first - all actions
492 * for the command that issued the count should be done before any other 488 * for the command that issued the count should be done before any other
493 * commands. 489 * commands.
… …
527 * commands. 523 * commands.
528 */ 524 */
529 pl->count = 0; 525 pl->count = 0;
530 526
531 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 527 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
532 int time = fabs (pl->ob->speed) < 0.001 528 int time = pl->ob->has_active_speed ()
533 ? time = MAX_TIME * 100
534 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 529 ? (int) (MAX_TIME / pl->ob->speed)
530 : MAX_TIME * 100;
535 531
536 /* Send confirmation of command execution now */ 532 /* Send confirmation of command execution now */
537 packet sl ("comc"); 533 packet sl ("comc");
538 sl << uint16 (cmdid) << uint32 (time); 534 sl << uint16 (cmdid) << uint32 (time);
539 pl->ns->send_packet (sl); 535 pl->ns->send_packet (sl);
… …
581 LOG (llevError, "Unknown input state: %d\n", ns->state); 577 LOG (llevError, "Unknown input state: %d\n", ns->state);
582 } 578 }
583} 579}
584 580
585/** 581/**
586 * Client tells its version. If there is a mismatch, we close the 582 * Client tells its version info.
587 * socket. In real life, all we should care about is the client having
588 * something older than the server. If we assume the client will be
589 * backwards compatible, having it be a later version should not be a
590 * problem.
591 */ 583 */
592void 584void
593VersionCmd (char *buf, int len, client * ns) 585VersionCmd (char *buf, int len, client *ns)
594{ 586{
595 if (!buf) 587 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
596 {
597 LOG (llevError, "CS: received corrupted version command\n");
598 return;
599 }
600
601 ns->cs_version = atoi (buf);
602 ns->sc_version = ns->cs_version;
603
604 LOG (llevDebug, "connection from client <%s>\n", buf);
605
606 //TODO: should log here just for statistics
607
608 //if (VERSION_CS != ns->cs_version)
609 // unchecked;
610
611 char *cp = strchr (buf + 1, ' ');
612 if (!cp)
613 return;
614
615 ns->sc_version = atoi (cp);
616
617 //if (VERSION_SC != ns->sc_version)
618 // unchecked;
619
620 cp = strchr (cp + 1, ' ');
621
622 if (cp)
623 {
624 ns->version = cp + 1;
625
626 if (ns->sc_version < 1026)
627 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
628 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
629 }
630} 588}
631 589
632/** sound related functions. */ 590/** sound related functions. */
633void 591void
634SetSound (char *buf, int len, client * ns) 592SetSound (char *buf, int len, client * ns)
… …
685 * Get player's current range attack in obuf. 643 * Get player's current range attack in obuf.
686 */ 644 */
687static void 645static void
688rangetostring (player *pl, char *obuf) 646rangetostring (player *pl, char *obuf)
689{ 647{
690 dynbuf_text buf; 648 dynbuf_text &buf = msg_dynbuf; buf.clear ();
649
650#if 0
651 // print ranged/chosen_skill etc. objects every call
652 printf ("%s %s => %s (%s)\n",
653 pl->ranged_ob ? &pl->ranged_ob->name : "-",
654 pl->combat_ob ? &pl->combat_ob->name : "-",
655 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
656 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
657 );
658#endif
691 659
692 if (pl->ranged_ob) 660 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 661 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694 662
695 if (pl->combat_ob) 663 if (pl->combat_ob)
… …
741 * commands for now. 709 * commands for now.
742 */ 710 */
743void 711void
744esrv_update_stats (player *pl) 712esrv_update_stats (player *pl)
745{ 713{
746 char buf[MAX_BUF];
747 uint16 flags;
748
749 client *ns = pl->ns; 714 client *ns = pl->ns;
750 if (!ns) 715 if (!ns)
751 return; 716 return;
752 717
753 object *ob = pl->observe; 718 object *ob = pl->observe;
… …
770 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 735 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 736 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 737 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 738 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
774 739
775 for (int s = 0; s < NUM_SKILLS; s++) 740 for (int s = 0; s < CS_NUM_SKILLS; s++)
776 if (object *skill = opl->last_skill_ob [s]) 741 if (object *skill = opl->last_skill_ob [s])
777 if (skill->stats.exp != ns->last_skill_exp [s]) 742 if (skill->stats.exp != ns->last_skill_exp [s])
778 { 743 {
779 ns->last_skill_exp [s] = skill->stats.exp; 744 ns->last_skill_exp [s] = skill->stats.exp;
780 745
781 /* Always send along the level if exp changes. This is only 746 /* Always send along the level if exp changes. This is only
782 * 1 extra byte, but keeps processing simpler. 747 * 1 extra byte, but keeps processing simpler.
783 */ 748 */
784 sl << uint8 (s + CS_STAT_SKILLINFO) 749 sl << uint8 (CS_STAT_SKILLINFO + s)
785 << uint8 (skill->level) 750 << uint8 (skill->level)
786 << uint64 (skill->stats.exp); 751 << uint64 (skill->stats.exp);
787 } 752 }
788 753
789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 754 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 755 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 756 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 757 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 758 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 759 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 760 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
796 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 761 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 762 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798 763
799 flags = 0; 764 int flags = (opl->fire_on ? SF_FIREON : 0)
800 765 | (opl->run_on ? SF_RUNON : 0);
801 if (opl->fire_on)
802 flags |= SF_FIREON;
803
804 if (opl->run_on)
805 flags |= SF_RUNON;
806 766
807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 767 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
808 768
809 if (ns->sc_version < 1025)
810 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
811 else
812 for (int i = 0; i < NROFATTACKS; i++) 769 for (int i = 0; i < NROFATTACKS; i++)
813 {
814 /* Skip ones we won't send */ 770 /* Skip ones we won't send */
815 if (atnr_cs_stat[i] == -1) 771 if (atnr_cs_stat[i] >= 0)
816 continue;
817
818 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 772 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
819 }
820 773
821 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
822 { 775 {
823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 776 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
824 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 777 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
825 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 778 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
826 } 779 }
827 780
781 char buf[MAX_BUF];
828 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 782 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 783 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
830 set_title (ob, buf); 784 set_title (ob, buf);
831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 785 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
832 786
… …
926 880
927 /* Nothing changed */ 881 /* Nothing changed */
928 return 0; 882 return 0;
929} 883}
930 884
931// prefetch (and touch) all maps within a specific distancd 885//-GPL
886
887// prefetch some flat area around the player
932static void 888static void
933prefetch_surrounding_maps (maptile *map, int distance) 889prefetch_surrounding_area (object *op, maptile *map, int range)
934{ 890{
935 map->last_access = runtime; 891 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
936 892 op->x - range , op->y - range ,
937 if (--distance) 893 op->x + range + 1, op->y + range + 1);
938 for (int dir = 4; --dir; ) 894 rect->m;
939 if (const shstr &path = map->tile_path [dir]) 895 ++rect)
940 if (maptile *&neigh = map->tile_map [dir]) 896 {
941 prefetch_surrounding_maps (neigh, distance); 897 rect->m->touch ();
942 else 898 rect->m->activate ();
943 neigh = maptile::find_async (path, map); 899 }
944} 900}
945 901
946// prefetch a generous area around the player 902// prefetch a generous area around the player, also up and down
947static void 903void
948prefetch_surrounding_maps (object *op) 904object::prefetch_surrounding_maps ()
949{ 905{
950 prefetch_surrounding_maps (op->map, 3); 906 prefetch_surrounding_area (this, map, 40);
907
908 if (maptile *m = map->tile_available (TILE_DOWN))
909 prefetch_surrounding_area (this, m, 20);
910
911 if (maptile *m = map->tile_available (TILE_UP))
912 prefetch_surrounding_area (this, m, 20);
951} 913}
914
915//+GPL
952 916
953/** 917/**
954 * Draws client map. 918 * Draws client map.
955 */ 919 */
956void 920void
957draw_client_map (player *pl) 921draw_client_map (player *pl)
958{ 922{
959 object *ob = pl->observe; 923 object *ob = pl->viewpoint;
960 if (!ob->active) 924 if (!pl->observe->active)
961 return; 925 return;
962 926
963 /* If player is just joining the game, he isn't here yet, so the map 927 /* If player is just joining the game, he isn't here yet, so the map
964 * can get swapped out. If so, don't try to send them a map. All will 928 * can get swapped out. If so, don't try to send them a map. All will
965 * be OK once they really log in. 929 * be OK once they really log in.
… …
968 return; 932 return;
969 933
970 int startlen, oldlen; 934 int startlen, oldlen;
971 935
972 check_map_change (pl); 936 check_map_change (pl);
973 prefetch_surrounding_maps (pl->ob); 937 pl->ob->prefetch_surrounding_maps ();
974 938
975 /* do LOS after calls to update_position */ 939 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */ 940 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob) 941 if (pl->do_los || pl->viewpoint != pl->ob)
978 { 942 {
979 pl->do_los = 0; 943 pl->do_los = 0;
980 pl->update_los (); 944 pl->update_los ();
981 } 945 }
982 946
… …
1003 * look like. 967 * look like.
1004 */ 968 */
1005 969
1006 client &socket = *pl->ns; 970 client &socket = *pl->ns;
1007 971
1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 972 packet sl ("map1a");
1009 973
1010 startlen = sl.length (); 974 startlen = sl.length ();
1011 975
1012 int hx = socket.mapx / 2; 976 int hx = socket.mapx / 2;
1013 int hy = socket.mapy / 2; 977 int hy = socket.mapy / 2;
… …
1034 map_clearcell (&lastcell, -1); 998 map_clearcell (&lastcell, -1);
1035 } 999 }
1036 1000
1037 continue; 1001 continue;
1038 } 1002 }
1039 1003
1040 int d = pl->blocked_los_uc (dx, dy); 1004 int d = pl->blocked_los_uc (dx, dy);
1041 1005
1042 if (d > 3) 1006 if (d > 3)
1043 { 1007 {
1044 /* This block deals with spaces that are not visible for whatever 1008 /* This block deals with spaces that are not visible for whatever
… …
1081 /* Darkness changed */ 1045 /* Darkness changed */
1082 if (lastcell.count != d) 1046 if (lastcell.count != d)
1083 { 1047 {
1084 mask |= 0x8; 1048 mask |= 0x8;
1085 1049
1086 if (socket.extmap) 1050 *last_ext |= 0x80;
1051 last_ext = &sl[sl.length ()];
1052 sl << uint8 (d);
1053 }
1054
1055 lastcell.count = d;
1056
1057 mapspace &ms = m->at (nx, ny);
1058 ms.update ();
1059
1060 // extmap handling
1061 uint8 stat_hp = 0;
1062 uint8 stat_width = 0;
1063 uint8 flags = 0;
1064 tag_t player = 0;
1065
1066 // send hp information, if applicable
1067 if (object *op = ms.faces_obj [0])
1068 if (op->is_head () && !op->invisible)
1069 {
1070 if (op->stats.maxhp > op->stats.hp
1071 && op->stats.maxhp > 0
1072 && (op->type == PLAYER
1073 || op->type == DOOR // does not work, have maxhp 0
1074 || op->flag [FLAG_MONSTER]
1075 || op->flag [FLAG_ALIVE]
1076 || op->flag [FLAG_GENERATOR]))
1077 {
1078 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1079 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1080 }
1081
1082 if (expect_false (op->has_dialogue ()))
1083 flags |= 1;
1084
1085 if (expect_false (op->type == PLAYER))
1086 player = op == ob ? pl->ob->count
1087 : op == pl->ob ? ob->count
1088 : op->count;
1089 }
1090
1091 if (expect_false (lastcell.stat_hp != stat_hp))
1092 {
1093 lastcell.stat_hp = stat_hp;
1094
1095 mask |= 0x8;
1096 *last_ext |= 0x80;
1097 last_ext = &sl[sl.length ()];
1098
1099 sl << uint8 (5) << uint8 (stat_hp);
1100
1101 if (stat_width > 1)
1087 { 1102 {
1088 *last_ext |= 0x80; 1103 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()]; 1104 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095 1105
1096 lastcell.count = d;
1097
1098 mapspace &ms = m->at (nx, ny);
1099 ms.update ();
1100
1101 if (expect_true (socket.extmap))
1102 {
1103 uint8 stat_hp = 0;
1104 uint8 stat_width = 0;
1105 uint8 flags = 0;
1106 tag_t player = 0;
1107
1108 // send hp information, if applicable
1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1111 {
1112 if (op->stats.maxhp > op->stats.hp
1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1123
1124 if (expect_false (op->has_dialogue ()))
1125 flags |= 1;
1126
1127 if (expect_false (op->type == PLAYER))
1128 player = op == ob ? pl->ob->count
1129 : op == pl->ob ? ob->count
1130 : op->count;
1131 }
1132
1133 if (expect_false (lastcell.stat_hp != stat_hp))
1134 {
1135 lastcell.stat_hp = stat_hp;
1136
1137 mask |= 0x8;
1138 *last_ext |= 0x80;
1139 last_ext = &sl[sl.length ()];
1140
1141 sl << uint8 (5) << uint8 (stat_hp);
1142
1143 if (stat_width > 1)
1144 {
1145 *last_ext |= 0x80;
1146 last_ext = &sl[sl.length ()];
1147
1148 sl << uint8 (6) << uint8 (stat_width); 1106 sl << uint8 (6) << uint8 (stat_width);
1149 }
1150 }
1151
1152 if (expect_false (lastcell.player != player))
1153 {
1154 lastcell.player = player;
1155
1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1159
1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1170
1171 sl << uint8 (8) << uint8 (flags);
1172 } 1107 }
1173 } 1108 }
1109
1110 if (expect_false (lastcell.player != player))
1111 {
1112 lastcell.player = player;
1113
1114 mask |= 0x8;
1115 *last_ext |= 0x80;
1116 last_ext = &sl[sl.length ()];
1117
1118 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1119 }
1120
1121 if (expect_false (lastcell.flags != flags))
1122 {
1123 lastcell.flags = flags;
1124
1125 mask |= 0x8;
1126 *last_ext |= 0x80;
1127 last_ext = &sl[sl.length ()];
1128
1129 sl << uint8 (8) << uint8 (flags);
1130 }
1131
1132 // faces
1174 1133
1175 /* Floor face */ 1134 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2)) 1135 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4; 1136 mask |= 0x4;
1178 1137
… …
1218 socket.send_packet (sl); 1177 socket.send_packet (sl);
1219 socket.sent_scroll = 0; 1178 socket.sent_scroll = 0;
1220 } 1179 }
1221} 1180}
1222 1181
1223/*****************************************************************************/
1224/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1225/* a player. Of course, the client need to know the command to be able to */
1226/* manage it ! */
1227/*****************************************************************************/
1228void
1229send_plugin_custom_message (object *pl, char *buf)
1230{
1231 pl->contr->ns->send_packet (buf);
1232}
1233
1234/**
1235 * This sends the skill number to name mapping. We ignore
1236 * the params - we always send the same info no matter what.
1237 */
1238void
1239send_skill_info (client *ns, char *params)
1240{
1241 packet sl;
1242 sl << "replyinfo skill_info\n";
1243
1244 for (int i = 1; i < NUM_SKILLS; i++)
1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1246
1247 if (sl.length () > MAXSOCKBUF)
1248 {
1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1250 fatal (0);
1251 }
1252
1253 ns->send_packet (sl);
1254}
1255
1256/**
1257 * This sends the spell path to name mapping. We ignore
1258 * the params - we always send the same info no matter what.
1259 */
1260void
1261send_spell_paths (client * ns, char *params)
1262{
1263 packet sl;
1264
1265 sl << "replyinfo spell_paths\n";
1266
1267 for (int i = 0; i < NRSPELLPATHS; i++)
1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1269
1270 if (sl.length () > MAXSOCKBUF)
1271 {
1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1273 fatal (0);
1274 }
1275
1276 ns->send_packet (sl);
1277}
1278
1279/** 1182/**
1280 * This looks for any spells the player may have that have changed their stats. 1183 * This looks for any spells the player may have that have changed their stats.
1281 * it then sends an updspell packet for each spell that has changed in this way 1184 * it then sends an updspell packet for each spell that has changed in this way
1282 */ 1185 */
1283void 1186void
1284esrv_update_spells (player *pl) 1187esrv_update_spells (player *pl)
1285{ 1188{
1286 if (!pl->ns) 1189 if (!pl->ns)
1287 return; 1190 return;
1288 1191
1192 pl->ns->update_spells = false;
1193
1289 if (!pl->ns->monitor_spells) 1194 if (!pl->ns->monitor_spells)
1290 return; 1195 return;
1291 1196
1292 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1197 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1293 {
1294 if (spell->type == SPELL) 1198 if (spell->type == SPELL)
1295 { 1199 {
1296 int flags = 0; 1200 int flags = 0;
1201 int val;
1297 1202
1298 /* check if we need to update it */ 1203 /* check if we need to update it */
1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1204 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1205 if (spell->cached_sp != val)
1300 { 1206 {
1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1207 spell->cached_sp = val;
1302 flags |= UPD_SP_MANA; 1208 flags |= UPD_SP_MANA;
1303 } 1209 }
1304 1210
1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1211 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1212 if (spell->cached_grace != val)
1306 { 1213 {
1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1214 spell->cached_grace = val;
1308 flags |= UPD_SP_GRACE; 1215 flags |= UPD_SP_GRACE;
1309 } 1216 }
1310 1217
1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1218 val = casting_level (pl->ob, spell);
1219 if (spell->cached_eat != val)
1312 { 1220 {
1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1221 spell->cached_eat = val;
1314 flags |= UPD_SP_DAMAGE; 1222 flags |= UPD_SP_LEVEL;
1315 } 1223 }
1316 1224
1317 if (flags) 1225 if (flags)
1318 { 1226 {
1319 packet sl; 1227 packet sl;
1320 1228
1321 sl << "updspell " 1229 sl << "updspell "
1322 << uint8 (flags) 1230 << uint8 (flags)
1323 << uint32 (spell->count); 1231 << uint32 (spell->count);
1324 1232
1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1233 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1234 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1235 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1328 1236
1329 pl->ns->send_packet (sl); 1237 pl->ns->send_packet (sl);
1330 } 1238 }
1331 } 1239 }
1332 }
1333} 1240}
1334 1241
1335void 1242void
1336esrv_remove_spell (player *pl, object *spell) 1243esrv_remove_spell (player *pl, object *spell)
1337{ 1244{
… …
1364 } 1271 }
1365 1272
1366 /* store costs and damage in the object struct, to compare to later */ 1273 /* store costs and damage in the object struct, to compare to later */
1367 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1274 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1368 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1275 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1276 spell->cached_eat = casting_level (pl->ob, spell);
1370 1277
1371 /* figure out which skill it uses, if it uses one */ 1278 /* figure out which skill it uses, if it uses one */
1372 if (spell->skill) 1279 if (spell->skill)
1373 if (object *tmp = pl->find_skill (spell->skill)) 1280 if (object *tmp = pl->find_skill (spell->skill))
1374 skill = tmp->subtype + CS_STAT_SKILLINFO; 1281 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1375 1282
1376 // spells better have a face 1283 // spells better have a face
1377 if (!spell->face) 1284 if (!spell->face)
1378 { 1285 {
1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1286 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1453 } 1360 }
1454 else 1361 else
1455 append_spell (pl, sl, spell); 1362 append_spell (pl, sl, spell);
1456 1363
1457 if (sl.length () > MAXSOCKBUF) 1364 if (sl.length () > MAXSOCKBUF)
1458 {
1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1365 cleanup ("buffer overflow in esrv_add_spells!");
1460 fatal (0);
1461 }
1462 1366
1463 /* finally, we can send the packet */ 1367 /* finally, we can send the packet */
1464 pl->ns->flush_fx (); 1368 pl->ns->flush_fx ();
1465 pl->ns->send_packet (sl); 1369 pl->ns->send_packet (sl);
1466} 1370}
1467 1371
1372//-GPL
1373

Diff Legend

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