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

Diff Legend

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