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.76 by root, Wed Mar 14 13:05:30 2007 UTC vs.
Revision 1.164 by root, Fri Mar 26 00:59:22 2010 UTC

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

Diff Legend

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