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

Diff Legend

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