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.75 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.167 by root, Sat Apr 3 22:30:21 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
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 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 436}
558 437
559/** 438/**
560 * The client has requested to be added to the game. 439 * The client has requested to be added to the game.
561 * 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.
562 * I am not sure if this file is the best place for this function. however, 441 * I am not sure if this file is the best place for this function. however,
563 * 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.
564 */ 443 */
565void 444void
566AddMeCmd (char *buf, int len, client * ns) 445AddMeCmd (char *buf, int len, client *ns)
567{ 446{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 448}
570 449
571/** Reply to ExtendedInfos command */ 450//+GPL
572void
573ToggleExtendedInfos (char *buf, int len, client * ns)
574{
575 char cmdback[MAX_BUF];
576 char command[50];
577 int info, nextinfo;
578
579 cmdback[0] = '\0';
580 nextinfo = 0;
581
582 while (1)
583 {
584 /* 1. Extract an info */
585 info = nextinfo;
586
587 while ((info < len) && (buf[info] == ' '))
588 info++;
589
590 if (info >= len)
591 break;
592
593 nextinfo = info + 1;
594
595 while ((nextinfo < len) && (buf[nextinfo] != ' '))
596 nextinfo++;
597
598 if (nextinfo - info >= 49) /*Erroneous info asked */
599 continue;
600
601 strncpy (command, &(buf[info]), nextinfo - info);
602
603 /* 2. Interpret info */
604 if (!strcmp ("smooth", command))
605 /* Toggle smoothing */
606 ns->EMI_smooth = !ns->EMI_smooth;
607 else
608 /*bad value */;
609
610 /*3. Next info */
611 }
612
613 strcpy (cmdback, "ExtendedInfoSet");
614
615 if (ns->EMI_smooth)
616 {
617 strcat (cmdback, " ");
618 strcat (cmdback, "smoothing");
619 }
620
621 ns->send_packet (cmdback);
622}
623 451
624/* 452/*
625#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
626#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
627#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
644 while (1) 472 while (1)
645 { 473 {
646 /* 1. Extract an info */ 474 /* 1. Extract an info */
647 info = nextinfo; 475 info = nextinfo;
648 476
649 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
650 info++; 478 info++;
651 479
652 if (info >= len) 480 if (info >= len)
653 break; 481 break;
654 482
655 nextinfo = info + 1; 483 nextinfo = info + 1;
656 484
657 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
658 nextinfo++; 486 nextinfo++;
659 487
660 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
661 continue; 489 continue;
662 490
663 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
664 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
665 /* 2. Interpret info */ 494 /* 2. Interpret info */
666 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
667 496
668 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
669 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
683 512
684 ns->send_packet (cmdback); 513 ns->send_packet (cmdback);
685} 514}
686 515
687/** 516/**
688 * Tells client the picture it has to use
689 * to smooth a picture number given as argument.
690 */
691void
692AskSmooth (char *buf, int len, client *ns)
693{
694 ns->send_face (atoi (buf));
695}
696
697/**
698 * 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,
699 * etc.) 518 * etc.)
700 */ 519 */
701void 520void
702PlayerCmd (char *buf, int len, player *pl) 521PlayerCmd (char *buf, int len, player *pl)
713 return; 532 return;
714 533
715 buf++; 534 buf++;
716 } 535 }
717 536
718 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
719 538
720 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
721 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
722 * 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
723 * commands. 542 * commands.
724 */ 543 */
725 pl->count = 0; 544 pl->count = 0;
726} 545}
727 546
728
729/** 547/**
730 * 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,
731 * 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
732 * '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
733 * can throttle. 551 * can throttle.
735void 553void
736NewPlayerCmd (char *buf, int len, player *pl) 554NewPlayerCmd (char *buf, int len, player *pl)
737{ 555{
738 if (len <= 6) 556 if (len <= 6)
739 { 557 {
740 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);
741 return; 559 return;
742 } 560 }
743 561
744 uint16 cmdid = net_uint16 ((uint8 *)buf); 562 uint16 cmdid = net_uint16 ((uint8 *)buf);
745 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 563 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
758 * commands. 576 * commands.
759 */ 577 */
760 pl->count = 0; 578 pl->count = 0;
761 579
762 //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
763 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
764 ? time = MAX_TIME * 100
765 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
766 584
767 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
768 packet sl ("comc"); 586 packet sl ("comc");
769 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
770 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
802 { 620 {
803 case ST_PLAYING: 621 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 622 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 623 break;
806 624
807 case ST_CHANGE_CLASS:
808 key_change_class (pl->ob, buf[0]);
809 break;
810
811 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 625 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 626 receive_party_password (pl->ob, 13);
813 break; 627 break;
814 628
815 default: 629 default:
854 668
855 cp = strchr (cp + 1, ' '); 669 cp = strchr (cp + 1, ' ');
856 670
857 if (cp) 671 if (cp)
858 { 672 {
859 assign (ns->version, cp + 1); 673 ns->version = cp + 1;
860 674
861 if (ns->sc_version < 1026) 675 if (ns->sc_version < 1026)
862 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 676 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 677 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864 } 678 }
887 * syntax is: move (to) (tag) (nrof) 701 * syntax is: move (to) (tag) (nrof)
888 */ 702 */
889void 703void
890MoveCmd (char *buf, int len, player *pl) 704MoveCmd (char *buf, int len, player *pl)
891{ 705{
892 int vals[3], i; 706 int to, tag, nrof;
893 707
894 /* A little funky here. We only cycle for 2 records, because 708 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
895 * we obviously are not going to find a space after the third
896 * record. Perhaps we should just replace this with a
897 * sscanf?
898 */
899 for (i = 0; i < 2; i++)
900 { 709 {
901 vals[i] = atoi (buf);
902
903 if (!(buf = strchr (buf, ' ')))
904 {
905 LOG (llevError, "Incomplete move command: %s\n", buf); 710 LOG (llevError, "Incomplete move command: %s\n", buf);
906 return; 711 return;
907 }
908
909 buf++;
910 } 712 }
911 713
912 vals[2] = atoi (buf); 714 esrv_move_object (pl->ob, to, tag, nrof);
913
914/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
915 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
916} 715}
917 716
918/****************************************************************************** 717/******************************************************************************
919 * 718 *
920 * Start of commands the server sends to the client. 719 * Start of commands the server sends to the client.
924/** 723/**
925 * 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
926 * 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)
927 */ 726 */
928void 727void
929send_query (client *ns, uint8 flags, char *text) 728send_query (client *ns, uint8 flags, const char *text)
930{ 729{
931 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 0
742 // print ranged/chosen_skill etc. objects every call
743 printf ("%s %s => %s (%s)\n",
744 pl->ranged_ob ? &pl->ranged_ob->name : "-",
745 pl->combat_ob ? &pl->combat_ob->name : "-",
746 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
747 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
748 );
749#endif
750
751 if (pl->ranged_ob)
752 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
753
754 if (pl->combat_ob)
755 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
756
757#if 0
758 //TODO: remove this when slot system is working, this is only for debugging
759 if (pl->ob->chosen_skill)
760 buf << " Skill*: " << pl->ob->chosen_skill->name;
761#endif
762
763 //TODO: maybe golem should become the current_weapon, quite simply?
764 if (pl->golem)
765 buf << " Golem*: " << pl->golem->name;
766
767 buf << '\0';
768 buf.linearise (obuf);
932} 769}
933 770
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 771#define AddIfInt64(Old,New,Type) if (Old != New) {\
935 Old = New; \ 772 Old = New; \
936 sl << uint8 (Type) << uint64 (New); \ 773 sl << uint8 (Type) << uint64 (New); \
944#define AddIfShort(Old,New,Type) if (Old != New) {\ 781#define AddIfShort(Old,New,Type) if (Old != New) {\
945 Old = New; \ 782 Old = New; \
946 sl << uint8 (Type) << uint16 (New); \ 783 sl << uint8 (Type) << uint16 (New); \
947 } 784 }
948 785
949#define AddIfFloat(Old,New,Type) if (Old != New) {\ 786#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950 Old = New; \ 787 Old = New; \
951 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 788 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952 } 789 }
953 790
954#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 791#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955 free(Old); Old = strdup (New);\ 792 free(Old); Old = strdup (New);\
956 sl << uint8 (Type) << data8 (New); \ 793 sl << uint8 (Type) << data8 (New); \
970 807
971 client *ns = pl->ns; 808 client *ns = pl->ns;
972 if (!ns) 809 if (!ns)
973 return; 810 return;
974 811
975 object *ob = pl->ob; 812 object *ob = pl->observe;
976 if (!ob) 813 if (!ob)
977 return; 814 return;
815
816 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978 817
979 packet sl ("stats"); 818 packet sl ("stats");
980 819
981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 820 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 821 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 830 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 831 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 832 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994 833
995 for (int s = 0; s < NUM_SKILLS; s++) 834 for (int s = 0; s < NUM_SKILLS; s++)
996 if (object *skill = pl->last_skill_ob[s]) 835 if (object *skill = opl->last_skill_ob [s])
997 if (skill->stats.exp != ns->last_skill_exp [s]) 836 if (skill->stats.exp != ns->last_skill_exp [s])
998 { 837 {
999 ns->last_skill_exp [s] = skill->stats.exp; 838 ns->last_skill_exp [s] = skill->stats.exp;
1000 839
1001 /* Always send along the level if exp changes. This is only 840 /* Always send along the level if exp changes. This is only
1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 848 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 849 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 850 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 851 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 852 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 853 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 854 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 855 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 856 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018 857
1019 flags = 0; 858 flags = 0;
1020 859
1021 if (pl->fire_on) 860 if (opl->fire_on)
1022 flags |= SF_FIREON; 861 flags |= SF_FIREON;
1023 862
1024 if (pl->run_on) 863 if (opl->run_on)
1025 flags |= SF_RUNON; 864 flags |= SF_RUNON;
1026 865
1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 866 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028 867
1029 if (ns->sc_version < 1025)
1030 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1031 else
1032 for (int i = 0; i < NROFATTACKS; i++) 868 for (int i = 0; i < NROFATTACKS; i++)
1033 { 869 {
1034 /* Skip ones we won't send */ 870 /* Skip ones we won't send */
1035 if (atnr_cs_stat[i] == -1) 871 if (atnr_cs_stat[i] == -1)
1036 continue; 872 continue;
1037 873
1038 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 874 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1039 } 875 }
1040 876
1041 if (pl->ns->monitor_spells) 877 if (pl->ns->monitor_spells)
1042 { 878 {
1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 879 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 880 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 881 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046 } 882 }
1047 883
1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 884 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 885 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050 set_title (ob, buf); 886 set_title (ob, buf);
1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 887 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052 888
1053 /* Only send it away if we have some actual data */ 889 /* Only send it away if we have some actual data */
1057 893
1058/** 894/**
1059 * Tells the client that here is a player it should start using. 895 * Tells the client that here is a player it should start using.
1060 */ 896 */
1061void 897void
1062esrv_new_player (player *pl, uint32 weight) 898esrv_new_player (player *pl)
1063{ 899{
900 sint32 weight = pl->ob->client_weight ();
901
1064 packet sl ("player"); 902 packet sl ("player");
1065 903
1066 sl << uint32 (pl->ob->count) 904 sl << uint32 (pl->ob->count)
1067 << uint32 (weight) 905 << uint32 (weight)
1068 << uint32 (pl->ob->face) 906 << uint32 (pl->ob->face)
1069 << data8 (pl->ob->name); 907 << data8 (pl->ob->name);
1070 908
1071 pl->ns->last_weight = weight; 909 pl->ns->last_weight = weight;
1072 pl->ns->send_packet (sl); 910 pl->ns->send_packet (sl);
1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1074} 911}
1075 912
1076/****************************************************************************** 913/******************************************************************************
1077 * 914 *
1078 * Start of map related commands. 915 * Start of map related commands.
1135 972
1136 if (!ns.faces_sent[face_num]) 973 if (!ns.faces_sent[face_num])
1137 if (ob) 974 if (ob)
1138 ns.send_faces (ob); 975 ns.send_faces (ob);
1139 else 976 else
1140 ns.send_face (face_num); 977 ns.send_face (face_num, 10);
1141 978
1142 sl << uint16 (face_num); 979 sl << uint16 (face_num);
1143 return 1; 980 return 1;
1144 } 981 }
1145 982
1146 /* Nothing changed */ 983 /* Nothing changed */
1147 return 0; 984 return 0;
1148} 985}
1149 986
1150/** 987//-GPL
1151 * Returns the size of a data for a map square as returned by
1152 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1153 * available.
1154 */
1155int
1156getExtendedMapInfoSize (client * ns)
1157{
1158 int result = 0;
1159
1160 if (ns->ext_mapinfos)
1161 {
1162 if (ns->EMI_smooth)
1163 result += 1; /*One byte for smoothlevel */
1164 }
1165
1166 return result;
1167}
1168 988
1169// prefetch (and touch) all maps within a specific distancd 989// prefetch (and touch) all maps within a specific distancd
1170static void 990static void
1171prefetch_surrounding_maps (maptile *map, int distance) 991prefetch_surrounding_maps (maptile *map, int distance)
1172{ 992{
1173 map->last_access = runtime; 993 map->touch ();
1174 994
1175 if (--distance) 995 if (--distance)
1176 for (int dir = 4; --dir; ) 996 for (int dir = 4; dir--; )
1177 if (const shstr &path = map->tile_path [dir]) 997 if (const shstr &path = map->tile_path [dir])
1178 if (maptile *&neigh = map->tile_map [dir]) 998 if (maptile *&neigh = map->tile_map [dir])
1179 prefetch_surrounding_maps (neigh, distance); 999 prefetch_surrounding_maps (neigh, distance);
1180 else 1000 else
1181 neigh = maptile::find_async (path, map); 1001 neigh = maptile::find_async (path, map);
1186prefetch_surrounding_maps (object *op) 1006prefetch_surrounding_maps (object *op)
1187{ 1007{
1188 prefetch_surrounding_maps (op->map, 3); 1008 prefetch_surrounding_maps (op->map, 3);
1189} 1009}
1190 1010
1011//+GPL
1012
1191/** 1013/**
1192 * This function uses the new map1 protocol command to send the map 1014 * Draws client map.
1193 * to the client. It is necessary because the old map command supports
1194 * a maximum map size of 15x15.
1195 * This function is much simpler than the old one. This is because
1196 * the old function optimized to send as few face identifiers as possible,
1197 * at the expense of sending more coordinate location (coordinates were
1198 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1199 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1200 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1201 * and use the other 4 bits for other informatiion. For full documentation
1202 * of what we send, see the doc/Protocol file.
1203 * I will describe internally what we do:
1204 * the ns->lastmap shows how the map last looked when sent to the client.
1205 * in the lastmap structure, there is a cells array, which is set to the
1206 * maximum viewable size (As set in config.h).
1207 * in the cells, there are faces and a count value.
1208 * we use the count value to hold the darkness value. If -1, then this space
1209 * is not viewable.
1210 * we use faces[0] faces[1] faces[2] to hold what the three layers
1211 * look like.
1212 */ 1015 */
1213void 1016void
1214draw_client_map1 (object *pl) 1017draw_client_map (player *pl)
1215{ 1018{
1216 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1019 object *ob = pl->viewpoint;
1217 sint16 nx, ny;
1218 int estartlen, eoldlen;
1219 uint8 eentrysize;
1220 uint16 ewhatstart, ewhatflag;
1221 uint8 extendedinfos;
1222 maptile *m;
1223
1224 client &socket = *pl->contr->ns;
1225
1226 if (!pl->active) 1020 if (!pl->observe->active)
1227 return; 1021 return;
1228
1229 check_map_change (pl->contr);
1230 prefetch_surrounding_maps (pl);
1231
1232 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1233 packet esl;
1234
1235 startlen = sl.length ();
1236
1237 /*Extendedmapinfo structure initialisation */
1238 if (socket.ext_mapinfos)
1239 {
1240 extendedinfos = EMI_NOREDRAW;
1241
1242 if (socket.EMI_smooth)
1243 extendedinfos |= EMI_SMOOTH;
1244
1245 ewhatstart = esl.length ();
1246 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1247 could need to be taken away */
1248 eentrysize = getExtendedMapInfoSize (&socket);
1249 esl << "mapextended "
1250 << uint8 (extendedinfos)
1251 << uint8 (eentrysize);
1252
1253 estartlen = esl.length ();
1254 }
1255 else
1256 {
1257 /* suppress compiler warnings */
1258 ewhatstart = 0;
1259 ewhatflag = 0;
1260 estartlen = 0;
1261 }
1262
1263 /* x,y are the real map locations. ax, ay are viewport relative
1264 * locations.
1265 */
1266 ay = 0;
1267
1268 /* We could do this logic as conditionals in the if statement,
1269 * but that started to get a bit messy to look at.
1270 */
1271 max_x = pl->x + (socket.mapx + 1) / 2;
1272 max_y = pl->y + (socket.mapy + 1) / 2;
1273
1274 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1275 {
1276 ax = 0;
1277 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1278 {
1279 int emask, mask;
1280 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1281
1282 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1283
1284 /* If the coordinates are not valid, or it is too dark to see,
1285 * we tell the client as such
1286 */
1287 nx = x;
1288 ny = y;
1289 m = get_map_from_coord (pl->map, &nx, &ny);
1290
1291 if (!m)
1292 {
1293 /* space is out of map. Update space and clear values
1294 * if this hasn't already been done. If the space is out
1295 * of the map, it shouldn't have a head
1296 */
1297 if (lastcell.count != -1)
1298 {
1299 sl << uint16 (mask);
1300 map_clearcell (&lastcell, -1);
1301 }
1302
1303 continue;
1304 }
1305
1306 m->touch ();
1307
1308 int d = pl->contr->blocked_los[ax][ay];
1309
1310 if (d > 3)
1311 {
1312
1313 int need_send = 0, count;
1314
1315 /* This block deals with spaces that are not visible for whatever
1316 * reason. Still may need to send the head for this space.
1317 */
1318
1319 oldlen = sl.length ();
1320
1321 sl << uint16 (mask);
1322
1323 if (lastcell.count != -1)
1324 need_send = 1;
1325
1326 count = -1;
1327
1328 /* properly clear a previously sent big face */
1329 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1330 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1331 need_send = 1;
1332
1333 map_clearcell (&lastcell, count);
1334
1335 if ((mask & 0xf) || need_send)
1336 sl[oldlen + 1] = mask & 0xff;
1337 else
1338 sl.reset (oldlen);
1339 }
1340 else
1341 {
1342 /* In this block, the space is visible.
1343 */
1344
1345 /* Rather than try to figure out what everything that we might
1346 * need to send is, then form the packet after that,
1347 * we presume that we will in fact form a packet, and update
1348 * the bits by what we do actually send. If we send nothing,
1349 * we just back out sl.length () to the old value, and no harm
1350 * is done.
1351 * I think this is simpler than doing a bunch of checks to see
1352 * what if anything we need to send, setting the bits, then
1353 * doing those checks again to add the real data.
1354 */
1355 oldlen = sl.length ();
1356 eoldlen = esl.length ();
1357
1358 sl << uint16 (mask);
1359
1360 unsigned char dummy;
1361 unsigned char *last_ext = &dummy;
1362
1363 /* Darkness changed */
1364 if (lastcell.count != d && socket.darkness)
1365 {
1366 mask |= 0x8;
1367
1368 if (socket.extmap)
1369 {
1370 *last_ext |= 0x80;
1371 last_ext = &sl[sl.length ()];
1372 sl << uint8 (d);
1373 }
1374 else
1375 sl << uint8 (255 - 64 * d);
1376 }
1377
1378 lastcell.count = d;
1379
1380 mapspace &ms = m->at (nx, ny);
1381
1382 if (socket.extmap)
1383 {
1384 uint8 stat_hp = 0;
1385 uint8 stat_width = 0;
1386 uint8 flags = 0;
1387 UUID player = 0;
1388
1389 // send hp information, if applicable
1390 if (object *op = ms.faces_obj [0])
1391 {
1392 if (op->head || op->invisible)
1393 ; // do not show
1394 else if (op->type == PLAYER
1395 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1396 {
1397 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1398 {
1399 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1400 stat_width = op->arch->tail_x;
1401 }
1402 }
1403
1404 if (op->msg && op->msg[0] == '@')
1405 flags |= 1;
1406
1407 if (op->type == PLAYER && op != pl)
1408 player = op->count;
1409 }
1410
1411 if (lastcell.stat_hp != stat_hp)
1412 {
1413 lastcell.stat_hp = stat_hp;
1414
1415 mask |= 0x8;
1416 *last_ext |= 0x80;
1417 last_ext = &sl[sl.length ()];
1418
1419 sl << uint8 (5) << uint8 (stat_hp);
1420
1421 if (stat_width > 1)
1422 {
1423 *last_ext |= 0x80;
1424 last_ext = &sl[sl.length ()];
1425
1426 sl << uint8 (6) << uint8 (stat_width);
1427 }
1428 }
1429
1430 if (lastcell.player != player)
1431 {
1432 lastcell.player = player;
1433
1434 mask |= 0x8;
1435 *last_ext |= 0x80;
1436 last_ext = &sl[sl.length ()];
1437
1438 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1439 }
1440
1441 if (lastcell.flags != flags)
1442 {
1443 lastcell.flags = flags;
1444
1445 mask |= 0x8;
1446 *last_ext |= 0x80;
1447 last_ext = &sl[sl.length ()];
1448
1449 sl << uint8 (8) << uint8 (flags);
1450 }
1451 }
1452
1453 /* Floor face */
1454 if (update_space (sl, socket, ms, lastcell, 2))
1455 mask |= 0x4;
1456
1457 /* Middle face */
1458 if (update_space (sl, socket, ms, lastcell, 1))
1459 mask |= 0x2;
1460
1461 if (ms.player () == pl
1462 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1463 {
1464 // force player to be visible to himself if invisible
1465 if (lastcell.faces[0] != pl->face)
1466 {
1467 lastcell.faces[0] = pl->face;
1468
1469 mask |= 0x1;
1470 sl << uint16 (pl->face);
1471
1472 socket.send_faces (pl);
1473 }
1474 }
1475 /* Top face */
1476 else if (update_space (sl, socket, ms, lastcell, 0))
1477 mask |= 0x1;
1478
1479
1480 /* Check to see if we are in fact sending anything for this
1481 * space by checking the mask. If so, update the mask.
1482 * if not, reset the len to that from before adding the mask
1483 * value, so we don't send those bits.
1484 */
1485 if (mask & 0xf)
1486 sl[oldlen + 1] = mask & 0xff;
1487 else
1488 sl.reset (oldlen);
1489
1490 if (socket.ext_mapinfos)
1491 esl << uint16 (emask);
1492
1493 if (socket.EMI_smooth)
1494 {
1495 for (int layer = 2+1; layer--; )
1496 {
1497 object *ob = ms.faces_obj [layer];
1498
1499 // If there is no object for this space, or if the face for the object
1500 // is the blank face, set the smoothlevel to zero.
1501 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1502
1503 // We've gotten what face we want to use for the object. Now see if
1504 // if it has changed since we last sent it to the client.
1505 if (lastcell.smooth[layer] != smoothlevel)
1506 {
1507 lastcell.smooth[layer] = smoothlevel;
1508 esl << uint8 (smoothlevel);
1509 emask |= 1 << layer;
1510 }
1511 }
1512
1513 if (emask & 0xf)
1514 esl[eoldlen + 1] = emask & 0xff;
1515 else
1516 esl.reset (eoldlen);
1517 }
1518 } /* else this is a viewable space */
1519 } /* for x loop */
1520 } /* for y loop */
1521
1522 /* Verify that we in fact do need to send this */
1523 if (socket.ext_mapinfos)
1524 {
1525 if (!(sl.length () > startlen || socket.sent_scroll))
1526 {
1527 /* No map data will follow, so don't say the client
1528 * it doesn't need draw!
1529 */
1530 ewhatflag &= ~EMI_NOREDRAW;
1531 esl[ewhatstart + 1] = ewhatflag & 0xff;
1532 }
1533
1534 if (esl.length () > estartlen)
1535 socket.send_packet (esl);
1536 }
1537
1538 if (sl.length () > startlen || socket.sent_scroll)
1539 {
1540 socket.send_packet (sl);
1541 socket.sent_scroll = 0;
1542 }
1543}
1544
1545/**
1546 * Draws client map.
1547 */
1548void
1549draw_client_map (object *pl)
1550{
1551 int i, j;
1552 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1553 int mflags;
1554 struct Map newmap;
1555 maptile *m, *pm;
1556
1557 if (pl->type != PLAYER)
1558 {
1559 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1560 return;
1561 }
1562
1563 pm = pl->map;
1564 1022
1565 /* If player is just joining the game, he isn't here yet, so the map 1023 /* If player is just joining the game, he isn't here yet, so the map
1566 * can get swapped out. If so, don't try to send them a map. All will 1024 * can get swapped out. If so, don't try to send them a map. All will
1567 * be OK once they really log in. 1025 * be OK once they really log in.
1568 */ 1026 */
1569 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1027 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1570 return; 1028 return;
1571 1029
1572 memset (&newmap, 0, sizeof (struct Map)); 1030 int startlen, oldlen;
1573 1031
1574 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 1032 check_map_change (pl);
1575 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 1033 prefetch_surrounding_maps (pl->ob);
1034
1035 /* do LOS after calls to update_position */
1036 /* unfortunately, we need to udpate los when observing, currently */
1037 if (pl->do_los || pl->viewpoint != pl->ob)
1038 {
1039 pl->do_los = 0;
1040 pl->update_los ();
1041 }
1042
1043 /**
1044 * This function uses the new map1 protocol command to send the map
1045 * to the client. It is necessary because the old map command supports
1046 * a maximum map size of 15x15.
1047 * This function is much simpler than the old one. This is because
1048 * the old function optimized to send as few face identifiers as possible,
1049 * at the expense of sending more coordinate location (coordinates were
1050 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1051 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1052 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1053 * and use the other 4 bits for other informatiion. For full documentation
1054 * of what we send, see the doc/Protocol file.
1055 * I will describe internally what we do:
1056 * the ns->lastmap shows how the map last looked when sent to the client.
1057 * in the lastmap structure, there is a cells array, which is set to the
1058 * maximum viewable size (As set in config.h).
1059 * in the cells, there are faces and a count value.
1060 * we use the count value to hold the darkness value. If -1, then this space
1061 * is not viewable.
1062 * we use faces[0] faces[1] faces[2] to hold what the three layers
1063 * look like.
1064 */
1065
1066 client &socket = *pl->ns;
1067
1068 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1069
1070 startlen = sl.length ();
1071
1072 int hx = socket.mapx / 2;
1073 int hy = socket.mapy / 2;
1074
1075 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1076 int ax = dx + hx;
1077 int ay = dy + hy;
1078
1079 int mask = (ax << 10) | (ay << 4);
1080 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1081
1082 /* If the coordinates are not valid, or it is too dark to see,
1083 * we tell the client as such
1084 */
1085 if (!m)
1576 { 1086 {
1577 ax = i; 1087 /* space is out of map. Update space and clear values
1578 ay = j; 1088 * if this hasn't already been done. If the space is out
1579 m = pm; 1089 * of the map, it shouldn't have a head.
1580 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1581
1582 if (mflags & P_OUT_OF_MAP)
1583 continue;
1584
1585 /* If a map is visible to the player, we don't want to swap it out
1586 * just to reload it. This should really call something like
1587 * swap_map, but this is much more efficient and 'good enough'
1588 */ 1090 */
1589 if (mflags & P_NEW_MAP) 1091 if (lastcell.count != -1)
1590 m->timeout = 50; 1092 {
1093 sl << uint16 (mask);
1094 map_clearcell (&lastcell, -1);
1095 }
1096
1097 continue;
1591 } 1098 }
1592 1099
1593 /* do LOS after calls to update_position */ 1100 int d = pl->blocked_los_uc (dx, dy);
1594 if (pl->contr->do_los) 1101
1102 if (d > 3)
1595 { 1103 {
1596 update_los (pl); 1104 /* This block deals with spaces that are not visible for whatever
1597 pl->contr->do_los = 0; 1105 * reason. Still may need to send the head for this space.
1106 */
1107 if (lastcell.count != -1
1108 || lastcell.faces[0]
1109 || lastcell.faces[1]
1110 || lastcell.faces[2]
1111 || lastcell.stat_hp
1112 || lastcell.flags
1113 || lastcell.player)
1114 sl << uint16 (mask);
1115
1116 /* properly clear a previously sent big face */
1117 map_clearcell (&lastcell, -1);
1598 } 1118 }
1599 1119 else
1600 /* Big maps need a different drawing mechanism to work */
1601 draw_client_map1 (pl);
1602}
1603
1604
1605/*****************************************************************************/
1606
1607/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1608
1609/* a player. Of course, the client need to know the command to be able to */
1610
1611/* manage it ! */
1612
1613/*****************************************************************************/
1614void
1615send_plugin_custom_message (object *pl, char *buf)
1616{
1617 pl->contr->ns->send_packet (buf);
1618}
1619
1620/**
1621 * This sends the skill number to name mapping. We ignore
1622 * the params - we always send the same info no matter what.
1623 */
1624void
1625send_skill_info (client *ns, char *params)
1626{
1627 packet sl;
1628 sl << "replyinfo skill_info\n";
1629
1630 for (int i = 1; i < NUM_SKILLS; i++)
1631 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1632
1633 if (sl.length () >= MAXSOCKBUF)
1634 { 1120 {
1635 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1121 /* In this block, the space is visible.
1636 fatal (0); 1122 */
1123
1124 /* Rather than try to figure out what everything that we might
1125 * need to send is, then form the packet after that,
1126 * we presume that we will in fact form a packet, and update
1127 * the bits by what we do actually send. If we send nothing,
1128 * we just back out sl.length () to the old value, and no harm
1129 * is done.
1130 * I think this is simpler than doing a bunch of checks to see
1131 * what if anything we need to send, setting the bits, then
1132 * doing those checks again to add the real data.
1133 */
1134 oldlen = sl.length ();
1135
1136 sl << uint16 (mask);
1137
1138 unsigned char dummy;
1139 unsigned char *last_ext = &dummy;
1140
1141 /* Darkness changed */
1142 if (lastcell.count != d)
1143 {
1144 mask |= 0x8;
1145
1146 *last_ext |= 0x80;
1147 last_ext = &sl[sl.length ()];
1148 sl << uint8 (d);
1149 }
1150
1151 lastcell.count = d;
1152
1153 mapspace &ms = m->at (nx, ny);
1154 ms.update ();
1155
1156 // extmap handling
1157 uint8 stat_hp = 0;
1158 uint8 stat_width = 0;
1159 uint8 flags = 0;
1160 tag_t player = 0;
1161
1162 // send hp information, if applicable
1163 if (object *op = ms.faces_obj [0])
1164 if (op->is_head () && !op->invisible)
1165 {
1166 if (op->stats.maxhp > op->stats.hp
1167 && op->stats.maxhp > 0
1168 && (op->type == PLAYER
1169 || op->type == DOOR // does not work, have maxhp 0
1170 || QUERY_FLAG (op, FLAG_MONSTER)
1171 || QUERY_FLAG (op, FLAG_ALIVE)
1172 || QUERY_FLAG (op, FLAG_GENERATOR)))
1173 {
1174 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1175 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1176 }
1177
1178 if (expect_false (op->has_dialogue ()))
1179 flags |= 1;
1180
1181 if (expect_false (op->type == PLAYER))
1182 player = op == ob ? pl->ob->count
1183 : op == pl->ob ? ob->count
1184 : op->count;
1185 }
1186
1187 if (expect_false (lastcell.stat_hp != stat_hp))
1188 {
1189 lastcell.stat_hp = stat_hp;
1190
1191 mask |= 0x8;
1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()];
1194
1195 sl << uint8 (5) << uint8 (stat_hp);
1196
1197 if (stat_width > 1)
1198 {
1199 *last_ext |= 0x80;
1200 last_ext = &sl[sl.length ()];
1201
1202 sl << uint8 (6) << uint8 (stat_width);
1203 }
1204 }
1205
1206 if (expect_false (lastcell.player != player))
1207 {
1208 lastcell.player = player;
1209
1210 mask |= 0x8;
1211 *last_ext |= 0x80;
1212 last_ext = &sl[sl.length ()];
1213
1214 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1215 }
1216
1217 if (expect_false (lastcell.flags != flags))
1218 {
1219 lastcell.flags = flags;
1220
1221 mask |= 0x8;
1222 *last_ext |= 0x80;
1223 last_ext = &sl[sl.length ()];
1224
1225 sl << uint8 (8) << uint8 (flags);
1226 }
1227
1228 // faces
1229
1230 /* Floor face */
1231 if (update_space (sl, socket, ms, lastcell, 2))
1232 mask |= 0x4;
1233
1234 /* Middle face */
1235 if (update_space (sl, socket, ms, lastcell, 1))
1236 mask |= 0x2;
1237
1238 if (expect_false (ob->invisible)
1239 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1240 && ms.player () == ob)
1241 {
1242 // force player to be visible to himself if invisible
1243 if (lastcell.faces[0] != ob->face)
1244 {
1245 lastcell.faces[0] = ob->face;
1246
1247 mask |= 0x1;
1248 sl << uint16 (ob->face);
1249
1250 socket.send_faces (ob);
1251 }
1252 }
1253 /* Top face */
1254 else if (update_space (sl, socket, ms, lastcell, 0))
1255 mask |= 0x1;
1256
1257 /* Check to see if we are in fact sending anything for this
1258 * space by checking the mask. If so, update the mask.
1259 * if not, reset the len to that from before adding the mask
1260 * value, so we don't send those bits.
1261 */
1262 if (mask & 0xf)
1263 sl[oldlen + 1] = mask & 0xff;
1264 else
1265 sl.reset (oldlen);
1266 } /* else this is a viewable space */
1267 ordered_mapwalk_end
1268
1269 socket.flush_fx ();
1270
1271 if (sl.length () > startlen || socket.sent_scroll)
1637 } 1272 {
1638
1639 ns->send_packet (sl); 1273 socket.send_packet (sl);
1640} 1274 socket.sent_scroll = 0;
1641
1642/**
1643 * This sends the spell path to name mapping. We ignore
1644 * the params - we always send the same info no matter what.
1645 */
1646void
1647send_spell_paths (client * ns, char *params)
1648{
1649 packet sl;
1650
1651 sl << "replyinfo spell_paths\n";
1652
1653 for (int i = 0; i < NRSPELLPATHS; i++)
1654 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1655
1656 if (sl.length () >= MAXSOCKBUF)
1657 { 1275 }
1658 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1659 fatal (0);
1660 }
1661
1662 ns->send_packet (sl);
1663} 1276}
1664 1277
1665/** 1278/**
1666 * This looks for any spells the player may have that have changed their stats. 1279 * This looks for any spells the player may have that have changed their stats.
1667 * it then sends an updspell packet for each spell that has changed in this way 1280 * it then sends an updspell packet for each spell that has changed in this way
1670esrv_update_spells (player *pl) 1283esrv_update_spells (player *pl)
1671{ 1284{
1672 if (!pl->ns) 1285 if (!pl->ns)
1673 return; 1286 return;
1674 1287
1288 pl->ns->update_spells = false;
1289
1675 if (!pl->ns->monitor_spells) 1290 if (!pl->ns->monitor_spells)
1676 return; 1291 return;
1677 1292
1678 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1293 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1679 {
1680 if (spell->type == SPELL) 1294 if (spell->type == SPELL)
1681 { 1295 {
1682 int flags = 0; 1296 int flags = 0;
1297 int val;
1683 1298
1684 /* check if we need to update it */ 1299 /* check if we need to update it */
1685 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1300 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1301 if (spell->cached_sp != val)
1686 { 1302 {
1687 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1303 spell->cached_sp = val;
1688 flags |= UPD_SP_MANA; 1304 flags |= UPD_SP_MANA;
1689 } 1305 }
1690 1306
1691 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1307 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1308 if (spell->cached_grace != val)
1692 { 1309 {
1693 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1310 spell->cached_grace = val;
1694 flags |= UPD_SP_GRACE; 1311 flags |= UPD_SP_GRACE;
1695 } 1312 }
1696 1313
1697 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1314 val = casting_level (pl->ob, spell);
1315 if (spell->cached_eat != val)
1698 { 1316 {
1699 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1317 spell->cached_eat = val;
1700 flags |= UPD_SP_DAMAGE; 1318 flags |= UPD_SP_LEVEL;
1701 } 1319 }
1702 1320
1703 if (flags) 1321 if (flags)
1704 { 1322 {
1705 packet sl; 1323 packet sl;
1706 1324
1707 sl << "updspell " 1325 sl << "updspell "
1708 << uint8 (flags) 1326 << uint8 (flags)
1709 << uint32 (spell->count); 1327 << uint32 (spell->count);
1710 1328
1711 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1712 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1330 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1713 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1331 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1714 1332
1715 pl->ns->send_packet (sl); 1333 pl->ns->send_packet (sl);
1716 } 1334 }
1717 } 1335 }
1718 }
1719} 1336}
1720 1337
1721void 1338void
1722esrv_remove_spell (player *pl, object *spell) 1339esrv_remove_spell (player *pl, object *spell)
1723{ 1340{
1748 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1365 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1749 return; 1366 return;
1750 } 1367 }
1751 1368
1752 /* store costs and damage in the object struct, to compare to later */ 1369 /* store costs and damage in the object struct, to compare to later */
1753 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1370 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1754 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1755 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = casting_level (pl->ob, spell);
1756 1373
1757 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1758 if (spell->skill) 1375 if (spell->skill)
1759 { 1376 if (object *tmp = pl->find_skill (spell->skill))
1760 for (i = 1; i < NUM_SKILLS; i++)
1761 if (!strcmp (spell->skill, skill_names[i]))
1762 {
1763 skill = i + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
1764 break;
1765 }
1766 }
1767 1378
1768 // spells better have a face 1379 // spells better have a face
1769 if (!spell->face) 1380 if (!spell->face)
1770 { 1381 {
1771 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1382 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1772 spell->face = face_find ("burnout.x11", blank_face); 1383 spell->face = face_find ("burnout.x11", blank_face);
1773 } 1384 }
1385
1386 pl->ns->send_face (spell->face);
1774 1387
1775 /* send the current values */ 1388 /* send the current values */
1776 sl << uint32 (spell->count) 1389 sl << uint32 (spell->count)
1777 << uint16 (spell->level) 1390 << uint16 (spell->level)
1778 << uint16 (spell->casting_time) 1391 << uint16 (spell->casting_time)
1779 << uint16 (spell->last_sp) 1392 << uint16 (spell->cached_sp)
1780 << uint16 (spell->last_grace) 1393 << uint16 (spell->cached_grace)
1781 << uint16 (spell->last_eat) 1394 << uint16 (spell->cached_eat)
1782 << uint8 (skill) 1395 << uint8 (skill)
1783 << uint32 (spell->path_attuned) 1396 << uint32 (spell->path_attuned)
1784 << uint32 (spell->face) 1397 << uint32 (spell->face)
1785 << data8 (spell->name) 1398 << data8 (spell->name)
1786 << data16 (spell->msg); 1399 << data16 (spell->msg);
1814 * bytes and 3 strings (because that is the spec) so we need to 1427 * bytes and 3 strings (because that is the spec) so we need to
1815 * check that the length of those 3 strings, plus the 23 bytes, 1428 * check that the length of those 3 strings, plus the 23 bytes,
1816 * won't take us over the length limit for the socket, if it does, 1429 * won't take us over the length limit for the socket, if it does,
1817 * we need to send what we already have, and restart packet formation 1430 * we need to send what we already have, and restart packet formation
1818 */ 1431 */
1432 if (spell->type != SPELL)
1433 continue;
1434
1819 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1435 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1820 * to show add_spell is 26 bytes + 2 strings. However, the overun 1436 * to show add_spell is 26 bytes + 2 strings. However, the overun
1821 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1437 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1822 * like it will fix this 1438 * like it will fix this
1823 */ 1439 */
1824 if (spell->type != SPELL)
1825 continue;
1826
1827 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1440 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1828 { 1441 {
1442 pl->ns->flush_fx ();
1829 pl->ns->send_packet (sl); 1443 pl->ns->send_packet (sl);
1830 1444
1831 sl.reset (); 1445 sl.reset ();
1832 sl << "addspell "; 1446 sl << "addspell ";
1833 } 1447 }
1841 return; 1455 return;
1842 } 1456 }
1843 else 1457 else
1844 append_spell (pl, sl, spell); 1458 append_spell (pl, sl, spell);
1845 1459
1846 if (sl.length () >= MAXSOCKBUF) 1460 if (sl.length () > MAXSOCKBUF)
1847 { 1461 {
1848 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1849 fatal (0); 1463 fatal (0);
1850 } 1464 }
1851 1465
1852 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1467 pl->ns->flush_fx ();
1853 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1854} 1469}
1855 1470
1471//-GPL
1472

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines