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.189 by root, Wed Oct 31 09:17:14 2012 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,2012 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)
151 { 164 {
152 int flags = 0; 165 int flags = 0;
153 166
167 // due to historical glitches, the bit ordering and map index ordering differs
154 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
155 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
156 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
157 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;
158 175
159 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",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
162 } 179 }
… …
168/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
169static void 186static void
170check_map_change (player *pl) 187check_map_change (player *pl)
171{ 188{
172 client &socket = *pl->ns; 189 client &socket = *pl->ns;
173 object *ob = pl->observe; 190 object *ob = pl->viewpoint;
174 191
175 region *reg = ob->region (); 192 region *reg = ob->region ();
176 if (socket.current_region != reg) 193 if (socket.current_region != reg)
177 { 194 {
178 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));
179 socket.current_region = reg; 196 socket.current_region = reg;
180 } 197 }
181 198
182 // first try to aovid a full newmap on tiled map scrolls 199 // first try to avoid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap) 200 if (socket.current_map != ob->map && !socket.force_newmap)
184 { 201 {
185 rv_vector rv; 202 rv_vector rv;
186 203
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
… …
214 socket.floorbox_reset (); 231 socket.floorbox_reset ();
215 } 232 }
216 233
217 socket.current_x = ob->x; 234 socket.current_x = ob->x;
218 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);
219} 275}
220 276
221/** 277/**
222 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
… …
236 { 292 {
237 *params++ = 0; 293 *params++ = 0;
238 break; 294 break;
239 } 295 }
240 296
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")) 297 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 298 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
249 else 301 else
250 { 302 {
… …
266ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
267{ 319{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 321}
270 322
323//-GPL
324
271void 325void
272client::mapinfo_queue_clear () 326client::mapinfo_queue_clear ()
273{ 327{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 329 free (*i);
… …
282{ 336{
283 char *token = buf; 337 char *token = buf;
284 buf += strlen (buf) + 9; 338 buf += strlen (buf) + 9;
285 339
286 // initial map and its origin 340 // initial map and its origin
287 maptile *map = pl->observe->map; 341 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 344 int max_distance = 8; // limit maximum path length to something generous
291 345
292 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
293 { 347 {
294 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
295 349
296 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 (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
297 { 355 {
356 dir = dirmap [dir];
357
298 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
299 map = 0; 359 map = 0;
300 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
301 { 361 {
302 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
325 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
326 else 386 else
327 { 387 {
328 int flags = 0; 388 int flags = 0;
329 389
390 // due to historical glitches, the bit ordering and map index ordering differs
330 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
331 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
332 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
333 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;
334 398
335 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);
336 } 400 }
337 401
338 return 1; 402 return 1;
… …
399AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
400{ 464{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 466}
403 467
404/* 468//+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 469
467/** 470/**
468 * 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,
469 * etc.) 472 * etc.)
470 */ 473 */
… …
483 return; 486 return;
484 487
485 buf++; 488 buf++;
486 } 489 }
487 490
488 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
489 492
490 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
491 * Cleaning up the input should probably be done first - all actions 494 * 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 495 * for the command that issued the count should be done before any other
493 * commands. 496 * commands.
… …
527 * commands. 530 * commands.
528 */ 531 */
529 pl->count = 0; 532 pl->count = 0;
530 533
531 //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
532 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
533 ? time = MAX_TIME * 100
534 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
535 538
536 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
537 packet sl ("comc"); 540 packet sl ("comc");
538 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
539 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
581 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
582 } 585 }
583} 586}
584 587
585/** 588/**
586 * Client tells its version. If there is a mismatch, we close the 589 * 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 */ 590 */
592void 591void
593VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
594{ 593{
595 if (!buf) 594 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} 595}
631 596
632/** sound related functions. */ 597/** sound related functions. */
633void 598void
634SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
685 * Get player's current range attack in obuf. 650 * Get player's current range attack in obuf.
686 */ 651 */
687static void 652static void
688rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
689{ 654{
690 dynbuf_text buf; 655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
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
691 666
692 if (pl->ranged_ob) 667 if (pl->ranged_ob)
693 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;
694 669
695 if (pl->combat_ob) 670 if (pl->combat_ob)
… …
741 * commands for now. 716 * commands for now.
742 */ 717 */
743void 718void
744esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
745{ 720{
746 char buf[MAX_BUF];
747 uint16 flags;
748
749 client *ns = pl->ns; 721 client *ns = pl->ns;
750 if (!ns) 722 if (!ns)
751 return; 723 return;
752 724
753 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
770 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
774 746
775 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
776 if (object *skill = opl->last_skill_ob [s]) 748 if (object *skill = opl->last_skill_ob [s])
777 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
778 { 750 {
779 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
780 752
781 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
782 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
783 */ 755 */
784 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
785 << uint8 (skill->level) 757 << uint8 (skill->level)
786 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
787 } 759 }
788 760
789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
794 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);
795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 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); 768 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); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798 770
799 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
800 772 | (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 773
807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
808 775
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++) 776 for (int i = 0; i < NROFATTACKS; i++)
813 {
814 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
815 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
816 continue;
817
818 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]);
819 }
820 780
821 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
822 { 782 {
823 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);
824 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);
825 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);
826 } 786 }
827 787
788 char buf[MAX_BUF];
828 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 */
829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
830 set_title (ob, buf); 791 set_title (ob, buf);
831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
832 793
… …
926 887
927 /* Nothing changed */ 888 /* Nothing changed */
928 return 0; 889 return 0;
929} 890}
930 891
931// prefetch (and touch) all maps within a specific distancd
932static void
933prefetch_surrounding_maps (maptile *map, int distance)
934{
935 map->last_access = runtime;
936
937 if (--distance)
938 for (int dir = 4; --dir; )
939 if (const shstr &path = map->tile_path [dir])
940 if (maptile *&neigh = map->tile_map [dir])
941 prefetch_surrounding_maps (neigh, distance);
942 else
943 neigh = maptile::find_async (path, map);
944}
945
946// prefetch a generous area around the player
947static void
948prefetch_surrounding_maps (object *op)
949{
950 prefetch_surrounding_maps (op->map, 3);
951}
952
953/** 892/**
954 * Draws client map. 893 * Draws client map.
955 */ 894 */
956void 895void
957draw_client_map (player *pl) 896draw_client_map (player *pl)
958{ 897{
959 object *ob = pl->observe; 898 object *ob = pl->viewpoint;
960 if (!ob->active) 899 if (!pl->observe->active)
961 return; 900 return;
962 901
963 /* If player is just joining the game, he isn't here yet, so the map 902 /* 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 903 * can get swapped out. If so, don't try to send them a map. All will
965 * be OK once they really log in. 904 * be OK once they really log in.
966 */ 905 */
967 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
968 return; 907 return;
969 908
970 int startlen, oldlen; 909 int startlen, oldlen;
971 910
972 check_map_change (pl); 911 check_map_change (pl);
973 prefetch_surrounding_maps (pl->ob); 912 pl->ob->prefetch_surrounding_maps ();
974 913
975 /* do LOS after calls to update_position */ 914 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */ 915 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob) 916 if (pl->do_los || pl->viewpoint != pl->ob)
978 { 917 {
979 pl->do_los = 0; 918 pl->do_los = 0;
980 pl->update_los (); 919 pl->update_los ();
981 } 920 }
982 921
… …
1003 * look like. 942 * look like.
1004 */ 943 */
1005 944
1006 client &socket = *pl->ns; 945 client &socket = *pl->ns;
1007 946
1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 947 packet sl ("map1a");
1009 948
1010 startlen = sl.length (); 949 startlen = sl.length ();
1011 950
1012 int hx = socket.mapx / 2; 951 int hx = socket.mapx / 2;
1013 int hy = socket.mapy / 2; 952 int hy = socket.mapy / 2;
… …
1034 map_clearcell (&lastcell, -1); 973 map_clearcell (&lastcell, -1);
1035 } 974 }
1036 975
1037 continue; 976 continue;
1038 } 977 }
1039 978
1040 int d = pl->blocked_los_uc (dx, dy); 979 int d = pl->blocked_los_uc (dx, dy);
1041 980
1042 if (d > 3) 981 if (d > 3)
1043 { 982 {
1044 /* This block deals with spaces that are not visible for whatever 983 /* This block deals with spaces that are not visible for whatever
… …
1081 /* Darkness changed */ 1020 /* Darkness changed */
1082 if (lastcell.count != d) 1021 if (lastcell.count != d)
1083 { 1022 {
1084 mask |= 0x8; 1023 mask |= 0x8;
1085 1024
1086 if (socket.extmap) 1025 *last_ext |= 0x80;
1026 last_ext = &sl[sl.length ()];
1027 sl << uint8 (d);
1028 }
1029
1030 lastcell.count = d;
1031
1032 mapspace &ms = m->at (nx, ny);
1033 ms.update ();
1034
1035 // extmap handling
1036 uint8 stat_hp = 0;
1037 uint8 stat_width = 0;
1038 uint8 flags = 0;
1039 tag_t player = 0;
1040
1041 // send hp information, if applicable
1042 if (object *op = ms.faces_obj [0])
1043 if (op->is_head () && !op->invisible)
1044 {
1045 if (op->stats.maxhp > op->stats.hp
1046 && op->stats.maxhp > 0
1047 && (op->type == PLAYER
1048 || op->type == DOOR // does not work, have maxhp 0
1049 || op->flag [FLAG_MONSTER]
1050 || op->flag [FLAG_ALIVE]
1051 || op->flag [FLAG_GENERATOR]))
1052 {
1053 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1054 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1055 }
1056
1057 if (expect_false (op->has_dialogue ()))
1058 flags |= 1;
1059
1060 if (expect_false (op->type == PLAYER))
1061 player = op == ob ? pl->ob->count
1062 : op == pl->ob ? ob->count
1063 : op->count;
1064 }
1065
1066 if (expect_false (lastcell.stat_hp != stat_hp))
1067 {
1068 lastcell.stat_hp = stat_hp;
1069
1070 mask |= 0x8;
1071 *last_ext |= 0x80;
1072 last_ext = &sl[sl.length ()];
1073
1074 sl << uint8 (5) << uint8 (stat_hp);
1075
1076 if (stat_width > 1)
1087 { 1077 {
1088 *last_ext |= 0x80; 1078 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()]; 1079 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095 1080
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); 1081 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 } 1082 }
1173 } 1083 }
1084
1085 if (expect_false (lastcell.player != player))
1086 {
1087 lastcell.player = player;
1088
1089 mask |= 0x8;
1090 *last_ext |= 0x80;
1091 last_ext = &sl[sl.length ()];
1092
1093 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1094 }
1095
1096 if (expect_false (lastcell.flags != flags))
1097 {
1098 lastcell.flags = flags;
1099
1100 mask |= 0x8;
1101 *last_ext |= 0x80;
1102 last_ext = &sl[sl.length ()];
1103
1104 sl << uint8 (8) << uint8 (flags);
1105 }
1106
1107 // faces
1174 1108
1175 /* Floor face */ 1109 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2)) 1110 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4; 1111 mask |= 0x4;
1178 1112
… …
1218 socket.send_packet (sl); 1152 socket.send_packet (sl);
1219 socket.sent_scroll = 0; 1153 socket.sent_scroll = 0;
1220 } 1154 }
1221} 1155}
1222 1156
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/** 1157/**
1280 * This looks for any spells the player may have that have changed their stats. 1158 * 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 1159 * it then sends an updspell packet for each spell that has changed in this way
1282 */ 1160 */
1283void 1161void
1284esrv_update_spells (player *pl) 1162esrv_update_spells (player *pl)
1285{ 1163{
1286 if (!pl->ns) 1164 if (!pl->ns)
1287 return; 1165 return;
1288 1166
1167 pl->ns->update_spells = false;
1168
1289 if (!pl->ns->monitor_spells) 1169 if (!pl->ns->monitor_spells)
1290 return; 1170 return;
1291 1171
1292 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1172 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1293 {
1294 if (spell->type == SPELL) 1173 if (spell->type == SPELL)
1295 { 1174 {
1296 int flags = 0; 1175 int flags = 0;
1176 int val;
1297 1177
1298 /* check if we need to update it */ 1178 /* check if we need to update it */
1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1179 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1180 if (spell->cached_sp != val)
1300 { 1181 {
1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1182 spell->cached_sp = val;
1302 flags |= UPD_SP_MANA; 1183 flags |= UPD_SP_MANA;
1303 } 1184 }
1304 1185
1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1186 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1187 if (spell->cached_grace != val)
1306 { 1188 {
1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1189 spell->cached_grace = val;
1308 flags |= UPD_SP_GRACE; 1190 flags |= UPD_SP_GRACE;
1309 } 1191 }
1310 1192
1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1193 val = casting_level (pl->ob, spell);
1194 if (spell->cached_eat != val)
1312 { 1195 {
1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1196 spell->cached_eat = val;
1314 flags |= UPD_SP_DAMAGE; 1197 flags |= UPD_SP_LEVEL;
1315 } 1198 }
1316 1199
1317 if (flags) 1200 if (flags)
1318 { 1201 {
1319 packet sl; 1202 packet sl;
1320 1203
1321 sl << "updspell " 1204 sl << "updspell "
1322 << uint8 (flags) 1205 << uint8 (flags)
1323 << uint32 (spell->count); 1206 << uint32 (spell->count);
1324 1207
1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1208 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1209 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1210 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1328 1211
1329 pl->ns->send_packet (sl); 1212 pl->ns->send_packet (sl);
1330 } 1213 }
1331 } 1214 }
1332 }
1333} 1215}
1334 1216
1335void 1217void
1336esrv_remove_spell (player *pl, object *spell) 1218esrv_remove_spell (player *pl, object *spell)
1337{ 1219{
… …
1353 1235
1354/* appends the spell *spell to the Socklist we will send the data to. */ 1236/* appends the spell *spell to the Socklist we will send the data to. */
1355static void 1237static void
1356append_spell (player *pl, packet &sl, object *spell) 1238append_spell (player *pl, packet &sl, object *spell)
1357{ 1239{
1358 int i, skill = 0; 1240 int skill = 0;
1359 1241
1360 if (!(spell->name)) 1242 if (!(spell->name))
1361 { 1243 {
1362 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1363 return; 1245 return;
1364 } 1246 }
1365 1247
1366 /* store costs and damage in the object struct, to compare to later */ 1248 /* 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); 1249 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); 1250 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); 1251 spell->cached_eat = casting_level (pl->ob, spell);
1370 1252
1371 /* figure out which skill it uses, if it uses one */ 1253 /* figure out which skill it uses, if it uses one */
1372 if (spell->skill) 1254 if (spell->skill)
1373 if (object *tmp = pl->find_skill (spell->skill)) 1255 if (object *tmp = pl->find_skill (spell->skill))
1374 skill = tmp->subtype + CS_STAT_SKILLINFO; 1256 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1375 1257
1376 // spells better have a face 1258 // spells better have a face
1377 if (!spell->face) 1259 if (!spell->face)
1378 { 1260 {
1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1261 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1453 } 1335 }
1454 else 1336 else
1455 append_spell (pl, sl, spell); 1337 append_spell (pl, sl, spell);
1456 1338
1457 if (sl.length () > MAXSOCKBUF) 1339 if (sl.length () > MAXSOCKBUF)
1458 {
1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1340 cleanup ("buffer overflow in esrv_add_spells!");
1460 fatal (0);
1461 }
1462 1341
1463 /* finally, we can send the packet */ 1342 /* finally, we can send the packet */
1464 pl->ns->flush_fx (); 1343 pl->ns->flush_fx ();
1465 pl->ns->send_packet (sl); 1344 pl->ns->send_packet (sl);
1466} 1345}
1467 1346
1347//-GPL
1348

Diff Legend

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