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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines