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.177 by root, Sat Oct 16 22:51:52 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] =
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 ();
153}
154
155static void
156send_map_info (player *pl)
157{
158 client &socket = *pl->ns;
159 object *ob = pl->viewpoint;
160
161 if (socket.mapinfocmd)
162 {
163 if (ob->map && ob->map->path[0])
164 {
165 int flags = 0;
166
167 if (ob->map->tile_path[0]) flags |= 1;
168 if (ob->map->tile_path[1]) flags |= 2;
169 if (ob->map->tile_path[2]) flags |= 4;
170 if (ob->map->tile_path[3]) flags |= 8;
171
172 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
174 ob->map->width, ob->map->height, &ob->map->path);
175 }
176 else
177 socket.send_packet ("mapinfo current");
178 }
144} 179}
145 180
146/** check for map/region change and send new map data */ 181/** check for map/region change and send new map data */
147static void 182static void
148check_map_change (player *pl) 183check_map_change (player *pl)
149{ 184{
150 client &socket = *pl->ns; 185 client &socket = *pl->ns;
151 object *ob = pl->observe; 186 object *ob = pl->viewpoint;
187
188 region *reg = ob->region ();
189 if (socket.current_region != reg)
190 {
191 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
192 socket.current_region = reg;
193 }
194
195 // first try to aovid a full newmap on tiled map scrolls
196 if (socket.current_map != ob->map && !socket.force_newmap)
197 {
198 rv_vector rv;
199
200 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
201
202 // manhattan distance is very handy here
203 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
204 {
205 socket.current_map = ob->map;
206 socket.current_x = ob->x;
207 socket.current_y = ob->y;
208
209 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
210 socket.floorbox_reset ();
211 send_map_info (pl);
212 }
213 }
152 214
153 if (socket.current_map != ob->map || socket.force_newmap) 215 if (socket.current_map != ob->map || socket.force_newmap)
154 { 216 {
155 clear_map (pl); 217 clear_map (pl);
156 socket.current_map = ob->map; 218 socket.current_map = ob->map;
157 219 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 } 220 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 221 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 222 {
179 int dx = ob->x - socket.current_x; 223 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 224 int dy = ob->y - socket.current_y;
181 225
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); 226 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 227 socket.floorbox_reset ();
188 }
189 } 228 }
190 229
191 socket.current_x = ob->x; 230 socket.current_x = ob->x;
192 socket.current_y = ob->y; 231 socket.current_y = ob->y;
232}
193 233
194 region *reg = ob->region (); 234/**
195 if (socket.current_region != reg) 235 * This sends the skill number to name mapping. We ignore
196 { 236 * 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)); 237 */
198 socket.current_region = reg; 238static void
199 } 239send_skill_info (client *ns, char *params)
240{
241 packet sl;
242 sl << "replyinfo skill_info\n";
243
244 for (int i = 0; i < skillvec.size (); ++i)
245 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
246
247 if (sl.length () > MAXSOCKBUF)
248 cleanup ("buffer overflow in send_skill_info!");
249
250 ns->send_packet (sl);
251}
252
253/**
254 * This sends the spell path to name mapping. We ignore
255 * the params - we always send the same info no matter what.
256 */
257static void
258send_spell_paths (client * ns, char *params)
259{
260 packet sl;
261
262 sl << "replyinfo spell_paths\n";
263
264 for (int i = 0; i < NRSPELLPATHS; i++)
265 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
266
267 if (sl.length () > MAXSOCKBUF)
268 cleanup ("buffer overflow in send_spell_paths!");
269
270 ns->send_packet (sl);
200} 271}
201 272
202/** 273/**
203 * RequestInfo is sort of a meta command. There is some specific 274 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 275 * request of information, but we call other functions to provide
… …
217 { 288 {
218 *params++ = 0; 289 *params++ = 0;
219 break; 290 break;
220 } 291 }
221 292
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")) 293 if (!strcmp (buf, "skill_info"))
227 send_skill_info (ns, params); 294 send_skill_info (ns, params);
228 else if (!strcmp (buf, "spell_paths")) 295 else if (!strcmp (buf, "spell_paths"))
229 send_spell_paths (ns, params); 296 send_spell_paths (ns, params);
230 else 297 else
231 { 298 {
… …
247ExtiCmd (char *buf, int len, client *ns) 314ExtiCmd (char *buf, int len, client *ns)
248{ 315{
249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 316 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250} 317}
251 318
319//-GPL
320
252void 321void
253client::mapinfo_queue_clear () 322client::mapinfo_queue_clear ()
254{ 323{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 324 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i); 325 free (*i);
… …
263{ 332{
264 char *token = buf; 333 char *token = buf;
265 buf += strlen (buf) + 9; 334 buf += strlen (buf) + 9;
266 335
267 // initial map and its origin 336 // initial map and its origin
268 maptile *map = pl->observe->map; 337 maptile *map = pl->viewpoint->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x; 338 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y; 339 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271 int max_distance = 8; // limit maximum path length to something generous 340 int max_distance = 8; // limit maximum path length to something generous
272 341
273 while (*buf && map && max_distance) 342 while (*buf && map && max_distance)
274 { 343 {
275 int dir = *buf++ - '1'; 344 int dir = *buf++ - '1';
… …
380AddMeCmd (char *buf, int len, client *ns) 449AddMeCmd (char *buf, int len, client *ns)
381{ 450{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 451 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 452}
384 453
385/** Reply to ExtendedInfos command */ 454//+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 455
501/** 456/**
502 * This handles the general commands from the client (ie, north, fire, cast, 457 * This handles the general commands from the client (ie, north, fire, cast,
503 * etc.) 458 * etc.)
504 */ 459 */
… …
517 return; 472 return;
518 473
519 buf++; 474 buf++;
520 } 475 }
521 476
522 execute_newserver_command (pl->ob, (char *) buf); 477 execute_newserver_command (pl->ob, (char *)buf);
523 478
524 /* Perhaps something better should be done with a left over count. 479 /* Perhaps something better should be done with a left over count.
525 * Cleaning up the input should probably be done first - all actions 480 * 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 481 * for the command that issued the count should be done before any other
527 * commands. 482 * commands.
… …
561 * commands. 516 * commands.
562 */ 517 */
563 pl->count = 0; 518 pl->count = 0;
564 519
565 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 520 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
566 int time = fabs (pl->ob->speed) < 0.001 521 int time = pl->ob->has_active_speed ()
567 ? time = MAX_TIME * 100
568 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 522 ? (int) (MAX_TIME / pl->ob->speed)
523 : MAX_TIME * 100;
569 524
570 /* Send confirmation of command execution now */ 525 /* Send confirmation of command execution now */
571 packet sl ("comc"); 526 packet sl ("comc");
572 sl << uint16 (cmdid) << uint32 (time); 527 sl << uint16 (cmdid) << uint32 (time);
573 pl->ns->send_packet (sl); 528 pl->ns->send_packet (sl);
… …
615 LOG (llevError, "Unknown input state: %d\n", ns->state); 570 LOG (llevError, "Unknown input state: %d\n", ns->state);
616 } 571 }
617} 572}
618 573
619/** 574/**
620 * Client tells its version. If there is a mismatch, we close the 575 * 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 */ 576 */
626void 577void
627VersionCmd (char *buf, int len, client * ns) 578VersionCmd (char *buf, int len, client *ns)
628{ 579{
629 if (!buf) 580 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} 581}
665 582
666/** sound related functions. */ 583/** sound related functions. */
667void 584void
668SetSound (char *buf, int len, client * ns) 585SetSound (char *buf, int len, client * ns)
… …
719 * Get player's current range attack in obuf. 636 * Get player's current range attack in obuf.
720 */ 637 */
721static void 638static void
722rangetostring (player *pl, char *obuf) 639rangetostring (player *pl, char *obuf)
723{ 640{
724 dynbuf_text buf; 641 dynbuf_text &buf = msg_dynbuf; buf.clear ();
642
643#if 0
644 // print ranged/chosen_skill etc. objects every call
645 printf ("%s %s => %s (%s)\n",
646 pl->ranged_ob ? &pl->ranged_ob->name : "-",
647 pl->combat_ob ? &pl->combat_ob->name : "-",
648 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
649 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
650 );
651#endif
725 652
726 if (pl->ranged_ob) 653 if (pl->ranged_ob)
727 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 654 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
728 655
729 if (pl->combat_ob) 656 if (pl->combat_ob)
… …
775 * commands for now. 702 * commands for now.
776 */ 703 */
777void 704void
778esrv_update_stats (player *pl) 705esrv_update_stats (player *pl)
779{ 706{
780 char buf[MAX_BUF];
781 uint16 flags;
782
783 client *ns = pl->ns; 707 client *ns = pl->ns;
784 if (!ns) 708 if (!ns)
785 return; 709 return;
786 710
787 object *ob = pl->observe; 711 object *ob = pl->observe;
… …
804 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 728 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
805 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 729 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
806 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 730 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
807 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 731 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
808 732
809 for (int s = 0; s < NUM_SKILLS; s++) 733 for (int s = 0; s < CS_NUM_SKILLS; s++)
810 if (object *skill = opl->last_skill_ob[s]) 734 if (object *skill = opl->last_skill_ob [s])
811 if (skill->stats.exp != ns->last_skill_exp [s]) 735 if (skill->stats.exp != ns->last_skill_exp [s])
812 { 736 {
813 ns->last_skill_exp [s] = skill->stats.exp; 737 ns->last_skill_exp [s] = skill->stats.exp;
814 738
815 /* Always send along the level if exp changes. This is only 739 /* Always send along the level if exp changes. This is only
816 * 1 extra byte, but keeps processing simpler. 740 * 1 extra byte, but keeps processing simpler.
817 */ 741 */
818 sl << uint8 (s + CS_STAT_SKILLINFO) 742 sl << uint8 (CS_STAT_SKILLINFO + s)
819 << uint8 (skill->level) 743 << uint8 (skill->level)
820 << uint64 (skill->stats.exp); 744 << uint64 (skill->stats.exp);
821 } 745 }
822 746
823 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 747 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
824 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 748 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
825 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 749 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
826 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 750 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
827 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 751 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
828 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 752 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
829 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 753 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); 754 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); 755 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
832 756
833 flags = 0; 757 int flags = (opl->fire_on ? SF_FIREON : 0)
834 758 | (opl->run_on ? SF_RUNON : 0);
835 if (opl->fire_on)
836 flags |= SF_FIREON;
837
838 if (opl->run_on)
839 flags |= SF_RUNON;
840 759
841 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 760 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
842 761
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++) 762 for (int i = 0; i < NROFATTACKS; i++)
847 {
848 /* Skip ones we won't send */ 763 /* Skip ones we won't send */
849 if (atnr_cs_stat[i] == -1) 764 if (atnr_cs_stat[i] >= 0)
850 continue;
851
852 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 765 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
853 }
854 766
855 if (pl->ns->monitor_spells) 767 if (pl->ns->monitor_spells)
856 { 768 {
857 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 769 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); 770 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
859 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 771 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
860 } 772 }
861 773
774 char buf[MAX_BUF];
862 rangetostring (opl, buf); /* we want use the new fire & run system in new client */ 775 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
863 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 776 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
864 set_title (ob, buf); 777 set_title (ob, buf);
865 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 778 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
866 779
… …
884 << uint32 (pl->ob->face) 797 << uint32 (pl->ob->face)
885 << data8 (pl->ob->name); 798 << data8 (pl->ob->name);
886 799
887 pl->ns->last_weight = weight; 800 pl->ns->last_weight = weight;
888 pl->ns->send_packet (sl); 801 pl->ns->send_packet (sl);
889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890} 802}
891 803
892/****************************************************************************** 804/******************************************************************************
893 * 805 *
894 * Start of map related commands. 806 * Start of map related commands.
… …
961 873
962 /* Nothing changed */ 874 /* Nothing changed */
963 return 0; 875 return 0;
964} 876}
965 877
966/** 878//-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 879
976 if (ns->ext_mapinfos) 880// prefetch maps in an area of PREFETCH x PREFETCH around the player
977 { 881#define PREFETCH 40
978 if (ns->EMI_smooth)
979 result += 1; /*One byte for smoothlevel */
980 }
981
982 return result;
983}
984
985// prefetch (and touch) all maps within a specific distancd
986static void
987prefetch_surrounding_maps (maptile *map, int distance)
988{
989 map->last_access = runtime;
990
991 if (--distance)
992 for (int dir = 4; --dir; )
993 if (const shstr &path = map->tile_path [dir])
994 if (maptile *&neigh = map->tile_map [dir])
995 prefetch_surrounding_maps (neigh, distance);
996 else
997 neigh = maptile::find_async (path, map);
998}
999 882
1000// prefetch a generous area around the player 883// prefetch a generous area around the player
1001static void 884static void
1002prefetch_surrounding_maps (object *op) 885prefetch_surrounding_maps (object *op)
1003{ 886{
1004 prefetch_surrounding_maps (op->map, 3); 887 for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
888 op->x - PREFETCH , op->y - PREFETCH ,
889 op->x + PREFETCH + 1, op->y + PREFETCH + 1);
890 rect->m;
891 ++rect)
892 rect->m->touch ();
1005} 893}
894
895//+GPL
1006 896
1007/** 897/**
1008 * Draws client map. 898 * Draws client map.
1009 */ 899 */
1010void 900void
1011draw_client_map (player *pl) 901draw_client_map (player *pl)
1012{ 902{
1013 object *ob = pl->observe; 903 object *ob = pl->viewpoint;
1014 if (!ob->active) 904 if (!pl->observe->active)
1015 return; 905 return;
1016
1017 maptile *plmap = ob->map;
1018 906
1019 /* If player is just joining the game, he isn't here yet, so the map 907 /* 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 908 * can get swapped out. If so, don't try to send them a map. All will
1021 * be OK once they really log in. 909 * be OK once they really log in.
1022 */ 910 */
1023 if (!plmap || plmap->in_memory != MAP_ACTIVE) 911 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1024 return; 912 return;
1025 913
1026 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1027 int estartlen, eoldlen; 914 int startlen, oldlen;
1028 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos;
1031 915
1032 check_map_change (pl); 916 check_map_change (pl);
1033 prefetch_surrounding_maps (pl->ob); 917 prefetch_surrounding_maps (pl->ob);
1034 918
1035 /* do LOS after calls to update_position */ 919 /* do LOS after calls to update_position */
1036 if (ob != pl->ob) 920 /* unfortunately, we need to udpate los when observing, currently */
1037 clear_los (pl); 921 if (pl->do_los || pl->viewpoint != pl->ob)
1038 else if (pl->do_los)
1039 { 922 {
1040 update_los (ob);
1041 pl->do_los = 0; 923 pl->do_los = 0;
924 pl->update_los ();
1042 } 925 }
1043 926
1044 /** 927 /**
1045 * This function uses the new map1 protocol command to send the map 928 * 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 929 * to the client. It is necessary because the old map command supports
… …
1064 * look like. 947 * look like.
1065 */ 948 */
1066 949
1067 client &socket = *pl->ns; 950 client &socket = *pl->ns;
1068 951
1069 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 952 packet sl ("map1a");
1070 packet esl;
1071 953
1072 startlen = sl.length (); 954 startlen = sl.length ();
1073 955
1074 /*Extendedmapinfo structure initialisation */ 956 int hx = socket.mapx / 2;
1075 if (socket.ext_mapinfos) 957 int hy = socket.mapy / 2;
1076 {
1077 extendedinfos = EMI_NOREDRAW;
1078 958
1079 if (socket.EMI_smooth) 959 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1080 extendedinfos |= EMI_SMOOTH; 960 int ax = dx + hx;
961 int ay = dy + hy;
1081 962
1082 ewhatstart = esl.length (); 963 int mask = (ax << 10) | (ay << 4);
1083 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 964 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 965
1090 estartlen = esl.length (); 966 /* If the coordinates are not valid, or it is too dark to see,
1091 } 967 * we tell the client as such
1092
1093 /* x,y are the real map locations. ax, ay are viewport relative
1094 * locations.
1095 */ 968 */
1096 ay = 0; 969 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 { 970 {
1106 sint16 nx, ny; 971 /* space is out of map. Update space and clear values
1107 maptile *m = 0; 972 * if this hasn't already been done. If the space is out
1108 973 * of the map, it shouldn't have a head.
1109 ax = 0; 974 */
1110 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 975 if (lastcell.count != -1)
1111 { 976 {
1112 // check to see if we can simply go one right quickly 977 sl << uint16 (mask);
978 map_clearcell (&lastcell, -1);
1113 ++nx; 979 }
1114 if (m && nx >= m->width) 980
981 continue;
982 }
983
984 int d = pl->blocked_los_uc (dx, dy);
985
986 if (d > 3)
987 {
988 /* This block deals with spaces that are not visible for whatever
989 * reason. Still may need to send the head for this space.
990 */
991 if (lastcell.count != -1
992 || lastcell.faces[0]
993 || lastcell.faces[1]
994 || lastcell.faces[2]
995 || lastcell.stat_hp
996 || lastcell.flags
997 || lastcell.player)
998 sl << uint16 (mask);
999
1000 /* properly clear a previously sent big face */
1001 map_clearcell (&lastcell, -1);
1002 }
1003 else
1004 {
1005 /* In this block, the space is visible.
1006 */
1007
1008 /* Rather than try to figure out what everything that we might
1009 * need to send is, then form the packet after that,
1010 * we presume that we will in fact form a packet, and update
1011 * the bits by what we do actually send. If we send nothing,
1012 * we just back out sl.length () to the old value, and no harm
1013 * is done.
1014 * I think this is simpler than doing a bunch of checks to see
1015 * what if anything we need to send, setting the bits, then
1016 * doing those checks again to add the real data.
1017 */
1018 oldlen = sl.length ();
1019
1020 sl << uint16 (mask);
1021
1022 unsigned char dummy;
1023 unsigned char *last_ext = &dummy;
1024
1025 /* Darkness changed */
1026 if (lastcell.count != d)
1027 {
1115 m = 0; 1028 mask |= 0x8;
1116 1029
1117 if (!m) 1030 *last_ext |= 0x80;
1031 last_ext = &sl[sl.length ()];
1032 sl << uint8 (d);
1033 }
1034
1035 lastcell.count = d;
1036
1037 mapspace &ms = m->at (nx, ny);
1038 ms.update ();
1039
1040 // extmap handling
1041 uint8 stat_hp = 0;
1042 uint8 stat_width = 0;
1043 uint8 flags = 0;
1044 tag_t player = 0;
1045
1046 // send hp information, if applicable
1047 if (object *op = ms.faces_obj [0])
1048 if (op->is_head () && !op->invisible)
1118 { 1049 {
1119 nx = x; ny = y; m = plmap; 1050 if (op->stats.maxhp > op->stats.hp
1120 1051 && op->stats.maxhp > 0
1121 if (xy_normalise (m, nx, ny)) 1052 && (op->type == PLAYER
1122 m->touch (); 1053 || op->type == DOOR // does not work, have maxhp 0
1123 else 1054 || op->flag [FLAG_MONSTER]
1055 || op->flag [FLAG_ALIVE]
1056 || op->flag [FLAG_GENERATOR]))
1124 m = 0; 1057 {
1058 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1059 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1060 }
1061
1062 if (expect_false (op->has_dialogue ()))
1063 flags |= 1;
1064
1065 if (expect_false (op->type == PLAYER))
1066 player = op == ob ? pl->ob->count
1067 : op == pl->ob ? ob->count
1068 : op->count;
1125 } 1069 }
1126 1070
1127 int emask, mask; 1071 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 { 1072 {
1137 /* space is out of map. Update space and clear values 1073 lastcell.stat_hp = stat_hp;
1138 * if this hasn't already been done. If the space is out 1074
1139 * of the map, it shouldn't have a head 1075 mask |= 0x8;
1140 */ 1076 *last_ext |= 0x80;
1141 if (lastcell.count != -1) 1077 last_ext = &sl[sl.length ()];
1078
1079 sl << uint8 (5) << uint8 (stat_hp);
1080
1081 if (stat_width > 1)
1142 { 1082 {
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; 1083 *last_ext |= 0x80;
1213 last_ext = &sl[sl.length ()]; 1084 last_ext = &sl[sl.length ()];
1214 sl << uint8 (d); 1085
1215 } 1086 sl << uint8 (6) << uint8 (stat_width);
1216 else
1217 sl << uint8 (255 - 64 * d);
1218 } 1087 }
1088 }
1219 1089
1220 lastcell.count = d; 1090 if (expect_false (lastcell.player != player))
1221
1222 mapspace &ms = m->at (nx, ny);
1223 ms.update ();
1224
1225 if (socket.extmap)
1226 { 1091 {
1227 uint8 stat_hp = 0; 1092 lastcell.player = player;
1228 uint8 stat_width = 0;
1229 uint8 flags = 0;
1230 tag_t player = 0;
1231 1093
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; 1094 mask |= 0x8;
1258 *last_ext |= 0x80; 1095 *last_ext |= 0x80;
1259 last_ext = &sl[sl.length ()]; 1096 last_ext = &sl[sl.length ()];
1260 1097
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; 1098 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1281 } 1099 }
1282 1100
1283 if (lastcell.flags != flags) 1101 if (expect_false (lastcell.flags != flags))
1284 { 1102 {
1285 lastcell.flags = flags; 1103 lastcell.flags = flags;
1286 1104
1287 mask |= 0x8; 1105 mask |= 0x8;
1288 *last_ext |= 0x80; 1106 *last_ext |= 0x80;
1289 last_ext = &sl[sl.length ()]; 1107 last_ext = &sl[sl.length ()];
1290 1108
1291 sl << uint8 (8) << uint8 (flags); 1109 sl << uint8 (8) << uint8 (flags);
1292 }
1293 } 1110 }
1294 1111
1112 // faces
1113
1295 /* Floor face */ 1114 /* Floor face */
1296 if (update_space (sl, socket, ms, lastcell, 2)) 1115 if (update_space (sl, socket, ms, lastcell, 2))
1297 mask |= 0x4; 1116 mask |= 0x4;
1298 1117
1299 /* Middle face */ 1118 /* Middle face */
1300 if (update_space (sl, socket, ms, lastcell, 1)) 1119 if (update_space (sl, socket, ms, lastcell, 1))
1301 mask |= 0x2; 1120 mask |= 0x2;
1302 1121
1122 if (expect_false (ob->invisible)
1123 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1303 if (ms.player () == ob 1124 && ms.player () == ob)
1304 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1305 { 1125 {
1306 // force player to be visible to himself if invisible 1126 // force player to be visible to himself if invisible
1307 if (lastcell.faces[0] != ob->face) 1127 if (lastcell.faces[0] != ob->face)
1308 { 1128 {
1309 lastcell.faces[0] = ob->face; 1129 lastcell.faces[0] = ob->face;
1310 1130
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; 1131 mask |= 0x1;
1132 sl << uint16 (ob->face);
1320 1133
1134 socket.send_faces (ob);
1135 }
1136 }
1137 /* Top face */
1138 else if (update_space (sl, socket, ms, lastcell, 0))
1139 mask |= 0x1;
1140
1321 /* Check to see if we are in fact sending anything for this 1141 /* Check to see if we are in fact sending anything for this
1322 * space by checking the mask. If so, update the mask. 1142 * space by checking the mask. If so, update the mask.
1323 * if not, reset the len to that from before adding the mask 1143 * if not, reset the len to that from before adding the mask
1324 * value, so we don't send those bits. 1144 * value, so we don't send those bits.
1325 */ 1145 */
1326 if (mask & 0xf) 1146 if (mask & 0xf)
1327 sl[oldlen + 1] = mask & 0xff; 1147 sl[oldlen + 1] = mask & 0xff;
1328 else 1148 else
1329 sl.reset (oldlen); 1149 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 */ 1150 } /* else this is a viewable space */
1360 } /* for x loop */ 1151 ordered_mapwalk_end
1361 } /* for y loop */
1362 1152
1363 socket.flush_fx (); 1153 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 1154
1381 if (sl.length () > startlen || socket.sent_scroll) 1155 if (sl.length () > startlen || socket.sent_scroll)
1382 { 1156 {
1383 socket.send_packet (sl); 1157 socket.send_packet (sl);
1384 socket.sent_scroll = 0; 1158 socket.sent_scroll = 0;
1385 } 1159 }
1386} 1160}
1387 1161
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/** 1162/**
1445 * This looks for any spells the player may have that have changed their stats. 1163 * 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 1164 * it then sends an updspell packet for each spell that has changed in this way
1447 */ 1165 */
1448void 1166void
1449esrv_update_spells (player *pl) 1167esrv_update_spells (player *pl)
1450{ 1168{
1451 if (!pl->ns) 1169 if (!pl->ns)
1452 return; 1170 return;
1453 1171
1172 pl->ns->update_spells = false;
1173
1454 if (!pl->ns->monitor_spells) 1174 if (!pl->ns->monitor_spells)
1455 return; 1175 return;
1456 1176
1457 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1177 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1458 {
1459 if (spell->type == SPELL) 1178 if (spell->type == SPELL)
1460 { 1179 {
1461 int flags = 0; 1180 int flags = 0;
1181 int val;
1462 1182
1463 /* check if we need to update it */ 1183 /* check if we need to update it */
1464 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1184 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1185 if (spell->cached_sp != val)
1465 { 1186 {
1466 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1187 spell->cached_sp = val;
1467 flags |= UPD_SP_MANA; 1188 flags |= UPD_SP_MANA;
1468 } 1189 }
1469 1190
1470 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1191 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1192 if (spell->cached_grace != val)
1471 { 1193 {
1472 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1194 spell->cached_grace = val;
1473 flags |= UPD_SP_GRACE; 1195 flags |= UPD_SP_GRACE;
1474 } 1196 }
1475 1197
1476 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1198 val = casting_level (pl->ob, spell);
1199 if (spell->cached_eat != val)
1477 { 1200 {
1478 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1201 spell->cached_eat = val;
1479 flags |= UPD_SP_DAMAGE; 1202 flags |= UPD_SP_LEVEL;
1480 } 1203 }
1481 1204
1482 if (flags) 1205 if (flags)
1483 { 1206 {
1484 packet sl; 1207 packet sl;
1485 1208
1486 sl << "updspell " 1209 sl << "updspell "
1487 << uint8 (flags) 1210 << uint8 (flags)
1488 << uint32 (spell->count); 1211 << uint32 (spell->count);
1489 1212
1490 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1213 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1491 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1214 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1492 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1215 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1493 1216
1494 pl->ns->send_packet (sl); 1217 pl->ns->send_packet (sl);
1495 } 1218 }
1496 } 1219 }
1497 }
1498} 1220}
1499 1221
1500void 1222void
1501esrv_remove_spell (player *pl, object *spell) 1223esrv_remove_spell (player *pl, object *spell)
1502{ 1224{
… …
1527 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1249 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1528 return; 1250 return;
1529 } 1251 }
1530 1252
1531 /* store costs and damage in the object struct, to compare to later */ 1253 /* 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); 1254 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); 1255 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); 1256 spell->cached_eat = casting_level (pl->ob, spell);
1535 1257
1536 /* figure out which skill it uses, if it uses one */ 1258 /* figure out which skill it uses, if it uses one */
1537 if (spell->skill) 1259 if (spell->skill)
1538 { 1260 if (object *tmp = pl->find_skill (spell->skill))
1539 for (i = 1; i < NUM_SKILLS; i++) 1261 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1540 if (!strcmp (spell->skill, skill_names[i]))
1541 {
1542 skill = i + CS_STAT_SKILLINFO;
1543 break;
1544 }
1545 }
1546 1262
1547 // spells better have a face 1263 // spells better have a face
1548 if (!spell->face) 1264 if (!spell->face)
1549 { 1265 {
1550 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1266 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1555 1271
1556 /* send the current values */ 1272 /* send the current values */
1557 sl << uint32 (spell->count) 1273 sl << uint32 (spell->count)
1558 << uint16 (spell->level) 1274 << uint16 (spell->level)
1559 << uint16 (spell->casting_time) 1275 << uint16 (spell->casting_time)
1560 << uint16 (spell->last_sp) 1276 << uint16 (spell->cached_sp)
1561 << uint16 (spell->last_grace) 1277 << uint16 (spell->cached_grace)
1562 << uint16 (spell->last_eat) 1278 << uint16 (spell->cached_eat)
1563 << uint8 (skill) 1279 << uint8 (skill)
1564 << uint32 (spell->path_attuned) 1280 << uint32 (spell->path_attuned)
1565 << uint32 (spell->face) 1281 << uint32 (spell->face)
1566 << data8 (spell->name) 1282 << data8 (spell->name)
1567 << data16 (spell->msg); 1283 << data16 (spell->msg);
… …
1624 } 1340 }
1625 else 1341 else
1626 append_spell (pl, sl, spell); 1342 append_spell (pl, sl, spell);
1627 1343
1628 if (sl.length () > MAXSOCKBUF) 1344 if (sl.length () > MAXSOCKBUF)
1629 {
1630 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1345 cleanup ("buffer overflow in esrv_add_spells!");
1631 fatal (0);
1632 }
1633 1346
1634 /* finally, we can send the packet */ 1347 /* finally, we can send the packet */
1635 pl->ns->flush_fx (); 1348 pl->ns->flush_fx ();
1636 pl->ns->send_packet (sl); 1349 pl->ns->send_packet (sl);
1637} 1350}
1638 1351
1352//-GPL
1353

Diff Legend

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