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.85 by root, Sat Apr 14 14:47:48 2007 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 17 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
23 */ 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */
24
25//+GPL
24 26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
42 44
43#include <global.h> 45#include <global.h>
44#include <sproto.h> 46#include <sproto.h>
45 47
46#include <living.h> 48#include <living.h>
47#include <commands.h>
48 49
49/* 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,
50 * it should work here. 51 * it should work here.
51 */ 52 */
52#include <sys/types.h> 53#include <sys/types.h>
64 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
65 * 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
66 * 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
67 * client. 68 * client.
68 */ 69 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
75 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
76 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
77 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
78 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD, 79 CS_STAT_RES_DRAIN,
80 -1 /* weaponmagic */,
81 CS_STAT_RES_GHOSTHIT,
82 CS_STAT_RES_POISON,
83 CS_STAT_RES_SLOW,
84 CS_STAT_RES_PARA,
85 CS_STAT_TURN_UNDEAD,
86 CS_STAT_RES_FEAR,
87 -1 /* Cancellation */,
88 CS_STAT_RES_DEPLETE,
89 CS_STAT_RES_DEATH,
90 -1 /* Chaos */,
91 -1 /* Counterspell */,
92 -1 /* Godpower */,
93 CS_STAT_RES_HOLYWORD,
79 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
80 -1, /* Internal */ 95 -1, /* Internal */
81 -1, /* life stealing */ 96 -1, /* life stealing */
82 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
83}; 98};
99 */ 114 */
100 mx = ns->mapx; 115 mx = ns->mapx;
101 my = ns->mapy; 116 my = ns->mapy;
102 117
103 /* the x and y here are coordinates for the new map, i.e. if we moved 118 /* the x and y here are coordinates for the new map, i.e. if we moved
104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 119 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105 * if the destination x or y coordinate is outside the viewable 120 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 121 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 122 * are preserved, and the check_head thinks it needs to clear them.
108 */ 123 */
109 for (x = 0; x < mx; x++) 124 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 125 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 126 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 127 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 128 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 129 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117 /* clear newly visible tiles within the viewable area */ 130 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 131 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 132 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 133 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 134
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 136
126 /* Make sure that the next "map1" command will be sent (even if it is 137 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 138 * empty).
130} 141}
131 142
132static void 143static void
133clear_map (player *pl) 144clear_map (player *pl)
134{ 145{
146 pl->ns->mapinfo_queue_clear ();
147
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 149
137 pl->ns->force_newmap = false; 150 pl->ns->force_newmap = false;
138
139 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 151 pl->ns->send_packet ("newmap");
141
142 pl->ns->floorbox_reset (); 152 pl->ns->floorbox_reset ();
153}
154
155static void
156send_map_info (player *pl)
157{
158 client &socket = *pl->ns;
159 object *ob = pl->viewpoint;
160
161 if (socket.mapinfocmd)
162 {
163 if (ob->map && ob->map->path)
164 {
165 int flags = 0;
166
167 // due to historical glitches, the bit ordering and map index ordering differs
168 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
169 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
170 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
171 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
172 // these two are debatable
173 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
174 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
175
176 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
177 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
178 ob->map->width, ob->map->height, &ob->map->path);
179 }
180 else
181 socket.send_packet ("mapinfo current");
182 }
143} 183}
144 184
145/** check for map/region change and send new map data */ 185/** check for map/region change and send new map data */
146static void 186static void
147check_map_change (player *pl) 187check_map_change (player *pl)
148{ 188{
149 client &socket = *pl->ns; 189 client &socket = *pl->ns;
150 object *ob = pl->ob; 190 object *ob = pl->viewpoint;
151 char buf[MAX_BUF]; /* eauugggh */ 191
192 region *reg = ob->region ();
193 if (socket.current_region != reg)
194 {
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg;
197 }
198
199 // first try to avoid a full newmap on tiled map scrolls
200 if (socket.current_map != ob->map && !socket.force_newmap)
201 {
202 rv_vector rv;
203
204 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
205
206 // manhattan distance is very handy here
207 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
208 {
209 socket.current_map = ob->map;
210 socket.current_x = ob->x;
211 socket.current_y = ob->y;
212
213 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
214 socket.floorbox_reset ();
215 send_map_info (pl);
216 }
217 }
152 218
153 if (socket.current_map != ob->map || socket.force_newmap) 219 if (socket.current_map != ob->map || socket.force_newmap)
154 { 220 {
155 clear_map (pl); 221 clear_map (pl);
156 socket.current_map = ob->map; 222 socket.current_map = ob->map;
157 223 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])
165 flags |= 1;
166 if (ob->map->tile_path[1])
167 flags |= 2;
168 if (ob->map->tile_path[2])
169 flags |= 4;
170 if (ob->map->tile_path[3])
171 flags |= 8;
172
173 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
174 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
175 }
176 else
177 snprintf (buf, MAX_BUF, "mapinfo current");
178
179 socket.send_packet (buf);
180 }
181 } 224 }
182 else if (socket.current_x != ob->x || socket.current_y != ob->y) 225 else if (socket.current_x != ob->x || socket.current_y != ob->y)
183 { 226 {
184 int dx = ob->x - socket.current_x; 227 int dx = ob->x - socket.current_x;
185 int dy = ob->y - socket.current_y; 228 int dy = ob->y - socket.current_y;
186 229
187 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
188 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
189 else
190 {
191 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 230 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
192 socket.floorbox_reset (); 231 socket.floorbox_reset ();
193 }
194 } 232 }
195 233
196 socket.current_x = ob->x; 234 socket.current_x = ob->x;
197 socket.current_y = ob->y; 235 socket.current_y = ob->y;
236}
198 237
199 region *reg = ob->region (); 238/**
200 if (socket.current_region != reg) 239 * This sends the skill number to name mapping. We ignore
201 { 240 * the params - we always send the same info no matter what.
202 socket.current_region = reg; 241 */
203 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 242static void
204 } 243send_skill_info (client *ns, char *params)
244{
245 packet sl;
246 sl << "replyinfo skill_info\n";
247
248 for (int i = 0; i < skillvec.size (); ++i)
249 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
250
251 if (sl.length () > MAXSOCKBUF)
252 cleanup ("buffer overflow in send_skill_info!");
253
254 ns->send_packet (sl);
255}
256
257/**
258 * This sends the spell path to name mapping. We ignore
259 * the params - we always send the same info no matter what.
260 */
261static void
262send_spell_paths (client * ns, char *params)
263{
264 packet sl;
265
266 sl << "replyinfo spell_paths\n";
267
268 for (int i = 0; i < NRSPELLPATHS; i++)
269 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
270
271 if (sl.length () > MAXSOCKBUF)
272 cleanup ("buffer overflow in send_spell_paths!");
273
274 ns->send_packet (sl);
205} 275}
206 276
207/** 277/**
208 * RequestInfo is sort of a meta command. There is some specific 278 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 279 * request of information, but we call other functions to provide
210 * that information. 280 * that information.
211 */ 281 */
212void 282void
213RequestInfo (char *buf, int len, client * ns) 283RequestInfo (char *buf, int len, client *ns)
214{ 284{
215 char *params = NULL, *cp; 285 char *params;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227 286
228 /* find the first space, make it null, and update the 287 /* find the first space, make it null, and update the
229 * params pointer. 288 * params pointer.
230 */ 289 */
231 for (cp = buf; *cp != '\0'; cp++) 290 for (params = buf; *params; params++)
232 if (*cp == ' ') 291 if (*params == ' ')
233 { 292 {
234 *cp = '\0';
235 params = cp + 1; 293 *params++ = 0;
236 break; 294 break;
237 } 295 }
238 296
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info")) 297 if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 298 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 299 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 300 send_spell_paths (ns, params);
247 else 301 else
248 ns->send_packet (bigbuf, len); 302 {
303 // undo tokenisation above and send replyinfo with the request unchanged
304 if (*params)
305 *--params = ' ';
306
307 ns->send_packet_printf ("replyinfo %s", buf);
308 }
249} 309}
250 310
251void 311void
252ExtCmd (char *buf, int len, player *pl) 312ExtCmd (char *buf, int len, player *pl)
253{ 313{
256 316
257void 317void
258ExtiCmd (char *buf, int len, client *ns) 318ExtiCmd (char *buf, int len, client *ns)
259{ 319{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 320 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
321}
322
323//-GPL
324
325void
326client::mapinfo_queue_clear ()
327{
328 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
329 free (*i);
330
331 mapinfo_queue.clear ();
332}
333
334bool
335client::mapinfo_try (char *buf)
336{
337 char *token = buf;
338 buf += strlen (buf) + 9;
339
340 // initial map and its origin
341 maptile *map = pl->viewpoint->map;
342 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
343 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
344 int max_distance = 8; // limit maximum path length to something generous
345
346 while (*buf && map && max_distance)
347 {
348 int dir = *buf++ - '1';
349
350 // due to historical glitches, the mapinfo index and tile index differs
351 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
352
353 // maybe we should only allow the four flat directions
354 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
355 {
356 dir = dirmap [dir];
357
358 if (!map->tile_path [dir])
359 map = 0;
360 else if (map->tile_available (dir, false))
361 {
362 maptile *neigh = map->tile_map [dir];
363
364 switch (dir)
365 {
366 case 0: mapy -= neigh->height; break;
367 case 2: mapy += map ->height; break;
368 case 3: mapx -= neigh->width ; break;
369 case 1: mapx += map ->width ; break;
370 }
371
372 map = neigh;
373 --max_distance;
374 }
375 else
376 return 0;
377 }
378 else
379 max_distance = 0;
380 }
381
382 if (!max_distance)
383 send_packet_printf ("mapinfo %s error", token);
384 else if (!map || !map->path)
385 send_packet_printf ("mapinfo %s nomap", token);
386 else
387 {
388 int flags = 0;
389
390 // due to historical glitches, the bit ordering and map index ordering differs
391 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
392 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
393 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
394 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
395 // these two are debatable
396 if (map->tile_path [TILE_UP ]) flags |= 0x10;
397 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
398
399 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
400 }
401
402 return 1;
403}
404
405void
406client::mapinfo_queue_run ()
407{
408 if (mapinfo_queue.empty () || !pl)
409 return;
410
411 for (int i = 0; i < mapinfo_queue.size (); ++i)
412 if (mapinfo_try (mapinfo_queue [i]))
413 {
414 free (mapinfo_queue [i]);
415 mapinfo_queue.erase (i);
416 }
417 else
418 ++i;
261} 419}
262 420
263void 421void
264MapInfoCmd (char *buf, int len, player *pl) 422MapInfoCmd (char *buf, int len, player *pl)
265{ 423{
266 // <mapinfo tag spatial tile-path 424 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 425 // >mapinfo tag spatial flags x y w h hash
268 426
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 427 char *token = buf;
272 // copy token 428
273 if (!(buf = strchr (buf, ' '))) 429 if (!(buf = strchr (buf, ' ')))
274 return; 430 return;
275 431
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 432 if (!strncmp (buf, " spatial ", 9))
279 { 433 {
280 buf += 8; 434 char *copy = strdup (token);
435 copy [buf - token] = 0;
281 436
282 // initial map and its origin 437#if 0
283 maptile *map = pl->ob->map; 438 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 439 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 440 free (copy);
286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = map->xy_find (dx, dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = map->xy_find (dx, dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 }
341 else 441 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 442#endif
443 pl->ns->mapinfo_queue.push_back (copy);
343 } 444 }
344 else 445 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 446 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 447}
349 448
350/** This is the Setup cmd */ 449/** This is the Setup cmd */
351void 450void
352SetUp (char *buf, int len, client * ns) 451SetUp (char *buf, int len, client * ns)
364AddMeCmd (char *buf, int len, client *ns) 463AddMeCmd (char *buf, int len, client *ns)
365{ 464{
366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 465 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
367} 466}
368 467
369/** Reply to ExtendedInfos command */ 468//+GPL
370void
371ToggleExtendedInfos (char *buf, int len, client * ns)
372{
373 char cmdback[MAX_BUF];
374 char command[50];
375 int info, nextinfo;
376
377 cmdback[0] = '\0';
378 nextinfo = 0;
379
380 while (1)
381 {
382 /* 1. Extract an info */
383 info = nextinfo;
384
385 while ((info < len) && (buf[info] == ' '))
386 info++;
387
388 if (info >= len)
389 break;
390
391 nextinfo = info + 1;
392
393 while ((nextinfo < len) && (buf[nextinfo] != ' '))
394 nextinfo++;
395
396 if (nextinfo - info >= 49) /*Erroneous info asked */
397 continue;
398
399 strncpy (command, &(buf[info]), nextinfo - info);
400
401 /* 2. Interpret info */
402 if (!strcmp ("smooth", command))
403 /* Toggle smoothing */
404 ns->EMI_smooth = !ns->EMI_smooth;
405 else
406 /*bad value */;
407
408 /*3. Next info */
409 }
410
411 strcpy (cmdback, "ExtendedInfoSet");
412
413 if (ns->EMI_smooth)
414 {
415 strcat (cmdback, " ");
416 strcat (cmdback, "smoothing");
417 }
418
419 ns->send_packet (cmdback);
420}
421
422/*
423#define MSG_TYPE_BOOK 1
424#define MSG_TYPE_CARD 2
425#define MSG_TYPE_PAPER 3
426#define MSG_TYPE_SIGN 4
427#define MSG_TYPE_MONUMENT 5
428#define MSG_TYPE_SCRIPTED_DIALOG 6*/
429
430/** Reply to ExtendedInfos command */
431void
432ToggleExtendedText (char *buf, int len, client * ns)
433{
434 char cmdback[MAX_BUF];
435 char temp[10];
436 char command[50];
437 int info, nextinfo, i, flag;
438
439 cmdback[0] = '\0';
440
441 nextinfo = 0;
442 while (1)
443 {
444 /* 1. Extract an info */
445 info = nextinfo;
446
447 while ((info < len) && (buf[info] == ' '))
448 info++;
449
450 if (info >= len)
451 break;
452
453 nextinfo = info + 1;
454
455 while ((nextinfo < len) && (buf[nextinfo] != ' '))
456 nextinfo++;
457
458 if (nextinfo - info >= 49) /*Erroneous info asked */
459 continue;
460
461 strncpy (command, &(buf[info]), nextinfo - info);
462 command[nextinfo - info] = '\0';
463 /* 2. Interpret info */
464 i = sscanf (command, "%d", &flag);
465
466 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
467 ns->supported_readables |= (1 << flag);
468 /*3. Next info */
469 }
470
471 /* Send resulting state */
472 strcpy (cmdback, "ExtendedTextSet");
473
474 for (i = 0; i <= MSG_TYPE_LAST; i++)
475 if (ns->supported_readables & (1 << i))
476 {
477 strcat (cmdback, " ");
478 snprintf (temp, sizeof (temp), "%d", i);
479 strcat (cmdback, temp);
480 }
481
482 ns->send_packet (cmdback);
483}
484
485/**
486 * client requested an image. send it rate-limited
487 * before flushing.
488 */
489void
490AskFaceCmd (char *buf, int len, client *ns)
491{
492 ns->askface.push_back (atoi (buf));
493}
494
495/**
496 * Tells client the picture it has to use
497 * to smooth a picture number given as argument.
498 */
499void
500AskSmooth (char *buf, int len, client *ns)
501{
502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
504}
505 469
506/** 470/**
507 * This handles the general commands from the client (ie, north, fire, cast, 471 * This handles the general commands from the client (ie, north, fire, cast,
508 * etc.) 472 * etc.)
509 */ 473 */
522 return; 486 return;
523 487
524 buf++; 488 buf++;
525 } 489 }
526 490
527 execute_newserver_command (pl->ob, (char *) buf); 491 execute_newserver_command (pl->ob, (char *)buf);
528 492
529 /* Perhaps something better should be done with a left over count. 493 /* Perhaps something better should be done with a left over count.
530 * Cleaning up the input should probably be done first - all actions 494 * Cleaning up the input should probably be done first - all actions
531 * for the command that issued the count should be done before any other 495 * for the command that issued the count should be done before any other
532 * commands. 496 * commands.
533 */ 497 */
534 pl->count = 0; 498 pl->count = 0;
535} 499}
536 500
537
538/** 501/**
539 * This handles the general commands from the client (ie, north, fire, cast, 502 * This handles the general commands from the client (ie, north, fire, cast,
540 * etc.). It is a lot like PlayerCmd above, but is called with the 503 * etc.). It is a lot like PlayerCmd above, but is called with the
541 * 'ncom' method which gives more information back to the client so it 504 * 'ncom' method which gives more information back to the client so it
542 * can throttle. 505 * can throttle.
544void 507void
545NewPlayerCmd (char *buf, int len, player *pl) 508NewPlayerCmd (char *buf, int len, player *pl)
546{ 509{
547 if (len <= 6) 510 if (len <= 6)
548 { 511 {
549 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 512 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
550 return; 513 return;
551 } 514 }
552 515
553 uint16 cmdid = net_uint16 ((uint8 *)buf); 516 uint16 cmdid = net_uint16 ((uint8 *)buf);
554 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 517 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
567 * commands. 530 * commands.
568 */ 531 */
569 pl->count = 0; 532 pl->count = 0;
570 533
571 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 534 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
572 int time = fabs (pl->ob->speed) < 0.001 535 int time = pl->ob->has_active_speed ()
573 ? time = MAX_TIME * 100
574 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 536 ? (int) (MAX_TIME / pl->ob->speed)
537 : MAX_TIME * 100;
575 538
576 /* Send confirmation of command execution now */ 539 /* Send confirmation of command execution now */
577 packet sl ("comc"); 540 packet sl ("comc");
578 sl << uint16 (cmdid) << uint32 (time); 541 sl << uint16 (cmdid) << uint32 (time);
579 pl->ns->send_packet (sl); 542 pl->ns->send_packet (sl);
611 { 574 {
612 case ST_PLAYING: 575 case ST_PLAYING:
613 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 576 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
614 break; 577 break;
615 578
616 case ST_CHANGE_CLASS:
617 key_change_class (pl->ob, buf[0]);
618 break;
619
620 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 579 case ST_GET_PARTY_PASSWORD: /* Get password for party */
621 receive_party_password (pl->ob, 13); 580 receive_party_password (pl->ob, 13);
622 break; 581 break;
623 582
624 default: 583 default:
625 LOG (llevError, "Unknown input state: %d\n", ns->state); 584 LOG (llevError, "Unknown input state: %d\n", ns->state);
626 } 585 }
627} 586}
628 587
629/** 588/**
630 * Client tells its version. If there is a mismatch, we close the 589 * Client tells its version info.
631 * socket. In real life, all we should care about is the client having
632 * something older than the server. If we assume the client will be
633 * backwards compatible, having it be a later version should not be a
634 * problem.
635 */ 590 */
636void 591void
637VersionCmd (char *buf, int len, client * ns) 592VersionCmd (char *buf, int len, client *ns)
638{ 593{
639 if (!buf) 594 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
640 {
641 LOG (llevError, "CS: received corrupted version command\n");
642 return;
643 }
644
645 ns->cs_version = atoi (buf);
646 ns->sc_version = ns->cs_version;
647
648 LOG (llevDebug, "connection from client <%s>\n", buf);
649
650 //TODO: should log here just for statistics
651
652 //if (VERSION_CS != ns->cs_version)
653 // unchecked;
654
655 char *cp = strchr (buf + 1, ' ');
656 if (!cp)
657 return;
658
659 ns->sc_version = atoi (cp);
660
661 //if (VERSION_SC != ns->sc_version)
662 // unchecked;
663
664 cp = strchr (cp + 1, ' ');
665
666 if (cp)
667 {
668 assign (ns->version, cp + 1);
669
670 if (ns->sc_version < 1026)
671 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
672 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
673 }
674} 595}
675 596
676/** sound related functions. */ 597/** sound related functions. */
677void 598void
678SetSound (char *buf, int len, client * ns) 599SetSound (char *buf, int len, client * ns)
696 * syntax is: move (to) (tag) (nrof) 617 * syntax is: move (to) (tag) (nrof)
697 */ 618 */
698void 619void
699MoveCmd (char *buf, int len, player *pl) 620MoveCmd (char *buf, int len, player *pl)
700{ 621{
701 int vals[3], i; 622 int to, tag, nrof;
702 623
703 /* A little funky here. We only cycle for 2 records, because 624 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
704 * we obviously are not going to find a space after the third
705 * record. Perhaps we should just replace this with a
706 * sscanf?
707 */
708 for (i = 0; i < 2; i++)
709 { 625 {
710 vals[i] = atoi (buf);
711
712 if (!(buf = strchr (buf, ' ')))
713 {
714 LOG (llevError, "Incomplete move command: %s\n", buf); 626 LOG (llevError, "Incomplete move command: %s\n", buf);
715 return; 627 return;
716 }
717
718 buf++;
719 } 628 }
720 629
721 vals[2] = atoi (buf); 630 esrv_move_object (pl->ob, to, tag, nrof);
722
723/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
724 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
725} 631}
726 632
727/****************************************************************************** 633/******************************************************************************
728 * 634 *
729 * Start of commands the server sends to the client. 635 * Start of commands the server sends to the client.
738send_query (client *ns, uint8 flags, const char *text) 644send_query (client *ns, uint8 flags, const char *text)
739{ 645{
740 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 646 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
741} 647}
742 648
649/**
650 * Get player's current range attack in obuf.
651 */
652static void
653rangetostring (player *pl, char *obuf)
654{
655 dynbuf_text &buf = msg_dynbuf; buf.clear ();
656
657#if 0
658 // print ranged/chosen_skill etc. objects every call
659 printf ("%s %s => %s (%s)\n",
660 pl->ranged_ob ? &pl->ranged_ob->name : "-",
661 pl->combat_ob ? &pl->combat_ob->name : "-",
662 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
663 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
664 );
665#endif
666
667 if (pl->ranged_ob)
668 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
669
670 if (pl->combat_ob)
671 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
672
673#if 0
674 //TODO: remove this when slot system is working, this is only for debugging
675 if (pl->ob->chosen_skill)
676 buf << " Skill*: " << pl->ob->chosen_skill->name;
677#endif
678
679 //TODO: maybe golem should become the current_weapon, quite simply?
680 if (pl->golem)
681 buf << " Golem*: " << pl->golem->name;
682
683 buf << '\0';
684 buf.linearise (obuf);
685}
686
743#define AddIfInt64(Old,New,Type) if (Old != New) {\ 687#define AddIfInt64(Old,New,Type) if (Old != New) {\
744 Old = New; \ 688 Old = New; \
745 sl << uint8 (Type) << uint64 (New); \ 689 sl << uint8 (Type) << uint64 (New); \
746 } 690 }
747 691
753#define AddIfShort(Old,New,Type) if (Old != New) {\ 697#define AddIfShort(Old,New,Type) if (Old != New) {\
754 Old = New; \ 698 Old = New; \
755 sl << uint8 (Type) << uint16 (New); \ 699 sl << uint8 (Type) << uint16 (New); \
756 } 700 }
757 701
758#define AddIfFloat(Old,New,Type) if (Old != New) {\ 702#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
759 Old = New; \ 703 Old = New; \
760 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 704 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
761 } 705 }
762 706
763#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 707#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
764 free(Old); Old = strdup (New);\ 708 free(Old); Old = strdup (New);\
765 sl << uint8 (Type) << data8 (New); \ 709 sl << uint8 (Type) << data8 (New); \
772 * commands for now. 716 * commands for now.
773 */ 717 */
774void 718void
775esrv_update_stats (player *pl) 719esrv_update_stats (player *pl)
776{ 720{
777 char buf[MAX_BUF];
778 uint16 flags;
779
780 client *ns = pl->ns; 721 client *ns = pl->ns;
781 if (!ns) 722 if (!ns)
782 return; 723 return;
783 724
784 object *ob = pl->ob; 725 object *ob = pl->observe;
785 if (!ob) 726 if (!ob)
786 return; 727 return;
728
729 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
787 730
788 packet sl ("stats"); 731 packet sl ("stats");
789 732
790 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 733 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
791 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 734 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
799 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 742 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
800 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 743 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
801 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 744 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
802 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 745 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
803 746
804 for (int s = 0; s < NUM_SKILLS; s++) 747 for (int s = 0; s < CS_NUM_SKILLS; s++)
805 if (object *skill = pl->last_skill_ob[s]) 748 if (object *skill = opl->last_skill_ob [s])
806 if (skill->stats.exp != ns->last_skill_exp [s]) 749 if (skill->stats.exp != ns->last_skill_exp [s])
807 { 750 {
808 ns->last_skill_exp [s] = skill->stats.exp; 751 ns->last_skill_exp [s] = skill->stats.exp;
809 752
810 /* Always send along the level if exp changes. This is only 753 /* Always send along the level if exp changes. This is only
811 * 1 extra byte, but keeps processing simpler. 754 * 1 extra byte, but keeps processing simpler.
812 */ 755 */
813 sl << uint8 (s + CS_STAT_SKILLINFO) 756 sl << uint8 (CS_STAT_SKILLINFO + s)
814 << uint8 (skill->level) 757 << uint8 (skill->level)
815 << uint64 (skill->stats.exp); 758 << uint64 (skill->stats.exp);
816 } 759 }
817 760
818 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 761 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
819 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 762 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
820 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 763 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
821 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 764 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
822 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 765 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
823 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 766 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
824 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 767 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
825 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 768 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
826 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 769 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
827 770
828 flags = 0; 771 int flags = (opl->fire_on ? SF_FIREON : 0)
829 772 | (opl->run_on ? SF_RUNON : 0);
830 if (pl->fire_on)
831 flags |= SF_FIREON;
832
833 if (pl->run_on)
834 flags |= SF_RUNON;
835 773
836 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 774 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
837 775
838 if (ns->sc_version < 1025)
839 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
840 else
841 for (int i = 0; i < NROFATTACKS; i++) 776 for (int i = 0; i < NROFATTACKS; i++)
842 {
843 /* Skip ones we won't send */ 777 /* Skip ones we won't send */
844 if (atnr_cs_stat[i] == -1) 778 if (atnr_cs_stat[i] >= 0)
845 continue;
846
847 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 779 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
848 }
849 780
850 if (pl->ns->monitor_spells) 781 if (pl->ns->monitor_spells)
851 { 782 {
852 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 783 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
853 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 784 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
854 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 785 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
855 } 786 }
856 787
788 char buf[MAX_BUF];
857 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 789 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
858 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 790 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
859 set_title (ob, buf); 791 set_title (ob, buf);
860 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 792 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
861 793
862 /* Only send it away if we have some actual data */ 794 /* Only send it away if we have some actual data */
866 798
867/** 799/**
868 * Tells the client that here is a player it should start using. 800 * Tells the client that here is a player it should start using.
869 */ 801 */
870void 802void
871esrv_new_player (player *pl, uint32 weight) 803esrv_new_player (player *pl)
872{ 804{
805 sint32 weight = pl->ob->client_weight ();
806
873 packet sl ("player"); 807 packet sl ("player");
874 808
875 sl << uint32 (pl->ob->count) 809 sl << uint32 (pl->ob->count)
876 << uint32 (weight) 810 << uint32 (weight)
877 << uint32 (pl->ob->face) 811 << uint32 (pl->ob->face)
878 << data8 (pl->ob->name); 812 << data8 (pl->ob->name);
879 813
880 pl->ns->last_weight = weight; 814 pl->ns->last_weight = weight;
881 pl->ns->send_packet (sl); 815 pl->ns->send_packet (sl);
882 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
883} 816}
884 817
885/****************************************************************************** 818/******************************************************************************
886 * 819 *
887 * Start of map related commands. 820 * Start of map related commands.
944 877
945 if (!ns.faces_sent[face_num]) 878 if (!ns.faces_sent[face_num])
946 if (ob) 879 if (ob)
947 ns.send_faces (ob); 880 ns.send_faces (ob);
948 else 881 else
949 ns.send_face (face_num); 882 ns.send_face (face_num, 10);
950 883
951 sl << uint16 (face_num); 884 sl << uint16 (face_num);
952 return 1; 885 return 1;
953 } 886 }
954 887
955 /* Nothing changed */ 888 /* Nothing changed */
956 return 0; 889 return 0;
957} 890}
958 891
959/** 892/**
960 * Returns the size of a data for a map square as returned by 893 * Draws client map.
961 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
962 * available.
963 */ 894 */
964int
965getExtendedMapInfoSize (client * ns)
966{
967 int result = 0;
968
969 if (ns->ext_mapinfos)
970 {
971 if (ns->EMI_smooth)
972 result += 1; /*One byte for smoothlevel */
973 }
974
975 return result;
976}
977
978// prefetch (and touch) all maps within a specific distancd
979static void
980prefetch_surrounding_maps (maptile *map, int distance)
981{
982 map->last_access = runtime;
983
984 if (--distance)
985 for (int dir = 4; --dir; )
986 if (const shstr &path = map->tile_path [dir])
987 if (maptile *&neigh = map->tile_map [dir])
988 prefetch_surrounding_maps (neigh, distance);
989 else
990 neigh = maptile::find_async (path, map);
991}
992
993// prefetch a generous area around the player
994static void
995prefetch_surrounding_maps (object *op)
996{
997 prefetch_surrounding_maps (op->map, 3);
998}
999
1000/**
1001 * This function uses the new map1 protocol command to send the map
1002 * to the client. It is necessary because the old map command supports
1003 * a maximum map size of 15x15.
1004 * This function is much simpler than the old one. This is because
1005 * the old function optimized to send as few face identifiers as possible,
1006 * at the expense of sending more coordinate location (coordinates were
1007 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1008 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1009 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1010 * and use the other 4 bits for other informatiion. For full documentation
1011 * of what we send, see the doc/Protocol file.
1012 * I will describe internally what we do:
1013 * the ns->lastmap shows how the map last looked when sent to the client.
1014 * in the lastmap structure, there is a cells array, which is set to the
1015 * maximum viewable size (As set in config.h).
1016 * in the cells, there are faces and a count value.
1017 * we use the count value to hold the darkness value. If -1, then this space
1018 * is not viewable.
1019 * we use faces[0] faces[1] faces[2] to hold what the three layers
1020 * look like.
1021 */
1022void 895void
1023draw_client_map1 (object *pl) 896draw_client_map (player *pl)
1024{ 897{
1025 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 898 object *ob = pl->viewpoint;
1026 sint16 nx, ny;
1027 int estartlen, eoldlen;
1028 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos;
1031 maptile *m;
1032
1033 client &socket = *pl->contr->ns;
1034
1035 if (!pl->active) 899 if (!pl->observe->active)
1036 return; 900 return;
1037
1038 check_map_change (pl->contr);
1039 prefetch_surrounding_maps (pl);
1040
1041 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1042 packet esl;
1043
1044 startlen = sl.length ();
1045
1046 /*Extendedmapinfo structure initialisation */
1047 if (socket.ext_mapinfos)
1048 {
1049 extendedinfos = EMI_NOREDRAW;
1050
1051 if (socket.EMI_smooth)
1052 extendedinfos |= EMI_SMOOTH;
1053
1054 ewhatstart = esl.length ();
1055 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1056 could need to be taken away */
1057 eentrysize = getExtendedMapInfoSize (&socket);
1058 esl << "mapextended "
1059 << uint8 (extendedinfos)
1060 << uint8 (eentrysize);
1061
1062 estartlen = esl.length ();
1063 }
1064
1065 /* x,y are the real map locations. ax, ay are viewport relative
1066 * locations.
1067 */
1068 ay = 0;
1069
1070 /* We could do this logic as conditionals in the if statement,
1071 * but that started to get a bit messy to look at.
1072 */
1073 max_x = pl->x + (socket.mapx + 1) / 2;
1074 max_y = pl->y + (socket.mapy + 1) / 2;
1075
1076 maptile *plmap = pl->map;
1077
1078 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1079 {
1080 ax = 0;
1081 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1082 {
1083 int emask, mask;
1084 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1085
1086 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1087
1088 /* If the coordinates are not valid, or it is too dark to see,
1089 * we tell the client as such
1090 */
1091 nx = x;
1092 ny = y;
1093 m = get_map_from_coord (plmap, &nx, &ny);
1094
1095 if (!m)
1096 {
1097 /* space is out of map. Update space and clear values
1098 * if this hasn't already been done. If the space is out
1099 * of the map, it shouldn't have a head
1100 */
1101 if (lastcell.count != -1)
1102 {
1103 sl << uint16 (mask);
1104 map_clearcell (&lastcell, -1);
1105 }
1106
1107 continue;
1108 }
1109
1110 m->touch ();
1111
1112 int d = pl->contr->blocked_los[ax][ay];
1113
1114 if (d > 3)
1115 {
1116
1117 int need_send = 0, count;
1118
1119 /* This block deals with spaces that are not visible for whatever
1120 * reason. Still may need to send the head for this space.
1121 */
1122
1123 oldlen = sl.length ();
1124
1125 sl << uint16 (mask);
1126
1127 if (lastcell.count != -1)
1128 need_send = 1;
1129
1130 count = -1;
1131
1132 /* properly clear a previously sent big face */
1133 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1134 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1135 need_send = 1;
1136
1137 map_clearcell (&lastcell, count);
1138
1139 if ((mask & 0xf) || need_send)
1140 sl[oldlen + 1] = mask & 0xff;
1141 else
1142 sl.reset (oldlen);
1143 }
1144 else
1145 {
1146 /* In this block, the space is visible.
1147 */
1148
1149 /* Rather than try to figure out what everything that we might
1150 * need to send is, then form the packet after that,
1151 * we presume that we will in fact form a packet, and update
1152 * the bits by what we do actually send. If we send nothing,
1153 * we just back out sl.length () to the old value, and no harm
1154 * is done.
1155 * I think this is simpler than doing a bunch of checks to see
1156 * what if anything we need to send, setting the bits, then
1157 * doing those checks again to add the real data.
1158 */
1159 oldlen = sl.length ();
1160 eoldlen = esl.length ();
1161
1162 sl << uint16 (mask);
1163
1164 unsigned char dummy;
1165 unsigned char *last_ext = &dummy;
1166
1167 /* Darkness changed */
1168 if (lastcell.count != d && socket.darkness)
1169 {
1170 mask |= 0x8;
1171
1172 if (socket.extmap)
1173 {
1174 *last_ext |= 0x80;
1175 last_ext = &sl[sl.length ()];
1176 sl << uint8 (d);
1177 }
1178 else
1179 sl << uint8 (255 - 64 * d);
1180 }
1181
1182 lastcell.count = d;
1183
1184 mapspace &ms = m->at (nx, ny);
1185
1186 if (socket.extmap)
1187 {
1188 uint8 stat_hp = 0;
1189 uint8 stat_width = 0;
1190 uint8 flags = 0;
1191 UUID player = 0;
1192
1193 // send hp information, if applicable
1194 if (object *op = ms.faces_obj [0])
1195 {
1196 if (op->head || op->invisible)
1197 ; // do not show
1198 else if (op->type == PLAYER
1199 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1200 {
1201 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1202 {
1203 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1204 stat_width = op->arch->tail_x;
1205 }
1206 }
1207
1208 if (op->msg && op->msg[0] == '@')
1209 flags |= 1;
1210
1211 if (op->type == PLAYER && op != pl)
1212 player = op->count;
1213 }
1214
1215 if (lastcell.stat_hp != stat_hp)
1216 {
1217 lastcell.stat_hp = stat_hp;
1218
1219 mask |= 0x8;
1220 *last_ext |= 0x80;
1221 last_ext = &sl[sl.length ()];
1222
1223 sl << uint8 (5) << uint8 (stat_hp);
1224
1225 if (stat_width > 1)
1226 {
1227 *last_ext |= 0x80;
1228 last_ext = &sl[sl.length ()];
1229
1230 sl << uint8 (6) << uint8 (stat_width);
1231 }
1232 }
1233
1234 if (lastcell.player != player)
1235 {
1236 lastcell.player = player;
1237
1238 mask |= 0x8;
1239 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()];
1241
1242 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1243 }
1244
1245 if (lastcell.flags != flags)
1246 {
1247 lastcell.flags = flags;
1248
1249 mask |= 0x8;
1250 *last_ext |= 0x80;
1251 last_ext = &sl[sl.length ()];
1252
1253 sl << uint8 (8) << uint8 (flags);
1254 }
1255 }
1256
1257 /* Floor face */
1258 if (update_space (sl, socket, ms, lastcell, 2))
1259 mask |= 0x4;
1260
1261 /* Middle face */
1262 if (update_space (sl, socket, ms, lastcell, 1))
1263 mask |= 0x2;
1264
1265 if (ms.player () == pl
1266 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1267 {
1268 // force player to be visible to himself if invisible
1269 if (lastcell.faces[0] != pl->face)
1270 {
1271 lastcell.faces[0] = pl->face;
1272
1273 mask |= 0x1;
1274 sl << uint16 (pl->face);
1275
1276 socket.send_faces (pl);
1277 }
1278 }
1279 /* Top face */
1280 else if (update_space (sl, socket, ms, lastcell, 0))
1281 mask |= 0x1;
1282
1283
1284 /* Check to see if we are in fact sending anything for this
1285 * space by checking the mask. If so, update the mask.
1286 * if not, reset the len to that from before adding the mask
1287 * value, so we don't send those bits.
1288 */
1289 if (mask & 0xf)
1290 sl[oldlen + 1] = mask & 0xff;
1291 else
1292 sl.reset (oldlen);
1293
1294 if (socket.ext_mapinfos)
1295 esl << uint16 (emask);
1296
1297 if (socket.EMI_smooth)
1298 {
1299 for (int layer = 2+1; layer--; )
1300 {
1301 object *ob = ms.faces_obj [layer];
1302
1303 // If there is no object for this space, or if the face for the object
1304 // is the blank face, set the smoothlevel to zero.
1305 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1306
1307 // We've gotten what face we want to use for the object. Now see if
1308 // if it has changed since we last sent it to the client.
1309 if (lastcell.smooth[layer] != smoothlevel)
1310 {
1311 lastcell.smooth[layer] = smoothlevel;
1312 esl << uint8 (smoothlevel);
1313 emask |= 1 << layer;
1314 }
1315 }
1316
1317 if (emask & 0xf)
1318 esl[eoldlen + 1] = emask & 0xff;
1319 else
1320 esl.reset (eoldlen);
1321 }
1322 } /* else this is a viewable space */
1323 } /* for x loop */
1324 } /* for y loop */
1325
1326 socket.flush_fx ();
1327
1328 /* Verify that we in fact do need to send this */
1329 if (socket.ext_mapinfos)
1330 {
1331 if (!(sl.length () > startlen || socket.sent_scroll))
1332 {
1333 /* No map data will follow, so don't say the client
1334 * it doesn't need draw!
1335 */
1336 ewhatflag &= ~EMI_NOREDRAW;
1337 esl[ewhatstart + 1] = ewhatflag & 0xff;
1338 }
1339
1340 if (esl.length () > estartlen)
1341 socket.send_packet (esl);
1342 }
1343
1344 if (sl.length () > startlen || socket.sent_scroll)
1345 {
1346 socket.send_packet (sl);
1347 socket.sent_scroll = 0;
1348 }
1349}
1350
1351/**
1352 * Draws client map.
1353 */
1354void
1355draw_client_map (object *pl)
1356{
1357 int i, j;
1358 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1359 int mflags;
1360 struct Map newmap;
1361 maptile *m, *pm;
1362
1363 if (pl->type != PLAYER)
1364 {
1365 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1366 return;
1367 }
1368
1369 pm = pl->map;
1370 901
1371 /* If player is just joining the game, he isn't here yet, so the map 902 /* If player is just joining the game, he isn't here yet, so the map
1372 * can get swapped out. If so, don't try to send them a map. All will 903 * can get swapped out. If so, don't try to send them a map. All will
1373 * be OK once they really log in. 904 * be OK once they really log in.
1374 */ 905 */
1375 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 906 if (!ob->map || ob->map->state != MAP_ACTIVE)
1376 return; 907 return;
1377 908
1378 memset (&newmap, 0, sizeof (struct Map)); 909 int startlen, oldlen;
1379 910
1380 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 911 check_map_change (pl);
1381 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 912 pl->ob->prefetch_surrounding_maps ();
913
914 /* do LOS after calls to update_position */
915 /* unfortunately, we need to udpate los when observing, currently */
916 if (pl->do_los || pl->viewpoint != pl->ob)
917 {
918 pl->do_los = 0;
919 pl->update_los ();
920 }
921
922 /**
923 * This function uses the new map1 protocol command to send the map
924 * to the client. It is necessary because the old map command supports
925 * a maximum map size of 15x15.
926 * This function is much simpler than the old one. This is because
927 * the old function optimized to send as few face identifiers as possible,
928 * at the expense of sending more coordinate location (coordinates were
929 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
930 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
931 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
932 * and use the other 4 bits for other informatiion. For full documentation
933 * of what we send, see the doc/Protocol file.
934 * I will describe internally what we do:
935 * the ns->lastmap shows how the map last looked when sent to the client.
936 * in the lastmap structure, there is a cells array, which is set to the
937 * maximum viewable size (As set in config.h).
938 * in the cells, there are faces and a count value.
939 * we use the count value to hold the darkness value. If -1, then this space
940 * is not viewable.
941 * we use faces[0] faces[1] faces[2] to hold what the three layers
942 * look like.
943 */
944
945 client &socket = *pl->ns;
946
947 packet sl ("map1a");
948
949 startlen = sl.length ();
950
951 int hx = socket.mapx / 2;
952 int hy = socket.mapy / 2;
953
954 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
955 int ax = dx + hx;
956 int ay = dy + hy;
957
958 int mask = (ax << 10) | (ay << 4);
959 MapCell &lastcell = socket.lastmap.cells[ax][ay];
960
961 /* If the coordinates are not valid, or it is too dark to see,
962 * we tell the client as such
963 */
964 if (!m)
1382 { 965 {
1383 ax = i; 966 /* space is out of map. Update space and clear values
1384 ay = j; 967 * if this hasn't already been done. If the space is out
1385 m = pm; 968 * of the map, it shouldn't have a head.
1386 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1387
1388 if (mflags & P_OUT_OF_MAP)
1389 continue;
1390
1391 /* If a map is visible to the player, we don't want to swap it out
1392 * just to reload it. This should really call something like
1393 * swap_map, but this is much more efficient and 'good enough'
1394 */ 969 */
1395 if (mflags & P_NEW_MAP) 970 if (lastcell.count != -1)
1396 m->timeout = 50; 971 {
972 sl << uint16 (mask);
973 map_clearcell (&lastcell, -1);
974 }
975
976 continue;
1397 } 977 }
1398 978
1399 /* do LOS after calls to update_position */ 979 int d = pl->blocked_los_uc (dx, dy);
1400 if (pl->contr->do_los) 980
981 if (d > 3)
1401 { 982 {
1402 update_los (pl); 983 /* This block deals with spaces that are not visible for whatever
1403 pl->contr->do_los = 0; 984 * reason. Still may need to send the head for this space.
985 */
986 if (lastcell.count != -1
987 || lastcell.faces[0]
988 || lastcell.faces[1]
989 || lastcell.faces[2]
990 || lastcell.stat_hp
991 || lastcell.flags
992 || lastcell.player)
993 sl << uint16 (mask);
994
995 /* properly clear a previously sent big face */
996 map_clearcell (&lastcell, -1);
1404 } 997 }
1405 998 else
1406 /* Big maps need a different drawing mechanism to work */
1407 draw_client_map1 (pl);
1408}
1409
1410
1411/*****************************************************************************/
1412
1413/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1414
1415/* a player. Of course, the client need to know the command to be able to */
1416
1417/* manage it ! */
1418
1419/*****************************************************************************/
1420void
1421send_plugin_custom_message (object *pl, char *buf)
1422{
1423 pl->contr->ns->send_packet (buf);
1424}
1425
1426/**
1427 * This sends the skill number to name mapping. We ignore
1428 * the params - we always send the same info no matter what.
1429 */
1430void
1431send_skill_info (client *ns, char *params)
1432{
1433 packet sl;
1434 sl << "replyinfo skill_info\n";
1435
1436 for (int i = 1; i < NUM_SKILLS; i++)
1437 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1438
1439 if (sl.length () >= MAXSOCKBUF)
1440 { 999 {
1441 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1000 /* In this block, the space is visible.
1442 fatal (0); 1001 */
1002
1003 /* Rather than try to figure out what everything that we might
1004 * need to send is, then form the packet after that,
1005 * we presume that we will in fact form a packet, and update
1006 * the bits by what we do actually send. If we send nothing,
1007 * we just back out sl.length () to the old value, and no harm
1008 * is done.
1009 * I think this is simpler than doing a bunch of checks to see
1010 * what if anything we need to send, setting the bits, then
1011 * doing those checks again to add the real data.
1012 */
1013 oldlen = sl.length ();
1014
1015 sl << uint16 (mask);
1016
1017 unsigned char dummy;
1018 unsigned char *last_ext = &dummy;
1019
1020 /* Darkness changed */
1021 if (lastcell.count != d)
1022 {
1023 mask |= 0x8;
1024
1025 *last_ext |= 0x80;
1026 last_ext = &sl[sl.length ()];
1027 sl << uint8 (d);
1028 }
1029
1030 lastcell.count = d;
1031
1032 mapspace &ms = m->at (nx, ny);
1033 ms.update ();
1034
1035 // extmap handling
1036 uint8 stat_hp = 0;
1037 uint8 stat_width = 0;
1038 uint8 flags = 0;
1039 tag_t player = 0;
1040
1041 // send hp information, if applicable
1042 if (object *op = ms.faces_obj [0])
1043 if (op->is_head () && !op->invisible)
1044 {
1045 if (op->stats.maxhp > op->stats.hp
1046 && op->stats.maxhp > 0
1047 && (op->type == PLAYER
1048 || op->type == DOOR // does not work, have maxhp 0
1049 || op->flag [FLAG_MONSTER]
1050 || op->flag [FLAG_ALIVE]
1051 || op->flag [FLAG_GENERATOR]))
1052 {
1053 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1054 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1055 }
1056
1057 if (expect_false (op->has_dialogue ()))
1058 flags |= 1;
1059
1060 if (expect_false (op->type == PLAYER))
1061 player = op == ob ? pl->ob->count
1062 : op == pl->ob ? ob->count
1063 : op->count;
1064 }
1065
1066 if (expect_false (lastcell.stat_hp != stat_hp))
1067 {
1068 lastcell.stat_hp = stat_hp;
1069
1070 mask |= 0x8;
1071 *last_ext |= 0x80;
1072 last_ext = &sl[sl.length ()];
1073
1074 sl << uint8 (5) << uint8 (stat_hp);
1075
1076 if (stat_width > 1)
1077 {
1078 *last_ext |= 0x80;
1079 last_ext = &sl[sl.length ()];
1080
1081 sl << uint8 (6) << uint8 (stat_width);
1082 }
1083 }
1084
1085 if (expect_false (lastcell.player != player))
1086 {
1087 lastcell.player = player;
1088
1089 mask |= 0x8;
1090 *last_ext |= 0x80;
1091 last_ext = &sl[sl.length ()];
1092
1093 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1094 }
1095
1096 if (expect_false (lastcell.flags != flags))
1097 {
1098 lastcell.flags = flags;
1099
1100 mask |= 0x8;
1101 *last_ext |= 0x80;
1102 last_ext = &sl[sl.length ()];
1103
1104 sl << uint8 (8) << uint8 (flags);
1105 }
1106
1107 // faces
1108
1109 /* Floor face */
1110 if (update_space (sl, socket, ms, lastcell, 2))
1111 mask |= 0x4;
1112
1113 /* Middle face */
1114 if (update_space (sl, socket, ms, lastcell, 1))
1115 mask |= 0x2;
1116
1117 if (expect_false (ob->invisible)
1118 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1119 && ms.player () == ob)
1120 {
1121 // force player to be visible to himself if invisible
1122 if (lastcell.faces[0] != ob->face)
1123 {
1124 lastcell.faces[0] = ob->face;
1125
1126 mask |= 0x1;
1127 sl << uint16 (ob->face);
1128
1129 socket.send_faces (ob);
1130 }
1131 }
1132 /* Top face */
1133 else if (update_space (sl, socket, ms, lastcell, 0))
1134 mask |= 0x1;
1135
1136 /* Check to see if we are in fact sending anything for this
1137 * space by checking the mask. If so, update the mask.
1138 * if not, reset the len to that from before adding the mask
1139 * value, so we don't send those bits.
1140 */
1141 if (mask & 0xf)
1142 sl[oldlen + 1] = mask & 0xff;
1143 else
1144 sl.reset (oldlen);
1145 } /* else this is a viewable space */
1146 ordered_mapwalk_end
1147
1148 socket.flush_fx ();
1149
1150 if (sl.length () > startlen || socket.sent_scroll)
1443 } 1151 {
1444
1445 ns->send_packet (sl); 1152 socket.send_packet (sl);
1446} 1153 socket.sent_scroll = 0;
1447
1448/**
1449 * This sends the spell path to name mapping. We ignore
1450 * the params - we always send the same info no matter what.
1451 */
1452void
1453send_spell_paths (client * ns, char *params)
1454{
1455 packet sl;
1456
1457 sl << "replyinfo spell_paths\n";
1458
1459 for (int i = 0; i < NRSPELLPATHS; i++)
1460 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1461
1462 if (sl.length () >= MAXSOCKBUF)
1463 { 1154 }
1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465 fatal (0);
1466 }
1467
1468 ns->send_packet (sl);
1469} 1155}
1470 1156
1471/** 1157/**
1472 * This looks for any spells the player may have that have changed their stats. 1158 * This looks for any spells the player may have that have changed their stats.
1473 * it then sends an updspell packet for each spell that has changed in this way 1159 * it then sends an updspell packet for each spell that has changed in this way
1476esrv_update_spells (player *pl) 1162esrv_update_spells (player *pl)
1477{ 1163{
1478 if (!pl->ns) 1164 if (!pl->ns)
1479 return; 1165 return;
1480 1166
1167 pl->ns->update_spells = false;
1168
1481 if (!pl->ns->monitor_spells) 1169 if (!pl->ns->monitor_spells)
1482 return; 1170 return;
1483 1171
1484 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1172 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1485 {
1486 if (spell->type == SPELL) 1173 if (spell->type == SPELL)
1487 { 1174 {
1488 int flags = 0; 1175 int flags = 0;
1176 int val;
1489 1177
1490 /* check if we need to update it */ 1178 /* check if we need to update it */
1491 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1179 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1180 if (spell->cached_sp != val)
1492 { 1181 {
1493 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1182 spell->cached_sp = val;
1494 flags |= UPD_SP_MANA; 1183 flags |= UPD_SP_MANA;
1495 } 1184 }
1496 1185
1497 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1186 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1187 if (spell->cached_grace != val)
1498 { 1188 {
1499 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1189 spell->cached_grace = val;
1500 flags |= UPD_SP_GRACE; 1190 flags |= UPD_SP_GRACE;
1501 } 1191 }
1502 1192
1503 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1193 val = casting_level (pl->ob, spell);
1194 if (spell->cached_eat != val)
1504 { 1195 {
1505 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1196 spell->cached_eat = val;
1506 flags |= UPD_SP_DAMAGE; 1197 flags |= UPD_SP_LEVEL;
1507 } 1198 }
1508 1199
1509 if (flags) 1200 if (flags)
1510 { 1201 {
1511 packet sl; 1202 packet sl;
1512 1203
1513 sl << "updspell " 1204 sl << "updspell "
1514 << uint8 (flags) 1205 << uint8 (flags)
1515 << uint32 (spell->count); 1206 << uint32 (spell->count);
1516 1207
1517 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1208 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1518 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1209 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1519 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1210 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1520 1211
1521 pl->ns->send_packet (sl); 1212 pl->ns->send_packet (sl);
1522 } 1213 }
1523 } 1214 }
1524 }
1525} 1215}
1526 1216
1527void 1217void
1528esrv_remove_spell (player *pl, object *spell) 1218esrv_remove_spell (player *pl, object *spell)
1529{ 1219{
1545 1235
1546/* appends the spell *spell to the Socklist we will send the data to. */ 1236/* appends the spell *spell to the Socklist we will send the data to. */
1547static void 1237static void
1548append_spell (player *pl, packet &sl, object *spell) 1238append_spell (player *pl, packet &sl, object *spell)
1549{ 1239{
1550 int i, skill = 0; 1240 int skill = 0;
1551 1241
1552 if (!(spell->name)) 1242 if (!(spell->name))
1553 { 1243 {
1554 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1244 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1555 return; 1245 return;
1556 } 1246 }
1557 1247
1558 /* store costs and damage in the object struct, to compare to later */ 1248 /* store costs and damage in the object struct, to compare to later */
1559 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1249 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1560 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1250 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1561 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1251 spell->cached_eat = casting_level (pl->ob, spell);
1562 1252
1563 /* figure out which skill it uses, if it uses one */ 1253 /* figure out which skill it uses, if it uses one */
1564 if (spell->skill) 1254 if (spell->skill)
1565 { 1255 if (object *tmp = pl->find_skill (spell->skill))
1566 for (i = 1; i < NUM_SKILLS; i++) 1256 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1567 if (!strcmp (spell->skill, skill_names[i]))
1568 {
1569 skill = i + CS_STAT_SKILLINFO;
1570 break;
1571 }
1572 }
1573 1257
1574 // spells better have a face 1258 // spells better have a face
1575 if (!spell->face) 1259 if (!spell->face)
1576 { 1260 {
1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1261 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1578 spell->face = face_find ("burnout.x11", blank_face); 1262 spell->face = face_find ("burnout.x11", blank_face);
1579 } 1263 }
1264
1265 pl->ns->send_face (spell->face);
1580 1266
1581 /* send the current values */ 1267 /* send the current values */
1582 sl << uint32 (spell->count) 1268 sl << uint32 (spell->count)
1583 << uint16 (spell->level) 1269 << uint16 (spell->level)
1584 << uint16 (spell->casting_time) 1270 << uint16 (spell->casting_time)
1585 << uint16 (spell->last_sp) 1271 << uint16 (spell->cached_sp)
1586 << uint16 (spell->last_grace) 1272 << uint16 (spell->cached_grace)
1587 << uint16 (spell->last_eat) 1273 << uint16 (spell->cached_eat)
1588 << uint8 (skill) 1274 << uint8 (skill)
1589 << uint32 (spell->path_attuned) 1275 << uint32 (spell->path_attuned)
1590 << uint32 (spell->face) 1276 << uint32 (spell->face)
1591 << data8 (spell->name) 1277 << data8 (spell->name)
1592 << data16 (spell->msg); 1278 << data16 (spell->msg);
1620 * bytes and 3 strings (because that is the spec) so we need to 1306 * bytes and 3 strings (because that is the spec) so we need to
1621 * check that the length of those 3 strings, plus the 23 bytes, 1307 * check that the length of those 3 strings, plus the 23 bytes,
1622 * won't take us over the length limit for the socket, if it does, 1308 * won't take us over the length limit for the socket, if it does,
1623 * we need to send what we already have, and restart packet formation 1309 * we need to send what we already have, and restart packet formation
1624 */ 1310 */
1311 if (spell->type != SPELL)
1312 continue;
1313
1625 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1314 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1626 * to show add_spell is 26 bytes + 2 strings. However, the overun 1315 * to show add_spell is 26 bytes + 2 strings. However, the overun
1627 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1316 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1628 * like it will fix this 1317 * like it will fix this
1629 */ 1318 */
1630 if (spell->type != SPELL)
1631 continue;
1632
1633 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1319 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1634 { 1320 {
1321 pl->ns->flush_fx ();
1635 pl->ns->send_packet (sl); 1322 pl->ns->send_packet (sl);
1636 1323
1637 sl.reset (); 1324 sl.reset ();
1638 sl << "addspell "; 1325 sl << "addspell ";
1639 } 1326 }
1647 return; 1334 return;
1648 } 1335 }
1649 else 1336 else
1650 append_spell (pl, sl, spell); 1337 append_spell (pl, sl, spell);
1651 1338
1652 if (sl.length () >= MAXSOCKBUF) 1339 if (sl.length () > MAXSOCKBUF)
1653 {
1654 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1340 cleanup ("buffer overflow in esrv_add_spells!");
1655 fatal (0);
1656 }
1657 1341
1658 /* finally, we can send the packet */ 1342 /* finally, we can send the packet */
1343 pl->ns->flush_fx ();
1659 pl->ns->send_packet (sl); 1344 pl->ns->send_packet (sl);
1660} 1345}
1661 1346
1347//-GPL
1348

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines