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.103 by root, Mon Jun 4 13:04:01 2007 UTC vs.
Revision 1.197 by root, Sat Dec 1 20:22:13 2018 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 (©) 2001,2007 Mark Wedel 6 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 10 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License along 19 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 20 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 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->observe; 191 object *ob = pl->viewpoint;
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 }
151 219
152 if (socket.current_map != ob->map || socket.force_newmap) 220 if (socket.current_map != ob->map || socket.force_newmap)
153 { 221 {
154 clear_map (pl); 222 clear_map (pl);
155 socket.current_map = ob->map; 223 socket.current_map = ob->map;
156 224 send_map_info (pl);
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0]) flags |= 1;
164 if (ob->map->tile_path[1]) flags |= 2;
165 if (ob->map->tile_path[2]) flags |= 4;
166 if (ob->map->tile_path[3]) flags |= 8;
167
168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 socket.send_packet ("mapinfo current");
174 }
175 } 225 }
176 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)
177 { 227 {
178 int dx = ob->x - socket.current_x; 228 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 229 int dy = ob->y - socket.current_y;
180 230
181 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
182 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
183 else
184 {
185 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);
186 socket.floorbox_reset (); 232 socket.floorbox_reset ();
187 }
188 } 233 }
189 234
190 socket.current_x = ob->x; 235 socket.current_x = ob->x;
191 socket.current_y = ob->y; 236 socket.current_y = ob->y;
237}
192 238
193 region *reg = ob->region (); 239/**
194 if (socket.current_region != reg) 240 * This sends the skill number to name mapping. We ignore
195 { 241 * the params - we always send the same info no matter what.
196 socket.current_region = reg; 242 */
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 243static void
198 } 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);
199} 276}
200 277
201/** 278/**
202 * RequestInfo is sort of a meta command. There is some specific 279 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 280 * request of information, but we call other functions to provide
204 * that information. 281 * that information.
282 * requestinfo is completely deprecated, use resource exti request
283 * and the fxix or http protocols.
205 */ 284 */
206void 285void
207RequestInfo (char *buf, int len, client * ns) 286RequestInfo (char *buf, int len, client *ns)
208{ 287{
209 char *params = NULL, *cp; 288 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 289
222 /* find the first space, make it null, and update the 290 /* find the first space, make it null, and update the
223 * params pointer. 291 * params pointer.
224 */ 292 */
225 for (cp = buf; *cp != '\0'; cp++) 293 for (params = buf; *params; params++)
226 if (*cp == ' ') 294 if (*params == ' ')
227 { 295 {
228 *cp = '\0';
229 params = cp + 1; 296 *params++ = 0;
230 break; 297 break;
231 } 298 }
232 299
233 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params);
235 else if (!strcmp (buf, "image_sums"))
236 send_image_sums (ns, params);
237 else if (!strcmp (buf, "skill_info")) 300 if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 301 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 302 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 303 send_spell_paths (ns, params);
241 else 304 else
242 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 }
243} 312}
244 313
245void 314void
246ExtCmd (char *buf, int len, player *pl) 315ExtCmd (char *buf, int len, player *pl)
247{ 316{
… …
250 319
251void 320void
252ExtiCmd (char *buf, int len, client *ns) 321ExtiCmd (char *buf, int len, client *ns)
253{ 322{
254 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;
255} 422}
256 423
257void 424void
258MapInfoCmd (char *buf, int len, player *pl) 425MapInfoCmd (char *buf, int len, player *pl)
259{ 426{
260 // <mapinfo tag spatial tile-path 427 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 428 // >mapinfo tag spatial flags x y w h hash
262 429
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 430 char *token = buf;
266 // copy token 431
267 if (!(buf = strchr (buf, ' '))) 432 if (!(buf = strchr (buf, ' ')))
268 return; 433 return;
269 434
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 435 if (!strncmp (buf, " spatial ", 9))
273 { 436 {
274 buf += 8; 437 char *copy = strdup (token);
438 copy [buf - token] = 0;
275 439
276 // initial map and its origin 440#if 0
277 maptile *map = pl->ob->map; 441 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 442 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 443 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 444 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 445#endif
446 pl->ns->mapinfo_queue.push_back (copy);
333 } 447 }
334 else 448 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 449 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 450}
339 451
340/** This is the Setup cmd */ 452/** This is the Setup cmd */
341void 453void
342SetUp (char *buf, int len, client * ns) 454SetUp (char *buf, int len, client * ns)
… …
354AddMeCmd (char *buf, int len, client *ns) 466AddMeCmd (char *buf, int len, client *ns)
355{ 467{
356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 468 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
357} 469}
358 470
359/** Reply to ExtendedInfos command */ 471//+GPL
360void
361ToggleExtendedInfos (char *buf, int len, client * ns)
362{
363 char cmdback[MAX_BUF];
364 char command[50];
365 int info, nextinfo;
366
367 cmdback[0] = '\0';
368 nextinfo = 0;
369
370 while (1)
371 {
372 /* 1. Extract an info */
373 info = nextinfo;
374
375 while ((info < len) && (buf[info] == ' '))
376 info++;
377
378 if (info >= len)
379 break;
380
381 nextinfo = info + 1;
382
383 while ((nextinfo < len) && (buf[nextinfo] != ' '))
384 nextinfo++;
385
386 if (nextinfo - info >= 49) /*Erroneous info asked */
387 continue;
388
389 strncpy (command, &(buf[info]), nextinfo - info);
390
391 /* 2. Interpret info */
392 if (!strcmp ("smooth", command))
393 /* Toggle smoothing */
394 ns->EMI_smooth = !ns->EMI_smooth;
395 else
396 /*bad value */;
397
398 /*3. Next info */
399 }
400
401 strcpy (cmdback, "ExtendedInfoSet");
402
403 if (ns->EMI_smooth)
404 {
405 strcat (cmdback, " ");
406 strcat (cmdback, "smoothing");
407 }
408
409 ns->send_packet (cmdback);
410}
411
412/*
413#define MSG_TYPE_BOOK 1
414#define MSG_TYPE_CARD 2
415#define MSG_TYPE_PAPER 3
416#define MSG_TYPE_SIGN 4
417#define MSG_TYPE_MONUMENT 5
418#define MSG_TYPE_SCRIPTED_DIALOG 6*/
419
420/** Reply to ExtendedInfos command */
421void
422ToggleExtendedText (char *buf, int len, client * ns)
423{
424 char cmdback[MAX_BUF];
425 char temp[10];
426 char command[50];
427 int info, nextinfo, i, flag;
428
429 cmdback[0] = '\0';
430
431 nextinfo = 0;
432 while (1)
433 {
434 /* 1. Extract an info */
435 info = nextinfo;
436
437 while ((info < len) && (buf[info] == ' '))
438 info++;
439
440 if (info >= len)
441 break;
442
443 nextinfo = info + 1;
444
445 while ((nextinfo < len) && (buf[nextinfo] != ' '))
446 nextinfo++;
447
448 if (nextinfo - info >= 49) /*Erroneous info asked */
449 continue;
450
451 strncpy (command, &(buf[info]), nextinfo - info);
452 command[nextinfo - info] = '\0';
453 /* 2. Interpret info */
454 i = sscanf (command, "%d", &flag);
455
456 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
457 ns->supported_readables |= (1 << flag);
458 /*3. Next info */
459 }
460
461 /* Send resulting state */
462 strcpy (cmdback, "ExtendedTextSet");
463
464 for (i = 0; i <= MSG_TYPE_LAST; i++)
465 if (ns->supported_readables & (1 << i))
466 {
467 strcat (cmdback, " ");
468 snprintf (temp, sizeof (temp), "%d", i);
469 strcat (cmdback, temp);
470 }
471
472 ns->send_packet (cmdback);
473}
474
475/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495 472
496/** 473/**
497 * 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,
498 * etc.) 475 * etc.)
499 */ 476 */
… …
512 return; 489 return;
513 490
514 buf++; 491 buf++;
515 } 492 }
516 493
517 execute_newserver_command (pl->ob, (char *) buf); 494 execute_newserver_command (pl->ob, (char *)buf);
518 495
519 /* Perhaps something better should be done with a left over count. 496 /* Perhaps something better should be done with a left over count.
520 * Cleaning up the input should probably be done first - all actions 497 * Cleaning up the input should probably be done first - all actions
521 * 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
522 * commands. 499 * commands.
523 */ 500 */
524 pl->count = 0; 501 pl->count = 0;
525}
526
527
528/**
529 * This handles the general commands from the client (ie, north, fire, cast,
530 * etc.). It is a lot like PlayerCmd above, but is called with the
531 * 'ncom' method which gives more information back to the client so it
532 * can throttle.
533 */
534void
535NewPlayerCmd (char *buf, int len, player *pl)
536{
537 if (len <= 6)
538 {
539 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
540 return;
541 }
542
543 uint16 cmdid = net_uint16 ((uint8 *)buf);
544 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
545
546 /* -1 is special - no repeat, but don't update */
547 if (repeat != -1)
548 pl->count = repeat;
549
550 buf += 6; //len -= 6;
551
552 execute_newserver_command (pl->ob, buf);
553
554 /* Perhaps something better should be done with a left over count.
555 * Cleaning up the input should probably be done first - all actions
556 * for the command that issued the count should be done before any other
557 * commands.
558 */
559 pl->count = 0;
560
561 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
562 int time = fabs (pl->ob->speed) < 0.001
563 ? time = MAX_TIME * 100
564 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
565
566 /* Send confirmation of command execution now */
567 packet sl ("comc");
568 sl << uint16 (cmdid) << uint32 (time);
569 pl->ns->send_packet (sl);
570} 502}
571 503
572/** This is a reply to a previous query. */ 504/** This is a reply to a previous query. */
573void 505void
574ReplyCmd (char *buf, int len, client *ns) 506ReplyCmd (char *buf, int len, client *ns)
… …
611 LOG (llevError, "Unknown input state: %d\n", ns->state); 543 LOG (llevError, "Unknown input state: %d\n", ns->state);
612 } 544 }
613} 545}
614 546
615/** 547/**
616 * Client tells its version. If there is a mismatch, we close the 548 * Client tells its version info.
617 * socket. In real life, all we should care about is the client having
618 * something older than the server. If we assume the client will be
619 * backwards compatible, having it be a later version should not be a
620 * problem.
621 */ 549 */
622void 550void
623VersionCmd (char *buf, int len, client * ns) 551VersionCmd (char *buf, int len, client *ns)
624{ 552{
625 if (!buf) 553 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
626 {
627 LOG (llevError, "CS: received corrupted version command\n");
628 return;
629 }
630
631 ns->cs_version = atoi (buf);
632 ns->sc_version = ns->cs_version;
633
634 LOG (llevDebug, "connection from client <%s>\n", buf);
635
636 //TODO: should log here just for statistics
637
638 //if (VERSION_CS != ns->cs_version)
639 // unchecked;
640
641 char *cp = strchr (buf + 1, ' ');
642 if (!cp)
643 return;
644
645 ns->sc_version = atoi (cp);
646
647 //if (VERSION_SC != ns->sc_version)
648 // unchecked;
649
650 cp = strchr (cp + 1, ' ');
651
652 if (cp)
653 {
654 ns->version = cp + 1;
655
656 if (ns->sc_version < 1026)
657 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
658 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
659 }
660} 554}
661 555
662/** sound related functions. */ 556/** sound related functions. */
663void 557void
664SetSound (char *buf, int len, client * ns) 558SetSound (char *buf, int len, client * ns)
… …
682 * syntax is: move (to) (tag) (nrof) 576 * syntax is: move (to) (tag) (nrof)
683 */ 577 */
684void 578void
685MoveCmd (char *buf, int len, player *pl) 579MoveCmd (char *buf, int len, player *pl)
686{ 580{
687 int vals[3], i; 581 int to, tag, nrof;
688 582
689 /* A little funky here. We only cycle for 2 records, because 583 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
690 * we obviously are not going to find a space after the third
691 * record. Perhaps we should just replace this with a
692 * sscanf?
693 */
694 for (i = 0; i < 2; i++)
695 { 584 {
696 vals[i] = atoi (buf);
697
698 if (!(buf = strchr (buf, ' ')))
699 {
700 LOG (llevError, "Incomplete move command: %s\n", buf); 585 LOG (llevError, "Incomplete move command: %s\n", buf);
701 return; 586 return;
702 }
703
704 buf++;
705 } 587 }
706 588
707 vals[2] = atoi (buf); 589 esrv_move_object (pl->ob, to, tag, nrof);
708
709/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
710 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
711} 590}
712 591
713/****************************************************************************** 592/******************************************************************************
714 * 593 *
715 * Start of commands the server sends to the client. 594 * Start of commands the server sends to the client.
… …
730 * Get player's current range attack in obuf. 609 * Get player's current range attack in obuf.
731 */ 610 */
732static void 611static void
733rangetostring (player *pl, char *obuf) 612rangetostring (player *pl, char *obuf)
734{ 613{
735 dynbuf_text buf; 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
736 625
737 if (pl->ranged_ob) 626 if (pl->ranged_ob)
738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 627 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739 628
740 if (pl->combat_ob) 629 if (pl->combat_ob)
741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 630 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742 631
632#if 0
743 //TODO: remove this when slot system is working, this is only for debugging 633 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill) 634 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name; 635 buf << " Skill*: " << pl->ob->chosen_skill->name;
636#endif
746 637
747 //TODO: maybe golem should become the current_weapon, quite simply? 638 //TODO: maybe golem should become the current_weapon, quite simply?
748 if (pl->golem) 639 if (pl->golem)
749 buf << " Golem*: " << pl->golem->name; 640 buf << " Golem*: " << pl->golem->name;
750 641
642 buf << '\0';
751 buf.linearise (obuf); 643 buf.linearise (obuf);
752 obuf [buf.size ()] = 0;
753} 644}
754 645
755#define AddIfInt64(Old,New,Type) if (Old != New) {\ 646#define AddIfInt64(Old,New,Type) if (Old != New) {\
756 Old = New; \ 647 Old = New; \
757 sl << uint8 (Type) << uint64 (New); \ 648 sl << uint8 (Type) << uint64 (New); \
… …
784 * commands for now. 675 * commands for now.
785 */ 676 */
786void 677void
787esrv_update_stats (player *pl) 678esrv_update_stats (player *pl)
788{ 679{
789 char buf[MAX_BUF];
790 uint16 flags;
791
792 client *ns = pl->ns; 680 client *ns = pl->ns;
793 if (!ns) 681 if (!ns)
794 return; 682 return;
795 683
796 object *ob = pl->observe; 684 object *ob = pl->observe;
797 if (!ob) 685 if (!ob)
798 return; 686 return;
687
688 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799 689
800 packet sl ("stats"); 690 packet sl ("stats");
801 691
802 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 692 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 693 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
811 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 701 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
812 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 702 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 703 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 704 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815 705
816 for (int s = 0; s < NUM_SKILLS; s++) 706 for (int s = 0; s < CS_NUM_SKILLS; s++)
817 if (object *skill = pl->last_skill_ob[s]) 707 if (object *skill = opl->last_skill_ob [s])
818 if (skill->stats.exp != ns->last_skill_exp [s]) 708 if (skill->stats.exp != ns->last_skill_exp [s])
819 { 709 {
820 ns->last_skill_exp [s] = skill->stats.exp; 710 ns->last_skill_exp [s] = skill->stats.exp;
821 711
822 /* Always send along the level if exp changes. This is only 712 /* Always send along the level if exp changes. This is only
823 * 1 extra byte, but keeps processing simpler. 713 * 1 extra byte, but keeps processing simpler.
824 */ 714 */
825 sl << uint8 (s + CS_STAT_SKILLINFO) 715 sl << uint8 (CS_STAT_SKILLINFO + s)
826 << uint8 (skill->level) 716 << uint8 (skill->level)
827 << uint64 (skill->stats.exp); 717 << uint64 (skill->stats.exp);
828 } 718 }
829 719
830 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 720 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
831 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 721 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
832 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 722 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
833 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 723 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
834 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 724 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
835 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 725 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
836 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 726 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
837 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 727 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
838 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);
839 729
840 flags = 0; 730 int flags = (opl->fire_on ? SF_FIREON : 0)
841 731 | (opl->run_on ? SF_RUNON : 0);
842 if (pl->fire_on)
843 flags |= SF_FIREON;
844
845 if (pl->run_on)
846 flags |= SF_RUNON;
847 732
848 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 733 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849 734
850 if (ns->sc_version < 1025)
851 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
852 else
853 for (int i = 0; i < NROFATTACKS; i++) 735 for (int i = 0; i < NROFATTACKS; i++)
854 {
855 /* Skip ones we won't send */ 736 /* Skip ones we won't send */
856 if (atnr_cs_stat[i] == -1) 737 if (atnr_cs_stat[i] >= 0)
857 continue;
858
859 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]);
860 }
861 739
862 if (pl->ns->monitor_spells) 740 if (pl->ns->monitor_spells)
863 { 741 {
864 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);
865 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);
866 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);
867 } 745 }
868 746
747 char buf[MAX_BUF];
869 rangetostring (pl, 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 */
870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 749 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871 set_title (ob, buf); 750 set_title (ob, buf);
872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 751 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873 752
874 /* Only send it away if we have some actual data */ 753 /* Only send it away if we have some actual data */
… …
878 757
879/** 758/**
880 * 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.
881 */ 760 */
882void 761void
883esrv_new_player (player *pl, uint32 weight) 762esrv_new_player (player *pl)
884{ 763{
764 sint32 weight = pl->ob->client_weight ();
765
885 packet sl ("player"); 766 packet sl ("player");
886 767
887 sl << uint32 (pl->ob->count) 768 sl << uint32 (pl->ob->count)
888 << uint32 (weight) 769 << uint32 (weight)
889 << uint32 (pl->ob->face) 770 << uint32 (pl->ob->face)
890 << data8 (pl->ob->name); 771 << data8 (pl->ob->name);
891 772
892 pl->ns->last_weight = weight; 773 pl->ns->last_weight = weight;
893 pl->ns->send_packet (sl); 774 pl->ns->send_packet (sl);
894 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
895} 775}
896 776
897/****************************************************************************** 777/******************************************************************************
898 * 778 *
899 * Start of map related commands. 779 * Start of map related commands.
… …
956 836
957 if (!ns.faces_sent[face_num]) 837 if (!ns.faces_sent[face_num])
958 if (ob) 838 if (ob)
959 ns.send_faces (ob); 839 ns.send_faces (ob);
960 else 840 else
961 ns.send_face (face_num); 841 ns.send_face (face_num, 10);
962 842
963 sl << uint16 (face_num); 843 sl << uint16 (face_num);
964 return 1; 844 return 1;
965 } 845 }
966 846
967 /* Nothing changed */ 847 /* Nothing changed */
968 return 0; 848 return 0;
969} 849}
970 850
971/** 851/**
972 * Returns the size of a data for a map square as returned by
973 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
974 * available.
975 */
976int
977getExtendedMapInfoSize (client * ns)
978{
979 int result = 0;
980
981 if (ns->ext_mapinfos)
982 {
983 if (ns->EMI_smooth)
984 result += 1; /*One byte for smoothlevel */
985 }
986
987 return result;
988}
989
990// prefetch (and touch) all maps within a specific distancd
991static void
992prefetch_surrounding_maps (maptile *map, int distance)
993{
994 map->last_access = runtime;
995
996 if (--distance)
997 for (int dir = 4; --dir; )
998 if (const shstr &path = map->tile_path [dir])
999 if (maptile *&neigh = map->tile_map [dir])
1000 prefetch_surrounding_maps (neigh, distance);
1001 else
1002 neigh = maptile::find_async (path, map);
1003}
1004
1005// prefetch a generous area around the player
1006static void
1007prefetch_surrounding_maps (object *op)
1008{
1009 prefetch_surrounding_maps (op->map, 3);
1010}
1011
1012/**
1013 * Draws client map. 852 * Draws client map.
1014 */ 853 */
1015void 854void
1016draw_client_map (player *pl) 855draw_client_map (player *pl)
1017{ 856{
1018 object *ob = pl->observe; 857 object *ob = pl->viewpoint;
1019 if (!ob->active) 858 if (!pl->observe->active)
1020 return; 859 return;
1021
1022 maptile *plmap = ob->map;
1023 860
1024 /* 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
1025 * 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
1026 * be OK once they really log in. 863 * be OK once they really log in.
1027 */ 864 */
1028 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 865 if (!ob->map || ob->map->state != MAP_ACTIVE)
1029 return; 866 return;
1030 867
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen; 868 int startlen, oldlen;
1034 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos;
1037 maptile *m;
1038 869
1039 check_map_change (pl); 870 check_map_change (pl);
1040 prefetch_surrounding_maps (pl->ob); 871 pl->ob->prefetch_surrounding_maps ();
1041 872
1042 /* do LOS after calls to update_position */ 873 /* do LOS after calls to update_position */
1043 if (ob != pl->ob) 874 /* unfortunately, we need to udpate los when observing, currently */
1044 clear_los (pl); 875 if (pl->do_los || pl->viewpoint != pl->ob)
1045 else if (pl->do_los)
1046 { 876 {
1047 update_los (ob);
1048 pl->do_los = 0; 877 pl->do_los = 0;
878 pl->update_los ();
1049 } 879 }
1050 880
1051 /** 881 /**
1052 * This function uses the new map1 protocol command to send the map 882 * This function uses the new map1 protocol command to send the map
1053 * to the client. It is necessary because the old map command supports 883 * to the client. It is necessary because the old map command supports
… …
1071 * look like. 901 * look like.
1072 */ 902 */
1073 903
1074 client &socket = *pl->ns; 904 client &socket = *pl->ns;
1075 905
1076 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 906 packet sl ("map1a");
1077 packet esl;
1078 907
1079 startlen = sl.length (); 908 startlen = sl.length ();
1080 909
1081 /*Extendedmapinfo structure initialisation */ 910 int hx = socket.mapx / 2;
1082 if (socket.ext_mapinfos) 911 int hy = socket.mapy / 2;
1083 {
1084 extendedinfos = EMI_NOREDRAW;
1085 912
1086 if (socket.EMI_smooth) 913 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1087 extendedinfos |= EMI_SMOOTH; 914 int ax = dx + hx;
915 int ay = dy + hy;
1088 916
1089 ewhatstart = esl.length (); 917 int mask = (ax << 10) | (ay << 4);
1090 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1091 could need to be taken away */
1092 eentrysize = getExtendedMapInfoSize (&socket);
1093 esl << "mapextended "
1094 << uint8 (extendedinfos)
1095 << uint8 (eentrysize);
1096
1097 estartlen = esl.length ();
1098 }
1099
1100 /* x,y are the real map locations. ax, ay are viewport relative
1101 * locations.
1102 */
1103 ay = 0;
1104
1105 /* We could do this logic as conditionals in the if statement,
1106 * but that started to get a bit messy to look at.
1107 */
1108 max_x = ob->x + (socket.mapx + 1) / 2;
1109 max_y = ob->y + (socket.mapy + 1) / 2;
1110
1111 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1112 {
1113 ax = 0;
1114 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1115 {
1116 int emask, mask;
1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1118
1119 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 918 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1120 919
1121 /* If the coordinates are not valid, or it is too dark to see, 920 /* If the coordinates are not valid, or it is too dark to see,
1122 * we tell the client as such 921 * we tell the client as such
922 */
923 if (!m)
924 {
925 /* space is out of map. Update space and clear values
926 * if this hasn't already been done. If the space is out
927 * of the map, it shouldn't have a head.
1123 */ 928 */
1124 nx = x; 929 if (lastcell.count != -1)
1125 ny = y; 930 {
1126 m = get_map_from_coord (plmap, &nx, &ny); 931 sl << uint16 (mask);
932 map_clearcell (&lastcell, -1);
933 }
1127 934
1128 if (!m) 935 continue;
936 }
937
938 int d = pl->blocked_los_uc (dx, dy);
939
940 if (d > 3)
941 {
942 /* This block deals with spaces that are not visible for whatever
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);
956 }
957 else
958 {
959 /* In this block, the space is visible.
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)
1129 { 1003 {
1130 /* space is out of map. Update space and clear values 1004 if (op->stats.maxhp > op->stats.hp
1131 * if this hasn't already been done. If the space is out 1005 && op->stats.maxhp > 0
1132 * of the map, it shouldn't have a head 1006 && (op->type == PLAYER
1133 */ 1007 || op->type == DOOR // does not work, have maxhp 0
1134 if (lastcell.count != -1) 1008 || op->flag [FLAG_MONSTER]
1009 || op->flag [FLAG_ALIVE]
1010 || op->flag [FLAG_GENERATOR]))
1135 { 1011 {
1136 sl << uint16 (mask); 1012 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1137 map_clearcell (&lastcell, -1); 1013 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1138 } 1014 }
1139 1015
1140 continue; 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;
1141 } 1023 }
1142
1143 m->touch ();
1144 1024
1145 int d = pl->blocked_los[ax][ay]; 1025 if (expect_false (lastcell.stat_hp != stat_hp))
1146
1147 if (d > 3)
1148 { 1026 {
1027 lastcell.stat_hp = stat_hp;
1149 1028
1150 int need_send = 0, count; 1029 mask |= 0x8;
1030 *last_ext |= 0x80;
1031 last_ext = &sl[sl.length ()];
1151 1032
1152 /* This block deals with spaces that are not visible for whatever 1033 sl << uint8 (5) << uint8 (stat_hp);
1153 * reason. Still may need to send the head for this space.
1154 */
1155 1034
1156 oldlen = sl.length (); 1035 if (stat_width > 1)
1157
1158 sl << uint16 (mask);
1159
1160 if (lastcell.count != -1)
1161 need_send = 1;
1162
1163 count = -1;
1164
1165 /* properly clear a previously sent big face */
1166 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1167 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1168 need_send = 1;
1169
1170 map_clearcell (&lastcell, count);
1171
1172 if ((mask & 0xf) || need_send)
1173 sl[oldlen + 1] = mask & 0xff;
1174 else
1175 sl.reset (oldlen);
1176 }
1177 else
1178 {
1179 /* In this block, the space is visible.
1180 */
1181
1182 /* Rather than try to figure out what everything that we might
1183 * need to send is, then form the packet after that,
1184 * we presume that we will in fact form a packet, and update
1185 * the bits by what we do actually send. If we send nothing,
1186 * we just back out sl.length () to the old value, and no harm
1187 * is done.
1188 * I think this is simpler than doing a bunch of checks to see
1189 * what if anything we need to send, setting the bits, then
1190 * doing those checks again to add the real data.
1191 */
1192 oldlen = sl.length ();
1193 eoldlen = esl.length ();
1194
1195 sl << uint16 (mask);
1196
1197 unsigned char dummy;
1198 unsigned char *last_ext = &dummy;
1199
1200 /* Darkness changed */
1201 if (lastcell.count != d && socket.darkness)
1202 { 1036 {
1203 mask |= 0x8;
1204
1205 if (socket.extmap)
1206 {
1207 *last_ext |= 0x80; 1037 *last_ext |= 0x80;
1208 last_ext = &sl[sl.length ()]; 1038 last_ext = &sl[sl.length ()];
1209 sl << uint8 (d); 1039
1210 } 1040 sl << uint8 (6) << uint8 (stat_width);
1211 else
1212 sl << uint8 (255 - 64 * d);
1213 } 1041 }
1042 }
1214 1043
1215 lastcell.count = d; 1044 if (expect_false (lastcell.player != player))
1216
1217 mapspace &ms = m->at (nx, ny);
1218
1219 if (socket.extmap)
1220 { 1045 {
1221 uint8 stat_hp = 0; 1046 lastcell.player = player;
1222 uint8 stat_width = 0;
1223 uint8 flags = 0;
1224 tag_t player = 0;
1225 1047
1226 // send hp information, if applicable
1227 if (object *op = ms.faces_obj [0])
1228 {
1229 if (op->head || op->invisible)
1230 ; // do not show
1231 else if (op->type == PLAYER
1232 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1233 {
1234 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1235 {
1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1237 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1238 }
1239 }
1240
1241 if (op->msg && op->msg[0] == '@')
1242 flags |= 1;
1243
1244 if (op->type == PLAYER && op != ob)
1245 player = op->count;
1246 }
1247
1248 if (lastcell.stat_hp != stat_hp)
1249 {
1250 lastcell.stat_hp = stat_hp;
1251
1252 mask |= 0x8; 1048 mask |= 0x8;
1253 *last_ext |= 0x80; 1049 *last_ext |= 0x80;
1254 last_ext = &sl[sl.length ()]; 1050 last_ext = &sl[sl.length ()];
1255 1051
1256 sl << uint8 (5) << uint8 (stat_hp);
1257
1258 if (stat_width > 1)
1259 {
1260 *last_ext |= 0x80;
1261 last_ext = &sl[sl.length ()];
1262
1263 sl << uint8 (6) << uint8 (stat_width);
1264 }
1265 }
1266
1267 if (lastcell.player != player)
1268 {
1269 lastcell.player = player;
1270
1271 mask |= 0x8;
1272 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()];
1274
1275 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1052 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1276 } 1053 }
1277 1054
1278 if (lastcell.flags != flags) 1055 if (expect_false (lastcell.flags != flags))
1279 { 1056 {
1280 lastcell.flags = flags; 1057 lastcell.flags = flags;
1281 1058
1282 mask |= 0x8; 1059 mask |= 0x8;
1283 *last_ext |= 0x80; 1060 *last_ext |= 0x80;
1284 last_ext = &sl[sl.length ()]; 1061 last_ext = &sl[sl.length ()];
1285 1062
1286 sl << uint8 (8) << uint8 (flags); 1063 sl << uint8 (8) << uint8 (flags);
1287 }
1288 } 1064 }
1289 1065
1066 // faces
1067
1290 /* Floor face */ 1068 /* Floor face */
1291 if (update_space (sl, socket, ms, lastcell, 2)) 1069 if (update_space (sl, socket, ms, lastcell, 2))
1292 mask |= 0x4; 1070 mask |= 0x4;
1293 1071
1294 /* Middle face */ 1072 /* Middle face */
1295 if (update_space (sl, socket, ms, lastcell, 1)) 1073 if (update_space (sl, socket, ms, lastcell, 1))
1296 mask |= 0x2; 1074 mask |= 0x2;
1297 1075
1076 if (expect_false (ob->invisible)
1077 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1298 if (ms.player () == ob 1078 && ms.player () == ob)
1299 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1300 { 1079 {
1301 // force player to be visible to himself if invisible 1080 // force player to be visible to himself if invisible
1302 if (lastcell.faces[0] != ob->face) 1081 if (lastcell.faces[0] != ob->face)
1303 { 1082 {
1304 lastcell.faces[0] = ob->face; 1083 lastcell.faces[0] = ob->face;
1305 1084
1306 mask |= 0x1;
1307 sl << uint16 (ob->face);
1308
1309 socket.send_faces (ob);
1310 }
1311 }
1312 /* Top face */
1313 else if (update_space (sl, socket, ms, lastcell, 0))
1314 mask |= 0x1; 1085 mask |= 0x1;
1086 sl << uint16 (ob->face);
1315 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
1316 /* Check to see if we are in fact sending anything for this 1095 /* Check to see if we are in fact sending anything for this
1317 * space by checking the mask. If so, update the mask. 1096 * space by checking the mask. If so, update the mask.
1318 * if not, reset the len to that from before adding the mask 1097 * if not, reset the len to that from before adding the mask
1319 * value, so we don't send those bits. 1098 * value, so we don't send those bits.
1320 */ 1099 */
1321 if (mask & 0xf) 1100 if (mask & 0xf)
1322 sl[oldlen + 1] = mask & 0xff; 1101 sl[oldlen + 1] = mask & 0xff;
1323 else 1102 else
1324 sl.reset (oldlen); 1103 sl.reset (oldlen);
1325
1326 if (socket.ext_mapinfos)
1327 esl << uint16 (emask);
1328
1329 if (socket.EMI_smooth)
1330 {
1331 for (int layer = 2+1; layer--; )
1332 {
1333 object *ob = ms.faces_obj [layer];
1334
1335 // If there is no object for this space, or if the face for the object
1336 // is the blank face, set the smoothlevel to zero.
1337 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1338
1339 // We've gotten what face we want to use for the object. Now see if
1340 // if it has changed since we last sent it to the client.
1341 if (lastcell.smooth[layer] != smoothlevel)
1342 {
1343 lastcell.smooth[layer] = smoothlevel;
1344 esl << uint8 (smoothlevel);
1345 emask |= 1 << layer;
1346 }
1347 }
1348
1349 if (emask & 0xf)
1350 esl[eoldlen + 1] = emask & 0xff;
1351 else
1352 esl.reset (eoldlen);
1353 }
1354 } /* else this is a viewable space */ 1104 } /* else this is a viewable space */
1355 } /* for x loop */ 1105 ordered_mapwalk_end
1356 } /* for y loop */
1357 1106
1358 socket.flush_fx (); 1107 socket.flush_fx ();
1359
1360 /* Verify that we in fact do need to send this */
1361 if (socket.ext_mapinfos)
1362 {
1363 if (!(sl.length () > startlen || socket.sent_scroll))
1364 {
1365 /* No map data will follow, so don't say the client
1366 * it doesn't need draw!
1367 */
1368 ewhatflag &= ~EMI_NOREDRAW;
1369 esl[ewhatstart + 1] = ewhatflag & 0xff;
1370 }
1371
1372 if (esl.length () > estartlen)
1373 socket.send_packet (esl);
1374 }
1375 1108
1376 if (sl.length () > startlen || socket.sent_scroll) 1109 if (sl.length () > startlen || socket.sent_scroll)
1377 { 1110 {
1378 socket.send_packet (sl); 1111 socket.send_packet (sl);
1379 socket.sent_scroll = 0; 1112 socket.sent_scroll = 0;
1380 } 1113 }
1381} 1114}
1382 1115
1383/*****************************************************************************/
1384/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1385/* a player. Of course, the client need to know the command to be able to */
1386/* manage it ! */
1387/*****************************************************************************/
1388void
1389send_plugin_custom_message (object *pl, char *buf)
1390{
1391 pl->contr->ns->send_packet (buf);
1392}
1393
1394/**
1395 * This sends the skill number to name mapping. We ignore
1396 * the params - we always send the same info no matter what.
1397 */
1398void
1399send_skill_info (client *ns, char *params)
1400{
1401 packet sl;
1402 sl << "replyinfo skill_info\n";
1403
1404 for (int i = 1; i < NUM_SKILLS; i++)
1405 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1406
1407 if (sl.length () >= MAXSOCKBUF)
1408 {
1409 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1410 fatal (0);
1411 }
1412
1413 ns->send_packet (sl);
1414}
1415
1416/**
1417 * This sends the spell path to name mapping. We ignore
1418 * the params - we always send the same info no matter what.
1419 */
1420void
1421send_spell_paths (client * ns, char *params)
1422{
1423 packet sl;
1424
1425 sl << "replyinfo spell_paths\n";
1426
1427 for (int i = 0; i < NRSPELLPATHS; i++)
1428 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1429
1430 if (sl.length () >= MAXSOCKBUF)
1431 {
1432 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1433 fatal (0);
1434 }
1435
1436 ns->send_packet (sl);
1437}
1438
1439/** 1116/**
1440 * 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.
1441 * 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
1442 */ 1119 */
1443void 1120void
1444esrv_update_spells (player *pl) 1121esrv_update_spells (player *pl)
1445{ 1122{
1446 if (!pl->ns) 1123 if (!pl->ns)
1447 return; 1124 return;
1448 1125
1126 pl->ns->update_spells = false;
1127
1449 if (!pl->ns->monitor_spells) 1128 if (!pl->ns->monitor_spells)
1450 return; 1129 return;
1451 1130
1452 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1453 {
1454 if (spell->type == SPELL) 1132 if (spell->type == SPELL)
1455 { 1133 {
1456 int flags = 0; 1134 int flags = 0;
1135 int val;
1457 1136
1458 /* check if we need to update it */ 1137 /* check if we need to update it */
1459 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)
1460 { 1140 {
1461 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1141 spell->cached_sp = val;
1462 flags |= UPD_SP_MANA; 1142 flags |= UPD_SP_MANA;
1463 } 1143 }
1464 1144
1465 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)
1466 { 1147 {
1467 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1148 spell->cached_grace = val;
1468 flags |= UPD_SP_GRACE; 1149 flags |= UPD_SP_GRACE;
1469 } 1150 }
1470 1151
1471 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)
1472 { 1154 {
1473 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1155 spell->cached_eat = val;
1474 flags |= UPD_SP_DAMAGE; 1156 flags |= UPD_SP_LEVEL;
1475 } 1157 }
1476 1158
1477 if (flags) 1159 if (flags)
1478 { 1160 {
1479 packet sl; 1161 packet sl;
1480 1162
1481 sl << "updspell " 1163 sl << "updspell "
1482 << uint8 (flags) 1164 << uint8 (flags)
1483 << uint32 (spell->count); 1165 << uint32 (spell->count);
1484 1166
1485 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1167 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1486 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1168 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1487 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1169 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1488 1170
1489 pl->ns->send_packet (sl); 1171 pl->ns->send_packet (sl);
1490 } 1172 }
1491 } 1173 }
1492 }
1493} 1174}
1494 1175
1495void 1176void
1496esrv_remove_spell (player *pl, object *spell) 1177esrv_remove_spell (player *pl, object *spell)
1497{ 1178{
… …
1513 1194
1514/* 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. */
1515static void 1196static void
1516append_spell (player *pl, packet &sl, object *spell) 1197append_spell (player *pl, packet &sl, object *spell)
1517{ 1198{
1518 int i, skill = 0; 1199 int skill = 0;
1519 1200
1520 if (!(spell->name)) 1201 if (!(spell->name))
1521 { 1202 {
1522 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);
1523 return; 1204 return;
1524 } 1205 }
1525 1206
1526 /* 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 */
1527 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);
1528 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);
1529 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1210 spell->cached_eat = casting_level (pl->ob, spell);
1530 1211
1531 /* figure out which skill it uses, if it uses one */ 1212 /* figure out which skill it uses, if it uses one */
1532 if (spell->skill) 1213 if (spell->skill)
1533 { 1214 if (object *tmp = pl->find_skill (spell->skill))
1534 for (i = 1; i < NUM_SKILLS; i++) 1215 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1535 if (!strcmp (spell->skill, skill_names[i]))
1536 {
1537 skill = i + CS_STAT_SKILLINFO;
1538 break;
1539 }
1540 }
1541 1216
1542 // spells better have a face 1217 // spells better have a face
1543 if (!spell->face) 1218 if (!spell->face)
1544 { 1219 {
1545 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);
1546 spell->face = face_find ("burnout.x11", blank_face); 1221 spell->face = face_find ("burnout.x11", blank_face);
1547 } 1222 }
1223
1224 pl->ns->send_face (spell->face);
1548 1225
1549 /* send the current values */ 1226 /* send the current values */
1550 sl << uint32 (spell->count) 1227 sl << uint32 (spell->count)
1551 << uint16 (spell->level) 1228 << uint16 (spell->level)
1552 << uint16 (spell->casting_time) 1229 << uint16 (spell->casting_time)
1553 << uint16 (spell->last_sp) 1230 << uint16 (spell->cached_sp)
1554 << uint16 (spell->last_grace) 1231 << uint16 (spell->cached_grace)
1555 << uint16 (spell->last_eat) 1232 << uint16 (spell->cached_eat)
1556 << uint8 (skill) 1233 << uint8 (skill)
1557 << uint32 (spell->path_attuned) 1234 << uint32 (spell->path_attuned)
1558 << uint32 (spell->face) 1235 << uint32 (spell->face)
1559 << data8 (spell->name) 1236 << data8 (spell->name);
1237
1238 if (pl->ns->monitor_spells < 2)
1560 << data16 (spell->msg); 1239 sl << data16 (spell->msg);
1561} 1240}
1562 1241
1563/** 1242/**
1564 * 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
1565 * all spells in the player's inventory. 1244 * all spells in the player's inventory.
1566 */ 1245 */
1567void 1246void
1568esrv_add_spells (player *pl, object *spell) 1247esrv_add_spells (player *pl, object *spell)
1569{ 1248{
… …
1580 1259
1581 if (!spell) 1260 if (!spell)
1582 { 1261 {
1583 for (spell = pl->ob->inv; spell; spell = spell->below) 1262 for (spell = pl->ob->inv; spell; spell = spell->below)
1584 { 1263 {
1585 /* were we to simply keep appending data here, we could exceed 1264 /* were we to simply keep appending data here, we could exceed
1586 * 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
1587 * append_spells will always append 19 data bytes, plus 4 length 1266 * append_spells will always append 19 data bytes, plus 4 length
1588 * 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
1589 * 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,
1590 * 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,
1591 * 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
1592 */ 1271 */
1272 if (spell->type != SPELL)
1273 continue;
1274
1593 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1275 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1594 * 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
1595 * 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
1596 * like it will fix this 1278 * like it will fix this
1597 */ 1279 */
1598 if (spell->type != SPELL)
1599 continue;
1600
1601 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))))
1602 { 1281 {
1282 pl->ns->flush_fx ();
1603 pl->ns->send_packet (sl); 1283 pl->ns->send_packet (sl);
1604 1284
1605 sl.reset (); 1285 sl.reset ();
1606 sl << "addspell "; 1286 sl << "addspell ";
1607 } 1287 }
… …
1615 return; 1295 return;
1616 } 1296 }
1617 else 1297 else
1618 append_spell (pl, sl, spell); 1298 append_spell (pl, sl, spell);
1619 1299
1620 if (sl.length () >= MAXSOCKBUF) 1300 if (sl.length () > MAXSOCKBUF)
1621 {
1622 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1301 cleanup ("buffer overflow in esrv_add_spells!");
1623 fatal (0);
1624 }
1625 1302
1626 /* finally, we can send the packet */ 1303 /* finally, we can send the packet */
1304 pl->ns->flush_fx ();
1627 pl->ns->send_packet (sl); 1305 pl->ns->send_packet (sl);
1628} 1306}
1629 1307
1308//-GPL
1309

Diff Legend

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