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.130 by root, Tue May 20 03:14:19 2008 UTC vs.
Revision 1.161 by root, Sun Nov 29 09:41:28 2009 UTC

… …
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,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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 }
152 184
153 // first try to aovid a full newmap on tiled map scrolls 185 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map) 186 if (socket.current_map != ob->map && !socket.force_newmap)
155 { 187 {
156 rv_vector rv; 188 rv_vector rv;
157 189
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159 191
… …
164 socket.current_x = ob->x; 196 socket.current_x = ob->x;
165 socket.current_y = ob->y; 197 socket.current_y = ob->y;
166 198
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y); 199 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset (); 200 socket.floorbox_reset ();
201 send_map_info (pl);
169 } 202 }
170 } 203 }
171 204
172 if (socket.current_map != ob->map || socket.force_newmap) 205 if (socket.current_map != ob->map || socket.force_newmap)
173 { 206 {
174 clear_map (pl); 207 clear_map (pl);
175 socket.current_map = ob->map; 208 socket.current_map = ob->map;
176 209 send_map_info (pl);
177 if (socket.mapinfocmd)
178 {
179 if (ob->map && ob->map->path[0])
180 {
181 int flags = 0;
182
183 if (ob->map->tile_path[0]) flags |= 1;
184 if (ob->map->tile_path[1]) flags |= 2;
185 if (ob->map->tile_path[2]) flags |= 4;
186 if (ob->map->tile_path[3]) flags |= 8;
187
188 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
189 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
190 ob->map->width, ob->map->height, &ob->map->path);
191 }
192 else
193 socket.send_packet ("mapinfo current");
194 }
195 } 210 }
196 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)
197 { 212 {
198 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
199 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
200 215
201 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
202 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
203 else
204 {
205 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);
206 socket.floorbox_reset (); 217 socket.floorbox_reset ();
207 }
208 } 218 }
209 219
210 socket.current_x = ob->x; 220 socket.current_x = ob->x;
211 socket.current_y = ob->y; 221 socket.current_y = ob->y;
222}
212 223
213 region *reg = ob->region (); 224/**
214 if (socket.current_region != reg) 225 * This sends the skill number to name mapping. We ignore
215 { 226 * the params - we always send the same info no matter what.
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 227 */
217 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)
218 } 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);
219} 267}
220 268
221/** 269/**
222 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
… …
236 { 284 {
237 *params++ = 0; 285 *params++ = 0;
238 break; 286 break;
239 } 287 }
240 288
241 if (!strcmp (buf, "image_info"))
242 send_image_info (ns, params);
243 else if (!strcmp (buf, "image_sums"))
244 send_image_sums (ns, params);
245 else if (!strcmp (buf, "skill_info")) 289 if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params); 290 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
249 else 293 else
250 { 294 {
… …
266ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
267{ 311{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269} 313}
270 314
315//-GPL
316
271void 317void
272client::mapinfo_queue_clear () 318client::mapinfo_queue_clear ()
273{ 319{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i); 321 free (*i);
… …
282{ 328{
283 char *token = buf; 329 char *token = buf;
284 buf += strlen (buf) + 9; 330 buf += strlen (buf) + 9;
285 331
286 // initial map and its origin 332 // initial map and its origin
287 maptile *map = pl->observe->map; 333 maptile *map = pl->viewpoint->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x; 334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y; 335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290 int max_distance = 8; // limit maximum path length to something generous 336 int max_distance = 8; // limit maximum path length to something generous
291 337
292 while (*buf && map && max_distance) 338 while (*buf && map && max_distance)
293 { 339 {
294 int dir = *buf++ - '1'; 340 int dir = *buf++ - '1';
… …
399AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
400{ 446{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 448}
403 449
404/** Reply to ExtendedInfos command */ 450//+GPL
405void
406ToggleExtendedInfos (char *buf, int len, client * ns)
407{
408 char cmdback[MAX_BUF];
409 char command[50];
410 int info, nextinfo;
411
412 cmdback[0] = '\0';
413 nextinfo = 0;
414
415 while (1)
416 {
417 /* 1. Extract an info */
418 info = nextinfo;
419
420 while ((info < len) && (buf[info] == ' '))
421 info++;
422
423 if (info >= len)
424 break;
425
426 nextinfo = info + 1;
427
428 while ((nextinfo < len) && (buf[nextinfo] != ' '))
429 nextinfo++;
430
431 if (nextinfo - info >= 49) /*Erroneous info asked */
432 continue;
433
434 strncpy (command, &(buf[info]), nextinfo - info);
435
436 /* 2. Interpret info */
437 if (!strcmp ("smooth", command))
438 /* Toggle smoothing */
439 ns->EMI_smooth = !ns->EMI_smooth;
440 else
441 /*bad value */;
442
443 /*3. Next info */
444 }
445
446 strcpy (cmdback, "ExtendedInfoSet");
447
448 if (ns->EMI_smooth)
449 {
450 strcat (cmdback, " ");
451 strcat (cmdback, "smoothing");
452 }
453
454 ns->send_packet (cmdback);
455}
456 451
457/* 452/*
458#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
459#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
460#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
… …
477 while (1) 472 while (1)
478 { 473 {
479 /* 1. Extract an info */ 474 /* 1. Extract an info */
480 info = nextinfo; 475 info = nextinfo;
481 476
482 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
483 info++; 478 info++;
484 479
485 if (info >= len) 480 if (info >= len)
486 break; 481 break;
487 482
488 nextinfo = info + 1; 483 nextinfo = info + 1;
489 484
490 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
491 nextinfo++; 486 nextinfo++;
492 487
493 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
494 continue; 489 continue;
495 490
496 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
497 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
498 /* 2. Interpret info */ 494 /* 2. Interpret info */
499 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
500 496
501 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
502 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
536 return; 532 return;
537 533
538 buf++; 534 buf++;
539 } 535 }
540 536
541 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
542 538
543 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
544 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
545 * 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
546 * commands. 542 * commands.
… …
580 * commands. 576 * commands.
581 */ 577 */
582 pl->count = 0; 578 pl->count = 0;
583 579
584 //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
585 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
586 ? time = MAX_TIME * 100
587 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
588 584
589 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
590 packet sl ("comc"); 586 packet sl ("comc");
591 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
592 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
738 * Get player's current range attack in obuf. 734 * Get player's current range attack in obuf.
739 */ 735 */
740static void 736static void
741rangetostring (player *pl, char *obuf) 737rangetostring (player *pl, char *obuf)
742{ 738{
743 dynbuf_text buf; 739 dynbuf_text &buf = msg_dynbuf; buf.clear ();
744 740
745 if (pl->ranged_ob) 741 if (pl->ranged_ob)
746 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;
747 743
748 if (pl->combat_ob) 744 if (pl->combat_ob)
… …
824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827 823
828 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
829 if (object *skill = opl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob [s])
830 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
831 { 827 {
832 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
833 829
834 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
842 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
843 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
844 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
845 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
846 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
847 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);
848 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
849 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);
850 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);
851 847
852 flags = 0; 848 flags = 0;
853 849
854 if (opl->fire_on) 850 if (opl->fire_on)
… …
857 if (opl->run_on) 853 if (opl->run_on)
858 flags |= SF_RUNON; 854 flags |= SF_RUNON;
859 855
860 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
861 857
862 if (ns->sc_version < 1025)
863 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
864 else
865 for (int i = 0; i < NROFATTACKS; i++) 858 for (int i = 0; i < NROFATTACKS; i++)
866 { 859 {
867 /* Skip ones we won't send */ 860 /* Skip ones we won't send */
868 if (atnr_cs_stat[i] == -1) 861 if (atnr_cs_stat[i] == -1)
869 continue; 862 continue;
870 863
871 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]);
872 } 865 }
873 866
874 if (pl->ns->monitor_spells) 867 if (pl->ns->monitor_spells)
875 { 868 {
876 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);
877 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);
… …
903 << uint32 (pl->ob->face) 896 << uint32 (pl->ob->face)
904 << data8 (pl->ob->name); 897 << data8 (pl->ob->name);
905 898
906 pl->ns->last_weight = weight; 899 pl->ns->last_weight = weight;
907 pl->ns->send_packet (sl); 900 pl->ns->send_packet (sl);
908 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909} 901}
910 902
911/****************************************************************************** 903/******************************************************************************
912 * 904 *
913 * Start of map related commands. 905 * Start of map related commands.
… …
980 972
981 /* Nothing changed */ 973 /* Nothing changed */
982 return 0; 974 return 0;
983} 975}
984 976
985/** 977//-GPL
986 * Returns the size of a data for a map square as returned by
987 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
988 * available.
989 */
990int
991getExtendedMapInfoSize (client * ns)
992{
993 int result = 0;
994
995 if (ns->ext_mapinfos)
996 {
997 if (ns->EMI_smooth)
998 result += 1; /*One byte for smoothlevel */
999 }
1000
1001 return result;
1002}
1003 978
1004// prefetch (and touch) all maps within a specific distancd 979// prefetch (and touch) all maps within a specific distancd
1005static void 980static void
1006prefetch_surrounding_maps (maptile *map, int distance) 981prefetch_surrounding_maps (maptile *map, int distance)
1007{ 982{
1008 map->last_access = runtime; 983 map->touch ();
1009 984
1010 if (--distance) 985 if (--distance)
1011 for (int dir = 4; --dir; ) 986 for (int dir = 4; --dir; )
1012 if (const shstr &path = map->tile_path [dir]) 987 if (const shstr &path = map->tile_path [dir])
1013 if (maptile *&neigh = map->tile_map [dir]) 988 if (maptile *&neigh = map->tile_map [dir])
… …
1021prefetch_surrounding_maps (object *op) 996prefetch_surrounding_maps (object *op)
1022{ 997{
1023 prefetch_surrounding_maps (op->map, 3); 998 prefetch_surrounding_maps (op->map, 3);
1024} 999}
1025 1000
1001//+GPL
1002
1026/** 1003/**
1027 * Draws client map. 1004 * Draws client map.
1028 */ 1005 */
1029void 1006void
1030draw_client_map (player *pl) 1007draw_client_map (player *pl)
1031{ 1008{
1032 object *ob = pl->observe; 1009 object *ob = pl->viewpoint;
1033 if (!ob->active) 1010 if (!pl->observe->active)
1034 return; 1011 return;
1035
1036 maptile *plmap = ob->map;
1037 1012
1038 /* 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
1039 * 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
1040 * be OK once they really log in. 1015 * be OK once they really log in.
1041 */ 1016 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE) 1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1043 return; 1018 return;
1044 1019
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046 int estartlen, eoldlen; 1020 int startlen, oldlen;
1047 uint8 eentrysize;
1048 uint16 ewhatstart, ewhatflag;
1049 uint8 extendedinfos;
1050 1021
1051 check_map_change (pl); 1022 check_map_change (pl);
1052 prefetch_surrounding_maps (pl->ob); 1023 prefetch_surrounding_maps (pl->ob);
1053 1024
1054 /* do LOS after calls to update_position */ 1025 /* do LOS after calls to update_position */
1055 if (ob != pl->ob) 1026 /* unfortunately, we need to udpate los when observing, currently */
1056 clear_los (pl); 1027 if (pl->do_los || pl->viewpoint != pl->ob)
1057 else if (pl->do_los)
1058 { 1028 {
1059 update_los (ob);
1060 pl->do_los = 0; 1029 pl->do_los = 0;
1030 pl->update_los ();
1061 } 1031 }
1062 1032
1063 /** 1033 /**
1064 * 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
1065 * 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
… …
1084 */ 1054 */
1085 1055
1086 client &socket = *pl->ns; 1056 client &socket = *pl->ns;
1087 1057
1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1089 packet esl;
1090 1059
1091 startlen = sl.length (); 1060 startlen = sl.length ();
1092 1061
1093 /*Extendedmapinfo structure initialisation */ 1062 int hx = socket.mapx / 2;
1094 if (socket.ext_mapinfos) 1063 int hy = socket.mapy / 2;
1095 {
1096 extendedinfos = EMI_NOREDRAW;
1097 1064
1098 if (socket.EMI_smooth) 1065 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1099 extendedinfos |= EMI_SMOOTH; 1066 int ax = dx + hx;
1067 int ay = dy + hy;
1100 1068
1101 ewhatstart = esl.length (); 1069 int mask = (ax << 10) | (ay << 4);
1102 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1070 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1103 could need to be taken away */
1104 eentrysize = getExtendedMapInfoSize (&socket);
1105 esl << "mapextended "
1106 << uint8 (extendedinfos)
1107 << uint8 (eentrysize);
1108 1071
1109 estartlen = esl.length (); 1072 /* If the coordinates are not valid, or it is too dark to see,
1110 } 1073 * we tell the client as such
1111
1112 /* x,y are the real map locations. ax, ay are viewport relative
1113 * locations.
1114 */ 1074 */
1115 ay = 0; 1075 if (!m)
1116
1117 /* We could do this logic as conditionals in the if statement,
1118 * but that started to get a bit messy to look at.
1119 */
1120 max_x = ob->x + (socket.mapx + 1) / 2;
1121 max_y = ob->y + (socket.mapy + 1) / 2;
1122
1123 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1124 { 1076 {
1125 sint16 nx, ny; 1077 /* space is out of map. Update space and clear values
1126 maptile *m = 0; 1078 * if this hasn't already been done. If the space is out
1127 1079 * of the map, it shouldn't have a head.
1128 ax = 0; 1080 */
1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1081 if (lastcell.count != -1)
1130 { 1082 {
1131 // check to see if we can simply go one right quickly 1083 sl << uint16 (mask);
1084 map_clearcell (&lastcell, -1);
1132 ++nx; 1085 }
1133 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 {
1134 m = 0; 1134 mask |= 0x8;
1135 1135
1136 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)
1137 { 1155 {
1138 nx = x; ny = y; m = plmap; 1156 if (op->stats.maxhp > op->stats.hp
1139 1157 && op->stats.maxhp > 0
1140 if (xy_normalise (m, nx, ny)) 1158 && (op->type == PLAYER
1141 m->touch (); 1159 || op->type == DOOR // does not work, have maxhp 0
1142 else 1160 || QUERY_FLAG (op, FLAG_MONSTER)
1161 || QUERY_FLAG (op, FLAG_ALIVE)
1162 || QUERY_FLAG (op, FLAG_GENERATOR)))
1143 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;
1144 } 1175 }
1145 1176
1146 int emask, mask; 1177 if (expect_false (lastcell.stat_hp != stat_hp))
1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1148
1149 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150
1151 /* If the coordinates are not valid, or it is too dark to see,
1152 * we tell the client as such
1153 */
1154 if (!m)
1155 { 1178 {
1156 /* space is out of map. Update space and clear values 1179 lastcell.stat_hp = stat_hp;
1157 * if this hasn't already been done. If the space is out 1180
1158 * of the map, it shouldn't have a head 1181 mask |= 0x8;
1159 */ 1182 *last_ext |= 0x80;
1160 if (lastcell.count != -1) 1183 last_ext = &sl[sl.length ()];
1184
1185 sl << uint8 (5) << uint8 (stat_hp);
1186
1187 if (stat_width > 1)
1161 { 1188 {
1162 sl << uint16 (mask);
1163 map_clearcell (&lastcell, -1);
1164 }
1165
1166 continue;
1167 }
1168
1169 int d = pl->blocked_los[ax][ay];
1170
1171 if (d > 3)
1172 {
1173
1174 int need_send = 0, count;
1175
1176 /* This block deals with spaces that are not visible for whatever
1177 * reason. Still may need to send the head for this space.
1178 */
1179
1180 oldlen = sl.length ();
1181
1182 sl << uint16 (mask);
1183
1184 if (lastcell.count != -1)
1185 need_send = 1;
1186
1187 count = -1;
1188
1189 /* properly clear a previously sent big face */
1190 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1191 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1192 need_send = 1;
1193
1194 map_clearcell (&lastcell, count);
1195
1196 if ((mask & 0xf) || need_send)
1197 sl[oldlen + 1] = mask & 0xff;
1198 else
1199 sl.reset (oldlen);
1200 }
1201 else
1202 {
1203 /* In this block, the space is visible.
1204 */
1205
1206 /* Rather than try to figure out what everything that we might
1207 * need to send is, then form the packet after that,
1208 * we presume that we will in fact form a packet, and update
1209 * the bits by what we do actually send. If we send nothing,
1210 * we just back out sl.length () to the old value, and no harm
1211 * is done.
1212 * I think this is simpler than doing a bunch of checks to see
1213 * what if anything we need to send, setting the bits, then
1214 * doing those checks again to add the real data.
1215 */
1216 oldlen = sl.length ();
1217 eoldlen = esl.length ();
1218
1219 sl << uint16 (mask);
1220
1221 unsigned char dummy;
1222 unsigned char *last_ext = &dummy;
1223
1224 /* Darkness changed */
1225 if (lastcell.count != d && socket.darkness)
1226 {
1227 mask |= 0x8;
1228
1229 if (socket.extmap)
1230 {
1231 *last_ext |= 0x80; 1189 *last_ext |= 0x80;
1232 last_ext = &sl[sl.length ()]; 1190 last_ext = &sl[sl.length ()];
1233 sl << uint8 (d); 1191
1234 } 1192 sl << uint8 (6) << uint8 (stat_width);
1235 else
1236 sl << uint8 (255 - 64 * d);
1237 } 1193 }
1194 }
1238 1195
1239 lastcell.count = d; 1196 if (expect_false (lastcell.player != player))
1240
1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1243
1244 if (socket.extmap)
1245 { 1197 {
1246 uint8 stat_hp = 0; 1198 lastcell.player = player;
1247 uint8 stat_width = 0;
1248 uint8 flags = 0;
1249 tag_t player = 0;
1250 1199
1251 // send hp information, if applicable
1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1254 {
1255 if (op->stats.maxhp > op->stats.hp
1256 && op->stats.maxhp > 0
1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1259 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1260 {
1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1263 }
1264
1265 if (op->msg && op->msg[0] == '@')
1266 flags |= 1;
1267
1268 if (op->type == PLAYER && op != ob)
1269 player = op->count;
1270 }
1271
1272 if (lastcell.stat_hp != stat_hp)
1273 {
1274 lastcell.stat_hp = stat_hp;
1275
1276 mask |= 0x8; 1200 mask |= 0x8;
1277 *last_ext |= 0x80; 1201 *last_ext |= 0x80;
1278 last_ext = &sl[sl.length ()]; 1202 last_ext = &sl[sl.length ()];
1279 1203
1280 sl << uint8 (5) << uint8 (stat_hp);
1281
1282 if (stat_width > 1)
1283 {
1284 *last_ext |= 0x80;
1285 last_ext = &sl[sl.length ()];
1286
1287 sl << uint8 (6) << uint8 (stat_width);
1288 }
1289 }
1290
1291 if (lastcell.player != player)
1292 {
1293 lastcell.player = player;
1294
1295 mask |= 0x8;
1296 *last_ext |= 0x80;
1297 last_ext = &sl[sl.length ()];
1298
1299 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1204 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1300 } 1205 }
1301 1206
1302 if (lastcell.flags != flags) 1207 if (expect_false (lastcell.flags != flags))
1303 { 1208 {
1304 lastcell.flags = flags; 1209 lastcell.flags = flags;
1305 1210
1306 mask |= 0x8; 1211 mask |= 0x8;
1307 *last_ext |= 0x80; 1212 *last_ext |= 0x80;
1308 last_ext = &sl[sl.length ()]; 1213 last_ext = &sl[sl.length ()];
1309 1214
1310 sl << uint8 (8) << uint8 (flags); 1215 sl << uint8 (8) << uint8 (flags);
1311 }
1312 } 1216 }
1313 1217
1218 // faces
1219
1314 /* Floor face */ 1220 /* Floor face */
1315 if (update_space (sl, socket, ms, lastcell, 2)) 1221 if (update_space (sl, socket, ms, lastcell, 2))
1316 mask |= 0x4; 1222 mask |= 0x4;
1317 1223
1318 /* Middle face */ 1224 /* Middle face */
1319 if (update_space (sl, socket, ms, lastcell, 1)) 1225 if (update_space (sl, socket, ms, lastcell, 1))
1320 mask |= 0x2; 1226 mask |= 0x2;
1321 1227
1228 if (expect_false (ob->invisible)
1229 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1322 if (ms.player () == ob 1230 && ms.player () == ob)
1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324 { 1231 {
1325 // force player to be visible to himself if invisible 1232 // force player to be visible to himself if invisible
1326 if (lastcell.faces[0] != ob->face) 1233 if (lastcell.faces[0] != ob->face)
1327 { 1234 {
1328 lastcell.faces[0] = ob->face; 1235 lastcell.faces[0] = ob->face;
1329 1236
1330 mask |= 0x1;
1331 sl << uint16 (ob->face);
1332
1333 socket.send_faces (ob);
1334 }
1335 }
1336 /* Top face */
1337 else if (update_space (sl, socket, ms, lastcell, 0))
1338 mask |= 0x1; 1237 mask |= 0x1;
1238 sl << uint16 (ob->face);
1339 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
1340 /* 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
1341 * space by checking the mask. If so, update the mask. 1248 * space by checking the mask. If so, update the mask.
1342 * 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
1343 * value, so we don't send those bits. 1250 * value, so we don't send those bits.
1344 */ 1251 */
1345 if (mask & 0xf) 1252 if (mask & 0xf)
1346 sl[oldlen + 1] = mask & 0xff; 1253 sl[oldlen + 1] = mask & 0xff;
1347 else 1254 else
1348 sl.reset (oldlen); 1255 sl.reset (oldlen);
1349
1350 if (socket.ext_mapinfos)
1351 esl << uint16 (emask);
1352
1353 if (socket.EMI_smooth)
1354 {
1355 for (int layer = 2+1; layer--; )
1356 {
1357 object *ob = ms.faces_obj [layer];
1358
1359 // If there is no object for this space, or if the face for the object
1360 // is the blank face, set the smoothlevel to zero.
1361 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1362
1363 // We've gotten what face we want to use for the object. Now see if
1364 // if it has changed since we last sent it to the client.
1365 if (lastcell.smooth[layer] != smoothlevel)
1366 {
1367 lastcell.smooth[layer] = smoothlevel;
1368 esl << uint8 (smoothlevel);
1369 emask |= 1 << layer;
1370 }
1371 }
1372
1373 if (emask & 0xf)
1374 esl[eoldlen + 1] = emask & 0xff;
1375 else
1376 esl.reset (eoldlen);
1377 }
1378 } /* else this is a viewable space */ 1256 } /* else this is a viewable space */
1379 } /* for x loop */ 1257 ordered_mapwalk_end
1380 } /* for y loop */
1381 1258
1382 socket.flush_fx (); 1259 socket.flush_fx ();
1383
1384 /* Verify that we in fact do need to send this */
1385 if (socket.ext_mapinfos)
1386 {
1387 if (!(sl.length () > startlen || socket.sent_scroll))
1388 {
1389 /* No map data will follow, so don't say the client
1390 * it doesn't need draw!
1391 */
1392 ewhatflag &= ~EMI_NOREDRAW;
1393 esl[ewhatstart + 1] = ewhatflag & 0xff;
1394 }
1395
1396 if (esl.length () > estartlen)
1397 socket.send_packet (esl);
1398 }
1399 1260
1400 if (sl.length () > startlen || socket.sent_scroll) 1261 if (sl.length () > startlen || socket.sent_scroll)
1401 { 1262 {
1402 socket.send_packet (sl); 1263 socket.send_packet (sl);
1403 socket.sent_scroll = 0; 1264 socket.sent_scroll = 0;
1404 } 1265 }
1405} 1266}
1406 1267
1407/*****************************************************************************/
1408/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1409/* a player. Of course, the client need to know the command to be able to */
1410/* manage it ! */
1411/*****************************************************************************/
1412void
1413send_plugin_custom_message (object *pl, char *buf)
1414{
1415 pl->contr->ns->send_packet (buf);
1416}
1417
1418/**
1419 * This sends the skill number to name mapping. We ignore
1420 * the params - we always send the same info no matter what.
1421 */
1422void
1423send_skill_info (client *ns, char *params)
1424{
1425 packet sl;
1426 sl << "replyinfo skill_info\n";
1427
1428 for (int i = 1; i < NUM_SKILLS; i++)
1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1430
1431 if (sl.length () > MAXSOCKBUF)
1432 {
1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434 fatal (0);
1435 }
1436
1437 ns->send_packet (sl);
1438}
1439
1440/**
1441 * This sends the spell path to name mapping. We ignore
1442 * the params - we always send the same info no matter what.
1443 */
1444void
1445send_spell_paths (client * ns, char *params)
1446{
1447 packet sl;
1448
1449 sl << "replyinfo spell_paths\n";
1450
1451 for (int i = 0; i < NRSPELLPATHS; i++)
1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1453
1454 if (sl.length () > MAXSOCKBUF)
1455 {
1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1457 fatal (0);
1458 }
1459
1460 ns->send_packet (sl);
1461}
1462
1463/** 1268/**
1464 * 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.
1465 * 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
1466 */ 1271 */
1467void 1272void
1468esrv_update_spells (player *pl) 1273esrv_update_spells (player *pl)
1469{ 1274{
1470 if (!pl->ns) 1275 if (!pl->ns)
1471 return; 1276 return;
1277
1278 pl->ns->update_spells = false;
1472 1279
1473 if (!pl->ns->monitor_spells) 1280 if (!pl->ns->monitor_spells)
1474 return; 1281 return;
1475 1282
1476 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1283 for (object *spell = pl->ob->inv; spell; spell = spell->below)
… …
1478 if (spell->type == SPELL) 1285 if (spell->type == SPELL)
1479 { 1286 {
1480 int flags = 0; 1287 int flags = 0;
1481 1288
1482 /* check if we need to update it */ 1289 /* check if we need to update it */
1483 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1290 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1484 { 1291 {
1485 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1292 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1486 flags |= UPD_SP_MANA; 1293 flags |= UPD_SP_MANA;
1487 } 1294 }
1488 1295
1489 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1296 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1490 { 1297 {
1491 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1298 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1492 flags |= UPD_SP_GRACE; 1299 flags |= UPD_SP_GRACE;
1493 } 1300 }
1494 1301
1495 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1302 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1496 { 1303 {
1497 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1304 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1498 flags |= UPD_SP_DAMAGE; 1305 flags |= UPD_SP_DAMAGE;
1499 } 1306 }
1500 1307
1501 if (flags) 1308 if (flags)
1502 { 1309 {
… …
1504 1311
1505 sl << "updspell " 1312 sl << "updspell "
1506 << uint8 (flags) 1313 << uint8 (flags)
1507 << uint32 (spell->count); 1314 << uint32 (spell->count);
1508 1315
1509 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1316 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1317 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1511 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1318 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1512 1319
1513 pl->ns->send_packet (sl); 1320 pl->ns->send_packet (sl);
1514 } 1321 }
1515 } 1322 }
1516 } 1323 }
… …
1546 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1353 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1547 return; 1354 return;
1548 } 1355 }
1549 1356
1550 /* store costs and damage in the object struct, to compare to later */ 1357 /* store costs and damage in the object struct, to compare to later */
1551 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1358 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1552 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1359 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1553 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1360 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1554 1361
1555 /* figure out which skill it uses, if it uses one */ 1362 /* figure out which skill it uses, if it uses one */
1556 if (spell->skill) 1363 if (spell->skill)
1557 { 1364 if (object *tmp = pl->find_skill (spell->skill))
1558 for (i = 1; i < NUM_SKILLS; i++)
1559 if (!strcmp (spell->skill, skill_names[i]))
1560 {
1561 skill = i + CS_STAT_SKILLINFO; 1365 skill = tmp->subtype + CS_STAT_SKILLINFO;
1562 break;
1563 }
1564 }
1565 1366
1566 // spells better have a face 1367 // spells better have a face
1567 if (!spell->face) 1368 if (!spell->face)
1568 { 1369 {
1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1370 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1574 1375
1575 /* send the current values */ 1376 /* send the current values */
1576 sl << uint32 (spell->count) 1377 sl << uint32 (spell->count)
1577 << uint16 (spell->level) 1378 << uint16 (spell->level)
1578 << uint16 (spell->casting_time) 1379 << uint16 (spell->casting_time)
1579 << uint16 (spell->last_sp) 1380 << uint16 (spell->cached_sp)
1580 << uint16 (spell->last_grace) 1381 << uint16 (spell->cached_grace)
1581 << uint16 (spell->last_eat) 1382 << uint16 (spell->cached_eat)
1582 << uint8 (skill) 1383 << uint8 (skill)
1583 << uint32 (spell->path_attuned) 1384 << uint32 (spell->path_attuned)
1584 << uint32 (spell->face) 1385 << uint32 (spell->face)
1585 << data8 (spell->name) 1386 << data8 (spell->name)
1586 << data16 (spell->msg); 1387 << data16 (spell->msg);
… …
1653 /* finally, we can send the packet */ 1454 /* finally, we can send the packet */
1654 pl->ns->flush_fx (); 1455 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1456 pl->ns->send_packet (sl);
1656} 1457}
1657 1458
1459//-GPL
1460

Diff Legend

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