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.128 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.164 by root, Fri Mar 26 00:59:22 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 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 *
… …
63 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
64 * program to the value we use when sending STATS command to the 67 * 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 68 * client. If a value is -1, then we don't send that to the
66 * client. 69 * client.
67 */ 70 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
98 */ 101 */
99 mx = ns->mapx; 102 mx = ns->mapx;
100 my = ns->mapy; 103 my = ns->mapy;
101 104
102 /* the x and y here are coordinates for the new map, i.e. if we moved 105 /* 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, 106 * (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 107 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 108 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 109 * are preserved, and the check_head thinks it needs to clear them.
107 */ 110 */
108 for (x = 0; x < mx; x++) 111 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 112 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 113 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 114 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 115 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) 116 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 */ 117 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 119 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 121
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 122 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 123
125 /* Make sure that the next "map1" command will be sent (even if it is 124 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 125 * empty).
… …
141 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
142 141
143 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
144} 143}
145 144
145static void
146send_map_info (player *pl)
147{
148 client &socket = *pl->ns;
149 object *ob = pl->viewpoint;
150
151 if (socket.mapinfocmd)
152 {
153 if (ob->map && ob->map->path[0])
154 {
155 int flags = 0;
156
157 if (ob->map->tile_path[0]) flags |= 1;
158 if (ob->map->tile_path[1]) flags |= 2;
159 if (ob->map->tile_path[2]) flags |= 4;
160 if (ob->map->tile_path[3]) flags |= 8;
161
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path);
165 }
166 else
167 socket.send_packet ("mapinfo current");
168 }
169}
170
146/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
147static void 172static void
148check_map_change (player *pl) 173check_map_change (player *pl)
149{ 174{
150 client &socket = *pl->ns; 175 client &socket = *pl->ns;
151 object *ob = pl->observe; 176 object *ob = pl->viewpoint;
177
178 region *reg = ob->region ();
179 if (socket.current_region != reg)
180 {
181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
182 socket.current_region = reg;
183 }
184
185 // first try to aovid a full newmap on tiled map scrolls
186 if (socket.current_map != ob->map && !socket.force_newmap)
187 {
188 rv_vector rv;
189
190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
191
192 // manhattan distance is very handy here
193 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
194 {
195 socket.current_map = ob->map;
196 socket.current_x = ob->x;
197 socket.current_y = ob->y;
198
199 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
200 socket.floorbox_reset ();
201 send_map_info (pl);
202 }
203 }
152 204
153 if (socket.current_map != ob->map || socket.force_newmap) 205 if (socket.current_map != ob->map || socket.force_newmap)
154 { 206 {
155 clear_map (pl); 207 clear_map (pl);
156 socket.current_map = ob->map; 208 socket.current_map = ob->map;
157 209 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 } 210 }
177 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
178 { 212 {
179 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
180 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
181 215
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); 216 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
187 socket.floorbox_reset (); 217 socket.floorbox_reset ();
188 }
189 } 218 }
190 219
191 socket.current_x = ob->x; 220 socket.current_x = ob->x;
192 socket.current_y = ob->y; 221 socket.current_y = ob->y;
222}
193 223
194 region *reg = ob->region (); 224/**
195 if (socket.current_region != reg) 225 * This sends the skill number to name mapping. We ignore
196 { 226 * 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)); 227 */
198 socket.current_region = reg; 228static void
229send_skill_info (client *ns, char *params)
230{
231 packet sl;
232 sl << "replyinfo skill_info\n";
233
234 for (int i = 1; i < NUM_SKILLS; i++)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
236
237 if (sl.length () > MAXSOCKBUF)
199 } 238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n");
240 fatal (0);
241 }
242
243 ns->send_packet (sl);
244}
245
246/**
247 * This sends the spell path to name mapping. We ignore
248 * the params - we always send the same info no matter what.
249 */
250static void
251send_spell_paths (client * ns, char *params)
252{
253 packet sl;
254
255 sl << "replyinfo spell_paths\n";
256
257 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259
260 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
263 fatal (0);
264 }
265
266 ns->send_packet (sl);
200} 267}
201 268
202/** 269/**
203 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
204 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
… …
217 { 284 {
218 *params++ = 0; 285 *params++ = 0;
219 break; 286 break;
220 } 287 }
221 288
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")) 289 if (!strcmp (buf, "skill_info"))
227 send_skill_info (ns, params); 290 send_skill_info (ns, params);
228 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
229 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
230 else 293 else
231 { 294 {
… …
247ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
248{ 311{
249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250} 313}
251 314
315//-GPL
316
252void 317void
253client::mapinfo_queue_clear () 318client::mapinfo_queue_clear ()
254{ 319{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i); 321 free (*i);
… …
263{ 328{
264 char *token = buf; 329 char *token = buf;
265 buf += strlen (buf) + 9; 330 buf += strlen (buf) + 9;
266 331
267 // initial map and its origin 332 // initial map and its origin
268 maptile *map = pl->observe->map; 333 maptile *map = pl->viewpoint->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x; 334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y; 335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271 int max_distance = 8; // limit maximum path length to something generous 336 int max_distance = 8; // limit maximum path length to something generous
272 337
273 while (*buf && map && max_distance) 338 while (*buf && map && max_distance)
274 { 339 {
275 int dir = *buf++ - '1'; 340 int dir = *buf++ - '1';
… …
380AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
381{ 446{
382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383} 448}
384 449
385/** Reply to ExtendedInfos command */ 450//+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 451
438/* 452/*
439#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
440#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
441#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
… …
458 while (1) 472 while (1)
459 { 473 {
460 /* 1. Extract an info */ 474 /* 1. Extract an info */
461 info = nextinfo; 475 info = nextinfo;
462 476
463 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
464 info++; 478 info++;
465 479
466 if (info >= len) 480 if (info >= len)
467 break; 481 break;
468 482
469 nextinfo = info + 1; 483 nextinfo = info + 1;
470 484
471 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
472 nextinfo++; 486 nextinfo++;
473 487
474 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
475 continue; 489 continue;
476 490
477 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
478 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
479 /* 2. Interpret info */ 494 /* 2. Interpret info */
480 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
481 496
482 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
517 return; 532 return;
518 533
519 buf++; 534 buf++;
520 } 535 }
521 536
522 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
523 538
524 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
525 * Cleaning up the input should probably be done first - all actions 540 * 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 541 * for the command that issued the count should be done before any other
527 * commands. 542 * commands.
… …
561 * commands. 576 * commands.
562 */ 577 */
563 pl->count = 0; 578 pl->count = 0;
564 579
565 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
566 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
567 ? time = MAX_TIME * 100
568 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
569 584
570 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
571 packet sl ("comc"); 586 packet sl ("comc");
572 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
573 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
686 * syntax is: move (to) (tag) (nrof) 701 * syntax is: move (to) (tag) (nrof)
687 */ 702 */
688void 703void
689MoveCmd (char *buf, int len, player *pl) 704MoveCmd (char *buf, int len, player *pl)
690{ 705{
691 int vals[3], i; 706 int to, tag, nrof;
692 707
693 /* A little funky here. We only cycle for 2 records, because 708 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694 * we obviously are not going to find a space after the third
695 * record. Perhaps we should just replace this with a
696 * sscanf?
697 */
698 for (i = 0; i < 2; i++)
699 { 709 {
700 vals[i] = atoi (buf);
701
702 if (!(buf = strchr (buf, ' ')))
703 {
704 LOG (llevError, "Incomplete move command: %s\n", buf); 710 LOG (llevError, "Incomplete move command: %s\n", buf);
705 return; 711 return;
706 }
707
708 buf++;
709 } 712 }
710 713
711 vals[2] = atoi (buf); 714 esrv_move_object (pl->ob, to, tag, nrof);
712
713/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715} 715}
716 716
717/****************************************************************************** 717/******************************************************************************
718 * 718 *
719 * Start of commands the server sends to the client. 719 * Start of commands the server sends to the client.
… …
734 * Get player's current range attack in obuf. 734 * Get player's current range attack in obuf.
735 */ 735 */
736static void 736static void
737rangetostring (player *pl, char *obuf) 737rangetostring (player *pl, char *obuf)
738{ 738{
739 dynbuf_text buf; 739 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740 740
741 if (pl->ranged_ob) 741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 743
744 if (pl->combat_ob) 744 if (pl->combat_ob)
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 823
824 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = opl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 827 {
828 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
829 829
830 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 847
848 flags = 0; 848 flags = 0;
849 849
850 if (opl->fire_on) 850 if (opl->fire_on)
… …
853 if (opl->run_on) 853 if (opl->run_on)
854 flags |= SF_RUNON; 854 flags |= SF_RUNON;
855 855
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 857
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 858 for (int i = 0; i < NROFATTACKS; i++)
862 { 859 {
863 /* Skip ones we won't send */ 860 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 861 if (atnr_cs_stat[i] == -1)
865 continue; 862 continue;
866 863
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 } 865 }
869 866
870 if (pl->ns->monitor_spells) 867 if (pl->ns->monitor_spells)
871 { 868 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 870 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
899 << uint32 (pl->ob->face) 896 << uint32 (pl->ob->face)
900 << data8 (pl->ob->name); 897 << data8 (pl->ob->name);
901 898
902 pl->ns->last_weight = weight; 899 pl->ns->last_weight = weight;
903 pl->ns->send_packet (sl); 900 pl->ns->send_packet (sl);
904 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
905} 901}
906 902
907/****************************************************************************** 903/******************************************************************************
908 * 904 *
909 * Start of map related commands. 905 * Start of map related commands.
… …
976 972
977 /* Nothing changed */ 973 /* Nothing changed */
978 return 0; 974 return 0;
979} 975}
980 976
981/** 977//-GPL
982 * Returns the size of a data for a map square as returned by
983 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
984 * available.
985 */
986int
987getExtendedMapInfoSize (client * ns)
988{
989 int result = 0;
990
991 if (ns->ext_mapinfos)
992 {
993 if (ns->EMI_smooth)
994 result += 1; /*One byte for smoothlevel */
995 }
996
997 return result;
998}
999 978
1000// prefetch (and touch) all maps within a specific distancd 979// prefetch (and touch) all maps within a specific distancd
1001static void 980static void
1002prefetch_surrounding_maps (maptile *map, int distance) 981prefetch_surrounding_maps (maptile *map, int distance)
1003{ 982{
1004 map->last_access = runtime; 983 map->touch ();
1005 984
1006 if (--distance) 985 if (--distance)
1007 for (int dir = 4; --dir; ) 986 for (int dir = 4; dir--; )
1008 if (const shstr &path = map->tile_path [dir]) 987 if (const shstr &path = map->tile_path [dir])
1009 if (maptile *&neigh = map->tile_map [dir]) 988 if (maptile *&neigh = map->tile_map [dir])
1010 prefetch_surrounding_maps (neigh, distance); 989 prefetch_surrounding_maps (neigh, distance);
1011 else 990 else
1012 neigh = maptile::find_async (path, map); 991 neigh = maptile::find_async (path, map);
… …
1017prefetch_surrounding_maps (object *op) 996prefetch_surrounding_maps (object *op)
1018{ 997{
1019 prefetch_surrounding_maps (op->map, 3); 998 prefetch_surrounding_maps (op->map, 3);
1020} 999}
1021 1000
1001//+GPL
1002
1022/** 1003/**
1023 * Draws client map. 1004 * Draws client map.
1024 */ 1005 */
1025void 1006void
1026draw_client_map (player *pl) 1007draw_client_map (player *pl)
1027{ 1008{
1028 object *ob = pl->observe; 1009 object *ob = pl->viewpoint;
1029 if (!ob->active) 1010 if (!pl->observe->active)
1030 return; 1011 return;
1031
1032 maptile *plmap = ob->map;
1033 1012
1034 /* If player is just joining the game, he isn't here yet, so the map 1013 /* If player is just joining the game, he isn't here yet, so the map
1035 * can get swapped out. If so, don't try to send them a map. All will 1014 * can get swapped out. If so, don't try to send them a map. All will
1036 * be OK once they really log in. 1015 * be OK once they really log in.
1037 */ 1016 */
1038 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1039 return; 1018 return;
1040 1019
1041 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1042 int estartlen, eoldlen; 1020 int startlen, oldlen;
1043 uint8 eentrysize;
1044 uint16 ewhatstart, ewhatflag;
1045 uint8 extendedinfos;
1046 1021
1047 check_map_change (pl); 1022 check_map_change (pl);
1048 prefetch_surrounding_maps (pl->ob); 1023 prefetch_surrounding_maps (pl->ob);
1049 1024
1050 /* do LOS after calls to update_position */ 1025 /* do LOS after calls to update_position */
1051 if (ob != pl->ob) 1026 /* unfortunately, we need to udpate los when observing, currently */
1052 clear_los (pl); 1027 if (pl->do_los || pl->viewpoint != pl->ob)
1053 else if (pl->do_los)
1054 { 1028 {
1055 update_los (ob);
1056 pl->do_los = 0; 1029 pl->do_los = 0;
1030 pl->update_los ();
1057 } 1031 }
1058 1032
1059 /** 1033 /**
1060 * This function uses the new map1 protocol command to send the map 1034 * This function uses the new map1 protocol command to send the map
1061 * to the client. It is necessary because the old map command supports 1035 * to the client. It is necessary because the old map command supports
… …
1080 */ 1054 */
1081 1055
1082 client &socket = *pl->ns; 1056 client &socket = *pl->ns;
1083 1057
1084 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1085 packet esl;
1086 1059
1087 startlen = sl.length (); 1060 startlen = sl.length ();
1088 1061
1089 /*Extendedmapinfo structure initialisation */ 1062 int hx = socket.mapx / 2;
1090 if (socket.ext_mapinfos) 1063 int hy = socket.mapy / 2;
1091 {
1092 extendedinfos = EMI_NOREDRAW;
1093 1064
1094 if (socket.EMI_smooth) 1065 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1095 extendedinfos |= EMI_SMOOTH; 1066 int ax = dx + hx;
1067 int ay = dy + hy;
1096 1068
1097 ewhatstart = esl.length (); 1069 int mask = (ax << 10) | (ay << 4);
1098 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1070 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1099 could need to be taken away */
1100 eentrysize = getExtendedMapInfoSize (&socket);
1101 esl << "mapextended "
1102 << uint8 (extendedinfos)
1103 << uint8 (eentrysize);
1104 1071
1105 estartlen = esl.length (); 1072 /* If the coordinates are not valid, or it is too dark to see,
1106 } 1073 * we tell the client as such
1107
1108 /* x,y are the real map locations. ax, ay are viewport relative
1109 * locations.
1110 */ 1074 */
1111 ay = 0; 1075 if (!m)
1112
1113 /* We could do this logic as conditionals in the if statement,
1114 * but that started to get a bit messy to look at.
1115 */
1116 max_x = ob->x + (socket.mapx + 1) / 2;
1117 max_y = ob->y + (socket.mapy + 1) / 2;
1118
1119 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1120 { 1076 {
1121 sint16 nx, ny; 1077 /* space is out of map. Update space and clear values
1122 maptile *m = 0; 1078 * if this hasn't already been done. If the space is out
1123 1079 * of the map, it shouldn't have a head.
1124 ax = 0; 1080 */
1125 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1081 if (lastcell.count != -1)
1126 { 1082 {
1127 // check to see if we can simply go one right quickly 1083 sl << uint16 (mask);
1084 map_clearcell (&lastcell, -1);
1128 ++nx; 1085 }
1129 if (m && nx >= m->width) 1086
1087 continue;
1088 }
1089
1090 int d = pl->blocked_los_uc (dx, dy);
1091
1092 if (d > 3)
1093 {
1094 /* This block deals with spaces that are not visible for whatever
1095 * reason. Still may need to send the head for this space.
1096 */
1097 if (lastcell.count != -1
1098 || lastcell.faces[0]
1099 || lastcell.faces[1]
1100 || lastcell.faces[2]
1101 || lastcell.stat_hp
1102 || lastcell.flags
1103 || lastcell.player)
1104 sl << uint16 (mask);
1105
1106 /* properly clear a previously sent big face */
1107 map_clearcell (&lastcell, -1);
1108 }
1109 else
1110 {
1111 /* In this block, the space is visible.
1112 */
1113
1114 /* Rather than try to figure out what everything that we might
1115 * need to send is, then form the packet after that,
1116 * we presume that we will in fact form a packet, and update
1117 * the bits by what we do actually send. If we send nothing,
1118 * we just back out sl.length () to the old value, and no harm
1119 * is done.
1120 * I think this is simpler than doing a bunch of checks to see
1121 * what if anything we need to send, setting the bits, then
1122 * doing those checks again to add the real data.
1123 */
1124 oldlen = sl.length ();
1125
1126 sl << uint16 (mask);
1127
1128 unsigned char dummy;
1129 unsigned char *last_ext = &dummy;
1130
1131 /* Darkness changed */
1132 if (lastcell.count != d)
1133 {
1130 m = 0; 1134 mask |= 0x8;
1131 1135
1132 if (!m) 1136 *last_ext |= 0x80;
1137 last_ext = &sl[sl.length ()];
1138 sl << uint8 (d);
1139 }
1140
1141 lastcell.count = d;
1142
1143 mapspace &ms = m->at (nx, ny);
1144 ms.update ();
1145
1146 // extmap handling
1147 uint8 stat_hp = 0;
1148 uint8 stat_width = 0;
1149 uint8 flags = 0;
1150 tag_t player = 0;
1151
1152 // send hp information, if applicable
1153 if (object *op = ms.faces_obj [0])
1154 if (op->is_head () && !op->invisible)
1133 { 1155 {
1134 nx = x; ny = y; m = plmap; 1156 if (op->stats.maxhp > op->stats.hp
1135 1157 && op->stats.maxhp > 0
1136 if (xy_normalise (m, nx, ny)) 1158 && (op->type == PLAYER
1137 m->touch (); 1159 || op->type == DOOR // does not work, have maxhp 0
1138 else 1160 || QUERY_FLAG (op, FLAG_MONSTER)
1161 || QUERY_FLAG (op, FLAG_ALIVE)
1162 || QUERY_FLAG (op, FLAG_GENERATOR)))
1139 m = 0; 1163 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1165 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 }
1167
1168 if (expect_false (op->has_dialogue ()))
1169 flags |= 1;
1170
1171 if (expect_false (op->type == PLAYER))
1172 player = op == ob ? pl->ob->count
1173 : op == pl->ob ? ob->count
1174 : op->count;
1140 } 1175 }
1141 1176
1142 int emask, mask; 1177 if (expect_false (lastcell.stat_hp != stat_hp))
1143 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1144
1145 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1146
1147 /* If the coordinates are not valid, or it is too dark to see,
1148 * we tell the client as such
1149 */
1150 if (!m)
1151 { 1178 {
1152 /* space is out of map. Update space and clear values 1179 lastcell.stat_hp = stat_hp;
1153 * if this hasn't already been done. If the space is out 1180
1154 * of the map, it shouldn't have a head 1181 mask |= 0x8;
1155 */ 1182 *last_ext |= 0x80;
1156 if (lastcell.count != -1) 1183 last_ext = &sl[sl.length ()];
1184
1185 sl << uint8 (5) << uint8 (stat_hp);
1186
1187 if (stat_width > 1)
1157 { 1188 {
1158 sl << uint16 (mask);
1159 map_clearcell (&lastcell, -1);
1160 }
1161
1162 continue;
1163 }
1164
1165 int d = pl->blocked_los[ax][ay];
1166
1167 if (d > 3)
1168 {
1169
1170 int need_send = 0, count;
1171
1172 /* This block deals with spaces that are not visible for whatever
1173 * reason. Still may need to send the head for this space.
1174 */
1175
1176 oldlen = sl.length ();
1177
1178 sl << uint16 (mask);
1179
1180 if (lastcell.count != -1)
1181 need_send = 1;
1182
1183 count = -1;
1184
1185 /* properly clear a previously sent big face */
1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1188 need_send = 1;
1189
1190 map_clearcell (&lastcell, count);
1191
1192 if ((mask & 0xf) || need_send)
1193 sl[oldlen + 1] = mask & 0xff;
1194 else
1195 sl.reset (oldlen);
1196 }
1197 else
1198 {
1199 /* In this block, the space is visible.
1200 */
1201
1202 /* Rather than try to figure out what everything that we might
1203 * need to send is, then form the packet after that,
1204 * we presume that we will in fact form a packet, and update
1205 * the bits by what we do actually send. If we send nothing,
1206 * we just back out sl.length () to the old value, and no harm
1207 * is done.
1208 * I think this is simpler than doing a bunch of checks to see
1209 * what if anything we need to send, setting the bits, then
1210 * doing those checks again to add the real data.
1211 */
1212 oldlen = sl.length ();
1213 eoldlen = esl.length ();
1214
1215 sl << uint16 (mask);
1216
1217 unsigned char dummy;
1218 unsigned char *last_ext = &dummy;
1219
1220 /* Darkness changed */
1221 if (lastcell.count != d && socket.darkness)
1222 {
1223 mask |= 0x8;
1224
1225 if (socket.extmap)
1226 {
1227 *last_ext |= 0x80; 1189 *last_ext |= 0x80;
1228 last_ext = &sl[sl.length ()]; 1190 last_ext = &sl[sl.length ()];
1229 sl << uint8 (d); 1191
1230 } 1192 sl << uint8 (6) << uint8 (stat_width);
1231 else
1232 sl << uint8 (255 - 64 * d);
1233 } 1193 }
1194 }
1234 1195
1235 lastcell.count = d; 1196 if (expect_false (lastcell.player != player))
1236
1237 mapspace &ms = m->at (nx, ny);
1238 ms.update ();
1239
1240 if (socket.extmap)
1241 { 1197 {
1242 uint8 stat_hp = 0; 1198 lastcell.player = player;
1243 uint8 stat_width = 0;
1244 uint8 flags = 0;
1245 tag_t player = 0;
1246 1199
1247 // send hp information, if applicable
1248 if (object *op = ms.faces_obj [0])
1249 if (op->is_head () && !op->invisible)
1250 {
1251 if (op->stats.maxhp > op->stats.hp
1252 && op->stats.maxhp > 0
1253 && (op->type == PLAYER
1254 || op->type == DOOR // does not work, have maxhp 0
1255 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1256 {
1257 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1258 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1259 }
1260
1261 if (op->msg && op->msg[0] == '@')
1262 flags |= 1;
1263
1264 if (op->type == PLAYER && op != ob)
1265 player = op->count;
1266 }
1267
1268 if (lastcell.stat_hp != stat_hp)
1269 {
1270 lastcell.stat_hp = stat_hp;
1271
1272 mask |= 0x8; 1200 mask |= 0x8;
1273 *last_ext |= 0x80; 1201 *last_ext |= 0x80;
1274 last_ext = &sl[sl.length ()]; 1202 last_ext = &sl[sl.length ()];
1275 1203
1276 sl << uint8 (5) << uint8 (stat_hp);
1277
1278 if (stat_width > 1)
1279 {
1280 *last_ext |= 0x80;
1281 last_ext = &sl[sl.length ()];
1282
1283 sl << uint8 (6) << uint8 (stat_width);
1284 }
1285 }
1286
1287 if (lastcell.player != player)
1288 {
1289 lastcell.player = player;
1290
1291 mask |= 0x8;
1292 *last_ext |= 0x80;
1293 last_ext = &sl[sl.length ()];
1294
1295 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1204 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1296 } 1205 }
1297 1206
1298 if (lastcell.flags != flags) 1207 if (expect_false (lastcell.flags != flags))
1299 { 1208 {
1300 lastcell.flags = flags; 1209 lastcell.flags = flags;
1301 1210
1302 mask |= 0x8; 1211 mask |= 0x8;
1303 *last_ext |= 0x80; 1212 *last_ext |= 0x80;
1304 last_ext = &sl[sl.length ()]; 1213 last_ext = &sl[sl.length ()];
1305 1214
1306 sl << uint8 (8) << uint8 (flags); 1215 sl << uint8 (8) << uint8 (flags);
1307 }
1308 } 1216 }
1309 1217
1218 // faces
1219
1310 /* Floor face */ 1220 /* Floor face */
1311 if (update_space (sl, socket, ms, lastcell, 2)) 1221 if (update_space (sl, socket, ms, lastcell, 2))
1312 mask |= 0x4; 1222 mask |= 0x4;
1313 1223
1314 /* Middle face */ 1224 /* Middle face */
1315 if (update_space (sl, socket, ms, lastcell, 1)) 1225 if (update_space (sl, socket, ms, lastcell, 1))
1316 mask |= 0x2; 1226 mask |= 0x2;
1317 1227
1228 if (expect_false (ob->invisible)
1229 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1318 if (ms.player () == ob 1230 && ms.player () == ob)
1319 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1320 { 1231 {
1321 // force player to be visible to himself if invisible 1232 // force player to be visible to himself if invisible
1322 if (lastcell.faces[0] != ob->face) 1233 if (lastcell.faces[0] != ob->face)
1323 { 1234 {
1324 lastcell.faces[0] = ob->face; 1235 lastcell.faces[0] = ob->face;
1325 1236
1326 mask |= 0x1;
1327 sl << uint16 (ob->face);
1328
1329 socket.send_faces (ob);
1330 }
1331 }
1332 /* Top face */
1333 else if (update_space (sl, socket, ms, lastcell, 0))
1334 mask |= 0x1; 1237 mask |= 0x1;
1238 sl << uint16 (ob->face);
1335 1239
1240 socket.send_faces (ob);
1241 }
1242 }
1243 /* Top face */
1244 else if (update_space (sl, socket, ms, lastcell, 0))
1245 mask |= 0x1;
1246
1336 /* Check to see if we are in fact sending anything for this 1247 /* Check to see if we are in fact sending anything for this
1337 * space by checking the mask. If so, update the mask. 1248 * space by checking the mask. If so, update the mask.
1338 * if not, reset the len to that from before adding the mask 1249 * if not, reset the len to that from before adding the mask
1339 * value, so we don't send those bits. 1250 * value, so we don't send those bits.
1340 */ 1251 */
1341 if (mask & 0xf) 1252 if (mask & 0xf)
1342 sl[oldlen + 1] = mask & 0xff; 1253 sl[oldlen + 1] = mask & 0xff;
1343 else 1254 else
1344 sl.reset (oldlen); 1255 sl.reset (oldlen);
1345
1346 if (socket.ext_mapinfos)
1347 esl << uint16 (emask);
1348
1349 if (socket.EMI_smooth)
1350 {
1351 for (int layer = 2+1; layer--; )
1352 {
1353 object *ob = ms.faces_obj [layer];
1354
1355 // If there is no object for this space, or if the face for the object
1356 // is the blank face, set the smoothlevel to zero.
1357 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1358
1359 // We've gotten what face we want to use for the object. Now see if
1360 // if it has changed since we last sent it to the client.
1361 if (lastcell.smooth[layer] != smoothlevel)
1362 {
1363 lastcell.smooth[layer] = smoothlevel;
1364 esl << uint8 (smoothlevel);
1365 emask |= 1 << layer;
1366 }
1367 }
1368
1369 if (emask & 0xf)
1370 esl[eoldlen + 1] = emask & 0xff;
1371 else
1372 esl.reset (eoldlen);
1373 }
1374 } /* else this is a viewable space */ 1256 } /* else this is a viewable space */
1375 } /* for x loop */ 1257 ordered_mapwalk_end
1376 } /* for y loop */
1377 1258
1378 socket.flush_fx (); 1259 socket.flush_fx ();
1379
1380 /* Verify that we in fact do need to send this */
1381 if (socket.ext_mapinfos)
1382 {
1383 if (!(sl.length () > startlen || socket.sent_scroll))
1384 {
1385 /* No map data will follow, so don't say the client
1386 * it doesn't need draw!
1387 */
1388 ewhatflag &= ~EMI_NOREDRAW;
1389 esl[ewhatstart + 1] = ewhatflag & 0xff;
1390 }
1391
1392 if (esl.length () > estartlen)
1393 socket.send_packet (esl);
1394 }
1395 1260
1396 if (sl.length () > startlen || socket.sent_scroll) 1261 if (sl.length () > startlen || socket.sent_scroll)
1397 { 1262 {
1398 socket.send_packet (sl); 1263 socket.send_packet (sl);
1399 socket.sent_scroll = 0; 1264 socket.sent_scroll = 0;
1400 } 1265 }
1401} 1266}
1402 1267
1403/*****************************************************************************/
1404/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1405/* a player. Of course, the client need to know the command to be able to */
1406/* manage it ! */
1407/*****************************************************************************/
1408void
1409send_plugin_custom_message (object *pl, char *buf)
1410{
1411 pl->contr->ns->send_packet (buf);
1412}
1413
1414/**
1415 * This sends the skill number to name mapping. We ignore
1416 * the params - we always send the same info no matter what.
1417 */
1418void
1419send_skill_info (client *ns, char *params)
1420{
1421 packet sl;
1422 sl << "replyinfo skill_info\n";
1423
1424 for (int i = 1; i < NUM_SKILLS; i++)
1425 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1426
1427 if (sl.length () > MAXSOCKBUF)
1428 {
1429 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1430 fatal (0);
1431 }
1432
1433 ns->send_packet (sl);
1434}
1435
1436/**
1437 * This sends the spell path to name mapping. We ignore
1438 * the params - we always send the same info no matter what.
1439 */
1440void
1441send_spell_paths (client * ns, char *params)
1442{
1443 packet sl;
1444
1445 sl << "replyinfo spell_paths\n";
1446
1447 for (int i = 0; i < NRSPELLPATHS; i++)
1448 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1449
1450 if (sl.length () > MAXSOCKBUF)
1451 {
1452 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1453 fatal (0);
1454 }
1455
1456 ns->send_packet (sl);
1457}
1458
1459/** 1268/**
1460 * This looks for any spells the player may have that have changed their stats. 1269 * This looks for any spells the player may have that have changed their stats.
1461 * it then sends an updspell packet for each spell that has changed in this way 1270 * it then sends an updspell packet for each spell that has changed in this way
1462 */ 1271 */
1463void 1272void
1464esrv_update_spells (player *pl) 1273esrv_update_spells (player *pl)
1465{ 1274{
1466 if (!pl->ns) 1275 if (!pl->ns)
1467 return; 1276 return;
1468 1277
1278 pl->ns->update_spells = false;
1279
1469 if (!pl->ns->monitor_spells) 1280 if (!pl->ns->monitor_spells)
1470 return; 1281 return;
1471 1282
1472 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1283 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1473 {
1474 if (spell->type == SPELL) 1284 if (spell->type == SPELL)
1475 { 1285 {
1476 int flags = 0; 1286 int flags = 0;
1287 int val;
1477 1288
1478 /* check if we need to update it */ 1289 /* check if we need to update it */
1479 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1290 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1291 if (spell->cached_sp != val)
1480 { 1292 {
1481 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1293 spell->cached_sp = val;
1482 flags |= UPD_SP_MANA; 1294 flags |= UPD_SP_MANA;
1483 } 1295 }
1484 1296
1485 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1297 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1298 if (spell->cached_grace != val)
1486 { 1299 {
1487 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1300 spell->cached_grace = val;
1488 flags |= UPD_SP_GRACE; 1301 flags |= UPD_SP_GRACE;
1489 } 1302 }
1490 1303
1491 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1304 val = casting_level (pl->ob, spell);
1305 if (spell->cached_eat != val)
1492 { 1306 {
1493 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1307 spell->cached_eat = val;
1494 flags |= UPD_SP_DAMAGE; 1308 flags |= UPD_SP_LEVEL;
1495 } 1309 }
1496 1310
1497 if (flags) 1311 if (flags)
1498 { 1312 {
1499 packet sl; 1313 packet sl;
1500 1314
1501 sl << "updspell " 1315 sl << "updspell "
1502 << uint8 (flags) 1316 << uint8 (flags)
1503 << uint32 (spell->count); 1317 << uint32 (spell->count);
1504 1318
1505 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1319 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1506 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1320 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1507 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1321 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1508 1322
1509 pl->ns->send_packet (sl); 1323 pl->ns->send_packet (sl);
1510 } 1324 }
1511 } 1325 }
1512 }
1513} 1326}
1514 1327
1515void 1328void
1516esrv_remove_spell (player *pl, object *spell) 1329esrv_remove_spell (player *pl, object *spell)
1517{ 1330{
… …
1542 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1355 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1543 return; 1356 return;
1544 } 1357 }
1545 1358
1546 /* store costs and damage in the object struct, to compare to later */ 1359 /* store costs and damage in the object struct, to compare to later */
1547 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1360 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1548 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1361 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1549 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1362 spell->cached_eat = casting_level (pl->ob, spell);
1550 1363
1551 /* figure out which skill it uses, if it uses one */ 1364 /* figure out which skill it uses, if it uses one */
1552 if (spell->skill) 1365 if (spell->skill)
1553 { 1366 if (object *tmp = pl->find_skill (spell->skill))
1554 for (i = 1; i < NUM_SKILLS; i++)
1555 if (!strcmp (spell->skill, skill_names[i]))
1556 {
1557 skill = i + CS_STAT_SKILLINFO; 1367 skill = tmp->subtype + CS_STAT_SKILLINFO;
1558 break;
1559 }
1560 }
1561 1368
1562 // spells better have a face 1369 // spells better have a face
1563 if (!spell->face) 1370 if (!spell->face)
1564 { 1371 {
1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1570 1377
1571 /* send the current values */ 1378 /* send the current values */
1572 sl << uint32 (spell->count) 1379 sl << uint32 (spell->count)
1573 << uint16 (spell->level) 1380 << uint16 (spell->level)
1574 << uint16 (spell->casting_time) 1381 << uint16 (spell->casting_time)
1575 << uint16 (spell->last_sp) 1382 << uint16 (spell->cached_sp)
1576 << uint16 (spell->last_grace) 1383 << uint16 (spell->cached_grace)
1577 << uint16 (spell->last_eat) 1384 << uint16 (spell->cached_eat)
1578 << uint8 (skill) 1385 << uint8 (skill)
1579 << uint32 (spell->path_attuned) 1386 << uint32 (spell->path_attuned)
1580 << uint32 (spell->face) 1387 << uint32 (spell->face)
1581 << data8 (spell->name) 1388 << data8 (spell->name)
1582 << data16 (spell->msg); 1389 << data16 (spell->msg);
… …
1649 /* finally, we can send the packet */ 1456 /* finally, we can send the packet */
1650 pl->ns->flush_fx (); 1457 pl->ns->flush_fx ();
1651 pl->ns->send_packet (sl); 1458 pl->ns->send_packet (sl);
1652} 1459}
1653 1460
1461//-GPL
1462

Diff Legend

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