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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines