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.43 by root, Sat Dec 16 20:16:37 2006 UTC vs.
Revision 1.180 by root, Tue May 3 11:23:48 2011 UTC

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

Diff Legend

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