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.91 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.174 by root, Thu Apr 15 00:40:34 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_skill)
742 {
743 buf.printf (" Range: %s", &pl->ranged_skill->name);
744
745 if (pl->ranged_ob) 662 if (pl->ranged_ob)
746 buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0)); 663 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747 }
748 664
749 if (pl->combat_skill)
750 {
751 buf.printf (" Combat: %s", &pl->combat_skill->name);
752
753 if (pl->combat_ob) 665 if (pl->combat_ob)
754 buf.printf (" (%s)", query_base_name (pl->combat_ob, 0)); 666 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
755 }
756 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?
757 if (pl->golem) 675 if (pl->golem)
758 buf.printf (" Golem: %s", &pl->golem->name); 676 buf << " Golem*: " << pl->golem->name;
759 677
760 strcpy (obuf, buf.linearise () + 1); 678 buf << '\0';
679 buf.linearise (obuf);
761} 680}
762 681
763#define AddIfInt64(Old,New,Type) if (Old != New) {\ 682#define AddIfInt64(Old,New,Type) if (Old != New) {\
764 Old = New; \ 683 Old = New; \
765 sl << uint8 (Type) << uint64 (New); \ 684 sl << uint8 (Type) << uint64 (New); \
… …
773#define AddIfShort(Old,New,Type) if (Old != New) {\ 692#define AddIfShort(Old,New,Type) if (Old != New) {\
774 Old = New; \ 693 Old = New; \
775 sl << uint8 (Type) << uint16 (New); \ 694 sl << uint8 (Type) << uint16 (New); \
776 } 695 }
777 696
778#define AddIfFloat(Old,New,Type) if (Old != New) {\ 697#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
779 Old = New; \ 698 Old = New; \
780 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 699 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
781 } 700 }
782 701
783#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 702#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
784 free(Old); Old = strdup (New);\ 703 free(Old); Old = strdup (New);\
785 sl << uint8 (Type) << data8 (New); \ 704 sl << uint8 (Type) << data8 (New); \
… …
792 * commands for now. 711 * commands for now.
793 */ 712 */
794void 713void
795esrv_update_stats (player *pl) 714esrv_update_stats (player *pl)
796{ 715{
797 char buf[MAX_BUF];
798 uint16 flags;
799
800 client *ns = pl->ns; 716 client *ns = pl->ns;
801 if (!ns) 717 if (!ns)
802 return; 718 return;
803 719
804 object *ob = pl->ob; 720 object *ob = pl->observe;
805 if (!ob) 721 if (!ob)
806 return; 722 return;
723
724 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
807 725
808 packet sl ("stats"); 726 packet sl ("stats");
809 727
810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 728 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 729 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
819 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 737 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 738 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 739 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 740 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 741
824 for (int s = 0; s < NUM_SKILLS; s++) 742 for (int s = 0; s < CS_NUM_SKILLS; s++)
825 if (object *skill = pl->last_skill_ob[s]) 743 if (object *skill = opl->last_skill_ob [s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 744 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 745 {
828 ns->last_skill_exp [s] = skill->stats.exp; 746 ns->last_skill_exp [s] = skill->stats.exp;
829 747
830 /* Always send along the level if exp changes. This is only 748 /* Always send along the level if exp changes. This is only
831 * 1 extra byte, but keeps processing simpler. 749 * 1 extra byte, but keeps processing simpler.
832 */ 750 */
833 sl << uint8 (s + CS_STAT_SKILLINFO) 751 sl << uint8 (CS_STAT_SKILLINFO + s)
834 << uint8 (skill->level) 752 << uint8 (skill->level)
835 << uint64 (skill->stats.exp); 753 << uint64 (skill->stats.exp);
836 } 754 }
837 755
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 756 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 757 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 758 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 759 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 760 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 761 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 762 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 763 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 764 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 765
848 flags = 0; 766 int flags = (opl->fire_on ? SF_FIREON : 0)
849 767 | (opl->run_on ? SF_RUNON : 0);
850 if (pl->fire_on)
851 flags |= SF_FIREON;
852
853 if (pl->run_on)
854 flags |= SF_RUNON;
855 768
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 769 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 770
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 771 for (int i = 0; i < NROFATTACKS; i++)
862 {
863 /* Skip ones we won't send */ 772 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 773 if (atnr_cs_stat[i] >= 0)
865 continue;
866
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 774 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 }
869 775
870 if (pl->ns->monitor_spells) 776 if (pl->ns->monitor_spells)
871 { 777 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 778 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 779 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 780 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
875 } 781 }
876 782
783 char buf[MAX_BUF];
877 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 784 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 785 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879 set_title (ob, buf); 786 set_title (ob, buf);
880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 787 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881 788
882 /* Only send it away if we have some actual data */ 789 /* Only send it away if we have some actual data */
… …
886 793
887/** 794/**
888 * Tells the client that here is a player it should start using. 795 * Tells the client that here is a player it should start using.
889 */ 796 */
890void 797void
891esrv_new_player (player *pl, uint32 weight) 798esrv_new_player (player *pl)
892{ 799{
800 sint32 weight = pl->ob->client_weight ();
801
893 packet sl ("player"); 802 packet sl ("player");
894 803
895 sl << uint32 (pl->ob->count) 804 sl << uint32 (pl->ob->count)
896 << uint32 (weight) 805 << uint32 (weight)
897 << uint32 (pl->ob->face) 806 << uint32 (pl->ob->face)
898 << data8 (pl->ob->name); 807 << data8 (pl->ob->name);
899 808
900 pl->ns->last_weight = weight; 809 pl->ns->last_weight = weight;
901 pl->ns->send_packet (sl); 810 pl->ns->send_packet (sl);
902 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903} 811}
904 812
905/****************************************************************************** 813/******************************************************************************
906 * 814 *
907 * Start of map related commands. 815 * Start of map related commands.
… …
964 872
965 if (!ns.faces_sent[face_num]) 873 if (!ns.faces_sent[face_num])
966 if (ob) 874 if (ob)
967 ns.send_faces (ob); 875 ns.send_faces (ob);
968 else 876 else
969 ns.send_face (face_num); 877 ns.send_face (face_num, 10);
970 878
971 sl << uint16 (face_num); 879 sl << uint16 (face_num);
972 return 1; 880 return 1;
973 } 881 }
974 882
975 /* Nothing changed */ 883 /* Nothing changed */
976 return 0; 884 return 0;
977} 885}
978 886
979/** 887//-GPL
980 * Returns the size of a data for a map square as returned by
981 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
982 * available.
983 */
984int
985getExtendedMapInfoSize (client * ns)
986{
987 int result = 0;
988
989 if (ns->ext_mapinfos)
990 {
991 if (ns->EMI_smooth)
992 result += 1; /*One byte for smoothlevel */
993 }
994
995 return result;
996}
997 888
998// prefetch (and touch) all maps within a specific distancd 889// prefetch (and touch) all maps within a specific distancd
999static void 890static void
1000prefetch_surrounding_maps (maptile *map, int distance) 891prefetch_surrounding_maps (maptile *map, int distance)
1001{ 892{
1002 map->last_access = runtime; 893 map->touch ();
1003 894
1004 if (--distance) 895 if (--distance)
1005 for (int dir = 4; --dir; ) 896 for (int dir = 4; dir--; )
1006 if (const shstr &path = map->tile_path [dir]) 897 if (const shstr &path = map->tile_path [dir])
1007 if (maptile *&neigh = map->tile_map [dir]) 898 if (maptile *&neigh = map->tile_map [dir])
1008 prefetch_surrounding_maps (neigh, distance); 899 prefetch_surrounding_maps (neigh, distance);
1009 else 900 else
1010 neigh = maptile::find_async (path, map); 901 neigh = maptile::find_async (path, map);
… …
1015prefetch_surrounding_maps (object *op) 906prefetch_surrounding_maps (object *op)
1016{ 907{
1017 prefetch_surrounding_maps (op->map, 3); 908 prefetch_surrounding_maps (op->map, 3);
1018} 909}
1019 910
911//+GPL
912
1020/** 913/**
1021 * This function uses the new map1 protocol command to send the map 914 * Draws client map.
1022 * to the client. It is necessary because the old map command supports
1023 * a maximum map size of 15x15.
1024 * This function is much simpler than the old one. This is because
1025 * the old function optimized to send as few face identifiers as possible,
1026 * at the expense of sending more coordinate location (coordinates were
1027 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1028 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1029 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1030 * and use the other 4 bits for other informatiion. For full documentation
1031 * of what we send, see the doc/Protocol file.
1032 * I will describe internally what we do:
1033 * the ns->lastmap shows how the map last looked when sent to the client.
1034 * in the lastmap structure, there is a cells array, which is set to the
1035 * maximum viewable size (As set in config.h).
1036 * in the cells, there are faces and a count value.
1037 * we use the count value to hold the darkness value. If -1, then this space
1038 * is not viewable.
1039 * we use faces[0] faces[1] faces[2] to hold what the three layers
1040 * look like.
1041 */ 915 */
1042void 916void
1043draw_client_map1 (object *pl) 917draw_client_map (player *pl)
1044{ 918{
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 919 object *ob = pl->viewpoint;
1046 sint16 nx, ny;
1047 int estartlen, eoldlen;
1048 uint8 eentrysize;
1049 uint16 ewhatstart, ewhatflag;
1050 uint8 extendedinfos;
1051 maptile *m;
1052
1053 client &socket = *pl->contr->ns;
1054
1055 if (!pl->active) 920 if (!pl->observe->active)
1056 return; 921 return;
1057
1058 check_map_change (pl->contr);
1059 prefetch_surrounding_maps (pl);
1060
1061 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1062 packet esl;
1063
1064 startlen = sl.length ();
1065
1066 /*Extendedmapinfo structure initialisation */
1067 if (socket.ext_mapinfos)
1068 {
1069 extendedinfos = EMI_NOREDRAW;
1070
1071 if (socket.EMI_smooth)
1072 extendedinfos |= EMI_SMOOTH;
1073
1074 ewhatstart = esl.length ();
1075 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1076 could need to be taken away */
1077 eentrysize = getExtendedMapInfoSize (&socket);
1078 esl << "mapextended "
1079 << uint8 (extendedinfos)
1080 << uint8 (eentrysize);
1081
1082 estartlen = esl.length ();
1083 }
1084
1085 /* x,y are the real map locations. ax, ay are viewport relative
1086 * locations.
1087 */
1088 ay = 0;
1089
1090 /* We could do this logic as conditionals in the if statement,
1091 * but that started to get a bit messy to look at.
1092 */
1093 max_x = pl->x + (socket.mapx + 1) / 2;
1094 max_y = pl->y + (socket.mapy + 1) / 2;
1095
1096 maptile *plmap = pl->map;
1097
1098 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1099 {
1100 ax = 0;
1101 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1102 {
1103 int emask, mask;
1104 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1105
1106 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1107
1108 /* If the coordinates are not valid, or it is too dark to see,
1109 * we tell the client as such
1110 */
1111 nx = x;
1112 ny = y;
1113 m = get_map_from_coord (plmap, &nx, &ny);
1114
1115 if (!m)
1116 {
1117 /* space is out of map. Update space and clear values
1118 * if this hasn't already been done. If the space is out
1119 * of the map, it shouldn't have a head
1120 */
1121 if (lastcell.count != -1)
1122 {
1123 sl << uint16 (mask);
1124 map_clearcell (&lastcell, -1);
1125 }
1126
1127 continue;
1128 }
1129
1130 m->touch ();
1131
1132 int d = pl->contr->blocked_los[ax][ay];
1133
1134 if (d > 3)
1135 {
1136
1137 int need_send = 0, count;
1138
1139 /* This block deals with spaces that are not visible for whatever
1140 * reason. Still may need to send the head for this space.
1141 */
1142
1143 oldlen = sl.length ();
1144
1145 sl << uint16 (mask);
1146
1147 if (lastcell.count != -1)
1148 need_send = 1;
1149
1150 count = -1;
1151
1152 /* properly clear a previously sent big face */
1153 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1154 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1155 need_send = 1;
1156
1157 map_clearcell (&lastcell, count);
1158
1159 if ((mask & 0xf) || need_send)
1160 sl[oldlen + 1] = mask & 0xff;
1161 else
1162 sl.reset (oldlen);
1163 }
1164 else
1165 {
1166 /* In this block, the space is visible.
1167 */
1168
1169 /* Rather than try to figure out what everything that we might
1170 * need to send is, then form the packet after that,
1171 * we presume that we will in fact form a packet, and update
1172 * the bits by what we do actually send. If we send nothing,
1173 * we just back out sl.length () to the old value, and no harm
1174 * is done.
1175 * I think this is simpler than doing a bunch of checks to see
1176 * what if anything we need to send, setting the bits, then
1177 * doing those checks again to add the real data.
1178 */
1179 oldlen = sl.length ();
1180 eoldlen = esl.length ();
1181
1182 sl << uint16 (mask);
1183
1184 unsigned char dummy;
1185 unsigned char *last_ext = &dummy;
1186
1187 /* Darkness changed */
1188 if (lastcell.count != d && socket.darkness)
1189 {
1190 mask |= 0x8;
1191
1192 if (socket.extmap)
1193 {
1194 *last_ext |= 0x80;
1195 last_ext = &sl[sl.length ()];
1196 sl << uint8 (d);
1197 }
1198 else
1199 sl << uint8 (255 - 64 * d);
1200 }
1201
1202 lastcell.count = d;
1203
1204 mapspace &ms = m->at (nx, ny);
1205
1206 if (socket.extmap)
1207 {
1208 uint8 stat_hp = 0;
1209 uint8 stat_width = 0;
1210 uint8 flags = 0;
1211 tag_t player = 0;
1212
1213 // send hp information, if applicable
1214 if (object *op = ms.faces_obj [0])
1215 {
1216 if (op->head || op->invisible)
1217 ; // do not show
1218 else if (op->type == PLAYER
1219 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1220 {
1221 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1222 {
1223 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1224 stat_width = op->arch->tail_x;
1225 }
1226 }
1227
1228 if (op->msg && op->msg[0] == '@')
1229 flags |= 1;
1230
1231 if (op->type == PLAYER && op != pl)
1232 player = op->count;
1233 }
1234
1235 if (lastcell.stat_hp != stat_hp)
1236 {
1237 lastcell.stat_hp = stat_hp;
1238
1239 mask |= 0x8;
1240 *last_ext |= 0x80;
1241 last_ext = &sl[sl.length ()];
1242
1243 sl << uint8 (5) << uint8 (stat_hp);
1244
1245 if (stat_width > 1)
1246 {
1247 *last_ext |= 0x80;
1248 last_ext = &sl[sl.length ()];
1249
1250 sl << uint8 (6) << uint8 (stat_width);
1251 }
1252 }
1253
1254 if (lastcell.player != player)
1255 {
1256 lastcell.player = player;
1257
1258 mask |= 0x8;
1259 *last_ext |= 0x80;
1260 last_ext = &sl[sl.length ()];
1261
1262 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1263 }
1264
1265 if (lastcell.flags != flags)
1266 {
1267 lastcell.flags = flags;
1268
1269 mask |= 0x8;
1270 *last_ext |= 0x80;
1271 last_ext = &sl[sl.length ()];
1272
1273 sl << uint8 (8) << uint8 (flags);
1274 }
1275 }
1276
1277 /* Floor face */
1278 if (update_space (sl, socket, ms, lastcell, 2))
1279 mask |= 0x4;
1280
1281 /* Middle face */
1282 if (update_space (sl, socket, ms, lastcell, 1))
1283 mask |= 0x2;
1284
1285 if (ms.player () == pl
1286 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1287 {
1288 // force player to be visible to himself if invisible
1289 if (lastcell.faces[0] != pl->face)
1290 {
1291 lastcell.faces[0] = pl->face;
1292
1293 mask |= 0x1;
1294 sl << uint16 (pl->face);
1295
1296 socket.send_faces (pl);
1297 }
1298 }
1299 /* Top face */
1300 else if (update_space (sl, socket, ms, lastcell, 0))
1301 mask |= 0x1;
1302
1303
1304 /* Check to see if we are in fact sending anything for this
1305 * space by checking the mask. If so, update the mask.
1306 * if not, reset the len to that from before adding the mask
1307 * value, so we don't send those bits.
1308 */
1309 if (mask & 0xf)
1310 sl[oldlen + 1] = mask & 0xff;
1311 else
1312 sl.reset (oldlen);
1313
1314 if (socket.ext_mapinfos)
1315 esl << uint16 (emask);
1316
1317 if (socket.EMI_smooth)
1318 {
1319 for (int layer = 2+1; layer--; )
1320 {
1321 object *ob = ms.faces_obj [layer];
1322
1323 // If there is no object for this space, or if the face for the object
1324 // is the blank face, set the smoothlevel to zero.
1325 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1326
1327 // We've gotten what face we want to use for the object. Now see if
1328 // if it has changed since we last sent it to the client.
1329 if (lastcell.smooth[layer] != smoothlevel)
1330 {
1331 lastcell.smooth[layer] = smoothlevel;
1332 esl << uint8 (smoothlevel);
1333 emask |= 1 << layer;
1334 }
1335 }
1336
1337 if (emask & 0xf)
1338 esl[eoldlen + 1] = emask & 0xff;
1339 else
1340 esl.reset (eoldlen);
1341 }
1342 } /* else this is a viewable space */
1343 } /* for x loop */
1344 } /* for y loop */
1345
1346 socket.flush_fx ();
1347
1348 /* Verify that we in fact do need to send this */
1349 if (socket.ext_mapinfos)
1350 {
1351 if (!(sl.length () > startlen || socket.sent_scroll))
1352 {
1353 /* No map data will follow, so don't say the client
1354 * it doesn't need draw!
1355 */
1356 ewhatflag &= ~EMI_NOREDRAW;
1357 esl[ewhatstart + 1] = ewhatflag & 0xff;
1358 }
1359
1360 if (esl.length () > estartlen)
1361 socket.send_packet (esl);
1362 }
1363
1364 if (sl.length () > startlen || socket.sent_scroll)
1365 {
1366 socket.send_packet (sl);
1367 socket.sent_scroll = 0;
1368 }
1369}
1370
1371/**
1372 * Draws client map.
1373 */
1374void
1375draw_client_map (object *pl)
1376{
1377 int i, j;
1378 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1379 int mflags;
1380 struct Map newmap;
1381 maptile *m, *pm;
1382
1383 if (pl->type != PLAYER)
1384 {
1385 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1386 return;
1387 }
1388
1389 pm = pl->map;
1390 922
1391 /* If player is just joining the game, he isn't here yet, so the map 923 /* If player is just joining the game, he isn't here yet, so the map
1392 * can get swapped out. If so, don't try to send them a map. All will 924 * can get swapped out. If so, don't try to send them a map. All will
1393 * be OK once they really log in. 925 * be OK once they really log in.
1394 */ 926 */
1395 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 927 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1396 return; 928 return;
1397 929
1398 memset (&newmap, 0, sizeof (struct Map)); 930 int startlen, oldlen;
1399 931
1400 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 932 check_map_change (pl);
1401 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 933 prefetch_surrounding_maps (pl->ob);
934
935 /* do LOS after calls to update_position */
936 /* unfortunately, we need to udpate los when observing, currently */
937 if (pl->do_los || pl->viewpoint != pl->ob)
938 {
939 pl->do_los = 0;
940 pl->update_los ();
941 }
942
943 /**
944 * This function uses the new map1 protocol command to send the map
945 * to the client. It is necessary because the old map command supports
946 * a maximum map size of 15x15.
947 * This function is much simpler than the old one. This is because
948 * the old function optimized to send as few face identifiers as possible,
949 * at the expense of sending more coordinate location (coordinates were
950 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
951 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
952 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
953 * and use the other 4 bits for other informatiion. For full documentation
954 * of what we send, see the doc/Protocol file.
955 * I will describe internally what we do:
956 * the ns->lastmap shows how the map last looked when sent to the client.
957 * in the lastmap structure, there is a cells array, which is set to the
958 * maximum viewable size (As set in config.h).
959 * in the cells, there are faces and a count value.
960 * we use the count value to hold the darkness value. If -1, then this space
961 * is not viewable.
962 * we use faces[0] faces[1] faces[2] to hold what the three layers
963 * look like.
964 */
965
966 client &socket = *pl->ns;
967
968 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
969
970 startlen = sl.length ();
971
972 int hx = socket.mapx / 2;
973 int hy = socket.mapy / 2;
974
975 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
976 int ax = dx + hx;
977 int ay = dy + hy;
978
979 int mask = (ax << 10) | (ay << 4);
980 MapCell &lastcell = socket.lastmap.cells[ax][ay];
981
982 /* If the coordinates are not valid, or it is too dark to see,
983 * we tell the client as such
984 */
985 if (!m)
1402 { 986 {
1403 ax = i; 987 /* space is out of map. Update space and clear values
1404 ay = j; 988 * if this hasn't already been done. If the space is out
1405 m = pm; 989 * of the map, it shouldn't have a head.
1406 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1407
1408 if (mflags & P_OUT_OF_MAP)
1409 continue;
1410
1411 /* If a map is visible to the player, we don't want to swap it out
1412 * just to reload it. This should really call something like
1413 * swap_map, but this is much more efficient and 'good enough'
1414 */ 990 */
1415 if (mflags & P_NEW_MAP) 991 if (lastcell.count != -1)
1416 m->timeout = 50; 992 {
993 sl << uint16 (mask);
994 map_clearcell (&lastcell, -1);
995 }
996
997 continue;
1417 } 998 }
1418 999
1419 /* do LOS after calls to update_position */ 1000 int d = pl->blocked_los_uc (dx, dy);
1420 if (pl->contr->do_los) 1001
1002 if (d > 3)
1421 { 1003 {
1422 update_los (pl); 1004 /* This block deals with spaces that are not visible for whatever
1423 pl->contr->do_los = 0; 1005 * reason. Still may need to send the head for this space.
1006 */
1007 if (lastcell.count != -1
1008 || lastcell.faces[0]
1009 || lastcell.faces[1]
1010 || lastcell.faces[2]
1011 || lastcell.stat_hp
1012 || lastcell.flags
1013 || lastcell.player)
1014 sl << uint16 (mask);
1015
1016 /* properly clear a previously sent big face */
1017 map_clearcell (&lastcell, -1);
1424 } 1018 }
1425 1019 else
1426 /* Big maps need a different drawing mechanism to work */
1427 draw_client_map1 (pl);
1428}
1429
1430
1431/*****************************************************************************/
1432
1433/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1434
1435/* a player. Of course, the client need to know the command to be able to */
1436
1437/* manage it ! */
1438
1439/*****************************************************************************/
1440void
1441send_plugin_custom_message (object *pl, char *buf)
1442{
1443 pl->contr->ns->send_packet (buf);
1444}
1445
1446/**
1447 * This sends the skill number to name mapping. We ignore
1448 * the params - we always send the same info no matter what.
1449 */
1450void
1451send_skill_info (client *ns, char *params)
1452{
1453 packet sl;
1454 sl << "replyinfo skill_info\n";
1455
1456 for (int i = 1; i < NUM_SKILLS; i++)
1457 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1458
1459 if (sl.length () >= MAXSOCKBUF)
1460 { 1020 {
1461 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1021 /* In this block, the space is visible.
1462 fatal (0); 1022 */
1023
1024 /* Rather than try to figure out what everything that we might
1025 * need to send is, then form the packet after that,
1026 * we presume that we will in fact form a packet, and update
1027 * the bits by what we do actually send. If we send nothing,
1028 * we just back out sl.length () to the old value, and no harm
1029 * is done.
1030 * I think this is simpler than doing a bunch of checks to see
1031 * what if anything we need to send, setting the bits, then
1032 * doing those checks again to add the real data.
1033 */
1034 oldlen = sl.length ();
1035
1036 sl << uint16 (mask);
1037
1038 unsigned char dummy;
1039 unsigned char *last_ext = &dummy;
1040
1041 /* Darkness changed */
1042 if (lastcell.count != d)
1043 {
1044 mask |= 0x8;
1045
1046 *last_ext |= 0x80;
1047 last_ext = &sl[sl.length ()];
1048 sl << uint8 (d);
1049 }
1050
1051 lastcell.count = d;
1052
1053 mapspace &ms = m->at (nx, ny);
1054 ms.update ();
1055
1056 // extmap handling
1057 uint8 stat_hp = 0;
1058 uint8 stat_width = 0;
1059 uint8 flags = 0;
1060 tag_t player = 0;
1061
1062 // send hp information, if applicable
1063 if (object *op = ms.faces_obj [0])
1064 if (op->is_head () && !op->invisible)
1065 {
1066 if (op->stats.maxhp > op->stats.hp
1067 && op->stats.maxhp > 0
1068 && (op->type == PLAYER
1069 || op->type == DOOR // does not work, have maxhp 0
1070 || op->flag [FLAG_MONSTER]
1071 || op->flag [FLAG_ALIVE]
1072 || op->flag [FLAG_GENERATOR]))
1073 {
1074 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1075 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1076 }
1077
1078 if (expect_false (op->has_dialogue ()))
1079 flags |= 1;
1080
1081 if (expect_false (op->type == PLAYER))
1082 player = op == ob ? pl->ob->count
1083 : op == pl->ob ? ob->count
1084 : op->count;
1085 }
1086
1087 if (expect_false (lastcell.stat_hp != stat_hp))
1088 {
1089 lastcell.stat_hp = stat_hp;
1090
1091 mask |= 0x8;
1092 *last_ext |= 0x80;
1093 last_ext = &sl[sl.length ()];
1094
1095 sl << uint8 (5) << uint8 (stat_hp);
1096
1097 if (stat_width > 1)
1098 {
1099 *last_ext |= 0x80;
1100 last_ext = &sl[sl.length ()];
1101
1102 sl << uint8 (6) << uint8 (stat_width);
1103 }
1104 }
1105
1106 if (expect_false (lastcell.player != player))
1107 {
1108 lastcell.player = player;
1109
1110 mask |= 0x8;
1111 *last_ext |= 0x80;
1112 last_ext = &sl[sl.length ()];
1113
1114 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1115 }
1116
1117 if (expect_false (lastcell.flags != flags))
1118 {
1119 lastcell.flags = flags;
1120
1121 mask |= 0x8;
1122 *last_ext |= 0x80;
1123 last_ext = &sl[sl.length ()];
1124
1125 sl << uint8 (8) << uint8 (flags);
1126 }
1127
1128 // faces
1129
1130 /* Floor face */
1131 if (update_space (sl, socket, ms, lastcell, 2))
1132 mask |= 0x4;
1133
1134 /* Middle face */
1135 if (update_space (sl, socket, ms, lastcell, 1))
1136 mask |= 0x2;
1137
1138 if (expect_false (ob->invisible)
1139 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1140 && ms.player () == ob)
1141 {
1142 // force player to be visible to himself if invisible
1143 if (lastcell.faces[0] != ob->face)
1144 {
1145 lastcell.faces[0] = ob->face;
1146
1147 mask |= 0x1;
1148 sl << uint16 (ob->face);
1149
1150 socket.send_faces (ob);
1151 }
1152 }
1153 /* Top face */
1154 else if (update_space (sl, socket, ms, lastcell, 0))
1155 mask |= 0x1;
1156
1157 /* Check to see if we are in fact sending anything for this
1158 * space by checking the mask. If so, update the mask.
1159 * if not, reset the len to that from before adding the mask
1160 * value, so we don't send those bits.
1161 */
1162 if (mask & 0xf)
1163 sl[oldlen + 1] = mask & 0xff;
1164 else
1165 sl.reset (oldlen);
1166 } /* else this is a viewable space */
1167 ordered_mapwalk_end
1168
1169 socket.flush_fx ();
1170
1171 if (sl.length () > startlen || socket.sent_scroll)
1463 } 1172 {
1464
1465 ns->send_packet (sl); 1173 socket.send_packet (sl);
1466} 1174 socket.sent_scroll = 0;
1467
1468/**
1469 * This sends the spell path to name mapping. We ignore
1470 * the params - we always send the same info no matter what.
1471 */
1472void
1473send_spell_paths (client * ns, char *params)
1474{
1475 packet sl;
1476
1477 sl << "replyinfo spell_paths\n";
1478
1479 for (int i = 0; i < NRSPELLPATHS; i++)
1480 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1481
1482 if (sl.length () >= MAXSOCKBUF)
1483 { 1175 }
1484 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1485 fatal (0);
1486 }
1487
1488 ns->send_packet (sl);
1489} 1176}
1490 1177
1491/** 1178/**
1492 * This looks for any spells the player may have that have changed their stats. 1179 * This looks for any spells the player may have that have changed their stats.
1493 * it then sends an updspell packet for each spell that has changed in this way 1180 * it then sends an updspell packet for each spell that has changed in this way
… …
1496esrv_update_spells (player *pl) 1183esrv_update_spells (player *pl)
1497{ 1184{
1498 if (!pl->ns) 1185 if (!pl->ns)
1499 return; 1186 return;
1500 1187
1188 pl->ns->update_spells = false;
1189
1501 if (!pl->ns->monitor_spells) 1190 if (!pl->ns->monitor_spells)
1502 return; 1191 return;
1503 1192
1504 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1193 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1505 {
1506 if (spell->type == SPELL) 1194 if (spell->type == SPELL)
1507 { 1195 {
1508 int flags = 0; 1196 int flags = 0;
1197 int val;
1509 1198
1510 /* check if we need to update it */ 1199 /* check if we need to update it */
1511 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1200 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1201 if (spell->cached_sp != val)
1512 { 1202 {
1513 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1203 spell->cached_sp = val;
1514 flags |= UPD_SP_MANA; 1204 flags |= UPD_SP_MANA;
1515 } 1205 }
1516 1206
1517 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1207 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1208 if (spell->cached_grace != val)
1518 { 1209 {
1519 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1210 spell->cached_grace = val;
1520 flags |= UPD_SP_GRACE; 1211 flags |= UPD_SP_GRACE;
1521 } 1212 }
1522 1213
1523 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1214 val = casting_level (pl->ob, spell);
1215 if (spell->cached_eat != val)
1524 { 1216 {
1525 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1217 spell->cached_eat = val;
1526 flags |= UPD_SP_DAMAGE; 1218 flags |= UPD_SP_LEVEL;
1527 } 1219 }
1528 1220
1529 if (flags) 1221 if (flags)
1530 { 1222 {
1531 packet sl; 1223 packet sl;
1532 1224
1533 sl << "updspell " 1225 sl << "updspell "
1534 << uint8 (flags) 1226 << uint8 (flags)
1535 << uint32 (spell->count); 1227 << uint32 (spell->count);
1536 1228
1537 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1229 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1538 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1230 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1539 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1231 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1540 1232
1541 pl->ns->send_packet (sl); 1233 pl->ns->send_packet (sl);
1542 } 1234 }
1543 } 1235 }
1544 }
1545} 1236}
1546 1237
1547void 1238void
1548esrv_remove_spell (player *pl, object *spell) 1239esrv_remove_spell (player *pl, object *spell)
1549{ 1240{
… …
1574 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1265 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1575 return; 1266 return;
1576 } 1267 }
1577 1268
1578 /* store costs and damage in the object struct, to compare to later */ 1269 /* store costs and damage in the object struct, to compare to later */
1579 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1270 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1580 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1271 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1581 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1272 spell->cached_eat = casting_level (pl->ob, spell);
1582 1273
1583 /* figure out which skill it uses, if it uses one */ 1274 /* figure out which skill it uses, if it uses one */
1584 if (spell->skill) 1275 if (spell->skill)
1585 { 1276 if (object *tmp = pl->find_skill (spell->skill))
1586 for (i = 1; i < NUM_SKILLS; i++) 1277 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1587 if (!strcmp (spell->skill, skill_names[i]))
1588 {
1589 skill = i + CS_STAT_SKILLINFO;
1590 break;
1591 }
1592 }
1593 1278
1594 // spells better have a face 1279 // spells better have a face
1595 if (!spell->face) 1280 if (!spell->face)
1596 { 1281 {
1597 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1282 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1598 spell->face = face_find ("burnout.x11", blank_face); 1283 spell->face = face_find ("burnout.x11", blank_face);
1599 } 1284 }
1285
1286 pl->ns->send_face (spell->face);
1600 1287
1601 /* send the current values */ 1288 /* send the current values */
1602 sl << uint32 (spell->count) 1289 sl << uint32 (spell->count)
1603 << uint16 (spell->level) 1290 << uint16 (spell->level)
1604 << uint16 (spell->casting_time) 1291 << uint16 (spell->casting_time)
1605 << uint16 (spell->last_sp) 1292 << uint16 (spell->cached_sp)
1606 << uint16 (spell->last_grace) 1293 << uint16 (spell->cached_grace)
1607 << uint16 (spell->last_eat) 1294 << uint16 (spell->cached_eat)
1608 << uint8 (skill) 1295 << uint8 (skill)
1609 << uint32 (spell->path_attuned) 1296 << uint32 (spell->path_attuned)
1610 << uint32 (spell->face) 1297 << uint32 (spell->face)
1611 << data8 (spell->name) 1298 << data8 (spell->name)
1612 << data16 (spell->msg); 1299 << data16 (spell->msg);
… …
1640 * bytes and 3 strings (because that is the spec) so we need to 1327 * bytes and 3 strings (because that is the spec) so we need to
1641 * check that the length of those 3 strings, plus the 23 bytes, 1328 * check that the length of those 3 strings, plus the 23 bytes,
1642 * won't take us over the length limit for the socket, if it does, 1329 * won't take us over the length limit for the socket, if it does,
1643 * we need to send what we already have, and restart packet formation 1330 * we need to send what we already have, and restart packet formation
1644 */ 1331 */
1332 if (spell->type != SPELL)
1333 continue;
1334
1645 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1335 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1646 * to show add_spell is 26 bytes + 2 strings. However, the overun 1336 * to show add_spell is 26 bytes + 2 strings. However, the overun
1647 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1337 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1648 * like it will fix this 1338 * like it will fix this
1649 */ 1339 */
1650 if (spell->type != SPELL)
1651 continue;
1652
1653 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1340 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1654 { 1341 {
1342 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1343 pl->ns->send_packet (sl);
1656 1344
1657 sl.reset (); 1345 sl.reset ();
1658 sl << "addspell "; 1346 sl << "addspell ";
1659 } 1347 }
… …
1667 return; 1355 return;
1668 } 1356 }
1669 else 1357 else
1670 append_spell (pl, sl, spell); 1358 append_spell (pl, sl, spell);
1671 1359
1672 if (sl.length () >= MAXSOCKBUF) 1360 if (sl.length () > MAXSOCKBUF)
1673 { 1361 {
1674 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1362 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1675 fatal (0); 1363 fatal (0);
1676 } 1364 }
1677 1365
1678 /* finally, we can send the packet */ 1366 /* finally, we can send the packet */
1367 pl->ns->flush_fx ();
1679 pl->ns->send_packet (sl); 1368 pl->ns->send_packet (sl);
1680} 1369}
1681 1370
1371//-GPL
1372

Diff Legend

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