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.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.188 by root, Mon Oct 29 23:55:57 2012 UTC

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

Diff Legend

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