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

Diff Legend

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