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

Diff Legend

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