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.145 by root, Fri Dec 26 10:44:17 2008 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 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));
… …
208 else if (socket.current_x != ob->x || socket.current_y != ob->y) 225 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 { 226 {
210 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
212 229
213 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
214 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215 else
216 {
217 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 230 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218 socket.floorbox_reset (); 231 socket.floorbox_reset ();
219 }
220 } 232 }
221 233
222 socket.current_x = ob->x; 234 socket.current_x = ob->x;
223 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);
224} 275}
225 276
226/** 277/**
227 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
228 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
… …
241 { 292 {
242 *params++ = 0; 293 *params++ = 0;
243 break; 294 break;
244 } 295 }
245 296
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 298 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
254 else 301 else
255 { 302 {
… …
271ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
272{ 319{
273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274} 321}
275 322
323//-GPL
324
276void 325void
277client::mapinfo_queue_clear () 326client::mapinfo_queue_clear ()
278{ 327{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i); 329 free (*i);
… …
287{ 336{
288 char *token = buf; 337 char *token = buf;
289 buf += strlen (buf) + 9; 338 buf += strlen (buf) + 9;
290 339
291 // initial map and its origin 340 // initial map and its origin
292 maptile *map = pl->observe->map; 341 maptile *map = pl->viewpoint->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x; 342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y; 343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295 int max_distance = 8; // limit maximum path length to something generous 344 int max_distance = 8; // limit maximum path length to something generous
296 345
297 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
298 { 347 {
299 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
300 349
301 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))
302 { 355 {
356 dir = dirmap [dir];
357
303 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
304 map = 0; 359 map = 0;
305 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
306 { 361 {
307 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
… …
330 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
331 else 386 else
332 { 387 {
333 int flags = 0; 388 int flags = 0;
334 389
390 // due to historical glitches, the bit ordering and map index ordering differs
335 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path[TILE_NORTH]) flags |= 0x01;
336 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path[TILE_EAST ]) flags |= 0x02;
337 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
338 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;
339 398
340 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);
341 } 400 }
342 401
343 return 1; 402 return 1;
… …
404AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
405{ 464{
406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407} 466}
408 467
409/* 468//+GPL
410#define MSG_TYPE_BOOK 1
411#define MSG_TYPE_CARD 2
412#define MSG_TYPE_PAPER 3
413#define MSG_TYPE_SIGN 4
414#define MSG_TYPE_MONUMENT 5
415#define MSG_TYPE_SCRIPTED_DIALOG 6*/
416
417/** Reply to ExtendedInfos command */
418void
419ToggleExtendedText (char *buf, int len, client * ns)
420{
421 char cmdback[MAX_BUF];
422 char temp[10];
423 char command[50];
424 int info, nextinfo, i, flag;
425
426 cmdback[0] = '\0';
427
428 nextinfo = 0;
429 while (1)
430 {
431 /* 1. Extract an info */
432 info = nextinfo;
433
434 while ((info < len) && (buf[info] == ' '))
435 info++;
436
437 if (info >= len)
438 break;
439
440 nextinfo = info + 1;
441
442 while ((nextinfo < len) && (buf[nextinfo] != ' '))
443 nextinfo++;
444
445 if (nextinfo - info >= 49) /*Erroneous info asked */
446 continue;
447
448 strncpy (command, &(buf[info]), nextinfo - info);
449 command[nextinfo - info] = '\0';
450 /* 2. Interpret info */
451 i = sscanf (command, "%d", &flag);
452
453 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454 ns->supported_readables |= (1 << flag);
455 /*3. Next info */
456 }
457
458 /* Send resulting state */
459 strcpy (cmdback, "ExtendedTextSet");
460
461 for (i = 0; i <= MSG_TYPE_LAST; i++)
462 if (ns->supported_readables & (1 << i))
463 {
464 strcat (cmdback, " ");
465 snprintf (temp, sizeof (temp), "%d", i);
466 strcat (cmdback, temp);
467 }
468
469 ns->send_packet (cmdback);
470}
471 469
472/** 470/**
473 * 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,
474 * etc.) 472 * etc.)
475 */ 473 */
… …
488 return; 486 return;
489 487
490 buf++; 488 buf++;
491 } 489 }
492 490
493 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
494 492
495 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
496 * Cleaning up the input should probably be done first - all actions 494 * Cleaning up the input should probably be done first - all actions
497 * 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
498 * commands. 496 * commands.
… …
532 * commands. 530 * commands.
533 */ 531 */
534 pl->count = 0; 532 pl->count = 0;
535 533
536 //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
537 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
538 ? time = MAX_TIME * 100
539 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
540 538
541 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
542 packet sl ("comc"); 540 packet sl ("comc");
543 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
544 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
… …
586 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
587 } 585 }
588} 586}
589 587
590/** 588/**
591 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
592 * socket. In real life, all we should care about is the client having
593 * something older than the server. If we assume the client will be
594 * backwards compatible, having it be a later version should not be a
595 * problem.
596 */ 590 */
597void 591void
598VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
599{ 593{
600 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
601 {
602 LOG (llevError, "CS: received corrupted version command\n");
603 return;
604 }
605
606 ns->cs_version = atoi (buf);
607 ns->sc_version = ns->cs_version;
608
609 LOG (llevDebug, "connection from client <%s>\n", buf);
610
611 //TODO: should log here just for statistics
612
613 //if (VERSION_CS != ns->cs_version)
614 // unchecked;
615
616 char *cp = strchr (buf + 1, ' ');
617 if (!cp)
618 return;
619
620 ns->sc_version = atoi (cp);
621
622 //if (VERSION_SC != ns->sc_version)
623 // unchecked;
624
625 cp = strchr (cp + 1, ' ');
626
627 if (cp)
628 {
629 ns->version = cp + 1;
630
631 if (ns->sc_version < 1026)
632 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
633 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
634 }
635} 595}
636 596
637/** sound related functions. */ 597/** sound related functions. */
638void 598void
639SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
… …
690 * Get player's current range attack in obuf. 650 * Get player's current range attack in obuf.
691 */ 651 */
692static void 652static void
693rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
694{ 654{
695 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
696 666
697 if (pl->ranged_ob) 667 if (pl->ranged_ob)
698 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;
699 669
700 if (pl->combat_ob) 670 if (pl->combat_ob)
… …
746 * commands for now. 716 * commands for now.
747 */ 717 */
748void 718void
749esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
750{ 720{
751 char buf[MAX_BUF];
752 uint16 flags;
753
754 client *ns = pl->ns; 721 client *ns = pl->ns;
755 if (!ns) 722 if (!ns)
756 return; 723 return;
757 724
758 object *ob = pl->observe; 725 object *ob = pl->observe;
… …
775 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
776 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
777 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
778 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
779 746
780 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
781 if (object *skill = opl->last_skill_ob [s]) 748 if (object *skill = opl->last_skill_ob [s])
782 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
783 { 750 {
784 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
785 752
786 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
787 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
788 */ 755 */
789 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
790 << uint8 (skill->level) 757 << uint8 (skill->level)
791 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
792 } 759 }
793 760
794 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
795 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
796 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
797 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
798 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
799 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);
800 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
801 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);
802 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);
803 770
804 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
805 772 | (opl->run_on ? SF_RUNON : 0);
806 if (opl->fire_on)
807 flags |= SF_FIREON;
808
809 if (opl->run_on)
810 flags |= SF_RUNON;
811 773
812 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
813 775
814 if (ns->sc_version < 1025)
815 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
816 else
817 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
818 {
819 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
820 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
821 continue;
822
823 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]);
824 }
825 780
826 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
827 { 782 {
828 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);
829 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);
830 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);
831 } 786 }
832 787
788 char buf[MAX_BUF];
833 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 */
834 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
835 set_title (ob, buf); 791 set_title (ob, buf);
836 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
837 793
… …
931 887
932 /* Nothing changed */ 888 /* Nothing changed */
933 return 0; 889 return 0;
934} 890}
935 891
936// prefetch (and touch) all maps within a specific distancd 892//-GPL
893
894// prefetch some flat area around the player
937static void 895static void
938prefetch_surrounding_maps (maptile *map, int distance) 896prefetch_surrounding_area (object *op, maptile *map, int range)
939{ 897{
940 map->last_access = runtime; 898 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
941 899 op->x - range , op->y - range ,
942 if (--distance) 900 op->x + range + 1, op->y + range + 1);
943 for (int dir = 4; --dir; ) 901 rect->m;
944 if (const shstr &path = map->tile_path [dir]) 902 ++rect)
945 if (maptile *&neigh = map->tile_map [dir]) 903 {
946 prefetch_surrounding_maps (neigh, distance); 904 rect->m->touch ();
947 else 905 rect->m->activate ();
948 neigh = maptile::find_async (path, map); 906 }
949} 907}
950 908
951// prefetch a generous area around the player 909// prefetch a generous area around the player, also up and down
952static void 910void
953prefetch_surrounding_maps (object *op) 911object::prefetch_surrounding_maps ()
954{ 912{
955 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);
956} 920}
921
922//+GPL
957 923
958/** 924/**
959 * Draws client map. 925 * Draws client map.
960 */ 926 */
961void 927void
962draw_client_map (player *pl) 928draw_client_map (player *pl)
963{ 929{
964 object *ob = pl->observe; 930 object *ob = pl->viewpoint;
965 if (!ob->active) 931 if (!pl->observe->active)
966 return; 932 return;
967 933
968 /* 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
969 * 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
970 * be OK once they really log in. 936 * be OK once they really log in.
971 */ 937 */
972 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 938 if (!ob->map || ob->map->state != MAP_ACTIVE)
973 return; 939 return;
974 940
975 int startlen, oldlen; 941 int startlen, oldlen;
976 942
977 check_map_change (pl); 943 check_map_change (pl);
978 prefetch_surrounding_maps (pl->ob); 944 pl->ob->prefetch_surrounding_maps ();
979 945
980 /* do LOS after calls to update_position */ 946 /* do LOS after calls to update_position */
981 /* unfortunately, we need to udpate los when observing, currently */ 947 /* unfortunately, we need to udpate los when observing, currently */
982 if (pl->do_los || pl->observe != pl->ob) 948 if (pl->do_los || pl->viewpoint != pl->ob)
983 { 949 {
984 pl->do_los = 0; 950 pl->do_los = 0;
985 pl->update_los (); 951 pl->update_los ();
986 } 952 }
987 953
… …
1008 * look like. 974 * look like.
1009 */ 975 */
1010 976
1011 client &socket = *pl->ns; 977 client &socket = *pl->ns;
1012 978
1013 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 979 packet sl ("map1a");
1014 980
1015 startlen = sl.length (); 981 startlen = sl.length ();
1016 982
1017 int hx = socket.mapx / 2; 983 int hx = socket.mapx / 2;
1018 int hy = socket.mapy / 2; 984 int hy = socket.mapy / 2;
… …
1039 map_clearcell (&lastcell, -1); 1005 map_clearcell (&lastcell, -1);
1040 } 1006 }
1041 1007
1042 continue; 1008 continue;
1043 } 1009 }
1044 1010
1045 int d = pl->blocked_los_uc (dx, dy); 1011 int d = pl->blocked_los_uc (dx, dy);
1046 1012
1047 if (d > 3) 1013 if (d > 3)
1048 { 1014 {
1049 /* This block deals with spaces that are not visible for whatever 1015 /* This block deals with spaces that are not visible for whatever
… …
1082 1048
1083 unsigned char dummy; 1049 unsigned char dummy;
1084 unsigned char *last_ext = &dummy; 1050 unsigned char *last_ext = &dummy;
1085 1051
1086 /* Darkness changed */ 1052 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness) 1053 if (lastcell.count != d)
1088 { 1054 {
1089 mask |= 0x8; 1055 mask |= 0x8;
1090 1056
1091 if (socket.extmap) 1057 *last_ext |= 0x80;
1058 last_ext = &sl[sl.length ()];
1059 sl << uint8 (d);
1060 }
1061
1062 lastcell.count = d;
1063
1064 mapspace &ms = m->at (nx, ny);
1065 ms.update ();
1066
1067 // extmap handling
1068 uint8 stat_hp = 0;
1069 uint8 stat_width = 0;
1070 uint8 flags = 0;
1071 tag_t player = 0;
1072
1073 // send hp information, if applicable
1074 if (object *op = ms.faces_obj [0])
1075 if (op->is_head () && !op->invisible)
1076 {
1077 if (op->stats.maxhp > op->stats.hp
1078 && op->stats.maxhp > 0
1079 && (op->type == PLAYER
1080 || op->type == DOOR // does not work, have maxhp 0
1081 || op->flag [FLAG_MONSTER]
1082 || op->flag [FLAG_ALIVE]
1083 || op->flag [FLAG_GENERATOR]))
1084 {
1085 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1086 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1087 }
1088
1089 if (expect_false (op->has_dialogue ()))
1090 flags |= 1;
1091
1092 if (expect_false (op->type == PLAYER))
1093 player = op == ob ? pl->ob->count
1094 : op == pl->ob ? ob->count
1095 : op->count;
1096 }
1097
1098 if (expect_false (lastcell.stat_hp != stat_hp))
1099 {
1100 lastcell.stat_hp = stat_hp;
1101
1102 mask |= 0x8;
1103 *last_ext |= 0x80;
1104 last_ext = &sl[sl.length ()];
1105
1106 sl << uint8 (5) << uint8 (stat_hp);
1107
1108 if (stat_width > 1)
1092 { 1109 {
1093 *last_ext |= 0x80; 1110 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()]; 1111 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100 1112
1101 lastcell.count = d;
1102
1103 mapspace &ms = m->at (nx, ny);
1104 ms.update ();
1105
1106 if (expect_true (socket.extmap))
1107 {
1108 uint8 stat_hp = 0;
1109 uint8 stat_width = 0;
1110 uint8 flags = 0;
1111 tag_t player = 0;
1112
1113 // send hp information, if applicable
1114 if (object *op = ms.faces_obj [0])
1115 if (op->is_head () && !op->invisible)
1116 {
1117 if (op->stats.maxhp > op->stats.hp
1118 && op->stats.maxhp > 0
1119 && (op->type == PLAYER
1120 || op->type == DOOR // does not work, have maxhp 0
1121 || QUERY_FLAG (op, FLAG_MONSTER)
1122 || QUERY_FLAG (op, FLAG_ALIVE)
1123 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 {
1125 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127 }
1128
1129 if (expect_false (op->has_dialogue ()))
1130 flags |= 1;
1131
1132 if (expect_false (op->type == PLAYER))
1133 player = op == ob ? pl->ob->count
1134 : op == pl->ob ? ob->count
1135 : op->count;
1136 }
1137
1138 if (expect_false (lastcell.stat_hp != stat_hp))
1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1145
1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1149 {
1150 *last_ext |= 0x80;
1151 last_ext = &sl[sl.length ()];
1152
1153 sl << uint8 (6) << uint8 (stat_width); 1113 sl << uint8 (6) << uint8 (stat_width);
1154 }
1155 }
1156
1157 if (expect_false (lastcell.player != player))
1158 {
1159 lastcell.player = player;
1160
1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1164
1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1175
1176 sl << uint8 (8) << uint8 (flags);
1177 } 1114 }
1178 } 1115 }
1116
1117 if (expect_false (lastcell.player != player))
1118 {
1119 lastcell.player = player;
1120
1121 mask |= 0x8;
1122 *last_ext |= 0x80;
1123 last_ext = &sl[sl.length ()];
1124
1125 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1126 }
1127
1128 if (expect_false (lastcell.flags != flags))
1129 {
1130 lastcell.flags = flags;
1131
1132 mask |= 0x8;
1133 *last_ext |= 0x80;
1134 last_ext = &sl[sl.length ()];
1135
1136 sl << uint8 (8) << uint8 (flags);
1137 }
1138
1139 // faces
1179 1140
1180 /* Floor face */ 1141 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2)) 1142 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4; 1143 mask |= 0x4;
1183 1144
… …
1223 socket.send_packet (sl); 1184 socket.send_packet (sl);
1224 socket.sent_scroll = 0; 1185 socket.sent_scroll = 0;
1225 } 1186 }
1226} 1187}
1227 1188
1228/*****************************************************************************/
1229/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1230/* a player. Of course, the client need to know the command to be able to */
1231/* manage it ! */
1232/*****************************************************************************/
1233void
1234send_plugin_custom_message (object *pl, char *buf)
1235{
1236 pl->contr->ns->send_packet (buf);
1237}
1238
1239/**
1240 * This sends the skill number to name mapping. We ignore
1241 * the params - we always send the same info no matter what.
1242 */
1243void
1244send_skill_info (client *ns, char *params)
1245{
1246 packet sl;
1247 sl << "replyinfo skill_info\n";
1248
1249 for (int i = 1; i < NUM_SKILLS; i++)
1250 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1251
1252 if (sl.length () > MAXSOCKBUF)
1253 {
1254 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1255 fatal (0);
1256 }
1257
1258 ns->send_packet (sl);
1259}
1260
1261/**
1262 * This sends the spell path to name mapping. We ignore
1263 * the params - we always send the same info no matter what.
1264 */
1265void
1266send_spell_paths (client * ns, char *params)
1267{
1268 packet sl;
1269
1270 sl << "replyinfo spell_paths\n";
1271
1272 for (int i = 0; i < NRSPELLPATHS; i++)
1273 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1274
1275 if (sl.length () > MAXSOCKBUF)
1276 {
1277 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1278 fatal (0);
1279 }
1280
1281 ns->send_packet (sl);
1282}
1283
1284/** 1189/**
1285 * 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.
1286 * 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
1287 */ 1192 */
1288void 1193void
1289esrv_update_spells (player *pl) 1194esrv_update_spells (player *pl)
1290{ 1195{
1291 if (!pl->ns) 1196 if (!pl->ns)
1292 return; 1197 return;
1293 1198
1199 pl->ns->update_spells = false;
1200
1294 if (!pl->ns->monitor_spells) 1201 if (!pl->ns->monitor_spells)
1295 return; 1202 return;
1296 1203
1297 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1204 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1298 {
1299 if (spell->type == SPELL) 1205 if (spell->type == SPELL)
1300 { 1206 {
1301 int flags = 0; 1207 int flags = 0;
1208 int val;
1302 1209
1303 /* check if we need to update it */ 1210 /* check if we need to update it */
1304 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)
1305 { 1213 {
1306 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1214 spell->cached_sp = val;
1307 flags |= UPD_SP_MANA; 1215 flags |= UPD_SP_MANA;
1308 } 1216 }
1309 1217
1310 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)
1311 { 1220 {
1312 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1221 spell->cached_grace = val;
1313 flags |= UPD_SP_GRACE; 1222 flags |= UPD_SP_GRACE;
1314 } 1223 }
1315 1224
1316 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)
1317 { 1227 {
1318 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1228 spell->cached_eat = val;
1319 flags |= UPD_SP_DAMAGE; 1229 flags |= UPD_SP_LEVEL;
1320 } 1230 }
1321 1231
1322 if (flags) 1232 if (flags)
1323 { 1233 {
1324 packet sl; 1234 packet sl;
1325 1235
1326 sl << "updspell " 1236 sl << "updspell "
1327 << uint8 (flags) 1237 << uint8 (flags)
1328 << uint32 (spell->count); 1238 << uint32 (spell->count);
1329 1239
1330 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1240 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1331 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1241 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1332 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1242 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1333 1243
1334 pl->ns->send_packet (sl); 1244 pl->ns->send_packet (sl);
1335 } 1245 }
1336 } 1246 }
1337 }
1338} 1247}
1339 1248
1340void 1249void
1341esrv_remove_spell (player *pl, object *spell) 1250esrv_remove_spell (player *pl, object *spell)
1342{ 1251{
… …
1369 } 1278 }
1370 1279
1371 /* 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 */
1372 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);
1373 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);
1374 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1283 spell->cached_eat = casting_level (pl->ob, spell);
1375 1284
1376 /* figure out which skill it uses, if it uses one */ 1285 /* figure out which skill it uses, if it uses one */
1377 if (spell->skill) 1286 if (spell->skill)
1378 if (object *tmp = pl->find_skill (spell->skill)) 1287 if (object *tmp = pl->find_skill (spell->skill))
1379 skill = tmp->subtype + CS_STAT_SKILLINFO; 1288 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1380 1289
1381 // spells better have a face 1290 // spells better have a face
1382 if (!spell->face) 1291 if (!spell->face)
1383 { 1292 {
1384 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);
… …
1458 } 1367 }
1459 else 1368 else
1460 append_spell (pl, sl, spell); 1369 append_spell (pl, sl, spell);
1461 1370
1462 if (sl.length () > MAXSOCKBUF) 1371 if (sl.length () > MAXSOCKBUF)
1463 {
1464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1372 cleanup ("buffer overflow in esrv_add_spells!");
1465 fatal (0);
1466 }
1467 1373
1468 /* finally, we can send the packet */ 1374 /* finally, we can send the packet */
1469 pl->ns->flush_fx (); 1375 pl->ns->flush_fx ();
1470 pl->ns->send_packet (sl); 1376 pl->ns->send_packet (sl);
1471} 1377}
1472 1378
1379//-GPL
1380

Diff Legend

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