ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

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

Diff Legend

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