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.78 by root, Thu Mar 15 14:59:43 2007 UTC vs.
Revision 1.158 by root, Fri Nov 6 13:11:28 2009 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,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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 *
… …
64 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
65 * 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
66 * 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
67 * client. 69 * client.
68 */ 70 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
70 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,
71 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,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
74 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,
… …
99 */ 101 */
100 mx = ns->mapx; 102 mx = ns->mapx;
101 my = ns->mapy; 103 my = ns->mapy;
102 104
103 /* 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
104 * (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,
105 * if the destination x or y coordinate is outside the viewable 107 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 108 * area, we clear the values - otherwise, the old values
107 * 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.
108 */ 110 */
109 for (x = 0; x < mx; x++) 111 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 112 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 113 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 114 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 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)
117 /* clear newly visible tiles within the viewable area */ 117 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 119 else
120 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));
121 }
122 }
123 121
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 122 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 123
126 /* 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
127 * empty). 125 * empty).
… …
130} 128}
131 129
132static void 130static void
133clear_map (player *pl) 131clear_map (player *pl)
134{ 132{
133 pl->ns->mapinfo_queue_clear ();
134
135 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;
136 138
137 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
139 141
140 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
143}
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 }
141} 169}
142 170
143/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
144static void 172static void
145check_map_change (player *pl) 173check_map_change (player *pl)
146{ 174{
147 client &socket = *pl->ns; 175 client &socket = *pl->ns;
148 object *ob = pl->ob; 176 object *ob = pl->viewpoint;
149 char buf[MAX_BUF]; /* eauugggh */
150 177
151 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;
152 { 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);
153 socket.current_map = ob->map; 208 socket.current_map = ob->map;
154 209 send_map_info (pl);
155 clear_map (pl);
156
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0])
164 flags |= 1;
165 if (ob->map->tile_path[1])
166 flags |= 2;
167 if (ob->map->tile_path[2])
168 flags |= 4;
169 if (ob->map->tile_path[3])
170 flags |= 8;
171
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174 }
175 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf);
179 }
180 } 210 }
181 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)
182 { 212 {
183 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
184 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
185 215
186 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
187 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
188 else
189 {
190 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);
191 socket.floorbox_reset (); 217 socket.floorbox_reset ();
192 }
193 } 218 }
194 219
195 socket.current_x = ob->x; 220 socket.current_x = ob->x;
196 socket.current_y = ob->y; 221 socket.current_y = ob->y;
222}
197 223
198 region *reg = ob->region (); 224/**
199 if (socket.current_region != reg) 225 * This sends the skill number to name mapping. We ignore
200 { 226 * the params - we always send the same info no matter what.
201 socket.current_region = reg; 227 */
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 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)
203 } 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);
204} 267}
205 268
206/** 269/**
207 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
209 * that information. 272 * that information.
210 */ 273 */
211void 274void
212RequestInfo (char *buf, int len, client * ns) 275RequestInfo (char *buf, int len, client *ns)
213{ 276{
214 char *params = NULL, *cp; 277 char *params;
215
216 /* No match */
217 char bigbuf[MAX_BUF];
218 int slen;
219
220 /* Set up replyinfo before we modify any of the buffers - this is used
221 * if we don't find a match.
222 */
223 strcpy (bigbuf, "replyinfo ");
224 slen = strlen (bigbuf);
225 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226 278
227 /* find the first space, make it null, and update the 279 /* find the first space, make it null, and update the
228 * params pointer. 280 * params pointer.
229 */ 281 */
230 for (cp = buf; *cp != '\0'; cp++) 282 for (params = buf; *params; params++)
231 if (*cp == ' ') 283 if (*params == ' ')
232 { 284 {
233 *cp = '\0';
234 params = cp + 1; 285 *params++ = 0;
235 break; 286 break;
236 } 287 }
237 288
238 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params);
240 else if (!strcmp (buf, "image_sums"))
241 send_image_sums (ns, params);
242 else if (!strcmp (buf, "skill_info")) 289 if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 290 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
246 else 293 else
247 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 }
248} 301}
249 302
250void 303void
251ExtCmd (char *buf, int len, player *pl) 304ExtCmd (char *buf, int len, player *pl)
252{ 305{
… …
255 308
256void 309void
257ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
258{ 311{
259 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;
260} 401}
261 402
262void 403void
263MapInfoCmd (char *buf, int len, player *pl) 404MapInfoCmd (char *buf, int len, player *pl)
264{ 405{
265 // <mapinfo tag spatial tile-path 406 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 407 // >mapinfo tag spatial flags x y w h hash
267 408
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 409 char *token = buf;
271 // copy token 410
272 if (!(buf = strchr (buf, ' '))) 411 if (!(buf = strchr (buf, ' ')))
273 return; 412 return;
274 413
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 414 if (!strncmp (buf, " spatial ", 9))
278 { 415 {
279 buf += 8; 416 char *copy = strdup (token);
417 copy [buf - token] = 0;
280 418
281 // initial map and its origin 419#if 0
282 maptile *map = pl->ob->map; 420 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 421 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 422 free (copy);
285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
286 int max_distance = 8; // limit maximum path length to something generous
287
288 while (*buf && map && max_distance)
289 {
290 int dir = *buf++;
291
292 switch (dir)
293 {
294 case '1':
295 dx = 0;
296 dy = -1;
297 map = map->xy_find (dx, dy);
298 map && (mapy -= map->height);
299 break;
300 case '2':
301 mapx += map->width;
302 dx = map->width;
303 dy = 0;
304 map = map->xy_find (dx, dy);
305 break;
306 case '3':
307 mapy += map->height;
308 dx = 0;
309 dy = map->height;
310 map = map->xy_find (dx, dy);
311 break;
312 case '4':
313 dx = -1;
314 dy = 0;
315 map = map->xy_find (dx, dy);
316 map && (mapx -= map->width);
317 break;
318 }
319
320 --max_distance;
321 }
322
323 if (!max_distance)
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0])
326 {
327 int flags = 0;
328
329 if (map->tile_path[0])
330 flags |= 1;
331 if (map->tile_path[1])
332 flags |= 2;
333 if (map->tile_path[2])
334 flags |= 4;
335 if (map->tile_path[3])
336 flags |= 8;
337
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 }
340 else 423 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 424#endif
425 pl->ns->mapinfo_queue.push_back (copy);
342 } 426 }
343 else 427 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 428 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 429}
348 430
349/** This is the Setup cmd - easy first implementation */ 431/** This is the Setup cmd */
350void 432void
351SetUp (char *buf, int len, client * ns) 433SetUp (char *buf, int len, client * ns)
352{ 434{
353 int s, slen; 435 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464
465 sprintf (tmpbuf, "%d", ns->faceset);
466 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
467 /* if the client is using faceset, it knows about image2 command */
468 ns->image2 = 1;
469 }
470 else if (!strcmp (cmd, "itemcmd"))
471 {
472 /* Version of the item protocol command to use. Currently,
473 * only supported versions are 1 and 2. Using a numeric
474 * value will make it very easy to extend this in the future.
475 */
476 char tmpbuf[20];
477 int q = atoi (param);
478
479 if (q < 1 || q > 2)
480 {
481 strcpy (tmpbuf, "FALSE");
482 }
483 else
484 {
485 ns->itemcmd = q;
486 sprintf (tmpbuf, "%d", ns->itemcmd);
487 }
488 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
489 }
490 else if (!strcmp (cmd, "mapsize"))
491 {
492 int x, y = 0;
493 char tmpbuf[MAX_BUF], *cp;
494
495 x = atoi (param);
496 for (cp = param; *cp != 0; cp++)
497 if (*cp == 'x' || *cp == 'X')
498 {
499 y = atoi (cp + 1);
500 break;
501 }
502
503 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
504 {
505 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
506 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
507 }
508 else
509 {
510 ns->mapx = x;
511 ns->mapy = y;
512 /* better to send back what we are really using and not the
513 * param as given to us in case it gets parsed differently.
514 */
515 sprintf (tmpbuf, "%dx%d", x, y);
516 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517 /* If beyond this size and still using orig map command, need to
518 * go to map1cmd.
519 */
520 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
521 ns->mapmode = Map1Cmd;
522 }
523 }
524 else if (!strcmp (cmd, "extendedMapInfos"))
525 {
526 /* Added by tchize
527 * prepare to use the mapextended command
528 */
529 char tmpbuf[20];
530
531 ns->ext_mapinfos = (atoi (param));
532 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
533 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
534 }
535 else if (!strcmp (cmd, "extendedTextInfos"))
536 {
537 /* Added by tchize
538 * prepare to use the extended text commands
539 * Client toggle this to non zero to get exttext
540 */
541 char tmpbuf[20];
542
543 ns->has_readable_type = (atoi (param));
544 sprintf (tmpbuf, "%d", ns->has_readable_type);
545 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
546 }
547 else
548 {
549 /* Didn't get a setup command we understood -
550 * report a failure to the client.
551 */
552 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
553 }
554 } /* for processing all the setup commands */
555
556 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
557 ns->send_packet (cmdback);
558} 436}
559 437
560/** 438/**
561 * The client has requested to be added to the game. 439 * The client has requested to be added to the game.
562 * 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.
… …
564 * 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.
565 */ 443 */
566void 444void
567AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
568{ 446{
569 // face caching is mandatory
570 if (!ns->facecache)
571 {
572 ns->send_drawinfo (
573 "\n"
574 "\n"
575 "***\n"
576 "*** WARNING:\n"
577 "*** Your client does not support face/image caching,\n"
578 "*** or it has been disabled. Face caching is mandatory\n"
579 "*** so please enable it or use a newer client.\n"
580 "***\n"
581 "*** Look at your client preferences:\n"
582 "***\n"
583 "*** CFPlus: all known versions automatically enable the facecache.\n"
584 "*** cfclient: use the -cache commandline option.\n"
585 "*** cfclient: map will not redraw automatically (bug).\n"
586 "*** gcfclient: use -cache commandline option, or enable\n"
587 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
588 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
589 "***\n"
590 "***\n",
591 NDI_RED
592 );
593
594 if (strstr (ns->version, "jcrossclient"))
595 /* let them, for now*/;
596 else
597 {
598 ns->flush ();
599 //ns->destroy ();
600 }
601 //ns->facecache = true;
602 }
603
604 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
605} 448}
606 449
607/** Reply to ExtendedInfos command */ 450//+GPL
608void
609ToggleExtendedInfos (char *buf, int len, client * ns)
610{
611 char cmdback[MAX_BUF];
612 char command[50];
613 int info, nextinfo;
614
615 cmdback[0] = '\0';
616 nextinfo = 0;
617
618 while (1)
619 {
620 /* 1. Extract an info */
621 info = nextinfo;
622
623 while ((info < len) && (buf[info] == ' '))
624 info++;
625
626 if (info >= len)
627 break;
628
629 nextinfo = info + 1;
630
631 while ((nextinfo < len) && (buf[nextinfo] != ' '))
632 nextinfo++;
633
634 if (nextinfo - info >= 49) /*Erroneous info asked */
635 continue;
636
637 strncpy (command, &(buf[info]), nextinfo - info);
638
639 /* 2. Interpret info */
640 if (!strcmp ("smooth", command))
641 /* Toggle smoothing */
642 ns->EMI_smooth = !ns->EMI_smooth;
643 else
644 /*bad value */;
645
646 /*3. Next info */
647 }
648
649 strcpy (cmdback, "ExtendedInfoSet");
650
651 if (ns->EMI_smooth)
652 {
653 strcat (cmdback, " ");
654 strcat (cmdback, "smoothing");
655 }
656
657 ns->send_packet (cmdback);
658}
659 451
660/* 452/*
661#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
662#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
663#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
… …
680 while (1) 472 while (1)
681 { 473 {
682 /* 1. Extract an info */ 474 /* 1. Extract an info */
683 info = nextinfo; 475 info = nextinfo;
684 476
685 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
686 info++; 478 info++;
687 479
688 if (info >= len) 480 if (info >= len)
689 break; 481 break;
690 482
691 nextinfo = info + 1; 483 nextinfo = info + 1;
692 484
693 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
694 nextinfo++; 486 nextinfo++;
695 487
696 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
697 continue; 489 continue;
698 490
699 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
700 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
701 /* 2. Interpret info */ 494 /* 2. Interpret info */
702 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
703 496
704 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
705 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
719 512
720 ns->send_packet (cmdback); 513 ns->send_packet (cmdback);
721} 514}
722 515
723/** 516/**
724 * client requested an image. send it rate-limited
725 * before flushing.
726 */
727void
728AskFaceCmd (char *buf, int len, client *ns)
729{
730 ns->askface.push_back (atoi (buf));
731}
732
733/**
734 * Tells client the picture it has to use
735 * to smooth a picture number given as argument.
736 */
737void
738AskSmooth (char *buf, int len, client *ns)
739{
740 ns->send_face (atoi (buf));
741}
742
743/**
744 * 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,
745 * etc.) 518 * etc.)
746 */ 519 */
747void 520void
748PlayerCmd (char *buf, int len, player *pl) 521PlayerCmd (char *buf, int len, player *pl)
… …
759 return; 532 return;
760 533
761 buf++; 534 buf++;
762 } 535 }
763 536
764 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
765 538
766 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
767 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
768 * 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
769 * commands. 542 * commands.
770 */ 543 */
771 pl->count = 0; 544 pl->count = 0;
772} 545}
773 546
774
775/** 547/**
776 * 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,
777 * 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
778 * '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
779 * can throttle. 551 * can throttle.
… …
781void 553void
782NewPlayerCmd (char *buf, int len, player *pl) 554NewPlayerCmd (char *buf, int len, player *pl)
783{ 555{
784 if (len <= 6) 556 if (len <= 6)
785 { 557 {
786 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);
787 return; 559 return;
788 } 560 }
789 561
790 uint16 cmdid = net_uint16 ((uint8 *)buf); 562 uint16 cmdid = net_uint16 ((uint8 *)buf);
791 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 563 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
848 { 620 {
849 case ST_PLAYING: 621 case ST_PLAYING:
850 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 622 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
851 break; 623 break;
852 624
853 case ST_CHANGE_CLASS:
854 key_change_class (pl->ob, buf[0]);
855 break;
856
857 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 625 case ST_GET_PARTY_PASSWORD: /* Get password for party */
858 receive_party_password (pl->ob, 13); 626 receive_party_password (pl->ob, 13);
859 break; 627 break;
860 628
861 default: 629 default:
… …
900 668
901 cp = strchr (cp + 1, ' '); 669 cp = strchr (cp + 1, ' ');
902 670
903 if (cp) 671 if (cp)
904 { 672 {
905 assign (ns->version, cp + 1); 673 ns->version = cp + 1;
906 674
907 if (ns->sc_version < 1026) 675 if (ns->sc_version < 1026)
908 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 676 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
909 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 677 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
910 } 678 }
… …
933 * syntax is: move (to) (tag) (nrof) 701 * syntax is: move (to) (tag) (nrof)
934 */ 702 */
935void 703void
936MoveCmd (char *buf, int len, player *pl) 704MoveCmd (char *buf, int len, player *pl)
937{ 705{
938 int vals[3], i; 706 int to, tag, nrof;
939 707
940 /* A little funky here. We only cycle for 2 records, because 708 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
941 * we obviously are not going to find a space after the third
942 * record. Perhaps we should just replace this with a
943 * sscanf?
944 */
945 for (i = 0; i < 2; i++)
946 { 709 {
947 vals[i] = atoi (buf);
948
949 if (!(buf = strchr (buf, ' ')))
950 {
951 LOG (llevError, "Incomplete move command: %s\n", buf); 710 LOG (llevError, "Incomplete move command: %s\n", buf);
952 return; 711 return;
953 }
954
955 buf++;
956 } 712 }
957 713
958 vals[2] = atoi (buf); 714 esrv_move_object (pl->ob, to, tag, nrof);
959
960/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
961 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
962} 715}
963 716
964/****************************************************************************** 717/******************************************************************************
965 * 718 *
966 * Start of commands the server sends to the client. 719 * Start of commands the server sends to the client.
… …
970/** 723/**
971 * 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
972 * 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)
973 */ 726 */
974void 727void
975send_query (client *ns, uint8 flags, char *text) 728send_query (client *ns, uint8 flags, const char *text)
976{ 729{
977 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);
978} 759}
979 760
980#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
981 Old = New; \ 762 Old = New; \
982 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
… …
990#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
991 Old = New; \ 772 Old = New; \
992 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
993 } 774 }
994 775
995#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
996 Old = New; \ 777 Old = New; \
997 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
998 } 779 }
999 780
1000#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1001 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
1002 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
1016 797
1017 client *ns = pl->ns; 798 client *ns = pl->ns;
1018 if (!ns) 799 if (!ns)
1019 return; 800 return;
1020 801
1021 object *ob = pl->ob; 802 object *ob = pl->observe;
1022 if (!ob) 803 if (!ob)
1023 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1024 807
1025 packet sl ("stats"); 808 packet sl ("stats");
1026 809
1027 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1028 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1037 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1038 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1039 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1040 823
1041 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
1042 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob [s])
1043 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
1044 { 827 {
1045 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
1046 829
1047 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
1055 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1056 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1057 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1058 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1059 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1060 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1061 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1062 AddIfFloat (ns->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);
1063 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1064 847
1065 flags = 0; 848 flags = 0;
1066 849
1067 if (pl->fire_on) 850 if (opl->fire_on)
1068 flags |= SF_FIREON; 851 flags |= SF_FIREON;
1069 852
1070 if (pl->run_on) 853 if (opl->run_on)
1071 flags |= SF_RUNON; 854 flags |= SF_RUNON;
1072 855
1073 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1074 857
1075 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
1089 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1090 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1091 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1092 } 875 }
1093 876
1094 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1095 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1096 set_title (ob, buf); 879 set_title (ob, buf);
1097 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1098 881
1099 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
1103 886
1104/** 887/**
1105 * Tells the client that here is a player it should start using. 888 * Tells the client that here is a player it should start using.
1106 */ 889 */
1107void 890void
1108esrv_new_player (player *pl, uint32 weight) 891esrv_new_player (player *pl)
1109{ 892{
893 sint32 weight = pl->ob->client_weight ();
894
1110 packet sl ("player"); 895 packet sl ("player");
1111 896
1112 sl << uint32 (pl->ob->count) 897 sl << uint32 (pl->ob->count)
1113 << uint32 (weight) 898 << uint32 (weight)
1114 << uint32 (pl->ob->face) 899 << uint32 (pl->ob->face)
1115 << data8 (pl->ob->name); 900 << data8 (pl->ob->name);
1116 901
1117 pl->ns->last_weight = weight; 902 pl->ns->last_weight = weight;
1118 pl->ns->send_packet (sl); 903 pl->ns->send_packet (sl);
1119 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1120} 904}
1121 905
1122/****************************************************************************** 906/******************************************************************************
1123 * 907 *
1124 * Start of map related commands. 908 * Start of map related commands.
… …
1181 965
1182 if (!ns.faces_sent[face_num]) 966 if (!ns.faces_sent[face_num])
1183 if (ob) 967 if (ob)
1184 ns.send_faces (ob); 968 ns.send_faces (ob);
1185 else 969 else
1186 ns.send_face (face_num); 970 ns.send_face (face_num, 10);
1187 971
1188 sl << uint16 (face_num); 972 sl << uint16 (face_num);
1189 return 1; 973 return 1;
1190 } 974 }
1191 975
1192 /* Nothing changed */ 976 /* Nothing changed */
1193 return 0; 977 return 0;
1194} 978}
1195 979
1196/** 980//-GPL
1197 * Returns the size of a data for a map square as returned by
1198 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1199 * available.
1200 */
1201int
1202getExtendedMapInfoSize (client * ns)
1203{
1204 int result = 0;
1205
1206 if (ns->ext_mapinfos)
1207 {
1208 if (ns->EMI_smooth)
1209 result += 1; /*One byte for smoothlevel */
1210 }
1211
1212 return result;
1213}
1214 981
1215// prefetch (and touch) all maps within a specific distancd 982// prefetch (and touch) all maps within a specific distancd
1216static void 983static void
1217prefetch_surrounding_maps (maptile *map, int distance) 984prefetch_surrounding_maps (maptile *map, int distance)
1218{ 985{
1219 map->last_access = runtime; 986 map->touch ();
1220 987
1221 if (--distance) 988 if (--distance)
1222 for (int dir = 4; --dir; ) 989 for (int dir = 4; --dir; )
1223 if (const shstr &path = map->tile_path [dir]) 990 if (const shstr &path = map->tile_path [dir])
1224 if (maptile *&neigh = map->tile_map [dir]) 991 if (maptile *&neigh = map->tile_map [dir])
… …
1232prefetch_surrounding_maps (object *op) 999prefetch_surrounding_maps (object *op)
1233{ 1000{
1234 prefetch_surrounding_maps (op->map, 3); 1001 prefetch_surrounding_maps (op->map, 3);
1235} 1002}
1236 1003
1004//+GPL
1005
1237/** 1006/**
1238 * This function uses the new map1 protocol command to send the map 1007 * Draws client map.
1239 * to the client. It is necessary because the old map command supports
1240 * a maximum map size of 15x15.
1241 * This function is much simpler than the old one. This is because
1242 * the old function optimized to send as few face identifiers as possible,
1243 * at the expense of sending more coordinate location (coordinates were
1244 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1245 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1246 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1247 * and use the other 4 bits for other informatiion. For full documentation
1248 * of what we send, see the doc/Protocol file.
1249 * I will describe internally what we do:
1250 * the ns->lastmap shows how the map last looked when sent to the client.
1251 * in the lastmap structure, there is a cells array, which is set to the
1252 * maximum viewable size (As set in config.h).
1253 * in the cells, there are faces and a count value.
1254 * we use the count value to hold the darkness value. If -1, then this space
1255 * is not viewable.
1256 * we use faces[0] faces[1] faces[2] to hold what the three layers
1257 * look like.
1258 */ 1008 */
1259void 1009void
1260draw_client_map1 (object *pl) 1010draw_client_map (player *pl)
1261{ 1011{
1262 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1012 object *ob = pl->viewpoint;
1263 sint16 nx, ny;
1264 int estartlen, eoldlen;
1265 uint8 eentrysize;
1266 uint16 ewhatstart, ewhatflag;
1267 uint8 extendedinfos;
1268 maptile *m;
1269
1270 client &socket = *pl->contr->ns;
1271
1272 if (!pl->active) 1013 if (!pl->observe->active)
1273 return; 1014 return;
1274
1275 check_map_change (pl->contr);
1276 prefetch_surrounding_maps (pl);
1277
1278 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1279 packet esl;
1280
1281 startlen = sl.length ();
1282
1283 /*Extendedmapinfo structure initialisation */
1284 if (socket.ext_mapinfos)
1285 {
1286 extendedinfos = EMI_NOREDRAW;
1287
1288 if (socket.EMI_smooth)
1289 extendedinfos |= EMI_SMOOTH;
1290
1291 ewhatstart = esl.length ();
1292 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1293 could need to be taken away */
1294 eentrysize = getExtendedMapInfoSize (&socket);
1295 esl << "mapextended "
1296 << uint8 (extendedinfos)
1297 << uint8 (eentrysize);
1298
1299 estartlen = esl.length ();
1300 }
1301
1302 /* x,y are the real map locations. ax, ay are viewport relative
1303 * locations.
1304 */
1305 ay = 0;
1306
1307 /* We could do this logic as conditionals in the if statement,
1308 * but that started to get a bit messy to look at.
1309 */
1310 max_x = pl->x + (socket.mapx + 1) / 2;
1311 max_y = pl->y + (socket.mapy + 1) / 2;
1312
1313 maptile *plmap = pl->map;
1314
1315 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1316 {
1317 ax = 0;
1318 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1319 {
1320 int emask, mask;
1321 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1322
1323 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1324
1325 /* If the coordinates are not valid, or it is too dark to see,
1326 * we tell the client as such
1327 */
1328 nx = x;
1329 ny = y;
1330 m = get_map_from_coord (plmap, &nx, &ny);
1331
1332 if (!m)
1333 {
1334 /* space is out of map. Update space and clear values
1335 * if this hasn't already been done. If the space is out
1336 * of the map, it shouldn't have a head
1337 */
1338 if (lastcell.count != -1)
1339 {
1340 sl << uint16 (mask);
1341 map_clearcell (&lastcell, -1);
1342 }
1343
1344 continue;
1345 }
1346
1347 m->touch ();
1348
1349 int d = pl->contr->blocked_los[ax][ay];
1350
1351 if (d > 3)
1352 {
1353
1354 int need_send = 0, count;
1355
1356 /* This block deals with spaces that are not visible for whatever
1357 * reason. Still may need to send the head for this space.
1358 */
1359
1360 oldlen = sl.length ();
1361
1362 sl << uint16 (mask);
1363
1364 if (lastcell.count != -1)
1365 need_send = 1;
1366
1367 count = -1;
1368
1369 /* properly clear a previously sent big face */
1370 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1371 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1372 need_send = 1;
1373
1374 map_clearcell (&lastcell, count);
1375
1376 if ((mask & 0xf) || need_send)
1377 sl[oldlen + 1] = mask & 0xff;
1378 else
1379 sl.reset (oldlen);
1380 }
1381 else
1382 {
1383 /* In this block, the space is visible.
1384 */
1385
1386 /* Rather than try to figure out what everything that we might
1387 * need to send is, then form the packet after that,
1388 * we presume that we will in fact form a packet, and update
1389 * the bits by what we do actually send. If we send nothing,
1390 * we just back out sl.length () to the old value, and no harm
1391 * is done.
1392 * I think this is simpler than doing a bunch of checks to see
1393 * what if anything we need to send, setting the bits, then
1394 * doing those checks again to add the real data.
1395 */
1396 oldlen = sl.length ();
1397 eoldlen = esl.length ();
1398
1399 sl << uint16 (mask);
1400
1401 unsigned char dummy;
1402 unsigned char *last_ext = &dummy;
1403
1404 /* Darkness changed */
1405 if (lastcell.count != d && socket.darkness)
1406 {
1407 mask |= 0x8;
1408
1409 if (socket.extmap)
1410 {
1411 *last_ext |= 0x80;
1412 last_ext = &sl[sl.length ()];
1413 sl << uint8 (d);
1414 }
1415 else
1416 sl << uint8 (255 - 64 * d);
1417 }
1418
1419 lastcell.count = d;
1420
1421 mapspace &ms = m->at (nx, ny);
1422
1423 if (socket.extmap)
1424 {
1425 uint8 stat_hp = 0;
1426 uint8 stat_width = 0;
1427 uint8 flags = 0;
1428 UUID player = 0;
1429
1430 // send hp information, if applicable
1431 if (object *op = ms.faces_obj [0])
1432 {
1433 if (op->head || op->invisible)
1434 ; // do not show
1435 else if (op->type == PLAYER
1436 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1437 {
1438 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1439 {
1440 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1441 stat_width = op->arch->tail_x;
1442 }
1443 }
1444
1445 if (op->msg && op->msg[0] == '@')
1446 flags |= 1;
1447
1448 if (op->type == PLAYER && op != pl)
1449 player = op->count;
1450 }
1451
1452 if (lastcell.stat_hp != stat_hp)
1453 {
1454 lastcell.stat_hp = stat_hp;
1455
1456 mask |= 0x8;
1457 *last_ext |= 0x80;
1458 last_ext = &sl[sl.length ()];
1459
1460 sl << uint8 (5) << uint8 (stat_hp);
1461
1462 if (stat_width > 1)
1463 {
1464 *last_ext |= 0x80;
1465 last_ext = &sl[sl.length ()];
1466
1467 sl << uint8 (6) << uint8 (stat_width);
1468 }
1469 }
1470
1471 if (lastcell.player != player)
1472 {
1473 lastcell.player = player;
1474
1475 mask |= 0x8;
1476 *last_ext |= 0x80;
1477 last_ext = &sl[sl.length ()];
1478
1479 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1480 }
1481
1482 if (lastcell.flags != flags)
1483 {
1484 lastcell.flags = flags;
1485
1486 mask |= 0x8;
1487 *last_ext |= 0x80;
1488 last_ext = &sl[sl.length ()];
1489
1490 sl << uint8 (8) << uint8 (flags);
1491 }
1492 }
1493
1494 /* Floor face */
1495 if (update_space (sl, socket, ms, lastcell, 2))
1496 mask |= 0x4;
1497
1498 /* Middle face */
1499 if (update_space (sl, socket, ms, lastcell, 1))
1500 mask |= 0x2;
1501
1502 if (ms.player () == pl
1503 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1504 {
1505 // force player to be visible to himself if invisible
1506 if (lastcell.faces[0] != pl->face)
1507 {
1508 lastcell.faces[0] = pl->face;
1509
1510 mask |= 0x1;
1511 sl << uint16 (pl->face);
1512
1513 socket.send_faces (pl);
1514 }
1515 }
1516 /* Top face */
1517 else if (update_space (sl, socket, ms, lastcell, 0))
1518 mask |= 0x1;
1519
1520
1521 /* Check to see if we are in fact sending anything for this
1522 * space by checking the mask. If so, update the mask.
1523 * if not, reset the len to that from before adding the mask
1524 * value, so we don't send those bits.
1525 */
1526 if (mask & 0xf)
1527 sl[oldlen + 1] = mask & 0xff;
1528 else
1529 sl.reset (oldlen);
1530
1531 if (socket.ext_mapinfos)
1532 esl << uint16 (emask);
1533
1534 if (socket.EMI_smooth)
1535 {
1536 for (int layer = 2+1; layer--; )
1537 {
1538 object *ob = ms.faces_obj [layer];
1539
1540 // If there is no object for this space, or if the face for the object
1541 // is the blank face, set the smoothlevel to zero.
1542 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1543
1544 // We've gotten what face we want to use for the object. Now see if
1545 // if it has changed since we last sent it to the client.
1546 if (lastcell.smooth[layer] != smoothlevel)
1547 {
1548 lastcell.smooth[layer] = smoothlevel;
1549 esl << uint8 (smoothlevel);
1550 emask |= 1 << layer;
1551 }
1552 }
1553
1554 if (emask & 0xf)
1555 esl[eoldlen + 1] = emask & 0xff;
1556 else
1557 esl.reset (eoldlen);
1558 }
1559 } /* else this is a viewable space */
1560 } /* for x loop */
1561 } /* for y loop */
1562
1563 /* Verify that we in fact do need to send this */
1564 if (socket.ext_mapinfos)
1565 {
1566 if (!(sl.length () > startlen || socket.sent_scroll))
1567 {
1568 /* No map data will follow, so don't say the client
1569 * it doesn't need draw!
1570 */
1571 ewhatflag &= ~EMI_NOREDRAW;
1572 esl[ewhatstart + 1] = ewhatflag & 0xff;
1573 }
1574
1575 if (esl.length () > estartlen)
1576 socket.send_packet (esl);
1577 }
1578
1579 if (sl.length () > startlen || socket.sent_scroll)
1580 {
1581 socket.send_packet (sl);
1582 socket.sent_scroll = 0;
1583 }
1584}
1585
1586/**
1587 * Draws client map.
1588 */
1589void
1590draw_client_map (object *pl)
1591{
1592 int i, j;
1593 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1594 int mflags;
1595 struct Map newmap;
1596 maptile *m, *pm;
1597
1598 if (pl->type != PLAYER)
1599 {
1600 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1601 return;
1602 }
1603
1604 pm = pl->map;
1605 1015
1606 /* If player is just joining the game, he isn't here yet, so the map 1016 /* If player is just joining the game, he isn't here yet, so the map
1607 * can get swapped out. If so, don't try to send them a map. All will 1017 * can get swapped out. If so, don't try to send them a map. All will
1608 * be OK once they really log in. 1018 * be OK once they really log in.
1609 */ 1019 */
1610 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1020 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1611 return; 1021 return;
1612 1022
1613 memset (&newmap, 0, sizeof (struct Map)); 1023 int startlen, oldlen;
1614 1024
1615 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 1025 check_map_change (pl);
1616 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 1026 prefetch_surrounding_maps (pl->ob);
1027
1028 /* do LOS after calls to update_position */
1029 /* unfortunately, we need to udpate los when observing, currently */
1030 if (pl->do_los || pl->viewpoint != pl->ob)
1031 {
1032 pl->do_los = 0;
1033 pl->update_los ();
1034 }
1035
1036 /**
1037 * This function uses the new map1 protocol command to send the map
1038 * to the client. It is necessary because the old map command supports
1039 * a maximum map size of 15x15.
1040 * This function is much simpler than the old one. This is because
1041 * the old function optimized to send as few face identifiers as possible,
1042 * at the expense of sending more coordinate location (coordinates were
1043 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1044 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1045 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1046 * and use the other 4 bits for other informatiion. For full documentation
1047 * of what we send, see the doc/Protocol file.
1048 * I will describe internally what we do:
1049 * the ns->lastmap shows how the map last looked when sent to the client.
1050 * in the lastmap structure, there is a cells array, which is set to the
1051 * maximum viewable size (As set in config.h).
1052 * in the cells, there are faces and a count value.
1053 * we use the count value to hold the darkness value. If -1, then this space
1054 * is not viewable.
1055 * we use faces[0] faces[1] faces[2] to hold what the three layers
1056 * look like.
1057 */
1058
1059 client &socket = *pl->ns;
1060
1061 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1062
1063 startlen = sl.length ();
1064
1065 int hx = socket.mapx / 2;
1066 int hy = socket.mapy / 2;
1067
1068 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1069 int ax = dx + hx;
1070 int ay = dy + hy;
1071
1072 int mask = (ax << 10) | (ay << 4);
1073 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1074
1075 /* If the coordinates are not valid, or it is too dark to see,
1076 * we tell the client as such
1077 */
1078 if (!m)
1617 { 1079 {
1618 ax = i; 1080 /* space is out of map. Update space and clear values
1619 ay = j; 1081 * if this hasn't already been done. If the space is out
1620 m = pm; 1082 * of the map, it shouldn't have a head.
1621 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1622
1623 if (mflags & P_OUT_OF_MAP)
1624 continue;
1625
1626 /* If a map is visible to the player, we don't want to swap it out
1627 * just to reload it. This should really call something like
1628 * swap_map, but this is much more efficient and 'good enough'
1629 */ 1083 */
1630 if (mflags & P_NEW_MAP) 1084 if (lastcell.count != -1)
1631 m->timeout = 50; 1085 {
1086 sl << uint16 (mask);
1087 map_clearcell (&lastcell, -1);
1088 }
1089
1090 continue;
1632 } 1091 }
1092
1093 int d = pl->blocked_los_uc (dx, dy);
1633 1094
1634 /* do LOS after calls to update_position */ 1095 if (d > 3)
1635 if (pl->contr->do_los)
1636 { 1096 {
1637 update_los (pl); 1097 /* This block deals with spaces that are not visible for whatever
1638 pl->contr->do_los = 0; 1098 * reason. Still may need to send the head for this space.
1099 */
1100 if (lastcell.count != -1
1101 || lastcell.faces[0]
1102 || lastcell.faces[1]
1103 || lastcell.faces[2]
1104 || lastcell.stat_hp
1105 || lastcell.flags
1106 || lastcell.player)
1107 sl << uint16 (mask);
1108
1109 /* properly clear a previously sent big face */
1110 map_clearcell (&lastcell, -1);
1639 } 1111 }
1640 1112 else
1641 /* Big maps need a different drawing mechanism to work */
1642 draw_client_map1 (pl);
1643}
1644
1645
1646/*****************************************************************************/
1647
1648/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1649
1650/* a player. Of course, the client need to know the command to be able to */
1651
1652/* manage it ! */
1653
1654/*****************************************************************************/
1655void
1656send_plugin_custom_message (object *pl, char *buf)
1657{
1658 pl->contr->ns->send_packet (buf);
1659}
1660
1661/**
1662 * This sends the skill number to name mapping. We ignore
1663 * the params - we always send the same info no matter what.
1664 */
1665void
1666send_skill_info (client *ns, char *params)
1667{
1668 packet sl;
1669 sl << "replyinfo skill_info\n";
1670
1671 for (int i = 1; i < NUM_SKILLS; i++)
1672 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1673
1674 if (sl.length () >= MAXSOCKBUF)
1675 { 1113 {
1676 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1114 /* In this block, the space is visible.
1677 fatal (0); 1115 */
1116
1117 /* Rather than try to figure out what everything that we might
1118 * need to send is, then form the packet after that,
1119 * we presume that we will in fact form a packet, and update
1120 * the bits by what we do actually send. If we send nothing,
1121 * we just back out sl.length () to the old value, and no harm
1122 * is done.
1123 * I think this is simpler than doing a bunch of checks to see
1124 * what if anything we need to send, setting the bits, then
1125 * doing those checks again to add the real data.
1126 */
1127 oldlen = sl.length ();
1128
1129 sl << uint16 (mask);
1130
1131 unsigned char dummy;
1132 unsigned char *last_ext = &dummy;
1133
1134 /* Darkness changed */
1135 if (lastcell.count != d)
1136 {
1137 mask |= 0x8;
1138
1139 *last_ext |= 0x80;
1140 last_ext = &sl[sl.length ()];
1141 sl << uint8 (d);
1142 }
1143
1144 lastcell.count = d;
1145
1146 mapspace &ms = m->at (nx, ny);
1147 ms.update ();
1148
1149 // extmap handling
1150 uint8 stat_hp = 0;
1151 uint8 stat_width = 0;
1152 uint8 flags = 0;
1153 tag_t player = 0;
1154
1155 // send hp information, if applicable
1156 if (object *op = ms.faces_obj [0])
1157 if (op->is_head () && !op->invisible)
1158 {
1159 if (op->stats.maxhp > op->stats.hp
1160 && op->stats.maxhp > 0
1161 && (op->type == PLAYER
1162 || op->type == DOOR // does not work, have maxhp 0
1163 || QUERY_FLAG (op, FLAG_MONSTER)
1164 || QUERY_FLAG (op, FLAG_ALIVE)
1165 || QUERY_FLAG (op, FLAG_GENERATOR)))
1166 {
1167 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1168 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1169 }
1170
1171 if (expect_false (op->has_dialogue ()))
1172 flags |= 1;
1173
1174 if (expect_false (op->type == PLAYER))
1175 player = op == ob ? pl->ob->count
1176 : op == pl->ob ? ob->count
1177 : op->count;
1178 }
1179
1180 if (expect_false (lastcell.stat_hp != stat_hp))
1181 {
1182 lastcell.stat_hp = stat_hp;
1183
1184 mask |= 0x8;
1185 *last_ext |= 0x80;
1186 last_ext = &sl[sl.length ()];
1187
1188 sl << uint8 (5) << uint8 (stat_hp);
1189
1190 if (stat_width > 1)
1191 {
1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()];
1194
1195 sl << uint8 (6) << uint8 (stat_width);
1196 }
1197 }
1198
1199 if (expect_false (lastcell.player != player))
1200 {
1201 lastcell.player = player;
1202
1203 mask |= 0x8;
1204 *last_ext |= 0x80;
1205 last_ext = &sl[sl.length ()];
1206
1207 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1208 }
1209
1210 if (expect_false (lastcell.flags != flags))
1211 {
1212 lastcell.flags = flags;
1213
1214 mask |= 0x8;
1215 *last_ext |= 0x80;
1216 last_ext = &sl[sl.length ()];
1217
1218 sl << uint8 (8) << uint8 (flags);
1219 }
1220
1221 // faces
1222
1223 /* Floor face */
1224 if (update_space (sl, socket, ms, lastcell, 2))
1225 mask |= 0x4;
1226
1227 /* Middle face */
1228 if (update_space (sl, socket, ms, lastcell, 1))
1229 mask |= 0x2;
1230
1231 if (expect_false (ob->invisible)
1232 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1233 && ms.player () == ob)
1234 {
1235 // force player to be visible to himself if invisible
1236 if (lastcell.faces[0] != ob->face)
1237 {
1238 lastcell.faces[0] = ob->face;
1239
1240 mask |= 0x1;
1241 sl << uint16 (ob->face);
1242
1243 socket.send_faces (ob);
1244 }
1245 }
1246 /* Top face */
1247 else if (update_space (sl, socket, ms, lastcell, 0))
1248 mask |= 0x1;
1249
1250 /* Check to see if we are in fact sending anything for this
1251 * space by checking the mask. If so, update the mask.
1252 * if not, reset the len to that from before adding the mask
1253 * value, so we don't send those bits.
1254 */
1255 if (mask & 0xf)
1256 sl[oldlen + 1] = mask & 0xff;
1257 else
1258 sl.reset (oldlen);
1259 } /* else this is a viewable space */
1260 ordered_mapwalk_end
1261
1262 socket.flush_fx ();
1263
1264 if (sl.length () > startlen || socket.sent_scroll)
1678 } 1265 {
1679
1680 ns->send_packet (sl); 1266 socket.send_packet (sl);
1681} 1267 socket.sent_scroll = 0;
1682
1683/**
1684 * This sends the spell path to name mapping. We ignore
1685 * the params - we always send the same info no matter what.
1686 */
1687void
1688send_spell_paths (client * ns, char *params)
1689{
1690 packet sl;
1691
1692 sl << "replyinfo spell_paths\n";
1693
1694 for (int i = 0; i < NRSPELLPATHS; i++)
1695 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1696
1697 if (sl.length () >= MAXSOCKBUF)
1698 { 1268 }
1699 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1700 fatal (0);
1701 }
1702
1703 ns->send_packet (sl);
1704} 1269}
1705 1270
1706/** 1271/**
1707 * This looks for any spells the player may have that have changed their stats. 1272 * This looks for any spells the player may have that have changed their stats.
1708 * it then sends an updspell packet for each spell that has changed in this way 1273 * it then sends an updspell packet for each spell that has changed in this way
… …
1721 if (spell->type == SPELL) 1286 if (spell->type == SPELL)
1722 { 1287 {
1723 int flags = 0; 1288 int flags = 0;
1724 1289
1725 /* check if we need to update it */ 1290 /* check if we need to update it */
1726 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1291 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1727 { 1292 {
1728 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1293 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1729 flags |= UPD_SP_MANA; 1294 flags |= UPD_SP_MANA;
1730 } 1295 }
1731 1296
1732 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1297 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1733 { 1298 {
1734 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1299 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1735 flags |= UPD_SP_GRACE; 1300 flags |= UPD_SP_GRACE;
1736 } 1301 }
1737 1302
1738 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1303 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1739 { 1304 {
1740 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1305 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1741 flags |= UPD_SP_DAMAGE; 1306 flags |= UPD_SP_DAMAGE;
1742 } 1307 }
1743 1308
1744 if (flags) 1309 if (flags)
1745 { 1310 {
… …
1747 1312
1748 sl << "updspell " 1313 sl << "updspell "
1749 << uint8 (flags) 1314 << uint8 (flags)
1750 << uint32 (spell->count); 1315 << uint32 (spell->count);
1751 1316
1752 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1317 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1753 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1318 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1754 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1319 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1755 1320
1756 pl->ns->send_packet (sl); 1321 pl->ns->send_packet (sl);
1757 } 1322 }
1758 } 1323 }
1759 } 1324 }
… …
1789 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1354 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1790 return; 1355 return;
1791 } 1356 }
1792 1357
1793 /* store costs and damage in the object struct, to compare to later */ 1358 /* store costs and damage in the object struct, to compare to later */
1794 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1359 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1795 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1360 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1796 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1361 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1797 1362
1798 /* figure out which skill it uses, if it uses one */ 1363 /* figure out which skill it uses, if it uses one */
1799 if (spell->skill) 1364 if (spell->skill)
1800 { 1365 if (object *tmp = pl->find_skill (spell->skill))
1801 for (i = 1; i < NUM_SKILLS; i++)
1802 if (!strcmp (spell->skill, skill_names[i]))
1803 {
1804 skill = i + CS_STAT_SKILLINFO; 1366 skill = tmp->subtype + CS_STAT_SKILLINFO;
1805 break;
1806 }
1807 }
1808 1367
1809 // spells better have a face 1368 // spells better have a face
1810 if (!spell->face) 1369 if (!spell->face)
1811 { 1370 {
1812 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1371 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1813 spell->face = face_find ("burnout.x11", blank_face); 1372 spell->face = face_find ("burnout.x11", blank_face);
1814 } 1373 }
1374
1375 pl->ns->send_face (spell->face);
1815 1376
1816 /* send the current values */ 1377 /* send the current values */
1817 sl << uint32 (spell->count) 1378 sl << uint32 (spell->count)
1818 << uint16 (spell->level) 1379 << uint16 (spell->level)
1819 << uint16 (spell->casting_time) 1380 << uint16 (spell->casting_time)
1820 << uint16 (spell->last_sp) 1381 << uint16 (spell->cached_sp)
1821 << uint16 (spell->last_grace) 1382 << uint16 (spell->cached_grace)
1822 << uint16 (spell->last_eat) 1383 << uint16 (spell->cached_eat)
1823 << uint8 (skill) 1384 << uint8 (skill)
1824 << uint32 (spell->path_attuned) 1385 << uint32 (spell->path_attuned)
1825 << uint32 (spell->face) 1386 << uint32 (spell->face)
1826 << data8 (spell->name) 1387 << data8 (spell->name)
1827 << data16 (spell->msg); 1388 << data16 (spell->msg);
… …
1855 * bytes and 3 strings (because that is the spec) so we need to 1416 * bytes and 3 strings (because that is the spec) so we need to
1856 * check that the length of those 3 strings, plus the 23 bytes, 1417 * check that the length of those 3 strings, plus the 23 bytes,
1857 * won't take us over the length limit for the socket, if it does, 1418 * won't take us over the length limit for the socket, if it does,
1858 * we need to send what we already have, and restart packet formation 1419 * we need to send what we already have, and restart packet formation
1859 */ 1420 */
1421 if (spell->type != SPELL)
1422 continue;
1423
1860 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1424 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1861 * to show add_spell is 26 bytes + 2 strings. However, the overun 1425 * to show add_spell is 26 bytes + 2 strings. However, the overun
1862 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1426 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1863 * like it will fix this 1427 * like it will fix this
1864 */ 1428 */
1865 if (spell->type != SPELL)
1866 continue;
1867
1868 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1429 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1869 { 1430 {
1431 pl->ns->flush_fx ();
1870 pl->ns->send_packet (sl); 1432 pl->ns->send_packet (sl);
1871 1433
1872 sl.reset (); 1434 sl.reset ();
1873 sl << "addspell "; 1435 sl << "addspell ";
1874 } 1436 }
… …
1882 return; 1444 return;
1883 } 1445 }
1884 else 1446 else
1885 append_spell (pl, sl, spell); 1447 append_spell (pl, sl, spell);
1886 1448
1887 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1888 { 1450 {
1889 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1451 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1890 fatal (0); 1452 fatal (0);
1891 } 1453 }
1892 1454
1893 /* finally, we can send the packet */ 1455 /* finally, we can send the packet */
1456 pl->ns->flush_fx ();
1894 pl->ns->send_packet (sl); 1457 pl->ns->send_packet (sl);
1895} 1458}
1896 1459
1460//-GPL
1461

Diff Legend

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