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.42 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.195 by root, Sat Nov 17 23:40:05 2018 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel 6 * Copyright (©) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
6 8 *
7 This program is free software; you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 12 * option) any later version.
11 13 *
12 This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 17 * GNU General Public License for more details.
16 18 *
17 You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 20 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * <http://www.gnu.org/licenses/>.
20 22 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 24 */
25
26//+GPL
23 27
24/** 28/**
25 * \file 29 * \file
26 * Client handling. 30 * Client handling.
27 * 31 *
28 * \date 2003-12-02 32 * \date 2003-12-02
29 * 33 *
30 * This file implements all of the goo on the server side for handling 34 * This file implements all of the goo on the server side for handling
31 * clients. It's got a bunch of global variables for keeping track of 35 * clients. It's got a bunch of global variables for keeping track of
32 * each of the clients. 36 * each of the clients.
33 * 37 *
34 * Note: All functions that are used to process data from the client 38 * Note: All functions that are used to process data from the client
35 * have the prototype of (char *data, int datalen, int client_num). This 39 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 40 * way, we can use one dispatch table.
37 * 41 *
38 * esrv_map_new starts updating the map 42 * esrv_map_new starts updating the map
39 * 43 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 44 */
47 45
48#include <global.h> 46#include <global.h>
49#include <sproto.h> 47#include <sproto.h>
50 48
51#include <living.h> 49#include <living.h>
52#include <commands.h>
53 50
54/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
55 * it should work here. 52 * it should work here.
56 */ 53 */
57#include <sys/types.h> 54#include <sys/types.h>
… …
69 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
70 * program to the value we use when sending STATS command to the 67 * program to the value we use when sending STATS command to the
71 * client. If a value is -1, then we don't send that to the 68 * client. If a value is -1, then we don't send that to the
72 * client. 69 * client.
73 */ 70 */
74short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] =
75 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72{
76 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_PHYS,
77 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_MAG,
78 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_FIRE,
79 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_ELEC,
80 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 77 CS_STAT_RES_COLD,
81 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 78 CS_STAT_RES_CONF,
82 -1 /* Chaos */ , -1 /* Counterspell */ , 79 CS_STAT_RES_ACID,
83 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD, 80 CS_STAT_RES_DRAIN,
81 -1 /* weaponmagic */,
82 CS_STAT_RES_GHOSTHIT,
83 CS_STAT_RES_POISON,
84 CS_STAT_RES_SLOW,
85 CS_STAT_RES_PARA,
86 CS_STAT_TURN_UNDEAD,
87 CS_STAT_RES_FEAR,
88 -1 /* Cancellation */,
89 CS_STAT_RES_DEPLETE,
90 CS_STAT_RES_DEATH,
91 -1 /* Chaos */,
92 -1 /* Counterspell */,
93 -1 /* Godpower */,
94 CS_STAT_RES_HOLYWORD,
84 CS_STAT_RES_BLIND, 95 CS_STAT_RES_BLIND,
85 -1, /* Internal */ 96 -1, /* Internal */
86 -1, /* life stealing */ 97 -1, /* life stealing */
87 -1 /* Disease - not fully done yet */ 98 -1 /* Disease - not fully done yet */
88}; 99};
89 100
90static void 101static void
91socket_map_scroll (client * ns, int dx, int dy) 102socket_map_scroll (client *ns, int dx, int dy)
92{ 103{
93 struct Map newmap; 104 struct Map newmap;
94 int x, y, mx, my; 105 int x, y, mx, my;
95 106
96 ns->send_packet_printf ("map_scroll %d %d", dx, dy); 107 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
… …
103 * that much difference in bandwidth. 114 * that much difference in bandwidth.
104 */ 115 */
105 mx = ns->mapx; 116 mx = ns->mapx;
106 my = ns->mapy; 117 my = ns->mapy;
107 118
108 if (ns->mapmode == Map1aCmd)
109 {
110 mx += MAX_HEAD_OFFSET;
111 my += MAX_HEAD_OFFSET;
112 }
113
114 /* the x and y here are coordinates for the new map, i.e. if we moved 119 /* the x and y here are coordinates for the new map, i.e. if we moved
115 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 120 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
116 * if the destination x or y coordinate is outside the viewable 121 * if the destination x or y coordinate is outside the viewable
117 * area, we clear the values - otherwise, the old values 122 * area, we clear the values - otherwise, the old values
118 * are preserved, and the check_head thinks it needs to clear them. 123 * are preserved, and the check_head thinks it needs to clear them.
119 */ 124 */
120 for (x = 0; x < mx; x++) 125 for (x = 0; x < mx; x++)
121 {
122 for (y = 0; y < my; y++) 126 for (y = 0; y < my; y++)
123 {
124 if (x >= ns->mapx || y >= ns->mapy) 127 if (x >= ns->mapx || y >= ns->mapy)
125 /* clear cells outside the viewable area */ 128 /* clear cells outside the viewable area */
126 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 129 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
127 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 130 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
128 /* clear newly visible tiles within the viewable area */ 131 /* clear newly visible tiles within the viewable area */
129 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 132 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
130 else 133 else
131 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 134 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
132 }
133 }
134 135
135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 136 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
136 137
137 /* Make sure that the next "map1" command will be sent (even if it is 138 /* Make sure that the next "map1" command will be sent (even if it is
138 * empty). 139 * empty).
… …
141} 142}
142 143
143static void 144static void
144clear_map (player *pl) 145clear_map (player *pl)
145{ 146{
147 pl->ns->mapinfo_queue_clear ();
148
149 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
150
151 pl->ns->force_newmap = false;
152 pl->ns->send_packet ("newmap");
153 pl->ns->floorbox_reset ();
154}
155
156static void
157send_map_info (player *pl)
158{
146 client &socket = *pl->socket; 159 client &socket = *pl->ns;
160 object *ob = pl->viewpoint;
147 161
148 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
149
150 if (socket.newmapcmd == 1) 162 if (socket.mapinfocmd)
163 {
164 if (ob->map && ob->map->path)
165 {
166 int flags = 0;
167
168 // due to historical glitches, the bit ordering and map index ordering differs
169 if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
170 if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
171 if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
172 if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
173 // these two are debatable
174 if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
175 if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
176
177 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
178 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
179 ob->map->width, ob->map->height, &ob->map->path);
180 }
181 else
151 socket.send_packet ("newmap"); 182 socket.send_packet ("mapinfo current");
152 183 }
153 socket.update_look = 1;
154 socket.look_position = 0;
155} 184}
156 185
157/** check for map change and send new map data */ 186/** check for map/region change and send new map data */
158static void 187static void
159check_map_change (player *pl) 188check_map_change (player *pl)
160{ 189{
161 client &socket = *pl->socket; 190 client &socket = *pl->ns;
162 object *ob = pl->ob; 191 object *ob = pl->viewpoint;
163 char buf[MAX_BUF]; /* eauugggh */
164 192
165 if (socket.current_map != ob->map) 193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
197 socket.current_region = reg;
166 { 198 }
199
200 // first try to avoid a full newmap on tiled map scrolls
201 if (socket.current_map != ob->map && !socket.force_newmap)
202 {
203 rv_vector rv;
204
205 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
206
207 // manhattan distance is very handy here
208 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
209 {
210 socket.current_map = ob->map;
211 socket.current_x = ob->x;
212 socket.current_y = ob->y;
213
214 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
215 socket.floorbox_reset ();
216 send_map_info (pl);
217 }
218 }
219
220 if (socket.current_map != ob->map || socket.force_newmap)
221 {
222 clear_map (pl);
167 socket.current_map = ob->map; 223 socket.current_map = ob->map;
168 224 send_map_info (pl);
169 clear_map (pl);
170
171 if (socket.mapinfocmd)
172 {
173 if (ob->map && ob->map->path[0])
174 {
175 int flags = 0;
176
177 if (ob->map->tile_path[0])
178 flags |= 1;
179 if (ob->map->tile_path[1])
180 flags |= 2;
181 if (ob->map->tile_path[2])
182 flags |= 4;
183 if (ob->map->tile_path[3])
184 flags |= 8;
185
186 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
187 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
188 }
189 else
190 snprintf (buf, MAX_BUF, "mapinfo current");
191
192 socket.send_packet (buf);
193 }
194 } 225 }
195 else if (socket.current_x != ob->x || socket.current_y != ob->y) 226 else if (socket.current_x != ob->x || socket.current_y != ob->y)
196 { 227 {
197 int dx = ob->x - socket.current_x; 228 int dx = ob->x - socket.current_x;
198 int dy = ob->y - socket.current_y; 229 int dy = ob->y - socket.current_y;
199 230
200 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
202 else
203 {
204 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 231 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
205 socket.update_look = 1; 232 socket.floorbox_reset ();
206 socket.look_position = 0;
207 }
208 } 233 }
209 234
210 socket.current_x = ob->x; 235 socket.current_x = ob->x;
211 socket.current_y = ob->y; 236 socket.current_y = ob->y;
237}
238
239/**
240 * This sends the skill number to name mapping. We ignore
241 * the params - we always send the same info no matter what.
242 */
243static void
244send_skill_info (client *ns, char *params)
245{
246 packet sl;
247 sl << "replyinfo skill_info\n";
248
249 for (int i = 0; i < skillvec.size (); ++i)
250 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
251
252 if (sl.length () > MAXSOCKBUF)
253 cleanup ("buffer overflow in send_skill_info!");
254
255 ns->send_packet (sl);
256}
257
258/**
259 * This sends the spell path to name mapping. We ignore
260 * the params - we always send the same info no matter what.
261 */
262static void
263send_spell_paths (client * ns, char *params)
264{
265 packet sl;
266
267 sl << "replyinfo spell_paths\n";
268
269 for (int i = 0; i < NRSPELLPATHS; i++)
270 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
271
272 if (sl.length () > MAXSOCKBUF)
273 cleanup ("buffer overflow in send_spell_paths!");
274
275 ns->send_packet (sl);
212} 276}
213 277
214/** 278/**
215 * RequestInfo is sort of a meta command. There is some specific 279 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 280 * request of information, but we call other functions to provide
217 * that information. 281 * that information.
282 * requestinfo is completely deprecated, use resource exti request
283 * and the fxix or http protocols.
218 */ 284 */
219void 285void
220RequestInfo (char *buf, int len, client * ns) 286RequestInfo (char *buf, int len, client *ns)
221{ 287{
222 char *params = NULL, *cp; 288 char *params;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234 289
235 /* find the first space, make it null, and update the 290 /* find the first space, make it null, and update the
236 * params pointer. 291 * params pointer.
237 */ 292 */
238 for (cp = buf; *cp != '\0'; cp++) 293 for (params = buf; *params; params++)
239 if (*cp == ' ') 294 if (*params == ' ')
240 { 295 {
241 *cp = '\0';
242 params = cp + 1; 296 *params++ = 0;
243 break; 297 break;
244 } 298 }
245 299
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info")) 300 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 301 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 302 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 303 send_spell_paths (ns, params);
254 else 304 else
255 ns->send_packet (bigbuf, len); 305 {
306 // undo tokenisation above and send replyinfo with the request unchanged
307 if (*params)
308 *--params = ' ';
309
310 ns->send_packet_printf ("replyinfo %s", buf);
311 }
256} 312}
257 313
258void 314void
259ExtCmd (char *buf, int len, player *pl) 315ExtCmd (char *buf, int len, player *pl)
260{ 316{
261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 317 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
318}
319
320void
321ExtiCmd (char *buf, int len, client *ns)
322{
323 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
324}
325
326//-GPL
327
328void
329client::mapinfo_queue_clear ()
330{
331 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
332 free (*i);
333
334 mapinfo_queue.clear ();
335}
336
337bool
338client::mapinfo_try (char *buf)
339{
340 char *token = buf;
341 buf += strlen (buf) + 9;
342
343 // initial map and its origin
344 maptile *map = pl->viewpoint->map;
345 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
346 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
347 int max_distance = 8; // limit maximum path length to something generous
348
349 while (*buf && map && max_distance)
350 {
351 int dir = *buf++ - '1';
352
353 // due to historical glitches, the mapinfo index and tile index differs
354 static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
355
356 // maybe we should only allow the four flat directions
357 if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
358 {
359 dir = dirmap [dir];
360
361 if (!map->tile_path [dir])
362 map = 0;
363 else if (map->tile_available (dir, false))
364 {
365 maptile *neigh = map->tile_map [dir];
366
367 switch (dir)
368 {
369 case 0: mapy -= neigh->height; break;
370 case 2: mapy += map ->height; break;
371 case 3: mapx -= neigh->width ; break;
372 case 1: mapx += map ->width ; break;
373 }
374
375 map = neigh;
376 --max_distance;
377 }
378 else
379 return 0;
380 }
381 else
382 max_distance = 0;
383 }
384
385 if (!max_distance)
386 send_packet_printf ("mapinfo %s error", token);
387 else if (!map || !map->path)
388 send_packet_printf ("mapinfo %s nomap", token);
389 else
390 {
391 int flags = 0;
392
393 // due to historical glitches, the bit ordering and map index ordering differs
394 if (map->tile_path [TILE_NORTH]) flags |= 0x01;
395 if (map->tile_path [TILE_EAST ]) flags |= 0x02;
396 if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
397 if (map->tile_path [TILE_WEST ]) flags |= 0x08;
398 // these two are debatable
399 if (map->tile_path [TILE_UP ]) flags |= 0x10;
400 if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
401
402 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
403 }
404
405 return 1;
406}
407
408void
409client::mapinfo_queue_run ()
410{
411 if (mapinfo_queue.empty () || !pl)
412 return;
413
414 for (int i = 0; i < mapinfo_queue.size (); ++i)
415 if (mapinfo_try (mapinfo_queue [i]))
416 {
417 free (mapinfo_queue [i]);
418 mapinfo_queue.erase (i);
419 }
420 else
421 ++i;
262} 422}
263 423
264void 424void
265MapInfoCmd (char *buf, int len, player *pl) 425MapInfoCmd (char *buf, int len, player *pl)
266{ 426{
267 // <mapinfo tag spatial tile-path 427 // <mapinfo tag spatial tile-path
268 // >mapinfo tag spatial flags x y w h hash 428 // >mapinfo tag spatial flags x y w h hash
269 429
270 char bigbuf[MAX_BUF], *token;
271
272 token = buf; 430 char *token = buf;
273 // copy token 431
274 if (!(buf = strchr (buf, ' '))) 432 if (!(buf = strchr (buf, ' ')))
275 return; 433 return;
276 434
277 *buf++ = 0;
278
279 if (!strncmp (buf, "spatial ", 8)) 435 if (!strncmp (buf, " spatial ", 9))
280 { 436 {
281 buf += 8; 437 char *copy = strdup (token);
438 copy [buf - token] = 0;
282 439
283 // initial map and its origin 440#if 0
284 maptile *map = pl->ob->map; 441 // this makes only sense when we flush the buffer immediately
285 sint16 dx, dy; 442 if (pl->ns->mapinfo_try (copy))
286 int mapx = pl->socket->mapx / 2 - pl->ob->x; 443 free (copy);
287 int mapy = pl->socket->mapy / 2 - pl->ob->y;
288 int max_distance = 8; // limit maximum path length to something generous
289
290 while (*buf && map && max_distance)
291 {
292 int dir = *buf++;
293
294 switch (dir)
295 {
296 case '1':
297 dx = 0;
298 dy = -1;
299 map = get_map_from_coord (map, &dx, &dy);
300 map && (mapy -= map->height);
301 break;
302 case '2':
303 mapx += map->width;
304 dx = map->width;
305 dy = 0;
306 map = get_map_from_coord (map, &dx, &dy);
307 break;
308 case '3':
309 mapy += map->height;
310 dx = 0;
311 dy = map->height;
312 map = get_map_from_coord (map, &dx, &dy);
313 break;
314 case '4':
315 dx = -1;
316 dy = 0;
317 map = get_map_from_coord (map, &dx, &dy);
318 map && (mapx -= map->width);
319 break;
320 }
321
322 --max_distance;
323 }
324
325 if (!max_distance)
326 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
327 else if (map && map->path[0])
328 {
329 int flags = 0;
330
331 if (map->tile_path[0])
332 flags |= 1;
333 if (map->tile_path[1])
334 flags |= 2;
335 if (map->tile_path[2])
336 flags |= 4;
337 if (map->tile_path[3])
338 flags |= 8;
339
340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
341 }
342 else 444 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 445#endif
446 pl->ns->mapinfo_queue.push_back (copy);
344 } 447 }
345 else 448 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 449 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
347
348 pl->socket->send_packet (bigbuf);
349} 450}
350 451
351/** This is the Setup cmd - easy first implementation */ 452/** This is the Setup cmd */
352void 453void
353SetUp (char *buf, int len, client * ns) 454SetUp (char *buf, int len, client * ns)
354{ 455{
355 int s, slen; 456 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
356 char *cmd, *param, cmdback[HUGE_BUF];
357
358 /* run through the cmds of setup
359 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
360 *
361 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
362 * The client then must sort this out
363 */
364
365 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
367 strcpy (cmdback, "setup");
368 for (s = 0; s < len; )
369 {
370 cmd = &buf[s];
371
372 /* find the next space, and put a null there */
373 for (; buf[s] && buf[s] != ' '; s++)
374 ;
375
376 buf[s++] = 0;
377
378 while (buf[s] == ' ')
379 s++;
380
381 if (s >= len)
382 break;
383
384 param = &buf[s];
385
386 for (; buf[s] && buf[s] != ' '; s++)
387 ;
388
389 buf[s++] = 0;
390
391 while (buf[s] == ' ')
392 s++;
393
394 slen = strlen (cmdback);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
397 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
398
399 if (!strcmp (cmd, "sound"))
400 {
401 ns->sound = atoi (param);
402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
403 }
404 else if (!strcmp (cmd, "exp64"))
405 {
406 ns->exp64 = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "spellmon"))
410 {
411 ns->monitor_spells = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "darkness"))
415 {
416 ns->darkness = atoi (param);
417 safe_strcat (cmdback, param, &slen, HUGE_BUF);
418 }
419 else if (!strcmp (cmd, "map1cmd"))
420 {
421 if (atoi (param))
422 ns->mapmode = Map1Cmd;
423 /* if beyond this size, need to use map1cmd no matter what */
424 if (ns->mapx > 11 || ns->mapy > 11)
425 ns->mapmode = Map1Cmd;
426 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
427 }
428 else if (!strcmp (cmd, "map1acmd"))
429 {
430 if (atoi (param))
431 ns->mapmode = Map1aCmd;
432 /* if beyond this size, need to use map1acmd no matter what */
433 if (ns->mapx > 11 || ns->mapy > 11)
434 ns->mapmode = Map1aCmd;
435 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "newmapcmd"))
438 {
439 ns->newmapcmd = atoi (param);
440 safe_strcat (cmdback, param, &slen, HUGE_BUF);
441// } else if (!strcmp(cmd,"plugincmd")) {
442// ns->plugincmd = atoi(param);
443// safe_strcat(cmdback, param, &slen, HUGE_BUF);
444 }
445 else if (!strcmp (cmd, "mapinfocmd"))
446 {
447 ns->mapinfocmd = atoi (param);
448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
449 }
450 else if (!strcmp (cmd, "extcmd"))
451 {
452 ns->extcmd = atoi (param);
453 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
454 }
455 else if (!strcmp (cmd, "extmap"))
456 {
457 ns->extmap = atoi (param);
458 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
459 }
460 else if (!strcmp (cmd, "facecache"))
461 {
462 ns->facecache = atoi (param);
463 safe_strcat (cmdback, param, &slen, HUGE_BUF);
464 }
465 else if (!strcmp (cmd, "faceset"))
466 {
467 char tmpbuf[20];
468 int q = atoi (param);
469
470 if (is_valid_faceset (q))
471 ns->faceset = q;
472 sprintf (tmpbuf, "%d", ns->faceset);
473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
474 /* if the client is using faceset, it knows about image2 command */
475 ns->image2 = 1;
476 }
477 else if (!strcmp (cmd, "itemcmd"))
478 {
479 /* Version of the item protocol command to use. Currently,
480 * only supported versions are 1 and 2. Using a numeric
481 * value will make it very easy to extend this in the future.
482 */
483 char tmpbuf[20];
484 int q = atoi (param);
485
486 if (q < 1 || q > 2)
487 {
488 strcpy (tmpbuf, "FALSE");
489 }
490 else
491 {
492 ns->itemcmd = q;
493 sprintf (tmpbuf, "%d", ns->itemcmd);
494 }
495 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
496 }
497 else if (!strcmp (cmd, "mapsize"))
498 {
499 int x, y = 0;
500 char tmpbuf[MAX_BUF], *cp;
501
502 x = atoi (param);
503 for (cp = param; *cp != 0; cp++)
504 if (*cp == 'x' || *cp == 'X')
505 {
506 y = atoi (cp + 1);
507 break;
508 }
509 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
510 {
511 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
512 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
513 }
514 else
515 {
516 ns->mapx = x;
517 ns->mapy = y;
518 /* better to send back what we are really using and not the
519 * param as given to us in case it gets parsed differently.
520 */
521 sprintf (tmpbuf, "%dx%d", x, y);
522 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
523 /* If beyond this size and still using orig map command, need to
524 * go to map1cmd.
525 */
526 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
527 ns->mapmode = Map1Cmd;
528 }
529 }
530 else if (!strcmp (cmd, "extendedMapInfos"))
531 {
532 /* Added by tchize
533 * prepare to use the mapextended command
534 */
535 char tmpbuf[20];
536
537 ns->ext_mapinfos = (atoi (param));
538 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
539 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
540 }
541 else if (!strcmp (cmd, "extendedTextInfos"))
542 {
543 /* Added by tchize
544 * prepare to use the extended text commands
545 * Client toggle this to non zero to get exttext
546 */
547 char tmpbuf[20];
548
549 ns->has_readable_type = (atoi (param));
550 sprintf (tmpbuf, "%d", ns->has_readable_type);
551 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
552 }
553 else
554 {
555 /* Didn't get a setup command we understood -
556 * report a failure to the client.
557 */
558 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
559 }
560 } /* for processing all the setup commands */
561
562 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
563 ns->send_packet (cmdback);
564} 457}
565 458
566/** 459/**
567 * The client has requested to be added to the game. 460 * The client has requested to be added to the game.
568 * This is what takes care of it. We tell the client how things worked out. 461 * This is what takes care of it. We tell the client how things worked out.
569 * I am not sure if this file is the best place for this function. however, 462 * I am not sure if this file is the best place for this function. however,
570 * it either has to be here or init_sockets needs to be exported. 463 * it either has to be here or init_sockets needs to be exported.
571 */ 464 */
572void 465void
573AddMeCmd (char *buf, int len, client * ns) 466AddMeCmd (char *buf, int len, client *ns)
574{ 467{
575 Settings oldsettings; 468 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
576
577 oldsettings = settings;
578 if (ns->status != Ns_Add || add_player (ns))
579 ns->send_packet ("addme_failed");
580 else
581 ns->send_packet ("addme_success");
582
583 settings = oldsettings;
584} 469}
585 470
586/** Reply to ExtendedInfos command */ 471//+GPL
587void
588ToggleExtendedInfos (char *buf, int len, client * ns)
589{
590 char cmdback[MAX_BUF];
591 char command[50];
592 int info, nextinfo;
593
594 cmdback[0] = '\0';
595 nextinfo = 0;
596
597 while (1)
598 {
599 /* 1. Extract an info */
600 info = nextinfo;
601
602 while ((info < len) && (buf[info] == ' '))
603 info++;
604
605 if (info >= len)
606 break;
607
608 nextinfo = info + 1;
609
610 while ((nextinfo < len) && (buf[nextinfo] != ' '))
611 nextinfo++;
612
613 if (nextinfo - info >= 49) /*Erroneous info asked */
614 continue;
615
616 strncpy (command, &(buf[info]), nextinfo - info);
617
618 /* 2. Interpret info */
619 if (!strcmp ("smooth", command))
620 /* Toggle smoothing */
621 ns->EMI_smooth = !ns->EMI_smooth;
622 else
623 /*bad value */;
624
625 /*3. Next info */
626 }
627
628 strcpy (cmdback, "ExtendedInfoSet");
629
630 if (ns->EMI_smooth)
631 {
632 strcat (cmdback, " ");
633 strcat (cmdback, "smoothing");
634 }
635
636 ns->send_packet (cmdback);
637}
638
639/*
640#define MSG_TYPE_BOOK 1
641#define MSG_TYPE_CARD 2
642#define MSG_TYPE_PAPER 3
643#define MSG_TYPE_SIGN 4
644#define MSG_TYPE_MONUMENT 5
645#define MSG_TYPE_SCRIPTED_DIALOG 6*/
646
647/** Reply to ExtendedInfos command */
648void
649ToggleExtendedText (char *buf, int len, client * ns)
650{
651 char cmdback[MAX_BUF];
652 char temp[10];
653 char command[50];
654 int info, nextinfo, i, flag;
655
656 cmdback[0] = '\0';
657
658 nextinfo = 0;
659 while (1)
660 {
661 /* 1. Extract an info */
662 info = nextinfo;
663
664 while ((info < len) && (buf[info] == ' '))
665 info++;
666
667 if (info >= len)
668 break;
669
670 nextinfo = info + 1;
671
672 while ((nextinfo < len) && (buf[nextinfo] != ' '))
673 nextinfo++;
674
675 if (nextinfo - info >= 49) /*Erroneous info asked */
676 continue;
677
678 strncpy (command, &(buf[info]), nextinfo - info);
679 command[nextinfo - info] = '\0';
680 /* 2. Interpret info */
681 i = sscanf (command, "%d", &flag);
682
683 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
684 ns->supported_readables |= (1 << flag);
685 /*3. Next info */
686 }
687
688 /* Send resulting state */
689 strcpy (cmdback, "ExtendedTextSet");
690
691 for (i = 0; i <= MSG_TYPE_LAST; i++)
692 if (ns->supported_readables & (1 << i))
693 {
694 strcat (cmdback, " ");
695 snprintf (temp, sizeof (temp), "%d", i);
696 strcat (cmdback, temp);
697 }
698
699 ns->send_packet (cmdback);
700}
701
702/**
703 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
704 * Basically, it makes no sense to wait for the client to request a
705 * a piece of data from us that we know the client wants. So
706 * if we know the client wants it, might as well push it to the
707 * client.
708 */
709static void
710SendSmooth (client * ns, uint16 face)
711{
712 uint16 smoothface;
713
714 /* If we can't find a face, return and set it so we won't try to send this
715 * again.
716 */
717 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
718 {
719
720 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722 return;
723 }
724
725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
726 esrv_send_face (ns, smoothface, 0);
727
728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
729
730 packet sl;
731
732 sl << "smooth "
733 << uint16 (face)
734 << uint16 (smoothface);
735
736 ns->send_packet (sl);
737}
738
739 /**
740 * Tells client the picture it has to use
741 * to smooth a picture number given as argument.
742 */
743void
744AskSmooth (char *buf, int len, client * ns)
745{
746 uint16 facenbr;
747
748 facenbr = atoi (buf);
749 SendSmooth (ns, facenbr);
750}
751 472
752/** 473/**
753 * This handles the general commands from the client (ie, north, fire, cast, 474 * This handles the general commands from the client (ie, north, fire, cast,
754 * etc.) 475 * etc.)
755 */ 476 */
756void 477void
757PlayerCmd (char *buf, int len, player *pl) 478PlayerCmd (char *buf, int len, player *pl)
758{ 479{
759
760 /* The following should never happen with a proper or honest client.
761 * Therefore, the error message doesn't have to be too clear - if
762 * someone is playing with a hacked/non working client, this gives them
763 * an idea of the problem, but they deserve what they get
764 */
765 if (pl->state != ST_PLAYING)
766 {
767 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
768 return;
769 }
770 /* Check if there is a count. In theory, a zero count could also be 480 /* Check if there is a count. In theory, a zero count could also be
771 * sent, so check for that also. 481 * sent, so check for that also.
772 */ 482 */
773 if (atoi (buf) || buf[0] == '0') 483 if (atoi (buf) || buf[0] == '0')
774 { 484 {
775 pl->count = atoi ((char *) buf); 485 pl->count = atoi ((char *) buf);
486
776 buf = strchr (buf, ' '); /* advance beyond the numbers */ 487 buf = strchr (buf, ' '); /* advance beyond the numbers */
777 if (!buf) 488 if (!buf)
778 {
779#ifdef ESRV_DEBUG
780 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
781#endif
782 return; 489 return;
783 } 490
784 buf++; 491 buf++;
785 } 492 }
786 /* This should not happen anymore. */ 493
787 if (pl->ob->speed_left < -1.0)
788 {
789 LOG (llevError, "Player has negative time - shouldn't do command.\n");
790 }
791 /* In c_new.c */
792 execute_newserver_command (pl->ob, (char *) buf); 494 execute_newserver_command (pl->ob, (char *)buf);
793 /* Perhaps something better should be done with a left over count.
794 * Cleaning up the input should probably be done first - all actions
795 * for the command that issued the count should be done before any other
796 * commands.
797 */
798 495
799 pl->count = 0;
800
801}
802
803
804/**
805 * This handles the general commands from the client (ie, north, fire, cast,
806 * etc.). It is a lot like PlayerCmd above, but is called with the
807 * 'ncom' method which gives more information back to the client so it
808 * can throttle.
809 */
810void
811NewPlayerCmd (char *buf, int len, player *pl)
812{
813 int time, repeat;
814 char command[MAX_BUF];
815 int pktlen;
816
817 if (len < 7)
818 {
819 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
820 return;
821 }
822
823 pktlen = net_uint16 ((uint8 *)buf);
824 repeat = net_uint32 ((uint8 *)buf + 2);
825
826 /* -1 is special - no repeat, but don't update */
827 if (repeat != -1)
828 pl->count = repeat;
829
830 if ((len - 4) >= MAX_BUF)
831 len = MAX_BUF - 5;
832
833 strncpy ((char *) command, (char *) buf + 6, len - 4);
834 command[len - 4] = 0;
835
836 /* This should not happen anymore. */
837 if (pl->ob->speed_left < -1.0)
838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
839
840 /* In c_new.c */
841 execute_newserver_command (pl->ob, (char *) command);
842 /* Perhaps something better should be done with a left over count. 496 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 497 * Cleaning up the input should probably be done first - all actions
844 * for the command that issued the count should be done before any other 498 * for the command that issued the count should be done before any other
845 * commands. 499 * commands.
846 */ 500 */
847 pl->count = 0; 501 pl->count = 0;
848
849 if (FABS (pl->ob->speed) < 0.001)
850 time = MAX_TIME * 100;
851 else
852 time = (int) (MAX_TIME / FABS (pl->ob->speed));
853
854 /* Send confirmation of command execution now */
855
856 packet sl;
857 sl << "comc " << uint16 (pktlen) << uint32 (time);
858 pl->socket->send_packet (sl);
859} 502}
860
861 503
862/** This is a reply to a previous query. */ 504/** This is a reply to a previous query. */
863void 505void
864ReplyCmd (char *buf, int len, player *pl) 506ReplyCmd (char *buf, int len, client *ns)
865{ 507{
508 if (ns->state == ST_CUSTOM)
509 {
510 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
511 return;
512 }
513
514 if (!ns->pl)
515 return; //TODO: depends on the exact reply we are after
516 //TODO: but right now, we always have a ns->pl
517
518 player *pl = ns->pl;
519
866 /* This is to synthesize how the data would be stored if it 520 /* This is to synthesize how the data would be stored if it
867 * was normally entered. A bit of a hack, and should be cleaned up 521 * was normally entered. A bit of a hack, and should be cleaned up
868 * once all the X11 code is removed from the server. 522 * once all the X11 code is removed from the server.
869 * 523 *
870 * We pass 13 to many of the functions because this way they 524 * We pass 13 to many of the functions because this way they
871 * think it was the carriage return that was entered, and the 525 * think it was the carriage return that was entered, and the
872 * function then does not try to do additional input. 526 * function then does not try to do additional input.
873 */ 527 */
874 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 528 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
875 529
876 /* this avoids any hacking here */ 530 /* this avoids any hacking here */
877 531
878 switch (pl->state) 532 switch (ns->state)
879 { 533 {
880 case ST_PLAYING: 534 case ST_PLAYING:
881 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 535 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
882 break; 536 break;
883 537
884 case ST_PLAY_AGAIN:
885 /* We can check this for return value (2==quit). Maybe we
886 * should, and do something appropriate?
887 */
888 receive_play_again (pl->ob, buf[0]);
889 break;
890
891 case ST_ROLL_STAT:
892 key_roll_stat (pl->ob, buf[0]);
893 break;
894
895 case ST_CHANGE_CLASS:
896
897 key_change_class (pl->ob, buf[0]);
898 break;
899
900 case ST_CONFIRM_QUIT:
901 key_confirm_quit (pl->ob, buf[0]);
902 break;
903
904 case ST_CONFIGURE:
905 LOG (llevError, "In client input handling, but into configure state\n");
906 pl->state = ST_PLAYING;
907 break;
908
909 case ST_GET_NAME:
910 receive_player_name (pl->ob, 13);
911 break;
912
913 case ST_GET_PASSWORD:
914 case ST_CONFIRM_PASSWORD:
915 receive_player_password (pl->ob, 13);
916 break;
917
918 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 538 case ST_GET_PARTY_PASSWORD: /* Get password for party */
919 receive_party_password (pl->ob, 13); 539 receive_party_password (pl->ob, 13);
920 break; 540 break;
921 541
922 default: 542 default:
923 LOG (llevError, "Unknown input state: %d\n", pl->state); 543 LOG (llevError, "Unknown input state: %d\n", ns->state);
924 } 544 }
925} 545}
926 546
927/** 547/**
928 * Client tells its version. If there is a mismatch, we close the 548 * Client tells its version info.
929 * socket. In real life, all we should care about is the client having
930 * something older than the server. If we assume the client will be
931 * backwards compatible, having it be a later version should not be a
932 * problem.
933 */ 549 */
934void 550void
935VersionCmd (char *buf, int len, client * ns) 551VersionCmd (char *buf, int len, client *ns)
936{ 552{
937 char *cp; 553 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
938 char version_warning[256];
939
940 if (!buf)
941 {
942 LOG (llevError, "CS: received corrupted version command\n");
943 return;
944 }
945
946 ns->cs_version = atoi (buf);
947 ns->sc_version = ns->cs_version;
948 if (VERSION_CS != ns->cs_version)
949 {
950#ifdef ESRV_DEBUG
951 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
952#endif
953 }
954 cp = strchr (buf + 1, ' ');
955 if (!cp)
956 return;
957 ns->sc_version = atoi (cp);
958 if (VERSION_SC != ns->sc_version)
959 {
960#ifdef ESRV_DEBUG
961 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
962#endif
963 }
964 cp = strchr (cp + 1, ' ');
965 if (cp)
966 {
967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
968
969 assign (ns->version, cp + 1);
970
971 if (ns->sc_version < 1026)
972 {
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 ns->send_packet (version_warning);
976 }
977
978 }
979} 554}
980 555
981/** sound related functions. */ 556/** sound related functions. */
982void 557void
983SetSound (char *buf, int len, client * ns) 558SetSound (char *buf, int len, client * ns)
984{ 559{
985 ns->sound = atoi (buf); 560 ns->sound = atoi (buf);
986} 561}
987 562
988/** client wants the map resent */ 563/** client wants the map resent */
989
990void 564void
991MapRedrawCmd (char *buf, int len, player *pl) 565MapRedrawCmd (char *buf, int len, player *pl)
992{ 566{
993
994/* This function is currently disabled; just clearing the map state results in 567/* This function is currently disabled; just clearing the map state results in
995 * display errors. It should clear the cache and send a newmap command. 568 * display errors. It should clear the cache and send a newmap command.
996 * Unfortunately this solution does not work because some client versions send 569 * Unfortunately this solution does not work because some client versions send
997 * a mapredraw command after receiving a newmap command. 570 * a mapredraw command after receiving a newmap command.
998 */ 571 */
999#if 0
1000 /* Okay, this is MAJOR UGLY. but the only way I know how to
1001 * clear the "cache"
1002 */
1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1004 draw_client_map (pl->ob);
1005#endif
1006} 572}
1007 573
1008/** 574/**
1009 * Moves an object (typically, container to inventory). 575 * Moves an object (typically, container to inventory).
1010 * syntax is: move (to) (tag) (nrof) 576 * syntax is: move (to) (tag) (nrof)
1011 */ 577 */
1012void 578void
1013MoveCmd (char *buf, int len, player *pl) 579MoveCmd (char *buf, int len, player *pl)
1014{ 580{
1015 int vals[3], i; 581 int to, tag, nrof;
1016 582
1017 /* A little funky here. We only cycle for 2 records, because 583 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
1018 * we obviously am not going to find a space after the third
1019 * record. Perhaps we should just replace this with a
1020 * sscanf?
1021 */
1022 for (i = 0; i < 2; i++)
1023 { 584 {
1024 vals[i] = atoi (buf);
1025 if (!(buf = strchr (buf, ' ')))
1026 {
1027 LOG (llevError, "Incomplete move command: %s\n", buf); 585 LOG (llevError, "Incomplete move command: %s\n", buf);
1028 return; 586 return;
1029 }
1030 buf++;
1031 } 587 }
1032 vals[2] = atoi (buf);
1033 588
1034/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 589 esrv_move_object (pl->ob, to, tag, nrof);
1035 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1036} 590}
1037
1038
1039 591
1040/****************************************************************************** 592/******************************************************************************
1041 * 593 *
1042 * Start of commands the server sends to the client. 594 * Start of commands the server sends to the client.
1043 * 595 *
… …
1046/** 598/**
1047 * Asks the client to query the user. This way, the client knows 599 * Asks the client to query the user. This way, the client knows
1048 * it needs to send something back (vs just printing out a message) 600 * it needs to send something back (vs just printing out a message)
1049 */ 601 */
1050void 602void
1051send_query (client * ns, uint8 flags, char *text) 603send_query (client *ns, uint8 flags, const char *text)
1052{ 604{
1053 char buf[MAX_BUF];
1054
1055 sprintf (buf, "query %d %s", flags, text ? text : ""); 605 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1056 ns->send_packet (buf); 606}
607
608/**
609 * Get player's current range attack in obuf.
610 */
611static void
612rangetostring (player *pl, char *obuf)
613{
614 dynbuf_text &buf = msg_dynbuf; buf.clear ();
615
616#if 0
617 // print ranged/chosen_skill etc. objects every call
618 printf ("%s %s => %s (%s)\n",
619 pl->ranged_ob ? &pl->ranged_ob->name : "-",
620 pl->combat_ob ? &pl->combat_ob->name : "-",
621 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
622 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
623 );
624#endif
625
626 if (pl->ranged_ob)
627 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
628
629 if (pl->combat_ob)
630 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
631
632#if 0
633 //TODO: remove this when slot system is working, this is only for debugging
634 if (pl->ob->chosen_skill)
635 buf << " Skill*: " << pl->ob->chosen_skill->name;
636#endif
637
638 //TODO: maybe golem should become the current_weapon, quite simply?
639 if (pl->golem)
640 buf << " Golem*: " << pl->golem->name;
641
642 buf << '\0';
643 buf.linearise (obuf);
1057} 644}
1058 645
1059#define AddIfInt64(Old,New,Type) if (Old != New) {\ 646#define AddIfInt64(Old,New,Type) if (Old != New) {\
1060 Old = New; \ 647 Old = New; \
1061 sl << uint8 (Type) << uint64 (New); \ 648 sl << uint8 (Type) << uint64 (New); \
… …
1069#define AddIfShort(Old,New,Type) if (Old != New) {\ 656#define AddIfShort(Old,New,Type) if (Old != New) {\
1070 Old = New; \ 657 Old = New; \
1071 sl << uint8 (Type) << uint16 (New); \ 658 sl << uint8 (Type) << uint16 (New); \
1072 } 659 }
1073 660
1074#define AddIfFloat(Old,New,Type) if (Old != New) {\ 661#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1075 Old = New; \ 662 Old = New; \
1076 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 663 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1077 } 664 }
1078 665
1079#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 666#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1080 free(Old); Old = strdup (New);\ 667 free(Old); Old = strdup (New);\
1081 sl << uint8 (Type) << data8 (New); \ 668 sl << uint8 (Type) << data8 (New); \
… …
1088 * commands for now. 675 * commands for now.
1089 */ 676 */
1090void 677void
1091esrv_update_stats (player *pl) 678esrv_update_stats (player *pl)
1092{ 679{
680 client *ns = pl->ns;
681 if (!ns)
682 return;
683
684 object *ob = pl->observe;
685 if (!ob)
686 return;
687
688 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
689
690 packet sl ("stats");
691
692 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
693 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
694 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
695 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
696 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
697 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
698 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
699 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
700 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
701 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
702 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
703 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
704 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
705
706 for (int s = 0; s < CS_NUM_SKILLS; s++)
707 if (object *skill = opl->last_skill_ob [s])
708 if (skill->stats.exp != ns->last_skill_exp [s])
709 {
710 ns->last_skill_exp [s] = skill->stats.exp;
711
712 /* Always send along the level if exp changes. This is only
713 * 1 extra byte, but keeps processing simpler.
714 */
715 sl << uint8 (CS_STAT_SKILLINFO + s)
716 << uint8 (skill->level)
717 << uint64 (skill->stats.exp);
718 }
719
720 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
721 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
722 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
723 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
724 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
725 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
726 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
727 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
728 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
729
730 int flags = (opl->fire_on ? SF_FIREON : 0)
731 | (opl->run_on ? SF_RUNON : 0);
732
733 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
734
735 for (int i = 0; i < NROFATTACKS; i++)
736 /* Skip ones we won't send */
737 if (atnr_cs_stat[i] >= 0)
738 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
739
740 if (pl->ns->monitor_spells)
741 {
742 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
743 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
744 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
745 }
746
1093 char buf[MAX_BUF]; 747 char buf[MAX_BUF];
1094 uint16 flags;
1095
1096 packet sl;
1097 sl << "stats ";
1098
1099 if (pl->ob != NULL)
1100 {
1101 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1102 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1103 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1104 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1105 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1106 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1107 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1108 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1109 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1110 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1111 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1112 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1113 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1114 }
1115
1116 if (pl->socket->exp64)
1117 {
1118 uint8 s;
1119
1120 for (s = 0; s < NUM_SKILLS; s++)
1121 {
1122 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1123 {
1124 /* Always send along the level if exp changes. This is only
1125 * 1 extra byte, but keeps processing simpler.
1126 */
1127 sl << uint8 (s + CS_STAT_SKILLINFO)
1128 << uint8 (pl->last_skill_ob[s]->level)
1129 << uint64 (pl->last_skill_ob[s]->stats.exp);
1130
1131 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1132 }
1133 }
1134 }
1135
1136 if (pl->socket->exp64)
1137 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1138 else
1139 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1140
1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1142 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1143 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1144 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1145 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1146 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
1147 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1148 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1149 flags = 0;
1150
1151 if (pl->fire_on)
1152 flags |= SF_FIREON;
1153
1154 if (pl->run_on)
1155 flags |= SF_RUNON;
1156
1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1158
1159 if (pl->socket->sc_version < 1025)
1160 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1161 else
1162 {
1163 int i;
1164
1165 for (i = 0; i < NROFATTACKS; i++)
1166 {
1167 /* Skip ones we won't send */
1168 if (atnr_cs_stat[i] == -1)
1169 continue;
1170
1171 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1172 }
1173 }
1174
1175 if (pl->socket->monitor_spells)
1176 {
1177 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1178 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1179 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1180 }
1181
1182 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 748 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 749 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1184 set_title (pl->ob, buf); 750 set_title (ob, buf);
1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 751 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1186 752
1187 /* Only send it away if we have some actual data */ 753 /* Only send it away if we have some actual data */
1188 if (sl.length () > 6) 754 if (sl.length () > 6)
1189 pl->socket->send_packet (sl); 755 ns->send_packet (sl);
1190} 756}
1191 757
1192/** 758/**
1193 * Tells the client that here is a player it should start using. 759 * Tells the client that here is a player it should start using.
1194 */ 760 */
1195void 761void
1196esrv_new_player (player *pl, uint32 weight) 762esrv_new_player (player *pl)
1197{ 763{
1198 pl->last_weight = weight; 764 sint32 weight = pl->ob->client_weight ();
1199 765
1200 packet sl; 766 packet sl ("player");
1201 sl << "player ";
1202 767
1203 sl << uint32 (pl->ob->count) 768 sl << uint32 (pl->ob->count)
1204 << uint32 (weight) 769 << uint32 (weight)
1205 << uint32 (pl->ob->face->number) 770 << uint32 (pl->ob->face)
1206 << data8 (pl->ob->name); 771 << data8 (pl->ob->name);
1207 772
1208 pl->socket->send_packet (sl); 773 pl->ns->last_weight = weight;
1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1210}
1211
1212/**
1213 * Need to send an animation sequence to the client.
1214 * We will send appropriate face commands to the client if we haven't
1215 * sent them the face yet (this can become quite costly in terms of
1216 * how much we are sending - on the other hand, this should only happen
1217 * when the player logs in and picks stuff up.
1218 */
1219void
1220esrv_send_animation (client * ns, short anim_num)
1221{
1222 int i;
1223
1224 /* Do some checking on the anim_num we got. Note that the animations
1225 * are added in contigous order, so if the number is in the valid
1226 * range, it must be a valid animation.
1227 */
1228 if (anim_num < 0 || anim_num > num_animations)
1229 {
1230 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1231 return;
1232 }
1233
1234 packet sl;
1235
1236 sl << "anim "
1237 << uint16 (anim_num)
1238 << uint16 (0); /* flags - not used right now */
1239
1240 /* Build up the list of faces. Also, send any information (ie, the
1241 * the face itself) down to the client.
1242 */
1243 for (i = 0; i < animations[anim_num].num_animations; i++)
1244 {
1245 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1246 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1247 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1248 }
1249
1250 ns->send_packet (sl); 774 pl->ns->send_packet (sl);
1251
1252 ns->anims_sent[anim_num] = 1;
1253} 775}
1254
1255 776
1256/****************************************************************************** 777/******************************************************************************
1257 * 778 *
1258 * Start of map related commands. 779 * Start of map related commands.
1259 * 780 *
1260 ******************************************************************************/ 781 ******************************************************************************/
1261 782
1262/**
1263 * This adds face_num to a map cell at x,y. If the client doesn't have
1264 * the face yet, we will also send it.
1265 */
1266static void
1267esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1268{
1269 if (newmap->cells[x][y].count >= MAP_LAYERS)
1270 {
1271 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1272 return;
1273 abort ();
1274 }
1275
1276 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1277 newmap->cells[x][y].count++;
1278
1279 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1280 esrv_send_face (ns, face_num, 0);
1281}
1282
1283struct LayerCell
1284{
1285 uint16 xy;
1286 short face;
1287};
1288
1289struct MapLayer
1290{
1291 int count;
1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1293};
1294
1295/** Checkes if map cells have changed */
1296static int
1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1298{
1299 int k;
1300
1301 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1302 return 1;
1303 for (k = 0; k < newmap->cells[i][j].count; k++)
1304 {
1305 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1306 {
1307 return 1;
1308 }
1309 }
1310 return 0;
1311}
1312
1313/**
1314 * Basically, what this does is pack the data into layers.
1315 * cnum is the client number, cur is the the buffer we put all of
1316 * this data into. we return the end of the data. layers is
1317 * how many layers of data we should back.
1318 */
1319static uint8 *
1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1321{
1322 int x, y, k;
1323 int face;
1324 unsigned char *fcur;
1325 struct MapLayer layers[MAP_LAYERS];
1326
1327 for (k = 0; k < MAP_LAYERS; k++)
1328 layers[k].count = 0;
1329 fcur = cur;
1330 for (x = 0; x < ns->mapx; x++)
1331 {
1332 for (y = 0; y < ns->mapy; y++)
1333 {
1334 if (!mapcellchanged (ns, x, y, newmap))
1335 continue;
1336 if (newmap->cells[x][y].count == 0)
1337 {
1338 *cur = x * ns->mapy + y; /* mark empty space */
1339 cur++;
1340 continue;
1341 }
1342 for (k = 0; k < newmap->cells[x][y].count; k++)
1343 {
1344 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1345 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1346 layers[k].count++;
1347 }
1348 }
1349 }
1350 /* If no data, return now. */
1351 if (fcur == cur && layers[0].count == 0)
1352 return cur;
1353 *cur = 255; /* mark end of explicitly cleared cells */
1354 cur++;
1355 /* First pack by layers. */
1356 for (k = 0; k < numlayers; k++)
1357 {
1358 if (layers[k].count == 0)
1359 break; /* once a layer is entirely empty, no layer below it can
1360 have anything in it either */
1361 /* Pack by entries in thie layer */
1362 for (x = 0; x < layers[k].count;)
1363 {
1364 fcur = cur;
1365 *cur = layers[k].lcells[x].face >> 8;
1366 cur++;
1367 *cur = layers[k].lcells[x].face & 0xFF;
1368 cur++;
1369 face = layers[k].lcells[x].face;
1370 /* Now, we back the redundant data into 1 byte xy pairings */
1371 for (y = x; y < layers[k].count; y++)
1372 {
1373 if (layers[k].lcells[y].face == face)
1374 {
1375 *cur = (uint8) layers[k].lcells[y].xy;
1376 cur++;
1377 layers[k].lcells[y].face = -1;
1378 }
1379 }
1380 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1381 /* forward over the now redundant data */
1382 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1383 x++;
1384 }
1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1386 }
1387 return cur;
1388}
1389
1390/** Clears a map cell */ 783/** Clears a map cell */
1391static void 784static void
1392map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 785map_clearcell (struct MapCell *cell, int count)
1393{ 786{
1394 cell->faces[0] = face0; 787 cell->faces[0] = 0;
1395 cell->faces[1] = face1; 788 cell->faces[1] = 0;
1396 cell->faces[2] = face2; 789 cell->faces[2] = 0;
790 cell->smooth[0] = 0;
791 cell->smooth[1] = 0;
792 cell->smooth[2] = 0;
1397 cell->count = count; 793 cell->count = count;
1398 cell->stat_hp = 0; 794 cell->stat_hp = 0;
1399 cell->flags = 0; 795 cell->flags = 0;
1400 cell->player = 0; 796 cell->player = 0;
1401} 797}
1402 798
1403#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1404#define MAX_LAYERS 3 799#define MAX_LAYERS 3
1405
1406/* Using a global really isn't a good approach, but saves the over head of
1407 * allocating and deallocating such a block of data each time run through,
1408 * and saves the space of allocating this in the socket object when we only
1409 * need it for this cycle. If the serve is ever threaded, this needs to be
1410 * re-examined.
1411 */
1412
1413static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1414
1415/**
1416 * Returns true if any of the heads for this
1417 * space is set. Returns false if all are blank - this is used
1418 * for empty space checking.
1419 */
1420static inline int
1421have_head (int ax, int ay)
1422{
1423
1424 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1425 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1426 return 1;
1427 return 0;
1428}
1429
1430/**
1431 * check_head is a bit simplistic version of update_space below.
1432 * basically, it only checks the that the head on space ax,ay at layer
1433 * needs to get sent - if so, it adds the data, sending the head
1434 * if needed, and returning 1. If this no data needs to get
1435 * sent, it returns zero.
1436 */
1437static int
1438check_head (packet &sl, client &ns, int ax, int ay, int layer)
1439{
1440 short face_num;
1441
1442 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1443 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1444 else
1445 face_num = 0;
1446
1447 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1448 {
1449 sl << uint16 (face_num);
1450 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1451 esrv_send_face (&ns, face_num, 0);
1452
1453 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1454 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1455 return 1;
1456 }
1457
1458 return 0; /* No change */
1459}
1460 800
1461/** 801/**
1462 * Removes the need to replicate the same code for each layer. 802 * Removes the need to replicate the same code for each layer.
1463 * this returns true if this space is now in fact different than 803 * this returns true if this space is now in fact different than
1464 * it was. 804 * it was.
1465 * sl is the socklist this data is going into. 805 * sl is the socklist this data is going into.
1466 * ns is the socket we are working on - all the info we care 806 * ns is the socket we are working on - all the info we care
1467 * about is in this socket structure, so now need not pass the 807 * about is in this socket structure, so now need not pass the
1468 * entire player object. 808 * entire player object.
1469 * mx and my are map coordinate offsets for map mp
1470 * sx and sy are the offsets into the socket structure that
1471 * holds the old values.
1472 * layer is the layer to update, with 2 being the floor and 0 the 809 * layer is the layer to update, with 2 being the floor and 0 the
1473 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 810 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1474 * take. Interesting to note that before this function, the map1 function 811 * take. Interesting to note that before this function, the map1 function
1475 * numbers the spaces differently - I think this was a leftover from 812 * numbers the spaces differently - I think this was a leftover from
1476 * the map command, where the faces stack up. Sinces that is no longer 813 * the map command, where the faces stack up. Sinces that is no longer
1477 * the case, it seems to make more sense to have these layer values 814 * the case, it seems to make more sense to have these layer values
1478 * actually match. 815 * actually match.
1479 */ 816 */
1480
1481static int 817static int
1482update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 818update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1483{ 819{
1484 object *ob, *head; 820 object *ob = ms.faces_obj [layer];
1485 uint16 face_num;
1486 int bx, by, i;
1487
1488 /* If there is a multipart object stored away, treat that as more important.
1489 * If not, then do the normal processing.
1490 */
1491 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1492
1493 /* Check to see if this head is part of the set of objects
1494 * we would normally send for this space. If so, then
1495 * don't use the head value. We need to do the check
1496 * here and not when setting up the heads[] value for two reasons -
1497 * 1) the heads[] values will get used even if the space is not visible.
1498 * 2) its possible the head is not on the same map as a part, and I'd
1499 * rather not need to do the map translation overhead.
1500 * 3) We need to do some extra checking to make sure that we will
1501 * otherwise send the image as this layer, eg, either it matches
1502 * the head value, or is not multipart.
1503 */
1504 if (head && !head->more)
1505 {
1506 for (i = 0; i < MAP_LAYERS; i++)
1507 {
1508 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1509 if (!ob)
1510 continue;
1511
1512 if (ob->head)
1513 ob = ob->head;
1514
1515 if (ob == head)
1516 {
1517 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1518 head = NULL;
1519 break;
1520 }
1521 }
1522 }
1523
1524 ob = head;
1525 if (!ob)
1526 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1527 821
1528 /* If there is no object for this space, or if the face for the object 822 /* If there is no object for this space, or if the face for the object
1529 * is the blank face, set the face number to zero. 823 * is the blank face, set the face number to zero.
1530 * else if we have the stored head object for this space, that takes 824 * else if we have the stored head object for this space, that takes
1531 * precedence over the other object for this space. 825 * precedence over the other object for this space.
1532 * otherwise, we do special head processing 826 * otherwise, we do special head processing
1533 */ 827 */
1534 if (!ob || ob->face == blank_face) 828 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1535 face_num = 0;
1536 else if (head)
1537 {
1538 /* if this is a head that had previously been stored */
1539 face_num = ob->face->number;
1540 }
1541 else
1542 {
1543 /* if the faces for the different parts of a multipart object
1544 * are the same, we only want to send the bottom right most
1545 * portion of the object. That info is in the tail_.. values
1546 * of the head. Note that for the head itself, ob->head will
1547 * be null, so we only do this block if we are working on
1548 * a tail piece.
1549 */
1550
1551 /* tail_x and tail_y will only be set in the head object. If
1552 * this is the head object and these are set, we proceed
1553 * with logic to only send bottom right. Similarly, if
1554 * this is one of the more parts but the head has those values
1555 * set, we want to do the processing. There can be cases where
1556 * the head is not visible but one of its parts is, so we just
1557 * can always expect that ob->arch->tail_x will be true for all
1558 * object we may want to display.
1559 */
1560 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1561 {
1562
1563 if (ob->head)
1564 head = ob->head;
1565 else
1566 head = ob;
1567
1568 /* Basically figure out where the offset is from where we are right
1569 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1570 * piece is from the head, and the tail is where the tail is from the
1571 * head. Note that bx and by will equal sx and sy if we are already working
1572 * on the bottom right corner. If ob is the head, the clone values
1573 * will be zero, so the right thing will still happen.
1574 */
1575 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1576 by = sy + head->arch->tail_y - ob->arch->clone.y;
1577
1578 /* I don't think this can ever happen, but better to check for it just
1579 * in case.
1580 */
1581 if (bx < sx || by < sy)
1582 {
1583 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1584 face_num = 0;
1585 }
1586 /* single part object, multipart object with non merged faces,
1587 * of multipart object already at lower right.
1588 */
1589 else if (bx == sx && by == sy)
1590 {
1591 face_num = ob->face->number;
1592
1593 /* if this face matches one stored away, clear that one away.
1594 * this code relies on the fact that the map1 commands
1595 * goes from 2 down to 0.
1596 */
1597 for (i = 0; i < MAP_LAYERS; i++)
1598 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1599 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1600 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1601 }
1602 else
1603 {
1604 /* If this head is stored away, clear it - otherwise,
1605 * there can be cases where a object is on multiple layers -
1606 * we only want to send it once.
1607 */
1608 face_num = head->face->number;
1609 for (i = 0; i < MAP_LAYERS; i++)
1610 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1611 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1612 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1613
1614 /* First, try to put the new head on the same layer. If that is used up,
1615 * then find another layer.
1616 */
1617 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1618 {
1619 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1620 }
1621 else
1622 for (i = 0; i < MAX_LAYERS; i++)
1623 {
1624 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1625 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1626 {
1627 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1628 }
1629 }
1630 face_num = 0; /* Don't send this object - we'll send the head later */
1631 }
1632 }
1633 else
1634 {
1635 /* In this case, we are already at the lower right or single part object,
1636 * so nothing special
1637 */
1638 face_num = ob->face->number;
1639
1640 /* clear out any head entries that have the same face as this one */
1641 for (bx = 0; bx < layer; bx++)
1642 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1643 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1644 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1645 }
1646 } /* else not already head object or blank face */
1647
1648 /* This is a real hack. Basically, if we have nothing to send for this layer,
1649 * but there is a head on the next layer, send that instead.
1650 * Without this, what happens is you can get the case where the player stands
1651 * on the same space as the head. However, if you have overlapping big objects
1652 * of the same type, what happens then is it doesn't think it needs to send
1653 * This tends to make stacking also work/look better.
1654 */
1655 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1656 {
1657 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1658 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1659 }
1660
1661 /* Another hack - because of heads and whatnot, this face may match one
1662 * we already sent for a lower layer. In that case, don't send
1663 * this one.
1664 */
1665 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1666 face_num = 0;
1667 829
1668 /* We've gotten what face we want to use for the object. Now see if 830 /* We've gotten what face we want to use for the object. Now see if
1669 * if it has changed since we last sent it to the client. 831 * if it has changed since we last sent it to the client.
1670 */ 832 */
1671 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 833 if (lastcell.faces[layer] != face_num)
1672 { 834 {
1673 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 835 lastcell.faces[layer] = face_num;
836
1674 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 837 if (!ns.faces_sent[face_num])
838 if (ob)
839 ns.send_faces (ob);
840 else
1675 esrv_send_face (&ns, face_num, 0); 841 ns.send_face (face_num, 10);
1676 842
1677 sl << uint16 (face_num); 843 sl << uint16 (face_num);
1678 return 1; 844 return 1;
1679 } 845 }
1680 846
1681 /* Nothing changed */ 847 /* Nothing changed */
1682 return 0; 848 return 0;
1683} 849}
1684 850
1685/** 851/**
1686 * This function is mainly a copy of update_space,
1687 * except it handles update of the smoothing updates,
1688 * not the face updates.
1689 * Removes the need to replicate the same code for each layer.
1690 * this returns true if this smooth is now in fact different
1691 * than it was.
1692 * sl is the socklist this data is going into.
1693 * ns is the socket we are working on - all the info we care
1694 * about is in this socket structure, so know need to pass the
1695 * entire player object.
1696 * mx and my are map coordinate offsets for map mp
1697 * sx and sy are the offsets into the socket structure that
1698 * holds the old values.
1699 * layer is the layer to update, with 2 being the floor and 0 the
1700 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1701 * take.
1702 */
1703
1704static inline int
1705update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1706{
1707 object *ob;
1708 int smoothlevel; /* old face_num; */
1709
1710 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1711
1712 /* If there is no object for this space, or if the face for the object
1713 * is the blank face, set the smoothlevel to zero.
1714 */
1715 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1716 smoothlevel = 0;
1717 else
1718 {
1719 smoothlevel = ob->smoothlevel;
1720 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1721 SendSmooth (&ns, ob->face->number);
1722 } /* else not already head object or blank face */
1723
1724 /* We've gotten what face we want to use for the object. Now see if
1725 * if it has changed since we last sent it to the client.
1726 */
1727 if (smoothlevel > 255)
1728 smoothlevel = 255;
1729 else if (smoothlevel < 0)
1730 smoothlevel = 0;
1731
1732 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1733 {
1734 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1735 sl << uint8 (smoothlevel);
1736 return 1;
1737 }
1738
1739 /* Nothing changed */
1740 return 0;
1741}
1742
1743/**
1744 * Returns the size of a data for a map square as returned by
1745 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1746 * available.
1747 */
1748int
1749getExtendedMapInfoSize (client * ns)
1750{
1751 int result = 0;
1752
1753 if (ns->ext_mapinfos)
1754 {
1755 if (ns->EMI_smooth)
1756 result += 1; /*One byte for smoothlevel */
1757 }
1758 return result;
1759}
1760
1761/**
1762 * This function uses the new map1 protocol command to send the map
1763 * to the client. It is necessary because the old map command supports
1764 * a maximum map size of 15x15.
1765 * This function is much simpler than the old one. This is because
1766 * the old function optimized to send as few face identifiers as possible,
1767 * at the expense of sending more coordinate location (coordinates were
1768 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1769 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1770 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1771 * and use the other 4 bits for other informatiion. For full documentation
1772 * of what we send, see the doc/Protocol file.
1773 * I will describe internally what we do:
1774 * the socket->lastmap shows how the map last looked when sent to the client.
1775 * in the lastmap structure, there is a cells array, which is set to the
1776 * maximum viewable size (As set in config.h).
1777 * in the cells, there are faces and a count value.
1778 * we use the count value to hold the darkness value. If -1, then this space
1779 * is not viewable.
1780 * we use faces[0] faces[1] faces[2] to hold what the three layers
1781 * look like.
1782 */
1783void
1784draw_client_map1 (object *pl)
1785{
1786 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1787 sint16 nx, ny;
1788 int estartlen, eoldlen;
1789 uint16 mask, emask;
1790 uint8 eentrysize;
1791 uint16 ewhatstart, ewhatflag;
1792 uint8 extendedinfos;
1793 maptile *m;
1794
1795 client &socket = *pl->contr->socket;
1796
1797 check_map_change (pl->contr);
1798
1799 packet sl;
1800 packet esl;
1801
1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1803 startlen = sl.length ();
1804
1805 /*Extendedmapinfo structure initialisation */
1806 if (socket.ext_mapinfos)
1807 {
1808 extendedinfos = EMI_NOREDRAW;
1809
1810 if (socket.EMI_smooth)
1811 extendedinfos |= EMI_SMOOTH;
1812
1813 ewhatstart = esl.length ();
1814 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1815 could need to be taken away */
1816 eentrysize = getExtendedMapInfoSize (&socket);
1817 esl << "mapextended "
1818 << uint8 (extendedinfos)
1819 << uint8 (eentrysize);
1820
1821 estartlen = esl.length ();
1822 }
1823 else
1824 {
1825 /* suppress compiler warnings */
1826 ewhatstart = 0;
1827 ewhatflag = 0;
1828 estartlen = 0;
1829 }
1830
1831 /* Init data to zero */
1832 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1833
1834 /* x,y are the real map locations. ax, ay are viewport relative
1835 * locations.
1836 */
1837 ay = 0;
1838
1839 /* We could do this logic as conditionals in the if statement,
1840 * but that started to get a bit messy to look at.
1841 */
1842 max_x = pl->x + (socket.mapx + 1) / 2;
1843 max_y = pl->y + (socket.mapy + 1) / 2;
1844
1845 if (socket.mapmode == Map1aCmd)
1846 {
1847 max_x += MAX_HEAD_OFFSET;
1848 max_y += MAX_HEAD_OFFSET;
1849 }
1850
1851 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1852 {
1853 ax = 0;
1854 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1855 {
1856
1857 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1858
1859 /* If this space is out of the normal viewable area, we only check
1860 * the heads value ax or ay will only be greater than what
1861 * the client wants if using the map1a command - this is because
1862 * if the map1a command is not used, max_x and max_y will be
1863 * set to lower values.
1864 */
1865 if (ax >= socket.mapx || ay >= socket.mapy)
1866 {
1867 int i, got_one;
1868
1869 oldlen = sl.length ();
1870
1871 sl << uint16 (mask);
1872
1873 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1874 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1875 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1876
1877 /* If all we are doing is sending 0 (blank) faces, we don't
1878 * actually need to send that - just the coordinates
1879 * with no faces tells the client to blank out the
1880 * space.
1881 */
1882 got_one = 0;
1883 for (i = oldlen + 2; i < sl.length (); i++)
1884 if (sl[i])
1885 got_one = 1;
1886
1887 if (got_one && (mask & 0xf))
1888 sl[oldlen + 1] = mask & 0xff;
1889 else
1890 { /*either all faces blank, either no face at all */
1891 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1892 sl.reset (oldlen + 2);
1893 else
1894 sl.reset (oldlen);
1895 }
1896
1897 /*What concerns extendinfos, nothing to be done for now
1898 * (perhaps effects layer later)
1899 */
1900 continue; /* don't do processing below */
1901 }
1902
1903 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1904
1905 d = pl->contr->blocked_los[ax][ay];
1906
1907 /* If the coordinates are not valid, or it is too dark to see,
1908 * we tell the client as such
1909 */
1910 nx = x;
1911 ny = y;
1912 m = get_map_from_coord (pl->map, &nx, &ny);
1913
1914 if (!m)
1915 {
1916 /* space is out of map. Update space and clear values
1917 * if this hasn't already been done. If the space is out
1918 * of the map, it shouldn't have a head
1919 */
1920 if (lastcell.count != -1)
1921 {
1922 sl << uint16 (mask);
1923 map_clearcell (&lastcell, 0, 0, 0, -1);
1924 }
1925 }
1926 else if (d > 3)
1927 {
1928 int need_send = 0, count;
1929
1930 /* This block deals with spaces that are not visible for whatever
1931 * reason. Still may need to send the head for this space.
1932 */
1933
1934 oldlen = sl.length ();
1935
1936 sl << uint16 (mask);
1937
1938 if (lastcell.count != -1)
1939 need_send = 1;
1940
1941 count = -1;
1942
1943 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1944 {
1945 /* Now check to see if any heads need to be sent */
1946
1947 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1948 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1949 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1950
1951 lastcell.count = count;
1952 }
1953 else
1954 {
1955 /* properly clear a previously sent big face */
1956 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1957 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1958 need_send = 1;
1959
1960 map_clearcell (&lastcell, 0, 0, 0, count);
1961 }
1962
1963 if ((mask & 0xf) || need_send)
1964 sl[oldlen + 1] = mask & 0xff;
1965 else
1966 sl.reset (oldlen);
1967 }
1968 else
1969 {
1970 /* In this block, the space is visible or there are head objects
1971 * we need to send.
1972 */
1973
1974 /* Rather than try to figure out what everything that we might
1975 * need to send is, then form the packet after that,
1976 * we presume that we will in fact form a packet, and update
1977 * the bits by what we do actually send. If we send nothing,
1978 * we just back out sl.length () to the old value, and no harm
1979 * is done.
1980 * I think this is simpler than doing a bunch of checks to see
1981 * what if anything we need to send, setting the bits, then
1982 * doing those checks again to add the real data.
1983 */
1984 oldlen = sl.length ();
1985 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1986 eoldlen = esl.length ();
1987 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1988 sl << uint16 (mask);
1989
1990 if (socket.ext_mapinfos)
1991 esl << uint16 (emask);
1992
1993 unsigned char dummy;
1994 unsigned char *last_ext = &dummy;
1995
1996 /* Darkness changed */
1997 if (lastcell.count != d && socket.darkness)
1998 {
1999 mask |= 0x8;
2000
2001 if (socket.extmap)
2002 {
2003 *last_ext |= 0x80;
2004 last_ext = &sl[sl.length ()];
2005 sl << uint8 (d);
2006 }
2007 else
2008 sl << uint8 (255 - 64 * d);
2009 }
2010
2011 lastcell.count = d;
2012
2013 if (socket.extmap)
2014 {
2015 uint8 stat_hp = 0;
2016 uint8 stat_width = 0;
2017 uint8 flags = 0;
2018 UUID player = 0;
2019
2020 // send hp information, if applicable
2021 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2022 {
2023 if (op->head || op->invisible)
2024 ; // do not show
2025 else if (op->type == PLAYER
2026 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
2027 {
2028 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
2029 {
2030 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2031 stat_width = op->arch->tail_x;
2032 }
2033 }
2034
2035 if (op->msg && op->msg[0] == '@')
2036 flags |= 1;
2037
2038 if (op->type == PLAYER && op != pl)
2039 player = op->count;
2040 }
2041
2042 if (lastcell.stat_hp != stat_hp)
2043 {
2044 lastcell.stat_hp = stat_hp;
2045
2046 mask |= 0x8;
2047 *last_ext |= 0x80;
2048 last_ext = &sl[sl.length ()];
2049
2050 sl << uint8 (5) << uint8 (stat_hp);
2051
2052 if (stat_width > 1)
2053 {
2054 *last_ext |= 0x80;
2055 last_ext = &sl[sl.length ()];
2056
2057 sl << uint8 (6) << uint8 (stat_width);
2058 }
2059 }
2060
2061 if (lastcell.player != player)
2062 {
2063 lastcell.player = player;
2064
2065 mask |= 0x8;
2066 *last_ext |= 0x80;
2067 last_ext = &sl[sl.length ()];
2068
2069 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2070 }
2071
2072 if (lastcell.flags != flags)
2073 {
2074 lastcell.flags = flags;
2075
2076 mask |= 0x8;
2077 *last_ext |= 0x80;
2078 last_ext = &sl[sl.length ()];
2079
2080 sl << uint8 (8) << uint8 (flags);
2081 }
2082 }
2083
2084 /* Floor face */
2085 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2086 mask |= 0x4;
2087
2088 if (socket.EMI_smooth)
2089 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2090 emask |= 0x4;
2091
2092 /* Middle face */
2093 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2094 mask |= 0x2;
2095
2096 if (socket.EMI_smooth)
2097 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2098 emask |= 0x2;
2099
2100 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2101 {
2102 if (lastcell.faces[0] != pl->face->number)
2103 {
2104 lastcell.faces[0] = pl->face->number;
2105 mask |= 0x1;
2106
2107 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2108 esrv_send_face (&socket, pl->face->number, 0);
2109
2110 sl << uint16 (pl->face->number);
2111 }
2112 }
2113 else
2114 {
2115 /* Top face */
2116 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2117 mask |= 0x1;
2118
2119 if (socket.EMI_smooth)
2120 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2121 emask |= 0x1;
2122 }
2123
2124 /* Check to see if we are in fact sending anything for this
2125 * space by checking the mask. If so, update the mask.
2126 * if not, reset the len to that from before adding the mask
2127 * value, so we don't send those bits.
2128 */
2129 if (mask & 0xf)
2130 sl[oldlen + 1] = mask & 0xff;
2131 else
2132 sl.reset (oldlen);
2133
2134 if (emask & 0xf)
2135 esl[eoldlen + 1] = emask & 0xff;
2136 else
2137 esl.reset (eoldlen);
2138 } /* else this is a viewable space */
2139 } /* for x loop */
2140 } /* for y loop */
2141
2142 /* Verify that we in fact do need to send this */
2143 if (socket.ext_mapinfos)
2144 {
2145 if (!(sl.length () > startlen || socket.sent_scroll))
2146 {
2147 /* No map data will follow, so don't say the client
2148 * it doesn't need draw!
2149 */
2150 ewhatflag &= (~EMI_NOREDRAW);
2151 esl[ewhatstart + 1] = ewhatflag & 0xff;
2152 }
2153
2154 if (esl.length () > estartlen)
2155 socket.send_packet (esl);
2156 }
2157
2158 if (sl.length () > startlen || socket.sent_scroll)
2159 {
2160 socket.send_packet (sl);
2161 socket.sent_scroll = 0;
2162 }
2163}
2164
2165/**
2166 * Draws client map. 852 * Draws client map.
2167 */ 853 */
2168void 854void
2169draw_client_map (object *pl) 855draw_client_map (player *pl)
2170{ 856{
2171 int i, j; 857 object *ob = pl->viewpoint;
2172 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 858 if (!pl->observe->active)
2173 New_Face *face, *floor;
2174 New_Face *floor2;
2175 int d, mflags;
2176 struct Map newmap;
2177 maptile *m, *pm;
2178
2179 if (pl->type != PLAYER)
2180 {
2181 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2182 return; 859 return;
2183 }
2184
2185 pm = pl->map;
2186 860
2187 /* If player is just joining the game, he isn't here yet, so the map 861 /* If player is just joining the game, he isn't here yet, so the map
2188 * can get swapped out. If so, don't try to send them a map. All will 862 * can get swapped out. If so, don't try to send them a map. All will
2189 * be OK once they really log in. 863 * be OK once they really log in.
2190 */ 864 */
2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 865 if (!ob->map || ob->map->state != MAP_ACTIVE)
2192 return; 866 return;
2193 867
2194 memset (&newmap, 0, sizeof (struct Map)); 868 int startlen, oldlen;
2195 869
2196 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 870 check_map_change (pl);
2197 { 871 pl->ob->prefetch_surrounding_maps ();
2198 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 872
2199 {
2200 ax = i;
2201 ay = j;
2202 m = pm;
2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2204 if (mflags & P_OUT_OF_MAP)
2205 continue;
2206 if (mflags & P_NEED_UPDATE)
2207 update_position (m, ax, ay);
2208 /* If a map is visible to the player, we don't want to swap it out
2209 * just to reload it. This should really call something like
2210 * swap_map, but this is much more efficient and 'good enough'
2211 */
2212 if (mflags & P_NEW_MAP)
2213 m->timeout = 50;
2214 }
2215 }
2216 /* do LOS after calls to update_position */ 873 /* do LOS after calls to update_position */
2217 if (pl->contr->do_los) 874 /* unfortunately, we need to udpate los when observing, currently */
875 if (pl->do_los || pl->viewpoint != pl->ob)
2218 { 876 {
877 pl->do_los = 0;
2219 update_los (pl); 878 pl->update_los ();
2220 pl->contr->do_los = 0;
2221 } 879 }
2222 880
2223 /* Big maps need a different drawing mechanism to work */
2224 draw_client_map1 (pl);
2225}
2226
2227
2228/*****************************************************************************/
2229
2230/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2231
2232/* a player. Of course, the client need to know the command to be able to */
2233
2234/* manage it ! */
2235
2236/*****************************************************************************/
2237void
2238send_plugin_custom_message (object *pl, char *buf)
2239{
2240 pl->contr->socket->send_packet (buf);
2241}
2242
2243/** 881 /**
2244 * This sends the skill number to name mapping. We ignore 882 * This function uses the new map1 protocol command to send the map
2245 * the params - we always send the same info no matter what. 883 * to the client. It is necessary because the old map command supports
884 * a maximum map size of 15x15.
885 * This function is much simpler than the old one. This is because
886 * the old function optimized to send as few face identifiers as possible,
887 * at the expense of sending more coordinate location (coordinates were
888 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
889 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
890 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
891 * and use the other 4 bits for other informatiion. For full documentation
892 * of what we send, see the doc/Protocol file.
893 * I will describe internally what we do:
894 * the ns->lastmap shows how the map last looked when sent to the client.
895 * in the lastmap structure, there is a cells array, which is set to the
896 * maximum viewable size (As set in config.h).
897 * in the cells, there are faces and a count value.
898 * we use the count value to hold the darkness value. If -1, then this space
899 * is not viewable.
900 * we use faces[0] faces[1] faces[2] to hold what the three layers
901 * look like.
2246 */ 902 */
2247void
2248send_skill_info (client *ns, char *params)
2249{
2250 packet sl;
2251 sl << "replyinfo skill_info\n";
2252 903
2253 for (int i = 1; i < NUM_SKILLS; i++) 904 client &socket = *pl->ns;
2254 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2255 905
2256 if (sl.length () >= MAXSOCKBUF) 906 packet sl ("map1a");
907
908 startlen = sl.length ();
909
910 int hx = socket.mapx / 2;
911 int hy = socket.mapy / 2;
912
913 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
914 int ax = dx + hx;
915 int ay = dy + hy;
916
917 int mask = (ax << 10) | (ay << 4);
918 MapCell &lastcell = socket.lastmap.cells[ax][ay];
919
920 /* If the coordinates are not valid, or it is too dark to see,
921 * we tell the client as such
922 */
923 if (!m)
2257 { 924 {
2258 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 925 /* space is out of map. Update space and clear values
2259 fatal (0); 926 * if this hasn't already been done. If the space is out
927 * of the map, it shouldn't have a head.
928 */
929 if (lastcell.count != -1)
930 {
931 sl << uint16 (mask);
932 map_clearcell (&lastcell, -1);
933 }
934
935 continue;
2260 } 936 }
2261 937
2262 ns->send_packet (sl); 938 int d = pl->blocked_los_uc (dx, dy);
2263}
2264 939
2265/** 940 if (d > 3)
2266 * This sends the spell path to name mapping. We ignore
2267 * the params - we always send the same info no matter what.
2268 */
2269void
2270send_spell_paths (client * ns, char *params)
2271{
2272 packet sl;
2273
2274 sl << "replyinfo spell_paths\n";
2275
2276 for (int i = 0; i < NRSPELLPATHS; i++)
2277 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2278
2279 if (sl.length () >= MAXSOCKBUF)
2280 { 941 {
2281 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 942 /* This block deals with spaces that are not visible for whatever
2282 fatal (0); 943 * reason. Still may need to send the head for this space.
944 */
945 if (lastcell.count != -1
946 || lastcell.faces[0]
947 || lastcell.faces[1]
948 || lastcell.faces[2]
949 || lastcell.stat_hp
950 || lastcell.flags
951 || lastcell.player)
952 sl << uint16 (mask);
953
954 /* properly clear a previously sent big face */
955 map_clearcell (&lastcell, -1);
2283 } 956 }
957 else
958 {
959 /* In this block, the space is visible.
960 */
2284 961
962 /* Rather than try to figure out what everything that we might
963 * need to send is, then form the packet after that,
964 * we presume that we will in fact form a packet, and update
965 * the bits by what we do actually send. If we send nothing,
966 * we just back out sl.length () to the old value, and no harm
967 * is done.
968 * I think this is simpler than doing a bunch of checks to see
969 * what if anything we need to send, setting the bits, then
970 * doing those checks again to add the real data.
971 */
972 oldlen = sl.length ();
973
974 sl << uint16 (mask);
975
976 unsigned char dummy;
977 unsigned char *last_ext = &dummy;
978
979 /* Darkness changed */
980 if (lastcell.count != d)
981 {
982 mask |= 0x8;
983
984 *last_ext |= 0x80;
985 last_ext = &sl[sl.length ()];
986 sl << uint8 (d);
987 }
988
989 lastcell.count = d;
990
991 mapspace &ms = m->at (nx, ny);
992 ms.update ();
993
994 // extmap handling
995 uint8 stat_hp = 0;
996 uint8 stat_width = 0;
997 uint8 flags = 0;
998 tag_t player = 0;
999
1000 // send hp information, if applicable
1001 if (object *op = ms.faces_obj [0])
1002 if (op->is_head () && !op->invisible)
1003 {
1004 if (op->stats.maxhp > op->stats.hp
1005 && op->stats.maxhp > 0
1006 && (op->type == PLAYER
1007 || op->type == DOOR // does not work, have maxhp 0
1008 || op->flag [FLAG_MONSTER]
1009 || op->flag [FLAG_ALIVE]
1010 || op->flag [FLAG_GENERATOR]))
1011 {
1012 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1013 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1014 }
1015
1016 if (expect_false (op->has_dialogue ()))
1017 flags |= 1;
1018
1019 if (expect_false (op->type == PLAYER))
1020 player = op == ob ? pl->ob->count
1021 : op == pl->ob ? ob->count
1022 : op->count;
1023 }
1024
1025 if (expect_false (lastcell.stat_hp != stat_hp))
1026 {
1027 lastcell.stat_hp = stat_hp;
1028
1029 mask |= 0x8;
1030 *last_ext |= 0x80;
1031 last_ext = &sl[sl.length ()];
1032
1033 sl << uint8 (5) << uint8 (stat_hp);
1034
1035 if (stat_width > 1)
1036 {
1037 *last_ext |= 0x80;
1038 last_ext = &sl[sl.length ()];
1039
1040 sl << uint8 (6) << uint8 (stat_width);
1041 }
1042 }
1043
1044 if (expect_false (lastcell.player != player))
1045 {
1046 lastcell.player = player;
1047
1048 mask |= 0x8;
1049 *last_ext |= 0x80;
1050 last_ext = &sl[sl.length ()];
1051
1052 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1053 }
1054
1055 if (expect_false (lastcell.flags != flags))
1056 {
1057 lastcell.flags = flags;
1058
1059 mask |= 0x8;
1060 *last_ext |= 0x80;
1061 last_ext = &sl[sl.length ()];
1062
1063 sl << uint8 (8) << uint8 (flags);
1064 }
1065
1066 // faces
1067
1068 /* Floor face */
1069 if (update_space (sl, socket, ms, lastcell, 2))
1070 mask |= 0x4;
1071
1072 /* Middle face */
1073 if (update_space (sl, socket, ms, lastcell, 1))
1074 mask |= 0x2;
1075
1076 if (expect_false (ob->invisible)
1077 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1078 && ms.player () == ob)
1079 {
1080 // force player to be visible to himself if invisible
1081 if (lastcell.faces[0] != ob->face)
1082 {
1083 lastcell.faces[0] = ob->face;
1084
1085 mask |= 0x1;
1086 sl << uint16 (ob->face);
1087
1088 socket.send_faces (ob);
1089 }
1090 }
1091 /* Top face */
1092 else if (update_space (sl, socket, ms, lastcell, 0))
1093 mask |= 0x1;
1094
1095 /* Check to see if we are in fact sending anything for this
1096 * space by checking the mask. If so, update the mask.
1097 * if not, reset the len to that from before adding the mask
1098 * value, so we don't send those bits.
1099 */
1100 if (mask & 0xf)
1101 sl[oldlen + 1] = mask & 0xff;
1102 else
1103 sl.reset (oldlen);
1104 } /* else this is a viewable space */
1105 ordered_mapwalk_end
1106
1107 socket.flush_fx ();
1108
1109 if (sl.length () > startlen || socket.sent_scroll)
1110 {
2285 ns->send_packet (sl); 1111 socket.send_packet (sl);
1112 socket.sent_scroll = 0;
1113 }
2286} 1114}
2287 1115
2288/** 1116/**
2289 * This looks for any spells the player may have that have changed their stats. 1117 * This looks for any spells the player may have that have changed their stats.
2290 * it then sends an updspell packet for each spell that has changed in this way 1118 * it then sends an updspell packet for each spell that has changed in this way
2291 */ 1119 */
2292void 1120void
2293esrv_update_spells (player *pl) 1121esrv_update_spells (player *pl)
2294{ 1122{
2295 if (!pl->socket->monitor_spells) 1123 if (!pl->ns)
2296 return; 1124 return;
2297 1125
1126 pl->ns->update_spells = false;
1127
1128 if (!pl->ns->monitor_spells)
1129 return;
1130
2298 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2299 {
2300 if (spell->type == SPELL) 1132 if (spell->type == SPELL)
2301 { 1133 {
2302 int flags = 0; 1134 int flags = 0;
1135 int val;
2303 1136
2304 /* check if we need to update it */ 1137 /* check if we need to update it */
2305 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1138 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1139 if (spell->cached_sp != val)
2306 { 1140 {
2307 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1141 spell->cached_sp = val;
2308 flags |= UPD_SP_MANA; 1142 flags |= UPD_SP_MANA;
2309 } 1143 }
2310 1144
2311 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1145 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1146 if (spell->cached_grace != val)
2312 { 1147 {
2313 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1148 spell->cached_grace = val;
2314 flags |= UPD_SP_GRACE; 1149 flags |= UPD_SP_GRACE;
2315 } 1150 }
2316 1151
2317 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1152 val = casting_level (pl->ob, spell);
1153 if (spell->cached_eat != val)
2318 { 1154 {
2319 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1155 spell->cached_eat = val;
2320 flags |= UPD_SP_DAMAGE; 1156 flags |= UPD_SP_LEVEL;
2321 } 1157 }
2322 1158
2323 if (flags) 1159 if (flags)
2324 { 1160 {
2325 packet sl; 1161 packet sl;
2326 1162
2327 sl << "updspell " 1163 sl << "updspell "
2328 << uint8 (flags) 1164 << uint8 (flags)
2329 << uint32 (spell->count); 1165 << uint32 (spell->count);
2330 1166
2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1167 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1168 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1169 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
2334 1170
2335 pl->socket->send_packet (sl); 1171 pl->ns->send_packet (sl);
2336 } 1172 }
2337 } 1173 }
2338 }
2339} 1174}
2340 1175
2341void 1176void
2342esrv_remove_spell (player *pl, object *spell) 1177esrv_remove_spell (player *pl, object *spell)
2343{ 1178{
2344 if (!pl->socket->monitor_spells) 1179 if (!pl->ns->monitor_spells)
2345 return; 1180 return;
2346 1181
2347 if (!pl || !spell || spell->env != pl->ob) 1182 if (!pl || !spell || spell->env != pl->ob)
2348 { 1183 {
2349 LOG (llevError, "Invalid call to esrv_remove_spell"); 1184 LOG (llevError, "Invalid call to esrv_remove_spell");
2350 return; 1185 return;
2351 } 1186 }
2352 1187
2353 packet sl; 1188 packet sl ("delspell");
2354 1189
2355 sl << "delspell "
2356 << uint32 (spell->count); 1190 sl << uint32 (spell->count);
2357 1191
2358 pl->socket->send_packet (sl); 1192 pl->ns->send_packet (sl);
2359} 1193}
2360 1194
2361/* appends the spell *spell to the Socklist we will send the data to. */ 1195/* appends the spell *spell to the Socklist we will send the data to. */
2362static void 1196static void
2363append_spell (player *pl, packet &sl, object *spell) 1197append_spell (player *pl, packet &sl, object *spell)
2364{ 1198{
2365 int len, i, skill = 0; 1199 int skill = 0;
2366 1200
2367 if (!(spell->name)) 1201 if (!(spell->name))
2368 { 1202 {
2369 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1203 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2370 return; 1204 return;
2371 } 1205 }
2372 1206
2373 /* store costs and damage in the object struct, to compare to later */ 1207 /* store costs and damage in the object struct, to compare to later */
2374 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1208 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2375 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1209 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2376 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1210 spell->cached_eat = casting_level (pl->ob, spell);
2377 1211
2378 /* figure out which skill it uses, if it uses one */ 1212 /* figure out which skill it uses, if it uses one */
2379 if (spell->skill) 1213 if (spell->skill)
2380 { 1214 if (object *tmp = pl->find_skill (spell->skill))
2381 for (i = 1; i < NUM_SKILLS; i++) 1215 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
2382 if (!strcmp (spell->skill, skill_names[i])) 1216
2383 { 1217 // spells better have a face
2384 skill = i + CS_STAT_SKILLINFO; 1218 if (!spell->face)
2385 break;
2386 }
2387 } 1219 {
1220 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1221 spell->face = face_find ("burnout.x11", blank_face);
1222 }
1223
1224 pl->ns->send_face (spell->face);
2388 1225
2389 /* send the current values */ 1226 /* send the current values */
2390 sl << uint32 (spell->count) 1227 sl << uint32 (spell->count)
2391 << uint16 (spell->level) 1228 << uint16 (spell->level)
2392 << uint16 (spell->casting_time) 1229 << uint16 (spell->casting_time)
2393 << uint16 (spell->last_sp) 1230 << uint16 (spell->cached_sp)
2394 << uint16 (spell->last_grace) 1231 << uint16 (spell->cached_grace)
2395 << uint16 (spell->last_eat) 1232 << uint16 (spell->cached_eat)
2396 << uint8 (skill) 1233 << uint8 (skill)
2397 << uint32 (spell->path_attuned) 1234 << uint32 (spell->path_attuned)
2398 << uint32 (spell->face ? spell->face->number : 0) 1235 << uint32 (spell->face)
2399 << data8 (spell->name) 1236 << data8 (spell->name);
1237
1238 if (pl->ns->monitor_spells < 2)
2400 << data16 (spell->msg); 1239 sl << data16 (spell->msg);
2401} 1240}
2402 1241
2403/** 1242/**
2404 * This tells the client to add the spell *ob, if *ob is NULL, then add 1243 * This tells the client to add the spell *ob, if *ob is NULL, then add
2405 * all spells in the player's inventory. 1244 * all spells in the player's inventory.
2406 */ 1245 */
2407void 1246void
2408esrv_add_spells (player *pl, object *spell) 1247esrv_add_spells (player *pl, object *spell)
2409{ 1248{
… …
2411 { 1250 {
2412 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1251 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2413 return; 1252 return;
2414 } 1253 }
2415 1254
2416 if (!pl->socket->monitor_spells) 1255 if (!pl->ns->monitor_spells)
2417 return; 1256 return;
2418 1257
2419 packet sl; 1258 packet sl ("addspell");
2420
2421 sl << "addspell ";
2422 1259
2423 if (!spell) 1260 if (!spell)
2424 { 1261 {
2425 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1262 for (spell = pl->ob->inv; spell; spell = spell->below)
2426 { 1263 {
2427 /* were we to simply keep appending data here, we could exceed 1264 /* were we to simply keep appending data here, we could exceed
2428 * MAXSOCKBUF if the player has enough spells to add, we know that 1265 * MAXSOCKBUF if the player has enough spells to add, we know that
2429 * append_spells will always append 19 data bytes, plus 4 length 1266 * append_spells will always append 19 data bytes, plus 4 length
2430 * bytes and 3 strings (because that is the spec) so we need to 1267 * bytes and 3 strings (because that is the spec) so we need to
2431 * check that the length of those 3 strings, plus the 23 bytes, 1268 * check that the length of those 3 strings, plus the 23 bytes,
2432 * won't take us over the length limit for the socket, if it does, 1269 * won't take us over the length limit for the socket, if it does,
2433 * we need to send what we already have, and restart packet formation 1270 * we need to send what we already have, and restart packet formation
2434 */ 1271 */
1272 if (spell->type != SPELL)
1273 continue;
1274
2435 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1275 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2436 * to show add_spell is 26 bytes + 2 strings. However, the overun 1276 * to show add_spell is 26 bytes + 2 strings. However, the overun
2437 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1277 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2438 * like it will fix this 1278 * like it will fix this
2439 */ 1279 */
2440 if (spell->type != SPELL)
2441 continue;
2442
2443 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1280 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2444 { 1281 {
1282 pl->ns->flush_fx ();
2445 pl->socket->send_packet (sl); 1283 pl->ns->send_packet (sl);
2446 1284
2447 sl.reset (); 1285 sl.reset ();
2448 sl << "addspell "; 1286 sl << "addspell ";
2449 } 1287 }
2450 1288
… …
2457 return; 1295 return;
2458 } 1296 }
2459 else 1297 else
2460 append_spell (pl, sl, spell); 1298 append_spell (pl, sl, spell);
2461 1299
2462 if (sl.length () >= MAXSOCKBUF) 1300 if (sl.length () > MAXSOCKBUF)
2463 {
2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1301 cleanup ("buffer overflow in esrv_add_spells!");
2465 fatal (0);
2466 }
2467 1302
2468 /* finally, we can send the packet */ 1303 /* finally, we can send the packet */
1304 pl->ns->flush_fx ();
2469 pl->socket->send_packet (sl); 1305 pl->ns->send_packet (sl);
2470} 1306}
2471 1307
1308//-GPL
1309

Diff Legend

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