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.87 by root, Thu Apr 19 11:12:46 2007 UTC vs.
Revision 1.194 by root, Sun Jan 29 02:47:06 2017 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,2013,2014,2015,2016 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 *
29 * \date 2003-12-02 31 * \date 2003-12-02
30 * 32 *
31 * This file implements all of the goo on the server side for handling 33 * 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 34 * clients. It's got a bunch of global variables for keeping track of
33 * each of the clients. 35 * each of the clients.
34 * 36 *
35 * Note: All functions that are used to process data from the client 37 * 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 38 * have the prototype of (char *data, int datalen, int client_num). This
37 * way, we can use one dispatch table. 39 * way, we can use one dispatch table.
38 * 40 *
… …
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.
281 * requestinfo is completely deprecated, use resource exti request
282 * and the fxix or http protocols.
211 */ 283 */
212void 284void
213RequestInfo (char *buf, int len, client * ns) 285RequestInfo (char *buf, int len, client *ns)
214{ 286{
215 char *params = NULL, *cp; 287 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 288
228 /* find the first space, make it null, and update the 289 /* find the first space, make it null, and update the
229 * params pointer. 290 * params pointer.
230 */ 291 */
231 for (cp = buf; *cp != '\0'; cp++) 292 for (params = buf; *params; params++)
232 if (*cp == ' ') 293 if (*params == ' ')
233 { 294 {
234 *cp = '\0';
235 params = cp + 1; 295 *params++ = 0;
236 break; 296 break;
237 } 297 }
238 298
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")) 299 if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 300 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 301 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 302 send_spell_paths (ns, params);
247 else 303 else
248 ns->send_packet (bigbuf, len); 304 {
305 // undo tokenisation above and send replyinfo with the request unchanged
306 if (*params)
307 *--params = ' ';
308
309 ns->send_packet_printf ("replyinfo %s", buf);
310 }
249} 311}
250 312
251void 313void
252ExtCmd (char *buf, int len, player *pl) 314ExtCmd (char *buf, int len, player *pl)
253{ 315{
… …
256 318
257void 319void
258ExtiCmd (char *buf, int len, client *ns) 320ExtiCmd (char *buf, int len, client *ns)
259{ 321{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 322 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
323}
324
325//-GPL
326
327void
328client::mapinfo_queue_clear ()
329{
330 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
331 free (*i);
332
333 mapinfo_queue.clear ();
334}
335
336bool
337client::mapinfo_try (char *buf)
338{
339 char *token = buf;
340 buf += strlen (buf) + 9;
341
342 // initial map and its origin
343 maptile *map = pl->viewpoint->map;
344 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
345 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
346 int max_distance = 8; // limit maximum path length to something generous
347
348 while (*buf && map && max_distance)
349 {
350 int dir = *buf++ - '1';
351
352 // due to historical glitches, the mapinfo index and tile index differs
353 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
354
355 // maybe we should only allow the four flat directions
356 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
357 {
358 dir = dirmap [dir];
359
360 if (!map->tile_path [dir])
361 map = 0;
362 else if (map->tile_available (dir, false))
363 {
364 maptile *neigh = map->tile_map [dir];
365
366 switch (dir)
367 {
368 case 0: mapy -= neigh->height; break;
369 case 2: mapy += map ->height; break;
370 case 3: mapx -= neigh->width ; break;
371 case 1: mapx += map ->width ; break;
372 }
373
374 map = neigh;
375 --max_distance;
376 }
377 else
378 return 0;
379 }
380 else
381 max_distance = 0;
382 }
383
384 if (!max_distance)
385 send_packet_printf ("mapinfo %s error", token);
386 else if (!map || !map->path)
387 send_packet_printf ("mapinfo %s nomap", token);
388 else
389 {
390 int flags = 0;
391
392 // due to historical glitches, the bit ordering and map index ordering differs
393 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
394 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
395 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
396 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
397 // these two are debatable
398 if (map->tile_path [TILE_UP ]) flags |= 0x10;
399 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
400
401 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
402 }
403
404 return 1;
405}
406
407void
408client::mapinfo_queue_run ()
409{
410 if (mapinfo_queue.empty () || !pl)
411 return;
412
413 for (int i = 0; i < mapinfo_queue.size (); ++i)
414 if (mapinfo_try (mapinfo_queue [i]))
415 {
416 free (mapinfo_queue [i]);
417 mapinfo_queue.erase (i);
418 }
419 else
420 ++i;
261} 421}
262 422
263void 423void
264MapInfoCmd (char *buf, int len, player *pl) 424MapInfoCmd (char *buf, int len, player *pl)
265{ 425{
266 // <mapinfo tag spatial tile-path 426 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 427 // >mapinfo tag spatial flags x y w h hash
268 428
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 429 char *token = buf;
272 // copy token 430
273 if (!(buf = strchr (buf, ' '))) 431 if (!(buf = strchr (buf, ' ')))
274 return; 432 return;
275 433
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 434 if (!strncmp (buf, " spatial ", 9))
279 { 435 {
280 buf += 8; 436 char *copy = strdup (token);
437 copy [buf - token] = 0;
281 438
282 // initial map and its origin 439#if 0
283 maptile *map = pl->ob->map; 440 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 441 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 442 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 443 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 444#endif
445 pl->ns->mapinfo_queue.push_back (copy);
343 } 446 }
344 else 447 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 448 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 449}
349 450
350/** This is the Setup cmd */ 451/** This is the Setup cmd */
351void 452void
352SetUp (char *buf, int len, client * ns) 453SetUp (char *buf, int len, client * ns)
… …
364AddMeCmd (char *buf, int len, client *ns) 465AddMeCmd (char *buf, int len, client *ns)
365{ 466{
366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 467 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
367} 468}
368 469
369/** Reply to ExtendedInfos command */ 470//+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 471
506/** 472/**
507 * This handles the general commands from the client (ie, north, fire, cast, 473 * This handles the general commands from the client (ie, north, fire, cast,
508 * etc.) 474 * etc.)
509 */ 475 */
… …
522 return; 488 return;
523 489
524 buf++; 490 buf++;
525 } 491 }
526 492
527 execute_newserver_command (pl->ob, (char *) buf); 493 execute_newserver_command (pl->ob, (char *)buf);
528 494
529 /* Perhaps something better should be done with a left over count. 495 /* Perhaps something better should be done with a left over count.
530 * Cleaning up the input should probably be done first - all actions 496 * 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 497 * for the command that issued the count should be done before any other
532 * commands. 498 * commands.
533 */ 499 */
534 pl->count = 0; 500 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} 501}
581 502
582/** This is a reply to a previous query. */ 503/** This is a reply to a previous query. */
583void 504void
584ReplyCmd (char *buf, int len, client *ns) 505ReplyCmd (char *buf, int len, client *ns)
… …
611 { 532 {
612 case ST_PLAYING: 533 case ST_PLAYING:
613 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 534 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
614 break; 535 break;
615 536
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 */ 537 case ST_GET_PARTY_PASSWORD: /* Get password for party */
621 receive_party_password (pl->ob, 13); 538 receive_party_password (pl->ob, 13);
622 break; 539 break;
623 540
624 default: 541 default:
625 LOG (llevError, "Unknown input state: %d\n", ns->state); 542 LOG (llevError, "Unknown input state: %d\n", ns->state);
626 } 543 }
627} 544}
628 545
629/** 546/**
630 * Client tells its version. If there is a mismatch, we close the 547 * 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 */ 548 */
636void 549void
637VersionCmd (char *buf, int len, client * ns) 550VersionCmd (char *buf, int len, client *ns)
638{ 551{
639 if (!buf) 552 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} 553}
675 554
676/** sound related functions. */ 555/** sound related functions. */
677void 556void
678SetSound (char *buf, int len, client * ns) 557SetSound (char *buf, int len, client * ns)
… …
696 * syntax is: move (to) (tag) (nrof) 575 * syntax is: move (to) (tag) (nrof)
697 */ 576 */
698void 577void
699MoveCmd (char *buf, int len, player *pl) 578MoveCmd (char *buf, int len, player *pl)
700{ 579{
701 int vals[3], i; 580 int to, tag, nrof;
702 581
703 /* A little funky here. We only cycle for 2 records, because 582 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 { 583 {
710 vals[i] = atoi (buf);
711
712 if (!(buf = strchr (buf, ' ')))
713 {
714 LOG (llevError, "Incomplete move command: %s\n", buf); 584 LOG (llevError, "Incomplete move command: %s\n", buf);
715 return; 585 return;
716 }
717
718 buf++;
719 } 586 }
720 587
721 vals[2] = atoi (buf); 588 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} 589}
726 590
727/****************************************************************************** 591/******************************************************************************
728 * 592 *
729 * Start of commands the server sends to the client. 593 * Start of commands the server sends to the client.
… …
738send_query (client *ns, uint8 flags, const char *text) 602send_query (client *ns, uint8 flags, const char *text)
739{ 603{
740 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 604 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
741} 605}
742 606
607/**
608 * Get player's current range attack in obuf.
609 */
610static void
611rangetostring (player *pl, char *obuf)
612{
613 dynbuf_text &buf = msg_dynbuf; buf.clear ();
614
615#if 0
616 // print ranged/chosen_skill etc. objects every call
617 printf ("%s %s => %s (%s)\n",
618 pl->ranged_ob ? &pl->ranged_ob->name : "-",
619 pl->combat_ob ? &pl->combat_ob->name : "-",
620 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
621 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
622 );
623#endif
624
625 if (pl->ranged_ob)
626 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
627
628 if (pl->combat_ob)
629 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
630
631#if 0
632 //TODO: remove this when slot system is working, this is only for debugging
633 if (pl->ob->chosen_skill)
634 buf << " Skill*: " << pl->ob->chosen_skill->name;
635#endif
636
637 //TODO: maybe golem should become the current_weapon, quite simply?
638 if (pl->golem)
639 buf << " Golem*: " << pl->golem->name;
640
641 buf << '\0';
642 buf.linearise (obuf);
643}
644
743#define AddIfInt64(Old,New,Type) if (Old != New) {\ 645#define AddIfInt64(Old,New,Type) if (Old != New) {\
744 Old = New; \ 646 Old = New; \
745 sl << uint8 (Type) << uint64 (New); \ 647 sl << uint8 (Type) << uint64 (New); \
746 } 648 }
747 649
… …
753#define AddIfShort(Old,New,Type) if (Old != New) {\ 655#define AddIfShort(Old,New,Type) if (Old != New) {\
754 Old = New; \ 656 Old = New; \
755 sl << uint8 (Type) << uint16 (New); \ 657 sl << uint8 (Type) << uint16 (New); \
756 } 658 }
757 659
758#define AddIfFloat(Old,New,Type) if (Old != New) {\ 660#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
759 Old = New; \ 661 Old = New; \
760 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 662 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
761 } 663 }
762 664
763#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 665#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
764 free(Old); Old = strdup (New);\ 666 free(Old); Old = strdup (New);\
765 sl << uint8 (Type) << data8 (New); \ 667 sl << uint8 (Type) << data8 (New); \
… …
772 * commands for now. 674 * commands for now.
773 */ 675 */
774void 676void
775esrv_update_stats (player *pl) 677esrv_update_stats (player *pl)
776{ 678{
777 char buf[MAX_BUF];
778 uint16 flags;
779
780 client *ns = pl->ns; 679 client *ns = pl->ns;
781 if (!ns) 680 if (!ns)
782 return; 681 return;
783 682
784 object *ob = pl->ob; 683 object *ob = pl->observe;
785 if (!ob) 684 if (!ob)
786 return; 685 return;
686
687 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
787 688
788 packet sl ("stats"); 689 packet sl ("stats");
789 690
790 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 691 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
791 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 692 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
799 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 700 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
800 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 701 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
801 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 702 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
802 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 703 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
803 704
804 for (int s = 0; s < NUM_SKILLS; s++) 705 for (int s = 0; s < CS_NUM_SKILLS; s++)
805 if (object *skill = pl->last_skill_ob[s]) 706 if (object *skill = opl->last_skill_ob [s])
806 if (skill->stats.exp != ns->last_skill_exp [s]) 707 if (skill->stats.exp != ns->last_skill_exp [s])
807 { 708 {
808 ns->last_skill_exp [s] = skill->stats.exp; 709 ns->last_skill_exp [s] = skill->stats.exp;
809 710
810 /* Always send along the level if exp changes. This is only 711 /* Always send along the level if exp changes. This is only
811 * 1 extra byte, but keeps processing simpler. 712 * 1 extra byte, but keeps processing simpler.
812 */ 713 */
813 sl << uint8 (s + CS_STAT_SKILLINFO) 714 sl << uint8 (CS_STAT_SKILLINFO + s)
814 << uint8 (skill->level) 715 << uint8 (skill->level)
815 << uint64 (skill->stats.exp); 716 << uint64 (skill->stats.exp);
816 } 717 }
817 718
818 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 719 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
819 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 720 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
820 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 721 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
821 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 722 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
822 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 723 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
823 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 724 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
824 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 725 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
825 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 726 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); 727 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
827 728
828 flags = 0; 729 int flags = (opl->fire_on ? SF_FIREON : 0)
829 730 | (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 731
836 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 732 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
837 733
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++) 734 for (int i = 0; i < NROFATTACKS; i++)
842 {
843 /* Skip ones we won't send */ 735 /* Skip ones we won't send */
844 if (atnr_cs_stat[i] == -1) 736 if (atnr_cs_stat[i] >= 0)
845 continue;
846
847 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 737 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
848 }
849 738
850 if (pl->ns->monitor_spells) 739 if (pl->ns->monitor_spells)
851 { 740 {
852 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 741 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); 742 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); 743 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
855 } 744 }
856 745
746 char buf[MAX_BUF];
857 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 747 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
858 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 748 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
859 set_title (ob, buf); 749 set_title (ob, buf);
860 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 750 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
861 751
862 /* Only send it away if we have some actual data */ 752 /* Only send it away if we have some actual data */
… …
866 756
867/** 757/**
868 * Tells the client that here is a player it should start using. 758 * Tells the client that here is a player it should start using.
869 */ 759 */
870void 760void
871esrv_new_player (player *pl, uint32 weight) 761esrv_new_player (player *pl)
872{ 762{
763 sint32 weight = pl->ob->client_weight ();
764
873 packet sl ("player"); 765 packet sl ("player");
874 766
875 sl << uint32 (pl->ob->count) 767 sl << uint32 (pl->ob->count)
876 << uint32 (weight) 768 << uint32 (weight)
877 << uint32 (pl->ob->face) 769 << uint32 (pl->ob->face)
878 << data8 (pl->ob->name); 770 << data8 (pl->ob->name);
879 771
880 pl->ns->last_weight = weight; 772 pl->ns->last_weight = weight;
881 pl->ns->send_packet (sl); 773 pl->ns->send_packet (sl);
882 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
883} 774}
884 775
885/****************************************************************************** 776/******************************************************************************
886 * 777 *
887 * Start of map related commands. 778 * Start of map related commands.
… …
944 835
945 if (!ns.faces_sent[face_num]) 836 if (!ns.faces_sent[face_num])
946 if (ob) 837 if (ob)
947 ns.send_faces (ob); 838 ns.send_faces (ob);
948 else 839 else
949 ns.send_face (face_num); 840 ns.send_face (face_num, 10);
950 841
951 sl << uint16 (face_num); 842 sl << uint16 (face_num);
952 return 1; 843 return 1;
953 } 844 }
954 845
955 /* Nothing changed */ 846 /* Nothing changed */
956 return 0; 847 return 0;
957} 848}
958 849
959/** 850/**
960 * Returns the size of a data for a map square as returned by 851 * Draws client map.
961 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
962 * available.
963 */ 852 */
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 853void
1023draw_client_map1 (object *pl) 854draw_client_map (player *pl)
1024{ 855{
1025 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 856 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) 857 if (!pl->observe->active)
1036 return; 858 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 tag_t 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 (4) << (uint32)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 859
1371 /* If player is just joining the game, he isn't here yet, so the map 860 /* 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 861 * can get swapped out. If so, don't try to send them a map. All will
1373 * be OK once they really log in. 862 * be OK once they really log in.
1374 */ 863 */
1375 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 864 if (!ob->map || ob->map->state != MAP_ACTIVE)
1376 return; 865 return;
1377 866
1378 memset (&newmap, 0, sizeof (struct Map)); 867 int startlen, oldlen;
1379 868
1380 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 869 check_map_change (pl);
1381 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 870 pl->ob->prefetch_surrounding_maps ();
871
872 /* do LOS after calls to update_position */
873 /* unfortunately, we need to udpate los when observing, currently */
874 if (pl->do_los || pl->viewpoint != pl->ob)
875 {
876 pl->do_los = 0;
877 pl->update_los ();
878 }
879
880 /**
881 * This function uses the new map1 protocol command to send the map
882 * to the client. It is necessary because the old map command supports
883 * a maximum map size of 15x15.
884 * This function is much simpler than the old one. This is because
885 * the old function optimized to send as few face identifiers as possible,
886 * at the expense of sending more coordinate location (coordinates were
887 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
888 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
889 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
890 * and use the other 4 bits for other informatiion. For full documentation
891 * of what we send, see the doc/Protocol file.
892 * I will describe internally what we do:
893 * the ns->lastmap shows how the map last looked when sent to the client.
894 * in the lastmap structure, there is a cells array, which is set to the
895 * maximum viewable size (As set in config.h).
896 * in the cells, there are faces and a count value.
897 * we use the count value to hold the darkness value. If -1, then this space
898 * is not viewable.
899 * we use faces[0] faces[1] faces[2] to hold what the three layers
900 * look like.
901 */
902
903 client &socket = *pl->ns;
904
905 packet sl ("map1a");
906
907 startlen = sl.length ();
908
909 int hx = socket.mapx / 2;
910 int hy = socket.mapy / 2;
911
912 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
913 int ax = dx + hx;
914 int ay = dy + hy;
915
916 int mask = (ax << 10) | (ay << 4);
917 MapCell &lastcell = socket.lastmap.cells[ax][ay];
918
919 /* If the coordinates are not valid, or it is too dark to see,
920 * we tell the client as such
921 */
922 if (!m)
1382 { 923 {
1383 ax = i; 924 /* space is out of map. Update space and clear values
1384 ay = j; 925 * if this hasn't already been done. If the space is out
1385 m = pm; 926 * 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 */ 927 */
1395 if (mflags & P_NEW_MAP) 928 if (lastcell.count != -1)
1396 m->timeout = 50; 929 {
930 sl << uint16 (mask);
931 map_clearcell (&lastcell, -1);
932 }
933
934 continue;
1397 } 935 }
1398 936
1399 /* do LOS after calls to update_position */ 937 int d = pl->blocked_los_uc (dx, dy);
1400 if (pl->contr->do_los) 938
939 if (d > 3)
1401 { 940 {
1402 update_los (pl); 941 /* This block deals with spaces that are not visible for whatever
1403 pl->contr->do_los = 0; 942 * reason. Still may need to send the head for this space.
943 */
944 if (lastcell.count != -1
945 || lastcell.faces[0]
946 || lastcell.faces[1]
947 || lastcell.faces[2]
948 || lastcell.stat_hp
949 || lastcell.flags
950 || lastcell.player)
951 sl << uint16 (mask);
952
953 /* properly clear a previously sent big face */
954 map_clearcell (&lastcell, -1);
1404 } 955 }
1405 956 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 { 957 {
1441 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 958 /* In this block, the space is visible.
1442 fatal (0); 959 */
960
961 /* Rather than try to figure out what everything that we might
962 * need to send is, then form the packet after that,
963 * we presume that we will in fact form a packet, and update
964 * the bits by what we do actually send. If we send nothing,
965 * we just back out sl.length () to the old value, and no harm
966 * is done.
967 * I think this is simpler than doing a bunch of checks to see
968 * what if anything we need to send, setting the bits, then
969 * doing those checks again to add the real data.
970 */
971 oldlen = sl.length ();
972
973 sl << uint16 (mask);
974
975 unsigned char dummy;
976 unsigned char *last_ext = &dummy;
977
978 /* Darkness changed */
979 if (lastcell.count != d)
980 {
981 mask |= 0x8;
982
983 *last_ext |= 0x80;
984 last_ext = &sl[sl.length ()];
985 sl << uint8 (d);
986 }
987
988 lastcell.count = d;
989
990 mapspace &ms = m->at (nx, ny);
991 ms.update ();
992
993 // extmap handling
994 uint8 stat_hp = 0;
995 uint8 stat_width = 0;
996 uint8 flags = 0;
997 tag_t player = 0;
998
999 // send hp information, if applicable
1000 if (object *op = ms.faces_obj [0])
1001 if (op->is_head () && !op->invisible)
1002 {
1003 if (op->stats.maxhp > op->stats.hp
1004 && op->stats.maxhp > 0
1005 && (op->type == PLAYER
1006 || op->type == DOOR // does not work, have maxhp 0
1007 || op->flag [FLAG_MONSTER]
1008 || op->flag [FLAG_ALIVE]
1009 || op->flag [FLAG_GENERATOR]))
1010 {
1011 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1012 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1013 }
1014
1015 if (expect_false (op->has_dialogue ()))
1016 flags |= 1;
1017
1018 if (expect_false (op->type == PLAYER))
1019 player = op == ob ? pl->ob->count
1020 : op == pl->ob ? ob->count
1021 : op->count;
1022 }
1023
1024 if (expect_false (lastcell.stat_hp != stat_hp))
1025 {
1026 lastcell.stat_hp = stat_hp;
1027
1028 mask |= 0x8;
1029 *last_ext |= 0x80;
1030 last_ext = &sl[sl.length ()];
1031
1032 sl << uint8 (5) << uint8 (stat_hp);
1033
1034 if (stat_width > 1)
1035 {
1036 *last_ext |= 0x80;
1037 last_ext = &sl[sl.length ()];
1038
1039 sl << uint8 (6) << uint8 (stat_width);
1040 }
1041 }
1042
1043 if (expect_false (lastcell.player != player))
1044 {
1045 lastcell.player = player;
1046
1047 mask |= 0x8;
1048 *last_ext |= 0x80;
1049 last_ext = &sl[sl.length ()];
1050
1051 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1052 }
1053
1054 if (expect_false (lastcell.flags != flags))
1055 {
1056 lastcell.flags = flags;
1057
1058 mask |= 0x8;
1059 *last_ext |= 0x80;
1060 last_ext = &sl[sl.length ()];
1061
1062 sl << uint8 (8) << uint8 (flags);
1063 }
1064
1065 // faces
1066
1067 /* Floor face */
1068 if (update_space (sl, socket, ms, lastcell, 2))
1069 mask |= 0x4;
1070
1071 /* Middle face */
1072 if (update_space (sl, socket, ms, lastcell, 1))
1073 mask |= 0x2;
1074
1075 if (expect_false (ob->invisible)
1076 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1077 && ms.player () == ob)
1078 {
1079 // force player to be visible to himself if invisible
1080 if (lastcell.faces[0] != ob->face)
1081 {
1082 lastcell.faces[0] = ob->face;
1083
1084 mask |= 0x1;
1085 sl << uint16 (ob->face);
1086
1087 socket.send_faces (ob);
1088 }
1089 }
1090 /* Top face */
1091 else if (update_space (sl, socket, ms, lastcell, 0))
1092 mask |= 0x1;
1093
1094 /* Check to see if we are in fact sending anything for this
1095 * space by checking the mask. If so, update the mask.
1096 * if not, reset the len to that from before adding the mask
1097 * value, so we don't send those bits.
1098 */
1099 if (mask & 0xf)
1100 sl[oldlen + 1] = mask & 0xff;
1101 else
1102 sl.reset (oldlen);
1103 } /* else this is a viewable space */
1104 ordered_mapwalk_end
1105
1106 socket.flush_fx ();
1107
1108 if (sl.length () > startlen || socket.sent_scroll)
1443 } 1109 {
1444
1445 ns->send_packet (sl); 1110 socket.send_packet (sl);
1446} 1111 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 { 1112 }
1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465 fatal (0);
1466 }
1467
1468 ns->send_packet (sl);
1469} 1113}
1470 1114
1471/** 1115/**
1472 * This looks for any spells the player may have that have changed their stats. 1116 * 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 1117 * it then sends an updspell packet for each spell that has changed in this way
… …
1476esrv_update_spells (player *pl) 1120esrv_update_spells (player *pl)
1477{ 1121{
1478 if (!pl->ns) 1122 if (!pl->ns)
1479 return; 1123 return;
1480 1124
1125 pl->ns->update_spells = false;
1126
1481 if (!pl->ns->monitor_spells) 1127 if (!pl->ns->monitor_spells)
1482 return; 1128 return;
1483 1129
1484 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1130 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1485 {
1486 if (spell->type == SPELL) 1131 if (spell->type == SPELL)
1487 { 1132 {
1488 int flags = 0; 1133 int flags = 0;
1134 int val;
1489 1135
1490 /* check if we need to update it */ 1136 /* check if we need to update it */
1491 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1137 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1138 if (spell->cached_sp != val)
1492 { 1139 {
1493 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1140 spell->cached_sp = val;
1494 flags |= UPD_SP_MANA; 1141 flags |= UPD_SP_MANA;
1495 } 1142 }
1496 1143
1497 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1144 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1145 if (spell->cached_grace != val)
1498 { 1146 {
1499 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1147 spell->cached_grace = val;
1500 flags |= UPD_SP_GRACE; 1148 flags |= UPD_SP_GRACE;
1501 } 1149 }
1502 1150
1503 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1151 val = casting_level (pl->ob, spell);
1152 if (spell->cached_eat != val)
1504 { 1153 {
1505 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1154 spell->cached_eat = val;
1506 flags |= UPD_SP_DAMAGE; 1155 flags |= UPD_SP_LEVEL;
1507 } 1156 }
1508 1157
1509 if (flags) 1158 if (flags)
1510 { 1159 {
1511 packet sl; 1160 packet sl;
1512 1161
1513 sl << "updspell " 1162 sl << "updspell "
1514 << uint8 (flags) 1163 << uint8 (flags)
1515 << uint32 (spell->count); 1164 << uint32 (spell->count);
1516 1165
1517 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1166 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1518 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1167 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1519 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1168 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1520 1169
1521 pl->ns->send_packet (sl); 1170 pl->ns->send_packet (sl);
1522 } 1171 }
1523 } 1172 }
1524 }
1525} 1173}
1526 1174
1527void 1175void
1528esrv_remove_spell (player *pl, object *spell) 1176esrv_remove_spell (player *pl, object *spell)
1529{ 1177{
… …
1545 1193
1546/* appends the spell *spell to the Socklist we will send the data to. */ 1194/* appends the spell *spell to the Socklist we will send the data to. */
1547static void 1195static void
1548append_spell (player *pl, packet &sl, object *spell) 1196append_spell (player *pl, packet &sl, object *spell)
1549{ 1197{
1550 int i, skill = 0; 1198 int skill = 0;
1551 1199
1552 if (!(spell->name)) 1200 if (!(spell->name))
1553 { 1201 {
1554 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1202 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1555 return; 1203 return;
1556 } 1204 }
1557 1205
1558 /* store costs and damage in the object struct, to compare to later */ 1206 /* 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); 1207 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); 1208 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); 1209 spell->cached_eat = casting_level (pl->ob, spell);
1562 1210
1563 /* figure out which skill it uses, if it uses one */ 1211 /* figure out which skill it uses, if it uses one */
1564 if (spell->skill) 1212 if (spell->skill)
1565 { 1213 if (object *tmp = pl->find_skill (spell->skill))
1566 for (i = 1; i < NUM_SKILLS; i++) 1214 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 1215
1574 // spells better have a face 1216 // spells better have a face
1575 if (!spell->face) 1217 if (!spell->face)
1576 { 1218 {
1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1219 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1578 spell->face = face_find ("burnout.x11", blank_face); 1220 spell->face = face_find ("burnout.x11", blank_face);
1579 } 1221 }
1222
1223 pl->ns->send_face (spell->face);
1580 1224
1581 /* send the current values */ 1225 /* send the current values */
1582 sl << uint32 (spell->count) 1226 sl << uint32 (spell->count)
1583 << uint16 (spell->level) 1227 << uint16 (spell->level)
1584 << uint16 (spell->casting_time) 1228 << uint16 (spell->casting_time)
1585 << uint16 (spell->last_sp) 1229 << uint16 (spell->cached_sp)
1586 << uint16 (spell->last_grace) 1230 << uint16 (spell->cached_grace)
1587 << uint16 (spell->last_eat) 1231 << uint16 (spell->cached_eat)
1588 << uint8 (skill) 1232 << uint8 (skill)
1589 << uint32 (spell->path_attuned) 1233 << uint32 (spell->path_attuned)
1590 << uint32 (spell->face) 1234 << uint32 (spell->face)
1591 << data8 (spell->name) 1235 << data8 (spell->name);
1236
1237 if (pl->ns->monitor_spells < 2)
1592 << data16 (spell->msg); 1238 sl << data16 (spell->msg);
1593} 1239}
1594 1240
1595/** 1241/**
1596 * This tells the client to add the spell *ob, if *ob is NULL, then add 1242 * This tells the client to add the spell *ob, if *ob is NULL, then add
1597 * all spells in the player's inventory. 1243 * all spells in the player's inventory.
1598 */ 1244 */
1599void 1245void
1600esrv_add_spells (player *pl, object *spell) 1246esrv_add_spells (player *pl, object *spell)
1601{ 1247{
… …
1612 1258
1613 if (!spell) 1259 if (!spell)
1614 { 1260 {
1615 for (spell = pl->ob->inv; spell; spell = spell->below) 1261 for (spell = pl->ob->inv; spell; spell = spell->below)
1616 { 1262 {
1617 /* were we to simply keep appending data here, we could exceed 1263 /* were we to simply keep appending data here, we could exceed
1618 * MAXSOCKBUF if the player has enough spells to add, we know that 1264 * MAXSOCKBUF if the player has enough spells to add, we know that
1619 * append_spells will always append 19 data bytes, plus 4 length 1265 * append_spells will always append 19 data bytes, plus 4 length
1620 * bytes and 3 strings (because that is the spec) so we need to 1266 * 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, 1267 * 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, 1268 * 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 1269 * we need to send what we already have, and restart packet formation
1624 */ 1270 */
1271 if (spell->type != SPELL)
1272 continue;
1273
1625 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1274 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1626 * to show add_spell is 26 bytes + 2 strings. However, the overun 1275 * 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 1276 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1628 * like it will fix this 1277 * like it will fix this
1629 */ 1278 */
1630 if (spell->type != SPELL)
1631 continue;
1632
1633 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1279 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1634 { 1280 {
1281 pl->ns->flush_fx ();
1635 pl->ns->send_packet (sl); 1282 pl->ns->send_packet (sl);
1636 1283
1637 sl.reset (); 1284 sl.reset ();
1638 sl << "addspell "; 1285 sl << "addspell ";
1639 } 1286 }
… …
1647 return; 1294 return;
1648 } 1295 }
1649 else 1296 else
1650 append_spell (pl, sl, spell); 1297 append_spell (pl, sl, spell);
1651 1298
1652 if (sl.length () >= MAXSOCKBUF) 1299 if (sl.length () > MAXSOCKBUF)
1653 {
1654 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1300 cleanup ("buffer overflow in esrv_add_spells!");
1655 fatal (0);
1656 }
1657 1301
1658 /* finally, we can send the packet */ 1302 /* finally, we can send the packet */
1303 pl->ns->flush_fx ();
1659 pl->ns->send_packet (sl); 1304 pl->ns->send_packet (sl);
1660} 1305}
1661 1306
1307//-GPL
1308

Diff Legend

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