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

Diff Legend

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