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.71 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC

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

Diff Legend

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