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.136 by root, Sun Aug 10 16:31:18 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};
98 */ 114 */
99 mx = ns->mapx; 115 mx = ns->mapx;
100 my = ns->mapy; 116 my = ns->mapy;
101 117
102 /* the x and y here are coordinates for the new map, i.e. if we moved 118 /* the x and y here are coordinates for the new map, i.e. if we moved
103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 119 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104 * if the destination x or y coordinate is outside the viewable 120 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 121 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 122 * are preserved, and the check_head thinks it needs to clear them.
107 */ 123 */
108 for (x = 0; x < mx; x++) 124 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 125 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 126 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 127 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 128 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 129 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 130 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 131 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 132 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 133 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 134
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 136
125 /* Make sure that the next "map1" command will be sent (even if it is 137 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 138 * empty).
134 pl->ns->mapinfo_queue_clear (); 146 pl->ns->mapinfo_queue_clear ();
135 147
136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137 149
138 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
139
140 if (pl->ns->newmapcmd == 1)
141 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
142
143 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
144} 153}
145 154
146static void 155static void
147send_map_info (player *pl) 156send_map_info (player *pl)
148{ 157{
149 client &socket = *pl->ns; 158 client &socket = *pl->ns;
150 object *ob = pl->observe; 159 object *ob = pl->viewpoint;
151 160
152 if (socket.mapinfocmd) 161 if (socket.mapinfocmd)
153 { 162 {
154 if (ob->map && ob->map->path[0]) 163 if (ob->map && ob->map->path)
155 { 164 {
156 int flags = 0; 165 int flags = 0;
157 166
167 // due to historical glitches, the bit ordering and map index ordering differs
158 if (ob->map->tile_path[0]) flags |= 1; 168 if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01;
159 if (ob->map->tile_path[1]) flags |= 2; 169 if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02;
160 if (ob->map->tile_path[2]) flags |= 4; 170 if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04;
161 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;
162 175
163 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",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path); 178 ob->map->width, ob->map->height, &ob->map->path);
166 } 179 }
172/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
173static void 186static void
174check_map_change (player *pl) 187check_map_change (player *pl)
175{ 188{
176 client &socket = *pl->ns; 189 client &socket = *pl->ns;
177 object *ob = pl->observe; 190 object *ob = pl->viewpoint;
178 191
179 region *reg = ob->region (); 192 region *reg = ob->region ();
180 if (socket.current_region != reg) 193 if (socket.current_region != reg)
181 { 194 {
182 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));
212 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)
213 { 226 {
214 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
215 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
216 229
217 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
218 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219 else
220 {
221 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);
222 socket.floorbox_reset (); 231 socket.floorbox_reset ();
223 }
224 } 232 }
225 233
226 socket.current_x = ob->x; 234 socket.current_x = ob->x;
227 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);
228} 275}
229 276
230/** 277/**
231 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
232 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
245 { 292 {
246 *params++ = 0; 293 *params++ = 0;
247 break; 294 break;
248 } 295 }
249 296
250 if (!strcmp (buf, "image_info"))
251 send_image_info (ns, params);
252 else if (!strcmp (buf, "image_sums"))
253 send_image_sums (ns, params);
254 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
255 send_skill_info (ns, params); 298 send_skill_info (ns, params);
256 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
257 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
258 else 301 else
259 { 302 {
275ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
276{ 319{
277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278} 321}
279 322
323//-GPL
324
280void 325void
281client::mapinfo_queue_clear () 326client::mapinfo_queue_clear ()
282{ 327{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i); 329 free (*i);
291{ 336{
292 char *token = buf; 337 char *token = buf;
293 buf += strlen (buf) + 9; 338 buf += strlen (buf) + 9;
294 339
295 // initial map and its origin 340 // initial map and its origin
296 maptile *map = pl->observe->map; 341 maptile *map = pl->viewpoint->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x; 342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y; 343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299 int max_distance = 8; // limit maximum path length to something generous 344 int max_distance = 8; // limit maximum path length to something generous
300 345
301 while (*buf && map && max_distance) 346 while (*buf && map && max_distance)
302 { 347 {
303 int dir = *buf++ - '1'; 348 int dir = *buf++ - '1';
304 349
305 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))
306 { 355 {
356 dir = dirmap [dir];
357
307 if (!map->tile_path [dir]) 358 if (!map->tile_path [dir])
308 map = 0; 359 map = 0;
309 else if (map->tile_available (dir, false)) 360 else if (map->tile_available (dir, false))
310 { 361 {
311 maptile *neigh = map->tile_map [dir]; 362 maptile *neigh = map->tile_map [dir];
334 send_packet_printf ("mapinfo %s nomap", token); 385 send_packet_printf ("mapinfo %s nomap", token);
335 else 386 else
336 { 387 {
337 int flags = 0; 388 int flags = 0;
338 389
390 // due to historical glitches, the bit ordering and map index ordering differs
339 if (map->tile_path[0]) flags |= 1; 391 if (map->tile_path[TILE_NORTH]) flags |= 0x01;
340 if (map->tile_path[1]) flags |= 2; 392 if (map->tile_path[TILE_EAST ]) flags |= 0x02;
341 if (map->tile_path[2]) flags |= 4; 393 if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
342 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;
343 398
344 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);
345 } 400 }
346 401
347 return 1; 402 return 1;
408AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
409{ 464{
410 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411} 466}
412 467
413/** Reply to ExtendedInfos command */ 468//+GPL
414void
415ToggleExtendedInfos (char *buf, int len, client * ns)
416{
417 char cmdback[MAX_BUF];
418 char command[50];
419 int info, nextinfo;
420
421 cmdback[0] = '\0';
422 nextinfo = 0;
423
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
445 /* 2. Interpret info */
446 if (!strcmp ("smooth", command))
447 /* Toggle smoothing */
448 ns->EMI_smooth = !ns->EMI_smooth;
449 else
450 /*bad value */;
451
452 /*3. Next info */
453 }
454
455 strcpy (cmdback, "ExtendedInfoSet");
456
457 if (ns->EMI_smooth)
458 {
459 strcat (cmdback, " ");
460 strcat (cmdback, "smoothing");
461 }
462
463 ns->send_packet (cmdback);
464}
465
466/*
467#define MSG_TYPE_BOOK 1
468#define MSG_TYPE_CARD 2
469#define MSG_TYPE_PAPER 3
470#define MSG_TYPE_SIGN 4
471#define MSG_TYPE_MONUMENT 5
472#define MSG_TYPE_SCRIPTED_DIALOG 6*/
473
474/** Reply to ExtendedInfos command */
475void
476ToggleExtendedText (char *buf, int len, client * ns)
477{
478 char cmdback[MAX_BUF];
479 char temp[10];
480 char command[50];
481 int info, nextinfo, i, flag;
482
483 cmdback[0] = '\0';
484
485 nextinfo = 0;
486 while (1)
487 {
488 /* 1. Extract an info */
489 info = nextinfo;
490
491 while ((info < len) && (buf[info] == ' '))
492 info++;
493
494 if (info >= len)
495 break;
496
497 nextinfo = info + 1;
498
499 while ((nextinfo < len) && (buf[nextinfo] != ' '))
500 nextinfo++;
501
502 if (nextinfo - info >= 49) /*Erroneous info asked */
503 continue;
504
505 strncpy (command, &(buf[info]), nextinfo - info);
506 command[nextinfo - info] = '\0';
507 /* 2. Interpret info */
508 i = sscanf (command, "%d", &flag);
509
510 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511 ns->supported_readables |= (1 << flag);
512 /*3. Next info */
513 }
514
515 /* Send resulting state */
516 strcpy (cmdback, "ExtendedTextSet");
517
518 for (i = 0; i <= MSG_TYPE_LAST; i++)
519 if (ns->supported_readables & (1 << i))
520 {
521 strcat (cmdback, " ");
522 snprintf (temp, sizeof (temp), "%d", i);
523 strcat (cmdback, temp);
524 }
525
526 ns->send_packet (cmdback);
527}
528 469
529/** 470/**
530 * 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,
531 * etc.) 472 * etc.)
532 */ 473 */
545 return; 486 return;
546 487
547 buf++; 488 buf++;
548 } 489 }
549 490
550 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
551 492
552 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
553 * Cleaning up the input should probably be done first - all actions 494 * Cleaning up the input should probably be done first - all actions
554 * 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
555 * commands. 496 * commands.
589 * commands. 530 * commands.
590 */ 531 */
591 pl->count = 0; 532 pl->count = 0;
592 533
593 //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
594 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
595 ? time = MAX_TIME * 100
596 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
597 538
598 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
599 packet sl ("comc"); 540 packet sl ("comc");
600 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
601 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
643 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
644 } 585 }
645} 586}
646 587
647/** 588/**
648 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
649 * socket. In real life, all we should care about is the client having
650 * something older than the server. If we assume the client will be
651 * backwards compatible, having it be a later version should not be a
652 * problem.
653 */ 590 */
654void 591void
655VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
656{ 593{
657 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
658 {
659 LOG (llevError, "CS: received corrupted version command\n");
660 return;
661 }
662
663 ns->cs_version = atoi (buf);
664 ns->sc_version = ns->cs_version;
665
666 LOG (llevDebug, "connection from client <%s>\n", buf);
667
668 //TODO: should log here just for statistics
669
670 //if (VERSION_CS != ns->cs_version)
671 // unchecked;
672
673 char *cp = strchr (buf + 1, ' ');
674 if (!cp)
675 return;
676
677 ns->sc_version = atoi (cp);
678
679 //if (VERSION_SC != ns->sc_version)
680 // unchecked;
681
682 cp = strchr (cp + 1, ' ');
683
684 if (cp)
685 {
686 ns->version = cp + 1;
687
688 if (ns->sc_version < 1026)
689 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
690 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
691 }
692} 595}
693 596
694/** sound related functions. */ 597/** sound related functions. */
695void 598void
696SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
747 * Get player's current range attack in obuf. 650 * Get player's current range attack in obuf.
748 */ 651 */
749static void 652static void
750rangetostring (player *pl, char *obuf) 653rangetostring (player *pl, char *obuf)
751{ 654{
752 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
753 666
754 if (pl->ranged_ob) 667 if (pl->ranged_ob)
755 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;
756 669
757 if (pl->combat_ob) 670 if (pl->combat_ob)
803 * commands for now. 716 * commands for now.
804 */ 717 */
805void 718void
806esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
807{ 720{
808 char buf[MAX_BUF];
809 uint16 flags;
810
811 client *ns = pl->ns; 721 client *ns = pl->ns;
812 if (!ns) 722 if (!ns)
813 return; 723 return;
814 724
815 object *ob = pl->observe; 725 object *ob = pl->observe;
832 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836 746
837 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
838 if (object *skill = opl->last_skill_ob[s]) 748 if (object *skill = opl->last_skill_ob [s])
839 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
840 { 750 {
841 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
842 752
843 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
844 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
845 */ 755 */
846 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
847 << uint8 (skill->level) 757 << uint8 (skill->level)
848 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
849 } 759 }
850 760
851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856 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);
857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
858 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);
859 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);
860 770
861 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
862 772 | (opl->run_on ? SF_RUNON : 0);
863 if (opl->fire_on)
864 flags |= SF_FIREON;
865
866 if (opl->run_on)
867 flags |= SF_RUNON;
868 773
869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870 775
871 if (ns->sc_version < 1025)
872 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
873 else
874 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
875 {
876 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
877 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
878 continue;
879
880 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]);
881 }
882 780
883 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
884 { 782 {
885 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);
886 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);
887 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);
888 } 786 }
889 787
788 char buf[MAX_BUF];
890 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 */
891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
892 set_title (ob, buf); 791 set_title (ob, buf);
893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
894 793
912 << uint32 (pl->ob->face) 811 << uint32 (pl->ob->face)
913 << data8 (pl->ob->name); 812 << data8 (pl->ob->name);
914 813
915 pl->ns->last_weight = weight; 814 pl->ns->last_weight = weight;
916 pl->ns->send_packet (sl); 815 pl->ns->send_packet (sl);
917 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918} 816}
919 817
920/****************************************************************************** 818/******************************************************************************
921 * 819 *
922 * Start of map related commands. 820 * Start of map related commands.
989 887
990 /* Nothing changed */ 888 /* Nothing changed */
991 return 0; 889 return 0;
992} 890}
993 891
994/** 892//-GPL
995 * Returns the size of a data for a map square as returned by
996 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
997 * available.
998 */
999int
1000getExtendedMapInfoSize (client * ns)
1001{
1002 int result = 0;
1003 893
1004 if (ns->ext_mapinfos) 894// prefetch some flat area around the player
1005 {
1006 if (ns->EMI_smooth)
1007 result += 1; /*One byte for smoothlevel */
1008 }
1009
1010 return result;
1011}
1012
1013// prefetch (and touch) all maps within a specific distancd
1014static void 895static void
1015prefetch_surrounding_maps (maptile *map, int distance) 896prefetch_surrounding_area (object *op, maptile *map, int range)
1016{ 897{
1017 map->last_access = runtime; 898 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
1018 899 op->x - range , op->y - range ,
1019 if (--distance) 900 op->x + range + 1, op->y + range + 1);
1020 for (int dir = 4; --dir; ) 901 rect->m;
1021 if (const shstr &path = map->tile_path [dir]) 902 ++rect)
1022 if (maptile *&neigh = map->tile_map [dir]) 903 {
1023 prefetch_surrounding_maps (neigh, distance); 904 rect->m->touch ();
1024 else 905 rect->m->activate ();
1025 neigh = maptile::find_async (path, map); 906 }
1026} 907}
1027 908
1028// prefetch a generous area around the player 909// prefetch a generous area around the player, also up and down
1029static void 910void
1030prefetch_surrounding_maps (object *op) 911object::prefetch_surrounding_maps ()
1031{ 912{
1032 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);
1033} 920}
921
922//+GPL
1034 923
1035/** 924/**
1036 * Draws client map. 925 * Draws client map.
1037 */ 926 */
1038void 927void
1039draw_client_map (player *pl) 928draw_client_map (player *pl)
1040{ 929{
1041 object *ob = pl->observe; 930 object *ob = pl->viewpoint;
1042 if (!ob->active) 931 if (!pl->observe->active)
1043 return; 932 return;
1044
1045 maptile *plmap = ob->map;
1046 933
1047 /* 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
1048 * 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
1049 * be OK once they really log in. 936 * be OK once they really log in.
1050 */ 937 */
1051 if (!plmap || plmap->in_memory != MAP_ACTIVE) 938 if (!ob->map || ob->map->state != MAP_ACTIVE)
1052 return; 939 return;
1053 940
1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055 int estartlen, eoldlen; 941 int startlen, oldlen;
1056 uint8 eentrysize;
1057 uint16 ewhatstart, ewhatflag;
1058 uint8 extendedinfos;
1059 942
1060 check_map_change (pl); 943 check_map_change (pl);
1061 prefetch_surrounding_maps (pl->ob); 944 pl->ob->prefetch_surrounding_maps ();
1062 945
1063 /* do LOS after calls to update_position */ 946 /* do LOS after calls to update_position */
1064 if (ob != pl->ob) 947 /* unfortunately, we need to udpate los when observing, currently */
1065 clear_los (pl); 948 if (pl->do_los || pl->viewpoint != pl->ob)
1066 else if (pl->do_los)
1067 { 949 {
1068 update_los (ob);
1069 pl->do_los = 0; 950 pl->do_los = 0;
951 pl->update_los ();
1070 } 952 }
1071 953
1072 /** 954 /**
1073 * This function uses the new map1 protocol command to send the map 955 * This function uses the new map1 protocol command to send the map
1074 * to the client. It is necessary because the old map command supports 956 * to the client. It is necessary because the old map command supports
1092 * look like. 974 * look like.
1093 */ 975 */
1094 976
1095 client &socket = *pl->ns; 977 client &socket = *pl->ns;
1096 978
1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 979 packet sl ("map1a");
1098 packet esl;
1099 980
1100 startlen = sl.length (); 981 startlen = sl.length ();
1101 982
1102 /*Extendedmapinfo structure initialisation */ 983 int hx = socket.mapx / 2;
1103 if (socket.ext_mapinfos) 984 int hy = socket.mapy / 2;
1104 {
1105 extendedinfos = EMI_NOREDRAW;
1106 985
1107 if (socket.EMI_smooth) 986 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108 extendedinfos |= EMI_SMOOTH; 987 int ax = dx + hx;
988 int ay = dy + hy;
1109 989
1110 ewhatstart = esl.length (); 990 int mask = (ax << 10) | (ay << 4);
1111 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 991 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1112 could need to be taken away */
1113 eentrysize = getExtendedMapInfoSize (&socket);
1114 esl << "mapextended "
1115 << uint8 (extendedinfos)
1116 << uint8 (eentrysize);
1117 992
1118 estartlen = esl.length (); 993 /* If the coordinates are not valid, or it is too dark to see,
1119 } 994 * we tell the client as such
1120
1121 /* x,y are the real map locations. ax, ay are viewport relative
1122 * locations.
1123 */ 995 */
1124 ay = 0; 996 if (!m)
1125
1126 /* We could do this logic as conditionals in the if statement,
1127 * but that started to get a bit messy to look at.
1128 */
1129 max_x = ob->x + (socket.mapx + 1) / 2;
1130 max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133 { 997 {
1134 sint16 nx, ny; 998 /* space is out of map. Update space and clear values
1135 maptile *m = 0; 999 * if this hasn't already been done. If the space is out
1136 1000 * of the map, it shouldn't have a head.
1137 ax = 0; 1001 */
1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1002 if (lastcell.count != -1)
1139 { 1003 {
1140 // check to see if we can simply go one right quickly 1004 sl << uint16 (mask);
1005 map_clearcell (&lastcell, -1);
1141 ++nx; 1006 }
1142 if (m && nx >= m->width) 1007
1008 continue;
1009 }
1010
1011 int d = pl->blocked_los_uc (dx, dy);
1012
1013 if (d > 3)
1014 {
1015 /* This block deals with spaces that are not visible for whatever
1016 * reason. Still may need to send the head for this space.
1017 */
1018 if (lastcell.count != -1
1019 || lastcell.faces[0]
1020 || lastcell.faces[1]
1021 || lastcell.faces[2]
1022 || lastcell.stat_hp
1023 || lastcell.flags
1024 || lastcell.player)
1025 sl << uint16 (mask);
1026
1027 /* properly clear a previously sent big face */
1028 map_clearcell (&lastcell, -1);
1029 }
1030 else
1031 {
1032 /* In this block, the space is visible.
1033 */
1034
1035 /* Rather than try to figure out what everything that we might
1036 * need to send is, then form the packet after that,
1037 * we presume that we will in fact form a packet, and update
1038 * the bits by what we do actually send. If we send nothing,
1039 * we just back out sl.length () to the old value, and no harm
1040 * is done.
1041 * I think this is simpler than doing a bunch of checks to see
1042 * what if anything we need to send, setting the bits, then
1043 * doing those checks again to add the real data.
1044 */
1045 oldlen = sl.length ();
1046
1047 sl << uint16 (mask);
1048
1049 unsigned char dummy;
1050 unsigned char *last_ext = &dummy;
1051
1052 /* Darkness changed */
1053 if (lastcell.count != d)
1054 {
1143 m = 0; 1055 mask |= 0x8;
1144 1056
1145 if (!m) 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)
1146 { 1076 {
1147 nx = x; ny = y; m = plmap; 1077 if (op->stats.maxhp > op->stats.hp
1148 1078 && op->stats.maxhp > 0
1149 if (xy_normalise (m, nx, ny)) 1079 && (op->type == PLAYER
1150 m->touch (); 1080 || op->type == DOOR // does not work, have maxhp 0
1151 else 1081 || op->flag [FLAG_MONSTER]
1082 || op->flag [FLAG_ALIVE]
1083 || op->flag [FLAG_GENERATOR]))
1152 m = 0; 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;
1153 } 1096 }
1154 1097
1155 int emask, mask; 1098 if (expect_false (lastcell.stat_hp != stat_hp))
1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1157
1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159
1160 /* If the coordinates are not valid, or it is too dark to see,
1161 * we tell the client as such
1162 */
1163 if (!m)
1164 { 1099 {
1165 /* space is out of map. Update space and clear values 1100 lastcell.stat_hp = stat_hp;
1166 * if this hasn't already been done. If the space is out 1101
1167 * of the map, it shouldn't have a head 1102 mask |= 0x8;
1168 */ 1103 *last_ext |= 0x80;
1169 if (lastcell.count != -1) 1104 last_ext = &sl[sl.length ()];
1105
1106 sl << uint8 (5) << uint8 (stat_hp);
1107
1108 if (stat_width > 1)
1170 { 1109 {
1171 sl << uint16 (mask);
1172 map_clearcell (&lastcell, -1);
1173 }
1174
1175 continue;
1176 }
1177
1178 int d = pl->blocked_los[ax][ay];
1179
1180 if (d > 3)
1181 {
1182 int need_send = 0, count;
1183
1184 /* This block deals with spaces that are not visible for whatever
1185 * reason. Still may need to send the head for this space.
1186 */
1187
1188 oldlen = sl.length ();
1189
1190 sl << uint16 (mask);
1191
1192 if (lastcell.count != -1)
1193 need_send = 1;
1194
1195 count = -1;
1196
1197 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1198 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1199 need_send = 1;
1200
1201 /* properly clear a previously sent big face */
1202 map_clearcell (&lastcell, count);
1203
1204 if ((mask & 0xf) || need_send)
1205 sl[oldlen + 1] = mask & 0xff;
1206 else
1207 sl.reset (oldlen);
1208 }
1209 else
1210 {
1211 /* In this block, the space is visible.
1212 */
1213
1214 /* Rather than try to figure out what everything that we might
1215 * need to send is, then form the packet after that,
1216 * we presume that we will in fact form a packet, and update
1217 * the bits by what we do actually send. If we send nothing,
1218 * we just back out sl.length () to the old value, and no harm
1219 * is done.
1220 * I think this is simpler than doing a bunch of checks to see
1221 * what if anything we need to send, setting the bits, then
1222 * doing those checks again to add the real data.
1223 */
1224 oldlen = sl.length ();
1225 eoldlen = esl.length ();
1226
1227 sl << uint16 (mask);
1228
1229 unsigned char dummy;
1230 unsigned char *last_ext = &dummy;
1231
1232 /* Darkness changed */
1233 if (lastcell.count != d && socket.darkness)
1234 {
1235 mask |= 0x8;
1236
1237 if (socket.extmap)
1238 {
1239 *last_ext |= 0x80; 1110 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()]; 1111 last_ext = &sl[sl.length ()];
1241 sl << uint8 (d); 1112
1242 } 1113 sl << uint8 (6) << uint8 (stat_width);
1243 else
1244 sl << uint8 (255 - 64 * d);
1245 } 1114 }
1115 }
1246 1116
1247 lastcell.count = d; 1117 if (expect_false (lastcell.player != player))
1248
1249 mapspace &ms = m->at (nx, ny);
1250 ms.update ();
1251
1252 if (socket.extmap)
1253 { 1118 {
1254 uint8 stat_hp = 0; 1119 lastcell.player = player;
1255 uint8 stat_width = 0;
1256 uint8 flags = 0;
1257 tag_t player = 0;
1258 1120
1259 // send hp information, if applicable
1260 if (object *op = ms.faces_obj [0])
1261 if (op->is_head () && !op->invisible)
1262 {
1263 if (op->stats.maxhp > op->stats.hp
1264 && op->stats.maxhp > 0
1265 && (op->type == PLAYER
1266 || op->type == DOOR // does not work, have maxhp 0
1267 || QUERY_FLAG (op, FLAG_MONSTER)
1268 || QUERY_FLAG (op, FLAG_ALIVE)
1269 || QUERY_FLAG (op, FLAG_GENERATOR)))
1270 {
1271 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1272 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1273 }
1274
1275 if (op->has_dialogue ())
1276 flags |= 1;
1277
1278 if (op->type == PLAYER)
1279 player = op == ob ? pl->ob->count
1280 : op == pl->ob ? ob->count
1281 : op->count;
1282 }
1283
1284 if (lastcell.stat_hp != stat_hp)
1285 {
1286 lastcell.stat_hp = stat_hp;
1287
1288 mask |= 0x8; 1121 mask |= 0x8;
1289 *last_ext |= 0x80; 1122 *last_ext |= 0x80;
1290 last_ext = &sl[sl.length ()]; 1123 last_ext = &sl[sl.length ()];
1291 1124
1292 sl << uint8 (5) << uint8 (stat_hp);
1293
1294 if (stat_width > 1)
1295 {
1296 *last_ext |= 0x80;
1297 last_ext = &sl[sl.length ()];
1298
1299 sl << uint8 (6) << uint8 (stat_width);
1300 }
1301 }
1302
1303 if (lastcell.player != player)
1304 {
1305 lastcell.player = player;
1306
1307 mask |= 0x8;
1308 *last_ext |= 0x80;
1309 last_ext = &sl[sl.length ()];
1310
1311 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1125 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1312 } 1126 }
1313 1127
1314 if (lastcell.flags != flags) 1128 if (expect_false (lastcell.flags != flags))
1315 { 1129 {
1316 lastcell.flags = flags; 1130 lastcell.flags = flags;
1317 1131
1318 mask |= 0x8; 1132 mask |= 0x8;
1319 *last_ext |= 0x80; 1133 *last_ext |= 0x80;
1320 last_ext = &sl[sl.length ()]; 1134 last_ext = &sl[sl.length ()];
1321 1135
1322 sl << uint8 (8) << uint8 (flags); 1136 sl << uint8 (8) << uint8 (flags);
1323 }
1324 } 1137 }
1325 1138
1139 // faces
1140
1326 /* Floor face */ 1141 /* Floor face */
1327 if (update_space (sl, socket, ms, lastcell, 2)) 1142 if (update_space (sl, socket, ms, lastcell, 2))
1328 mask |= 0x4; 1143 mask |= 0x4;
1329 1144
1330 /* Middle face */ 1145 /* Middle face */
1331 if (update_space (sl, socket, ms, lastcell, 1)) 1146 if (update_space (sl, socket, ms, lastcell, 1))
1332 mask |= 0x2; 1147 mask |= 0x2;
1333 1148
1149 if (expect_false (ob->invisible)
1150 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1334 if (ms.player () == ob 1151 && ms.player () == ob)
1335 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1336 { 1152 {
1337 // force player to be visible to himself if invisible 1153 // force player to be visible to himself if invisible
1338 if (lastcell.faces[0] != ob->face) 1154 if (lastcell.faces[0] != ob->face)
1339 { 1155 {
1340 lastcell.faces[0] = ob->face; 1156 lastcell.faces[0] = ob->face;
1341 1157
1342 mask |= 0x1;
1343 sl << uint16 (ob->face);
1344
1345 socket.send_faces (ob);
1346 }
1347 }
1348 /* Top face */
1349 else if (update_space (sl, socket, ms, lastcell, 0))
1350 mask |= 0x1; 1158 mask |= 0x1;
1159 sl << uint16 (ob->face);
1351 1160
1161 socket.send_faces (ob);
1162 }
1163 }
1164 /* Top face */
1165 else if (update_space (sl, socket, ms, lastcell, 0))
1166 mask |= 0x1;
1167
1352 /* Check to see if we are in fact sending anything for this 1168 /* Check to see if we are in fact sending anything for this
1353 * space by checking the mask. If so, update the mask. 1169 * space by checking the mask. If so, update the mask.
1354 * if not, reset the len to that from before adding the mask 1170 * if not, reset the len to that from before adding the mask
1355 * value, so we don't send those bits. 1171 * value, so we don't send those bits.
1356 */ 1172 */
1357 if (mask & 0xf) 1173 if (mask & 0xf)
1358 sl[oldlen + 1] = mask & 0xff; 1174 sl[oldlen + 1] = mask & 0xff;
1359 else 1175 else
1360 sl.reset (oldlen); 1176 sl.reset (oldlen);
1361
1362 if (socket.ext_mapinfos)
1363 esl << uint16 (emask);
1364
1365 if (socket.EMI_smooth)
1366 {
1367 for (int layer = 2+1; layer--; )
1368 {
1369 object *ob = ms.faces_obj [layer];
1370
1371 // If there is no object for this space, or if the face for the object
1372 // is the blank face, set the smoothlevel to zero.
1373 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1374
1375 // We've gotten what face we want to use for the object. Now see if
1376 // if it has changed since we last sent it to the client.
1377 if (lastcell.smooth[layer] != smoothlevel)
1378 {
1379 lastcell.smooth[layer] = smoothlevel;
1380 esl << uint8 (smoothlevel);
1381 emask |= 1 << layer;
1382 }
1383 }
1384
1385 if (emask & 0xf)
1386 esl[eoldlen + 1] = emask & 0xff;
1387 else
1388 esl.reset (eoldlen);
1389 }
1390 } /* else this is a viewable space */ 1177 } /* else this is a viewable space */
1391 } /* for x loop */ 1178 ordered_mapwalk_end
1392 } /* for y loop */
1393 1179
1394 socket.flush_fx (); 1180 socket.flush_fx ();
1395
1396 /* Verify that we in fact do need to send this */
1397 if (socket.ext_mapinfos)
1398 {
1399 if (!(sl.length () > startlen || socket.sent_scroll))
1400 {
1401 /* No map data will follow, so don't say the client
1402 * it doesn't need draw!
1403 */
1404 ewhatflag &= ~EMI_NOREDRAW;
1405 esl[ewhatstart + 1] = ewhatflag & 0xff;
1406 }
1407
1408 if (esl.length () > estartlen)
1409 socket.send_packet (esl);
1410 }
1411 1181
1412 if (sl.length () > startlen || socket.sent_scroll) 1182 if (sl.length () > startlen || socket.sent_scroll)
1413 { 1183 {
1414 socket.send_packet (sl); 1184 socket.send_packet (sl);
1415 socket.sent_scroll = 0; 1185 socket.sent_scroll = 0;
1416 } 1186 }
1417} 1187}
1418 1188
1419/*****************************************************************************/
1420/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1421/* a player. Of course, the client need to know the command to be able to */
1422/* manage it ! */
1423/*****************************************************************************/
1424void
1425send_plugin_custom_message (object *pl, char *buf)
1426{
1427 pl->contr->ns->send_packet (buf);
1428}
1429
1430/**
1431 * This sends the skill number to name mapping. We ignore
1432 * the params - we always send the same info no matter what.
1433 */
1434void
1435send_skill_info (client *ns, char *params)
1436{
1437 packet sl;
1438 sl << "replyinfo skill_info\n";
1439
1440 for (int i = 1; i < NUM_SKILLS; i++)
1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1442
1443 if (sl.length () > MAXSOCKBUF)
1444 {
1445 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446 fatal (0);
1447 }
1448
1449 ns->send_packet (sl);
1450}
1451
1452/**
1453 * This sends the spell path to name mapping. We ignore
1454 * the params - we always send the same info no matter what.
1455 */
1456void
1457send_spell_paths (client * ns, char *params)
1458{
1459 packet sl;
1460
1461 sl << "replyinfo spell_paths\n";
1462
1463 for (int i = 0; i < NRSPELLPATHS; i++)
1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465
1466 if (sl.length () > MAXSOCKBUF)
1467 {
1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469 fatal (0);
1470 }
1471
1472 ns->send_packet (sl);
1473}
1474
1475/** 1189/**
1476 * 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.
1477 * 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
1478 */ 1192 */
1479void 1193void
1480esrv_update_spells (player *pl) 1194esrv_update_spells (player *pl)
1481{ 1195{
1482 if (!pl->ns) 1196 if (!pl->ns)
1483 return; 1197 return;
1484 1198
1199 pl->ns->update_spells = false;
1200
1485 if (!pl->ns->monitor_spells) 1201 if (!pl->ns->monitor_spells)
1486 return; 1202 return;
1487 1203
1488 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1204 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1489 {
1490 if (spell->type == SPELL) 1205 if (spell->type == SPELL)
1491 { 1206 {
1492 int flags = 0; 1207 int flags = 0;
1208 int val;
1493 1209
1494 /* check if we need to update it */ 1210 /* check if we need to update it */
1495 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)
1496 { 1213 {
1497 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1214 spell->cached_sp = val;
1498 flags |= UPD_SP_MANA; 1215 flags |= UPD_SP_MANA;
1499 } 1216 }
1500 1217
1501 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)
1502 { 1220 {
1503 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1221 spell->cached_grace = val;
1504 flags |= UPD_SP_GRACE; 1222 flags |= UPD_SP_GRACE;
1505 } 1223 }
1506 1224
1507 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)
1508 { 1227 {
1509 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1228 spell->cached_eat = val;
1510 flags |= UPD_SP_DAMAGE; 1229 flags |= UPD_SP_LEVEL;
1511 } 1230 }
1512 1231
1513 if (flags) 1232 if (flags)
1514 { 1233 {
1515 packet sl; 1234 packet sl;
1516 1235
1517 sl << "updspell " 1236 sl << "updspell "
1518 << uint8 (flags) 1237 << uint8 (flags)
1519 << uint32 (spell->count); 1238 << uint32 (spell->count);
1520 1239
1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1240 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1241 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1242 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1524 1243
1525 pl->ns->send_packet (sl); 1244 pl->ns->send_packet (sl);
1526 } 1245 }
1527 } 1246 }
1528 }
1529} 1247}
1530 1248
1531void 1249void
1532esrv_remove_spell (player *pl, object *spell) 1250esrv_remove_spell (player *pl, object *spell)
1533{ 1251{
1560 } 1278 }
1561 1279
1562 /* 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 */
1563 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);
1564 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);
1565 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1283 spell->cached_eat = casting_level (pl->ob, spell);
1566 1284
1567 /* figure out which skill it uses, if it uses one */ 1285 /* figure out which skill it uses, if it uses one */
1568 if (spell->skill) 1286 if (spell->skill)
1569 { 1287 if (object *tmp = pl->find_skill (spell->skill))
1570 for (i = 1; i < NUM_SKILLS; i++) 1288 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1571 if (!strcmp (spell->skill, skill_names[i]))
1572 {
1573 skill = i + CS_STAT_SKILLINFO;
1574 break;
1575 }
1576 }
1577 1289
1578 // spells better have a face 1290 // spells better have a face
1579 if (!spell->face) 1291 if (!spell->face)
1580 { 1292 {
1581 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);
1655 } 1367 }
1656 else 1368 else
1657 append_spell (pl, sl, spell); 1369 append_spell (pl, sl, spell);
1658 1370
1659 if (sl.length () > MAXSOCKBUF) 1371 if (sl.length () > MAXSOCKBUF)
1660 {
1661 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1372 cleanup ("buffer overflow in esrv_add_spells!");
1662 fatal (0);
1663 }
1664 1373
1665 /* finally, we can send the packet */ 1374 /* finally, we can send the packet */
1666 pl->ns->flush_fx (); 1375 pl->ns->flush_fx ();
1667 pl->ns->send_packet (sl); 1376 pl->ns->send_packet (sl);
1668} 1377}
1669 1378
1379//-GPL
1380

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines