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.129 by root, Tue May 6 19:37:01 2008 UTC vs.
Revision 1.171 by root, Sun Apr 11 00:34:07 2010 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 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] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
98 */ 100 */
99 mx = ns->mapx; 101 mx = ns->mapx;
100 my = ns->mapy; 102 my = ns->mapy;
101 103
102 /* the x and y here are coordinates for the new map, i.e. if we moved 104 /* 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, 105 * (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 106 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 107 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 108 * are preserved, and the check_head thinks it needs to clear them.
107 */ 109 */
108 for (x = 0; x < mx; x++) 110 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 111 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 112 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 113 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 114 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) 115 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 */ 116 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 118 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 120
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 121 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 122
125 /* Make sure that the next "map1" command will be sent (even if it is 123 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 124 * empty).
… …
141 pl->ns->send_packet ("newmap"); 139 pl->ns->send_packet ("newmap");
142 140
143 pl->ns->floorbox_reset (); 141 pl->ns->floorbox_reset ();
144} 142}
145 143
144static void
145send_map_info (player *pl)
146{
147 client &socket = *pl->ns;
148 object *ob = pl->viewpoint;
149
150 if (socket.mapinfocmd)
151 {
152 if (ob->map && ob->map->path[0])
153 {
154 int flags = 0;
155
156 if (ob->map->tile_path[0]) flags |= 1;
157 if (ob->map->tile_path[1]) flags |= 2;
158 if (ob->map->tile_path[2]) flags |= 4;
159 if (ob->map->tile_path[3]) flags |= 8;
160
161 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
162 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
163 ob->map->width, ob->map->height, &ob->map->path);
164 }
165 else
166 socket.send_packet ("mapinfo current");
167 }
168}
169
146/** check for map/region change and send new map data */ 170/** check for map/region change and send new map data */
147static void 171static void
148check_map_change (player *pl) 172check_map_change (player *pl)
149{ 173{
150 client &socket = *pl->ns; 174 client &socket = *pl->ns;
151 object *ob = pl->observe; 175 object *ob = pl->viewpoint;
176
177 region *reg = ob->region ();
178 if (socket.current_region != reg)
179 {
180 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
181 socket.current_region = reg;
182 }
183
184 // first try to aovid a full newmap on tiled map scrolls
185 if (socket.current_map != ob->map && !socket.force_newmap)
186 {
187 rv_vector rv;
188
189 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
190
191 // manhattan distance is very handy here
192 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
193 {
194 socket.current_map = ob->map;
195 socket.current_x = ob->x;
196 socket.current_y = ob->y;
197
198 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
199 socket.floorbox_reset ();
200 send_map_info (pl);
201 }
202 }
152 203
153 if (socket.current_map != ob->map || socket.force_newmap) 204 if (socket.current_map != ob->map || socket.force_newmap)
154 { 205 {
155 clear_map (pl); 206 clear_map (pl);
156 socket.current_map = ob->map; 207 socket.current_map = ob->map;
157 208 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
172 }
173 else
174 socket.send_packet ("mapinfo current");
175 }
176 } 209 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 210 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 211 {
179 int dx = ob->x - socket.current_x; 212 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 213 int dy = ob->y - socket.current_y;
181 214
182 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
183 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184 else
185 {
186 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 215 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 216 socket.floorbox_reset ();
188 }
189 } 217 }
190 218
191 socket.current_x = ob->x; 219 socket.current_x = ob->x;
192 socket.current_y = ob->y; 220 socket.current_y = ob->y;
221}
193 222
194 region *reg = ob->region (); 223/**
195 if (socket.current_region != reg) 224 * This sends the skill number to name mapping. We ignore
196 { 225 * the params - we always send the same info no matter what.
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 226 */
198 socket.current_region = reg; 227static void
228send_skill_info (client *ns, char *params)
229{
230 packet sl;
231 sl << "replyinfo skill_info\n";
232
233 for (int i = 1; i < NUM_SKILLS; i++)
234 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
235
236 if (sl.length () > MAXSOCKBUF)
199 } 237 {
238 LOG (llevError, "Buffer overflow in send_skill_info!\n");
239 fatal (0);
240 }
241
242 ns->send_packet (sl);
243}
244
245/**
246 * This sends the spell path to name mapping. We ignore
247 * the params - we always send the same info no matter what.
248 */
249static void
250send_spell_paths (client * ns, char *params)
251{
252 packet sl;
253
254 sl << "replyinfo spell_paths\n";
255
256 for (int i = 0; i < NRSPELLPATHS; i++)
257 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
258
259 if (sl.length () > MAXSOCKBUF)
260 {
261 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
262 fatal (0);
263 }
264
265 ns->send_packet (sl);
200} 266}
201 267
202/** 268/**
203 * RequestInfo is sort of a meta command. There is some specific 269 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 270 * request of information, but we call other functions to provide
… …
217 { 283 {
218 *params++ = 0; 284 *params++ = 0;
219 break; 285 break;
220 } 286 }
221 287
222 if (!strcmp (buf, "image_info"))
223 send_image_info (ns, params);
224 else if (!strcmp (buf, "image_sums"))
225 send_image_sums (ns, params);
226 else if (!strcmp (buf, "skill_info")) 288 if (!strcmp (buf, "skill_info"))
227 send_skill_info (ns, params); 289 send_skill_info (ns, params);
228 else if (!strcmp (buf, "spell_paths")) 290 else if (!strcmp (buf, "spell_paths"))
229 send_spell_paths (ns, params); 291 send_spell_paths (ns, params);
230 else 292 else
231 { 293 {
… …
247ExtiCmd (char *buf, int len, client *ns) 309ExtiCmd (char *buf, int len, client *ns)
248{ 310{
249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 311 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250} 312}
251 313
314//-GPL
315
252void 316void
253client::mapinfo_queue_clear () 317client::mapinfo_queue_clear ()
254{ 318{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 319 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i); 320 free (*i);
… …
263{ 327{
264 char *token = buf; 328 char *token = buf;
265 buf += strlen (buf) + 9; 329 buf += strlen (buf) + 9;
266 330
267 // initial map and its origin 331 // initial map and its origin
268 maptile *map = pl->observe->map; 332 maptile *map = pl->viewpoint->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x; 333 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y; 334 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271 int max_distance = 8; // limit maximum path length to something generous 335 int max_distance = 8; // limit maximum path length to something generous
272 336
273 while (*buf && map && max_distance) 337 while (*buf && map && max_distance)
274 { 338 {
275 int dir = *buf++ - '1'; 339 int dir = *buf++ - '1';
… …
380AddMeCmd (char *buf, int len, client *ns) 444AddMeCmd (char *buf, int len, client *ns)
381{ 445{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 446 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 447}
384 448
385/** Reply to ExtendedInfos command */ 449//+GPL
386void
387ToggleExtendedInfos (char *buf, int len, client * ns)
388{
389 char cmdback[MAX_BUF];
390 char command[50];
391 int info, nextinfo;
392
393 cmdback[0] = '\0';
394 nextinfo = 0;
395
396 while (1)
397 {
398 /* 1. Extract an info */
399 info = nextinfo;
400
401 while ((info < len) && (buf[info] == ' '))
402 info++;
403
404 if (info >= len)
405 break;
406
407 nextinfo = info + 1;
408
409 while ((nextinfo < len) && (buf[nextinfo] != ' '))
410 nextinfo++;
411
412 if (nextinfo - info >= 49) /*Erroneous info asked */
413 continue;
414
415 strncpy (command, &(buf[info]), nextinfo - info);
416
417 /* 2. Interpret info */
418 if (!strcmp ("smooth", command))
419 /* Toggle smoothing */
420 ns->EMI_smooth = !ns->EMI_smooth;
421 else
422 /*bad value */;
423
424 /*3. Next info */
425 }
426
427 strcpy (cmdback, "ExtendedInfoSet");
428
429 if (ns->EMI_smooth)
430 {
431 strcat (cmdback, " ");
432 strcat (cmdback, "smoothing");
433 }
434
435 ns->send_packet (cmdback);
436}
437
438/*
439#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3
442#define MSG_TYPE_SIGN 4
443#define MSG_TYPE_MONUMENT 5
444#define MSG_TYPE_SCRIPTED_DIALOG 6*/
445
446/** Reply to ExtendedInfos command */
447void
448ToggleExtendedText (char *buf, int len, client * ns)
449{
450 char cmdback[MAX_BUF];
451 char temp[10];
452 char command[50];
453 int info, nextinfo, i, flag;
454
455 cmdback[0] = '\0';
456
457 nextinfo = 0;
458 while (1)
459 {
460 /* 1. Extract an info */
461 info = nextinfo;
462
463 while ((info < len) && (buf[info] == ' '))
464 info++;
465
466 if (info >= len)
467 break;
468
469 nextinfo = info + 1;
470
471 while ((nextinfo < len) && (buf[nextinfo] != ' '))
472 nextinfo++;
473
474 if (nextinfo - info >= 49) /*Erroneous info asked */
475 continue;
476
477 strncpy (command, &(buf[info]), nextinfo - info);
478 command[nextinfo - info] = '\0';
479 /* 2. Interpret info */
480 i = sscanf (command, "%d", &flag);
481
482 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483 ns->supported_readables |= (1 << flag);
484 /*3. Next info */
485 }
486
487 /* Send resulting state */
488 strcpy (cmdback, "ExtendedTextSet");
489
490 for (i = 0; i <= MSG_TYPE_LAST; i++)
491 if (ns->supported_readables & (1 << i))
492 {
493 strcat (cmdback, " ");
494 snprintf (temp, sizeof (temp), "%d", i);
495 strcat (cmdback, temp);
496 }
497
498 ns->send_packet (cmdback);
499}
500 450
501/** 451/**
502 * This handles the general commands from the client (ie, north, fire, cast, 452 * This handles the general commands from the client (ie, north, fire, cast,
503 * etc.) 453 * etc.)
504 */ 454 */
… …
517 return; 467 return;
518 468
519 buf++; 469 buf++;
520 } 470 }
521 471
522 execute_newserver_command (pl->ob, (char *) buf); 472 execute_newserver_command (pl->ob, (char *)buf);
523 473
524 /* Perhaps something better should be done with a left over count. 474 /* Perhaps something better should be done with a left over count.
525 * Cleaning up the input should probably be done first - all actions 475 * Cleaning up the input should probably be done first - all actions
526 * for the command that issued the count should be done before any other 476 * for the command that issued the count should be done before any other
527 * commands. 477 * commands.
… …
561 * commands. 511 * commands.
562 */ 512 */
563 pl->count = 0; 513 pl->count = 0;
564 514
565 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 515 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
566 int time = fabs (pl->ob->speed) < 0.001 516 int time = pl->ob->has_active_speed ()
567 ? time = MAX_TIME * 100
568 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 517 ? (int) (MAX_TIME / pl->ob->speed)
518 : MAX_TIME * 100;
569 519
570 /* Send confirmation of command execution now */ 520 /* Send confirmation of command execution now */
571 packet sl ("comc"); 521 packet sl ("comc");
572 sl << uint16 (cmdid) << uint32 (time); 522 sl << uint16 (cmdid) << uint32 (time);
573 pl->ns->send_packet (sl); 523 pl->ns->send_packet (sl);
… …
615 LOG (llevError, "Unknown input state: %d\n", ns->state); 565 LOG (llevError, "Unknown input state: %d\n", ns->state);
616 } 566 }
617} 567}
618 568
619/** 569/**
620 * Client tells its version. If there is a mismatch, we close the 570 * Client tells its version info.
621 * socket. In real life, all we should care about is the client having
622 * something older than the server. If we assume the client will be
623 * backwards compatible, having it be a later version should not be a
624 * problem.
625 */ 571 */
626void 572void
627VersionCmd (char *buf, int len, client * ns) 573VersionCmd (char *buf, int len, client *ns)
628{ 574{
629 if (!buf) 575 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
630 {
631 LOG (llevError, "CS: received corrupted version command\n");
632 return;
633 }
634
635 ns->cs_version = atoi (buf);
636 ns->sc_version = ns->cs_version;
637
638 LOG (llevDebug, "connection from client <%s>\n", buf);
639
640 //TODO: should log here just for statistics
641
642 //if (VERSION_CS != ns->cs_version)
643 // unchecked;
644
645 char *cp = strchr (buf + 1, ' ');
646 if (!cp)
647 return;
648
649 ns->sc_version = atoi (cp);
650
651 //if (VERSION_SC != ns->sc_version)
652 // unchecked;
653
654 cp = strchr (cp + 1, ' ');
655
656 if (cp)
657 {
658 ns->version = cp + 1;
659
660 if (ns->sc_version < 1026)
661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
663 }
664} 576}
665 577
666/** sound related functions. */ 578/** sound related functions. */
667void 579void
668SetSound (char *buf, int len, client * ns) 580SetSound (char *buf, int len, client * ns)
… …
719 * Get player's current range attack in obuf. 631 * Get player's current range attack in obuf.
720 */ 632 */
721static void 633static void
722rangetostring (player *pl, char *obuf) 634rangetostring (player *pl, char *obuf)
723{ 635{
724 dynbuf_text buf; 636 dynbuf_text &buf = msg_dynbuf; buf.clear ();
637
638#if 0
639 // print ranged/chosen_skill etc. objects every call
640 printf ("%s %s => %s (%s)\n",
641 pl->ranged_ob ? &pl->ranged_ob->name : "-",
642 pl->combat_ob ? &pl->combat_ob->name : "-",
643 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
644 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
645 );
646#endif
725 647
726 if (pl->ranged_ob) 648 if (pl->ranged_ob)
727 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 649 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
728 650
729 if (pl->combat_ob) 651 if (pl->combat_ob)
… …
805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 727 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 728 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 729 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
808 730
809 for (int s = 0; s < NUM_SKILLS; s++) 731 for (int s = 0; s < NUM_SKILLS; s++)
810 if (object *skill = opl->last_skill_ob[s]) 732 if (object *skill = opl->last_skill_ob [s])
811 if (skill->stats.exp != ns->last_skill_exp [s]) 733 if (skill->stats.exp != ns->last_skill_exp [s])
812 { 734 {
813 ns->last_skill_exp [s] = skill->stats.exp; 735 ns->last_skill_exp [s] = skill->stats.exp;
814 736
815 /* Always send along the level if exp changes. This is only 737 /* Always send along the level if exp changes. This is only
… …
823 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 745 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
824 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 746 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
825 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 747 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
826 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 748 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
827 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 749 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
828 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 750 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
829 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 751 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
830 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 752 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
831 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 753 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
832 754
833 flags = 0; 755 flags = 0;
834 756
835 if (opl->fire_on) 757 if (opl->fire_on)
… …
838 if (opl->run_on) 760 if (opl->run_on)
839 flags |= SF_RUNON; 761 flags |= SF_RUNON;
840 762
841 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 763 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
842 764
843 if (ns->sc_version < 1025)
844 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
845 else
846 for (int i = 0; i < NROFATTACKS; i++) 765 for (int i = 0; i < NROFATTACKS; i++)
847 { 766 {
848 /* Skip ones we won't send */ 767 /* Skip ones we won't send */
849 if (atnr_cs_stat[i] == -1) 768 if (atnr_cs_stat[i] == -1)
850 continue; 769 continue;
851 770
852 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 771 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
853 } 772 }
854 773
855 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
856 { 775 {
857 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 776 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
858 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 777 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
884 << uint32 (pl->ob->face) 803 << uint32 (pl->ob->face)
885 << data8 (pl->ob->name); 804 << data8 (pl->ob->name);
886 805
887 pl->ns->last_weight = weight; 806 pl->ns->last_weight = weight;
888 pl->ns->send_packet (sl); 807 pl->ns->send_packet (sl);
889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890} 808}
891 809
892/****************************************************************************** 810/******************************************************************************
893 * 811 *
894 * Start of map related commands. 812 * Start of map related commands.
… …
961 879
962 /* Nothing changed */ 880 /* Nothing changed */
963 return 0; 881 return 0;
964} 882}
965 883
966/** 884//-GPL
967 * Returns the size of a data for a map square as returned by
968 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
969 * available.
970 */
971int
972getExtendedMapInfoSize (client * ns)
973{
974 int result = 0;
975
976 if (ns->ext_mapinfos)
977 {
978 if (ns->EMI_smooth)
979 result += 1; /*One byte for smoothlevel */
980 }
981
982 return result;
983}
984 885
985// prefetch (and touch) all maps within a specific distancd 886// prefetch (and touch) all maps within a specific distancd
986static void 887static void
987prefetch_surrounding_maps (maptile *map, int distance) 888prefetch_surrounding_maps (maptile *map, int distance)
988{ 889{
989 map->last_access = runtime; 890 map->touch ();
990 891
991 if (--distance) 892 if (--distance)
992 for (int dir = 4; --dir; ) 893 for (int dir = 4; dir--; )
993 if (const shstr &path = map->tile_path [dir]) 894 if (const shstr &path = map->tile_path [dir])
994 if (maptile *&neigh = map->tile_map [dir]) 895 if (maptile *&neigh = map->tile_map [dir])
995 prefetch_surrounding_maps (neigh, distance); 896 prefetch_surrounding_maps (neigh, distance);
996 else 897 else
997 neigh = maptile::find_async (path, map); 898 neigh = maptile::find_async (path, map);
… …
1002prefetch_surrounding_maps (object *op) 903prefetch_surrounding_maps (object *op)
1003{ 904{
1004 prefetch_surrounding_maps (op->map, 3); 905 prefetch_surrounding_maps (op->map, 3);
1005} 906}
1006 907
908//+GPL
909
1007/** 910/**
1008 * Draws client map. 911 * Draws client map.
1009 */ 912 */
1010void 913void
1011draw_client_map (player *pl) 914draw_client_map (player *pl)
1012{ 915{
1013 object *ob = pl->observe; 916 object *ob = pl->viewpoint;
1014 if (!ob->active) 917 if (!pl->observe->active)
1015 return; 918 return;
1016
1017 maptile *plmap = ob->map;
1018 919
1019 /* If player is just joining the game, he isn't here yet, so the map 920 /* If player is just joining the game, he isn't here yet, so the map
1020 * can get swapped out. If so, don't try to send them a map. All will 921 * can get swapped out. If so, don't try to send them a map. All will
1021 * be OK once they really log in. 922 * be OK once they really log in.
1022 */ 923 */
1023 if (!plmap || plmap->in_memory != MAP_ACTIVE) 924 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1024 return; 925 return;
1025 926
1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1027 int estartlen, eoldlen; 927 int startlen, oldlen;
1028 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos;
1031 928
1032 check_map_change (pl); 929 check_map_change (pl);
1033 prefetch_surrounding_maps (pl->ob); 930 prefetch_surrounding_maps (pl->ob);
1034 931
1035 /* do LOS after calls to update_position */ 932 /* do LOS after calls to update_position */
1036 if (ob != pl->ob) 933 /* unfortunately, we need to udpate los when observing, currently */
1037 clear_los (pl); 934 if (pl->do_los || pl->viewpoint != pl->ob)
1038 else if (pl->do_los)
1039 { 935 {
1040 update_los (ob);
1041 pl->do_los = 0; 936 pl->do_los = 0;
937 pl->update_los ();
1042 } 938 }
1043 939
1044 /** 940 /**
1045 * This function uses the new map1 protocol command to send the map 941 * This function uses the new map1 protocol command to send the map
1046 * to the client. It is necessary because the old map command supports 942 * to the client. It is necessary because the old map command supports
… …
1065 */ 961 */
1066 962
1067 client &socket = *pl->ns; 963 client &socket = *pl->ns;
1068 964
1069 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 965 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1070 packet esl;
1071 966
1072 startlen = sl.length (); 967 startlen = sl.length ();
1073 968
1074 /*Extendedmapinfo structure initialisation */ 969 int hx = socket.mapx / 2;
1075 if (socket.ext_mapinfos) 970 int hy = socket.mapy / 2;
1076 {
1077 extendedinfos = EMI_NOREDRAW;
1078 971
1079 if (socket.EMI_smooth) 972 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1080 extendedinfos |= EMI_SMOOTH; 973 int ax = dx + hx;
974 int ay = dy + hy;
1081 975
1082 ewhatstart = esl.length (); 976 int mask = (ax << 10) | (ay << 4);
1083 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 977 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1084 could need to be taken away */
1085 eentrysize = getExtendedMapInfoSize (&socket);
1086 esl << "mapextended "
1087 << uint8 (extendedinfos)
1088 << uint8 (eentrysize);
1089 978
1090 estartlen = esl.length (); 979 /* If the coordinates are not valid, or it is too dark to see,
1091 } 980 * we tell the client as such
1092
1093 /* x,y are the real map locations. ax, ay are viewport relative
1094 * locations.
1095 */ 981 */
1096 ay = 0; 982 if (!m)
1097
1098 /* We could do this logic as conditionals in the if statement,
1099 * but that started to get a bit messy to look at.
1100 */
1101 max_x = ob->x + (socket.mapx + 1) / 2;
1102 max_y = ob->y + (socket.mapy + 1) / 2;
1103
1104 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1105 { 983 {
1106 sint16 nx, ny; 984 /* space is out of map. Update space and clear values
1107 maptile *m = 0; 985 * if this hasn't already been done. If the space is out
1108 986 * of the map, it shouldn't have a head.
1109 ax = 0; 987 */
1110 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 988 if (lastcell.count != -1)
1111 { 989 {
1112 // check to see if we can simply go one right quickly 990 sl << uint16 (mask);
991 map_clearcell (&lastcell, -1);
1113 ++nx; 992 }
1114 if (m && nx >= m->width) 993
994 continue;
995 }
996
997 int d = pl->blocked_los_uc (dx, dy);
998
999 if (d > 3)
1000 {
1001 /* This block deals with spaces that are not visible for whatever
1002 * reason. Still may need to send the head for this space.
1003 */
1004 if (lastcell.count != -1
1005 || lastcell.faces[0]
1006 || lastcell.faces[1]
1007 || lastcell.faces[2]
1008 || lastcell.stat_hp
1009 || lastcell.flags
1010 || lastcell.player)
1011 sl << uint16 (mask);
1012
1013 /* properly clear a previously sent big face */
1014 map_clearcell (&lastcell, -1);
1015 }
1016 else
1017 {
1018 /* In this block, the space is visible.
1019 */
1020
1021 /* Rather than try to figure out what everything that we might
1022 * need to send is, then form the packet after that,
1023 * we presume that we will in fact form a packet, and update
1024 * the bits by what we do actually send. If we send nothing,
1025 * we just back out sl.length () to the old value, and no harm
1026 * is done.
1027 * I think this is simpler than doing a bunch of checks to see
1028 * what if anything we need to send, setting the bits, then
1029 * doing those checks again to add the real data.
1030 */
1031 oldlen = sl.length ();
1032
1033 sl << uint16 (mask);
1034
1035 unsigned char dummy;
1036 unsigned char *last_ext = &dummy;
1037
1038 /* Darkness changed */
1039 if (lastcell.count != d)
1040 {
1115 m = 0; 1041 mask |= 0x8;
1116 1042
1117 if (!m) 1043 *last_ext |= 0x80;
1044 last_ext = &sl[sl.length ()];
1045 sl << uint8 (d);
1046 }
1047
1048 lastcell.count = d;
1049
1050 mapspace &ms = m->at (nx, ny);
1051 ms.update ();
1052
1053 // extmap handling
1054 uint8 stat_hp = 0;
1055 uint8 stat_width = 0;
1056 uint8 flags = 0;
1057 tag_t player = 0;
1058
1059 // send hp information, if applicable
1060 if (object *op = ms.faces_obj [0])
1061 if (op->is_head () && !op->invisible)
1118 { 1062 {
1119 nx = x; ny = y; m = plmap; 1063 if (op->stats.maxhp > op->stats.hp
1120 1064 && op->stats.maxhp > 0
1121 if (xy_normalise (m, nx, ny)) 1065 && (op->type == PLAYER
1122 m->touch (); 1066 || op->type == DOOR // does not work, have maxhp 0
1123 else 1067 || op->flag [FLAG_MONSTER]
1068 || op->flag [FLAG_ALIVE]
1069 || op->flag [FLAG_GENERATOR]))
1124 m = 0; 1070 {
1071 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1072 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1073 }
1074
1075 if (expect_false (op->has_dialogue ()))
1076 flags |= 1;
1077
1078 if (expect_false (op->type == PLAYER))
1079 player = op == ob ? pl->ob->count
1080 : op == pl->ob ? ob->count
1081 : op->count;
1125 } 1082 }
1126 1083
1127 int emask, mask; 1084 if (expect_false (lastcell.stat_hp != stat_hp))
1128 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1129
1130 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1131
1132 /* If the coordinates are not valid, or it is too dark to see,
1133 * we tell the client as such
1134 */
1135 if (!m)
1136 { 1085 {
1137 /* space is out of map. Update space and clear values 1086 lastcell.stat_hp = stat_hp;
1138 * if this hasn't already been done. If the space is out 1087
1139 * of the map, it shouldn't have a head 1088 mask |= 0x8;
1140 */ 1089 *last_ext |= 0x80;
1141 if (lastcell.count != -1) 1090 last_ext = &sl[sl.length ()];
1091
1092 sl << uint8 (5) << uint8 (stat_hp);
1093
1094 if (stat_width > 1)
1142 { 1095 {
1143 sl << uint16 (mask);
1144 map_clearcell (&lastcell, -1);
1145 }
1146
1147 continue;
1148 }
1149
1150 int d = pl->blocked_los[ax][ay];
1151
1152 if (d > 3)
1153 {
1154
1155 int need_send = 0, count;
1156
1157 /* This block deals with spaces that are not visible for whatever
1158 * reason. Still may need to send the head for this space.
1159 */
1160
1161 oldlen = sl.length ();
1162
1163 sl << uint16 (mask);
1164
1165 if (lastcell.count != -1)
1166 need_send = 1;
1167
1168 count = -1;
1169
1170 /* properly clear a previously sent big face */
1171 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1172 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1173 need_send = 1;
1174
1175 map_clearcell (&lastcell, count);
1176
1177 if ((mask & 0xf) || need_send)
1178 sl[oldlen + 1] = mask & 0xff;
1179 else
1180 sl.reset (oldlen);
1181 }
1182 else
1183 {
1184 /* In this block, the space is visible.
1185 */
1186
1187 /* Rather than try to figure out what everything that we might
1188 * need to send is, then form the packet after that,
1189 * we presume that we will in fact form a packet, and update
1190 * the bits by what we do actually send. If we send nothing,
1191 * we just back out sl.length () to the old value, and no harm
1192 * is done.
1193 * I think this is simpler than doing a bunch of checks to see
1194 * what if anything we need to send, setting the bits, then
1195 * doing those checks again to add the real data.
1196 */
1197 oldlen = sl.length ();
1198 eoldlen = esl.length ();
1199
1200 sl << uint16 (mask);
1201
1202 unsigned char dummy;
1203 unsigned char *last_ext = &dummy;
1204
1205 /* Darkness changed */
1206 if (lastcell.count != d && socket.darkness)
1207 {
1208 mask |= 0x8;
1209
1210 if (socket.extmap)
1211 {
1212 *last_ext |= 0x80; 1096 *last_ext |= 0x80;
1213 last_ext = &sl[sl.length ()]; 1097 last_ext = &sl[sl.length ()];
1214 sl << uint8 (d); 1098
1215 } 1099 sl << uint8 (6) << uint8 (stat_width);
1216 else
1217 sl << uint8 (255 - 64 * d);
1218 } 1100 }
1101 }
1219 1102
1220 lastcell.count = d; 1103 if (expect_false (lastcell.player != player))
1221
1222 mapspace &ms = m->at (nx, ny);
1223 ms.update ();
1224
1225 if (socket.extmap)
1226 { 1104 {
1227 uint8 stat_hp = 0; 1105 lastcell.player = player;
1228 uint8 stat_width = 0;
1229 uint8 flags = 0;
1230 tag_t player = 0;
1231 1106
1232 // send hp information, if applicable
1233 if (object *op = ms.faces_obj [0])
1234 if (op->is_head () && !op->invisible)
1235 {
1236 if (op->stats.maxhp > op->stats.hp
1237 && op->stats.maxhp > 0
1238 && (op->type == PLAYER
1239 || op->type == DOOR // does not work, have maxhp 0
1240 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1241 {
1242 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1243 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1244 }
1245
1246 if (op->msg && op->msg[0] == '@')
1247 flags |= 1;
1248
1249 if (op->type == PLAYER && op != ob)
1250 player = op->count;
1251 }
1252
1253 if (lastcell.stat_hp != stat_hp)
1254 {
1255 lastcell.stat_hp = stat_hp;
1256
1257 mask |= 0x8; 1107 mask |= 0x8;
1258 *last_ext |= 0x80; 1108 *last_ext |= 0x80;
1259 last_ext = &sl[sl.length ()]; 1109 last_ext = &sl[sl.length ()];
1260 1110
1261 sl << uint8 (5) << uint8 (stat_hp);
1262
1263 if (stat_width > 1)
1264 {
1265 *last_ext |= 0x80;
1266 last_ext = &sl[sl.length ()];
1267
1268 sl << uint8 (6) << uint8 (stat_width);
1269 }
1270 }
1271
1272 if (lastcell.player != player)
1273 {
1274 lastcell.player = player;
1275
1276 mask |= 0x8;
1277 *last_ext |= 0x80;
1278 last_ext = &sl[sl.length ()];
1279
1280 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1111 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1281 } 1112 }
1282 1113
1283 if (lastcell.flags != flags) 1114 if (expect_false (lastcell.flags != flags))
1284 { 1115 {
1285 lastcell.flags = flags; 1116 lastcell.flags = flags;
1286 1117
1287 mask |= 0x8; 1118 mask |= 0x8;
1288 *last_ext |= 0x80; 1119 *last_ext |= 0x80;
1289 last_ext = &sl[sl.length ()]; 1120 last_ext = &sl[sl.length ()];
1290 1121
1291 sl << uint8 (8) << uint8 (flags); 1122 sl << uint8 (8) << uint8 (flags);
1292 }
1293 } 1123 }
1294 1124
1125 // faces
1126
1295 /* Floor face */ 1127 /* Floor face */
1296 if (update_space (sl, socket, ms, lastcell, 2)) 1128 if (update_space (sl, socket, ms, lastcell, 2))
1297 mask |= 0x4; 1129 mask |= 0x4;
1298 1130
1299 /* Middle face */ 1131 /* Middle face */
1300 if (update_space (sl, socket, ms, lastcell, 1)) 1132 if (update_space (sl, socket, ms, lastcell, 1))
1301 mask |= 0x2; 1133 mask |= 0x2;
1302 1134
1135 if (expect_false (ob->invisible)
1136 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1303 if (ms.player () == ob 1137 && ms.player () == ob)
1304 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1305 { 1138 {
1306 // force player to be visible to himself if invisible 1139 // force player to be visible to himself if invisible
1307 if (lastcell.faces[0] != ob->face) 1140 if (lastcell.faces[0] != ob->face)
1308 { 1141 {
1309 lastcell.faces[0] = ob->face; 1142 lastcell.faces[0] = ob->face;
1310 1143
1311 mask |= 0x1;
1312 sl << uint16 (ob->face);
1313
1314 socket.send_faces (ob);
1315 }
1316 }
1317 /* Top face */
1318 else if (update_space (sl, socket, ms, lastcell, 0))
1319 mask |= 0x1; 1144 mask |= 0x1;
1145 sl << uint16 (ob->face);
1320 1146
1147 socket.send_faces (ob);
1148 }
1149 }
1150 /* Top face */
1151 else if (update_space (sl, socket, ms, lastcell, 0))
1152 mask |= 0x1;
1153
1321 /* Check to see if we are in fact sending anything for this 1154 /* Check to see if we are in fact sending anything for this
1322 * space by checking the mask. If so, update the mask. 1155 * space by checking the mask. If so, update the mask.
1323 * if not, reset the len to that from before adding the mask 1156 * if not, reset the len to that from before adding the mask
1324 * value, so we don't send those bits. 1157 * value, so we don't send those bits.
1325 */ 1158 */
1326 if (mask & 0xf) 1159 if (mask & 0xf)
1327 sl[oldlen + 1] = mask & 0xff; 1160 sl[oldlen + 1] = mask & 0xff;
1328 else 1161 else
1329 sl.reset (oldlen); 1162 sl.reset (oldlen);
1330
1331 if (socket.ext_mapinfos)
1332 esl << uint16 (emask);
1333
1334 if (socket.EMI_smooth)
1335 {
1336 for (int layer = 2+1; layer--; )
1337 {
1338 object *ob = ms.faces_obj [layer];
1339
1340 // If there is no object for this space, or if the face for the object
1341 // is the blank face, set the smoothlevel to zero.
1342 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1343
1344 // We've gotten what face we want to use for the object. Now see if
1345 // if it has changed since we last sent it to the client.
1346 if (lastcell.smooth[layer] != smoothlevel)
1347 {
1348 lastcell.smooth[layer] = smoothlevel;
1349 esl << uint8 (smoothlevel);
1350 emask |= 1 << layer;
1351 }
1352 }
1353
1354 if (emask & 0xf)
1355 esl[eoldlen + 1] = emask & 0xff;
1356 else
1357 esl.reset (eoldlen);
1358 }
1359 } /* else this is a viewable space */ 1163 } /* else this is a viewable space */
1360 } /* for x loop */ 1164 ordered_mapwalk_end
1361 } /* for y loop */
1362 1165
1363 socket.flush_fx (); 1166 socket.flush_fx ();
1364
1365 /* Verify that we in fact do need to send this */
1366 if (socket.ext_mapinfos)
1367 {
1368 if (!(sl.length () > startlen || socket.sent_scroll))
1369 {
1370 /* No map data will follow, so don't say the client
1371 * it doesn't need draw!
1372 */
1373 ewhatflag &= ~EMI_NOREDRAW;
1374 esl[ewhatstart + 1] = ewhatflag & 0xff;
1375 }
1376
1377 if (esl.length () > estartlen)
1378 socket.send_packet (esl);
1379 }
1380 1167
1381 if (sl.length () > startlen || socket.sent_scroll) 1168 if (sl.length () > startlen || socket.sent_scroll)
1382 { 1169 {
1383 socket.send_packet (sl); 1170 socket.send_packet (sl);
1384 socket.sent_scroll = 0; 1171 socket.sent_scroll = 0;
1385 } 1172 }
1386} 1173}
1387 1174
1388/*****************************************************************************/
1389/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1390/* a player. Of course, the client need to know the command to be able to */
1391/* manage it ! */
1392/*****************************************************************************/
1393void
1394send_plugin_custom_message (object *pl, char *buf)
1395{
1396 pl->contr->ns->send_packet (buf);
1397}
1398
1399/**
1400 * This sends the skill number to name mapping. We ignore
1401 * the params - we always send the same info no matter what.
1402 */
1403void
1404send_skill_info (client *ns, char *params)
1405{
1406 packet sl;
1407 sl << "replyinfo skill_info\n";
1408
1409 for (int i = 1; i < NUM_SKILLS; i++)
1410 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1411
1412 if (sl.length () > MAXSOCKBUF)
1413 {
1414 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1415 fatal (0);
1416 }
1417
1418 ns->send_packet (sl);
1419}
1420
1421/**
1422 * This sends the spell path to name mapping. We ignore
1423 * the params - we always send the same info no matter what.
1424 */
1425void
1426send_spell_paths (client * ns, char *params)
1427{
1428 packet sl;
1429
1430 sl << "replyinfo spell_paths\n";
1431
1432 for (int i = 0; i < NRSPELLPATHS; i++)
1433 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1434
1435 if (sl.length () > MAXSOCKBUF)
1436 {
1437 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1438 fatal (0);
1439 }
1440
1441 ns->send_packet (sl);
1442}
1443
1444/** 1175/**
1445 * This looks for any spells the player may have that have changed their stats. 1176 * This looks for any spells the player may have that have changed their stats.
1446 * it then sends an updspell packet for each spell that has changed in this way 1177 * it then sends an updspell packet for each spell that has changed in this way
1447 */ 1178 */
1448void 1179void
1449esrv_update_spells (player *pl) 1180esrv_update_spells (player *pl)
1450{ 1181{
1451 if (!pl->ns) 1182 if (!pl->ns)
1452 return; 1183 return;
1453 1184
1185 pl->ns->update_spells = false;
1186
1454 if (!pl->ns->monitor_spells) 1187 if (!pl->ns->monitor_spells)
1455 return; 1188 return;
1456 1189
1457 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1190 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1458 {
1459 if (spell->type == SPELL) 1191 if (spell->type == SPELL)
1460 { 1192 {
1461 int flags = 0; 1193 int flags = 0;
1194 int val;
1462 1195
1463 /* check if we need to update it */ 1196 /* check if we need to update it */
1464 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1197 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1198 if (spell->cached_sp != val)
1465 { 1199 {
1466 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1200 spell->cached_sp = val;
1467 flags |= UPD_SP_MANA; 1201 flags |= UPD_SP_MANA;
1468 } 1202 }
1469 1203
1470 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1204 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1205 if (spell->cached_grace != val)
1471 { 1206 {
1472 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1207 spell->cached_grace = val;
1473 flags |= UPD_SP_GRACE; 1208 flags |= UPD_SP_GRACE;
1474 } 1209 }
1475 1210
1476 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1211 val = casting_level (pl->ob, spell);
1212 if (spell->cached_eat != val)
1477 { 1213 {
1478 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1214 spell->cached_eat = val;
1479 flags |= UPD_SP_DAMAGE; 1215 flags |= UPD_SP_LEVEL;
1480 } 1216 }
1481 1217
1482 if (flags) 1218 if (flags)
1483 { 1219 {
1484 packet sl; 1220 packet sl;
1485 1221
1486 sl << "updspell " 1222 sl << "updspell "
1487 << uint8 (flags) 1223 << uint8 (flags)
1488 << uint32 (spell->count); 1224 << uint32 (spell->count);
1489 1225
1490 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1226 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1491 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1227 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1492 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1228 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1493 1229
1494 pl->ns->send_packet (sl); 1230 pl->ns->send_packet (sl);
1495 } 1231 }
1496 } 1232 }
1497 }
1498} 1233}
1499 1234
1500void 1235void
1501esrv_remove_spell (player *pl, object *spell) 1236esrv_remove_spell (player *pl, object *spell)
1502{ 1237{
… …
1527 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1262 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1528 return; 1263 return;
1529 } 1264 }
1530 1265
1531 /* store costs and damage in the object struct, to compare to later */ 1266 /* store costs and damage in the object struct, to compare to later */
1532 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1267 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1533 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1268 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1534 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1269 spell->cached_eat = casting_level (pl->ob, spell);
1535 1270
1536 /* figure out which skill it uses, if it uses one */ 1271 /* figure out which skill it uses, if it uses one */
1537 if (spell->skill) 1272 if (spell->skill)
1538 { 1273 if (object *tmp = pl->find_skill (spell->skill))
1539 for (i = 1; i < NUM_SKILLS; i++)
1540 if (!strcmp (spell->skill, skill_names[i]))
1541 {
1542 skill = i + CS_STAT_SKILLINFO; 1274 skill = tmp->subtype + CS_STAT_SKILLINFO;
1543 break;
1544 }
1545 }
1546 1275
1547 // spells better have a face 1276 // spells better have a face
1548 if (!spell->face) 1277 if (!spell->face)
1549 { 1278 {
1550 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1279 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1555 1284
1556 /* send the current values */ 1285 /* send the current values */
1557 sl << uint32 (spell->count) 1286 sl << uint32 (spell->count)
1558 << uint16 (spell->level) 1287 << uint16 (spell->level)
1559 << uint16 (spell->casting_time) 1288 << uint16 (spell->casting_time)
1560 << uint16 (spell->last_sp) 1289 << uint16 (spell->cached_sp)
1561 << uint16 (spell->last_grace) 1290 << uint16 (spell->cached_grace)
1562 << uint16 (spell->last_eat) 1291 << uint16 (spell->cached_eat)
1563 << uint8 (skill) 1292 << uint8 (skill)
1564 << uint32 (spell->path_attuned) 1293 << uint32 (spell->path_attuned)
1565 << uint32 (spell->face) 1294 << uint32 (spell->face)
1566 << data8 (spell->name) 1295 << data8 (spell->name)
1567 << data16 (spell->msg); 1296 << data16 (spell->msg);
… …
1634 /* finally, we can send the packet */ 1363 /* finally, we can send the packet */
1635 pl->ns->flush_fx (); 1364 pl->ns->flush_fx ();
1636 pl->ns->send_packet (sl); 1365 pl->ns->send_packet (sl);
1637} 1366}
1638 1367
1368//-GPL
1369

Diff Legend

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