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

Diff Legend

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