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.83 by root, Mon Apr 2 18:04:47 2007 UTC vs.
Revision 1.195 by root, Sat Nov 17 23:40:05 2018 UTC

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

Diff Legend

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