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.66 by root, Thu Feb 15 04:04:23 2007 UTC vs.
Revision 1.173 by root, Thu Apr 15 00:37:24 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25//+GPL
24 26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
… …
36 * have the prototype of (char *data, int datalen, int client_num). This 38 * have the prototype of (char *data, int datalen, int client_num). This
37 * way, we can use one dispatch table. 39 * way, we can use one dispatch table.
38 * 40 *
39 * esrv_map_new starts updating the map 41 * esrv_map_new starts updating the map
40 * 42 *
41 * esrv_map_setbelow allows filling in all of the faces for the map.
42 * if a face has not already been sent to the client, it is sent now.
43 *
44 */ 43 */
45 44
46#include <global.h> 45#include <global.h>
47#include <sproto.h> 46#include <sproto.h>
48 47
49#include <living.h> 48#include <living.h>
50#include <commands.h>
51 49
52/* 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,
53 * it should work here. 51 * it should work here.
54 */ 52 */
55#include <sys/types.h> 53#include <sys/types.h>
… …
67 * This table translates the attack numbers as used within the 65 * This table translates the attack numbers as used within the
68 * 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
69 * 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
70 * client. 68 * client.
71 */ 69 */
72short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 70static short atnr_cs_stat[NROFATTACKS] =
73 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 71{
74 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 72 CS_STAT_RES_PHYS,
75 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 73 CS_STAT_RES_MAG,
76 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 74 CS_STAT_RES_FIRE,
77 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 75 CS_STAT_RES_ELEC,
78 CS_STAT_RES_FEAR, -1 /* Cancellation */ , 76 CS_STAT_RES_COLD,
79 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 77 CS_STAT_RES_CONF,
80 -1 /* Chaos */ , -1 /* Counterspell */ , 78 CS_STAT_RES_ACID,
81 -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,
82 CS_STAT_RES_BLIND, 94 CS_STAT_RES_BLIND,
83 -1, /* Internal */ 95 -1, /* Internal */
84 -1, /* life stealing */ 96 -1, /* life stealing */
85 -1 /* Disease - not fully done yet */ 97 -1 /* Disease - not fully done yet */
86}; 98};
… …
101 * that much difference in bandwidth. 113 * that much difference in bandwidth.
102 */ 114 */
103 mx = ns->mapx; 115 mx = ns->mapx;
104 my = ns->mapy; 116 my = ns->mapy;
105 117
106 if (ns->mapmode == Map1aCmd)
107 {
108 mx += MAX_HEAD_OFFSET;
109 my += MAX_HEAD_OFFSET;
110 }
111
112 /* 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
113 * (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,
114 * if the destination x or y coordinate is outside the viewable 120 * if the destination x or y coordinate is outside the viewable
115 * area, we clear the values - otherwise, the old values 121 * area, we clear the values - otherwise, the old values
116 * 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.
117 */ 123 */
118 for (x = 0; x < mx; x++) 124 for (x = 0; x < mx; x++)
119 {
120 for (y = 0; y < my; y++) 125 for (y = 0; y < my; y++)
121 {
122 if (x >= ns->mapx || y >= ns->mapy) 126 if (x >= ns->mapx || y >= ns->mapy)
123 /* clear cells outside the viewable area */ 127 /* clear cells outside the viewable area */
124 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 128 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
125 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)
126 /* clear newly visible tiles within the viewable area */ 130 /* clear newly visible tiles within the viewable area */
127 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 131 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
128 else 132 else
129 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));
130 }
131 }
132 134
133 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 135 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
134 136
135 /* 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
136 * empty). 138 * empty).
… …
139} 141}
140 142
141static void 143static void
142clear_map (player *pl) 144clear_map (player *pl)
143{ 145{
146 pl->ns->mapinfo_queue_clear ();
147
144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 148 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149
150 pl->ns->force_newmap = false;
145 151
146 if (pl->ns->newmapcmd == 1) 152 if (pl->ns->newmapcmd == 1)
147 pl->ns->send_packet ("newmap"); 153 pl->ns->send_packet ("newmap");
148 154
149 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 }
150} 182}
151 183
152/** check for map/region change and send new map data */ 184/** check for map/region change and send new map data */
153static void 185static void
154check_map_change (player *pl) 186check_map_change (player *pl)
155{ 187{
156 client &socket = *pl->ns; 188 client &socket = *pl->ns;
157 object *ob = pl->ob; 189 object *ob = pl->viewpoint;
158 char buf[MAX_BUF]; /* eauugggh */
159 190
160 if (socket.current_map != ob->map) 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;
161 { 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 }
217
218 if (socket.current_map != ob->map || socket.force_newmap)
219 {
220 clear_map (pl);
162 socket.current_map = ob->map; 221 socket.current_map = ob->map;
163 222 send_map_info (pl);
164 clear_map (pl);
165
166 if (socket.mapinfocmd)
167 {
168 if (ob->map && ob->map->path[0])
169 {
170 int flags = 0;
171
172 if (ob->map->tile_path[0])
173 flags |= 1;
174 if (ob->map->tile_path[1])
175 flags |= 2;
176 if (ob->map->tile_path[2])
177 flags |= 4;
178 if (ob->map->tile_path[3])
179 flags |= 8;
180
181 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
183 }
184 else
185 snprintf (buf, MAX_BUF, "mapinfo current");
186
187 socket.send_packet (buf);
188 }
189 } 223 }
190 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)
191 { 225 {
192 int dx = ob->x - socket.current_x; 226 int dx = ob->x - socket.current_x;
193 int dy = ob->y - socket.current_y; 227 int dy = ob->y - socket.current_y;
194 228
195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
196 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
197 else
198 {
199 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);
200 socket.floorbox_reset (); 230 socket.floorbox_reset ();
201 }
202 } 231 }
203 232
204 socket.current_x = ob->x; 233 socket.current_x = ob->x;
205 socket.current_y = ob->y; 234 socket.current_y = ob->y;
235}
206 236
207 region *reg = ob->region (); 237/**
208 if (socket.current_region != reg) 238 * This sends the skill number to name mapping. We ignore
209 { 239 * the params - we always send the same info no matter what.
210 socket.current_region = reg; 240 */
211 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)
212 } 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);
213} 280}
214 281
215/** 282/**
216 * RequestInfo is sort of a meta command. There is some specific 283 * RequestInfo is sort of a meta command. There is some specific
217 * request of information, but we call other functions to provide 284 * request of information, but we call other functions to provide
218 * that information. 285 * that information.
219 */ 286 */
220void 287void
221RequestInfo (char *buf, int len, client * ns) 288RequestInfo (char *buf, int len, client *ns)
222{ 289{
223 char *params = NULL, *cp; 290 char *params;
224
225 /* No match */
226 char bigbuf[MAX_BUF];
227 int slen;
228
229 /* Set up replyinfo before we modify any of the buffers - this is used
230 * if we don't find a match.
231 */
232 strcpy (bigbuf, "replyinfo ");
233 slen = strlen (bigbuf);
234 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
235 291
236 /* find the first space, make it null, and update the 292 /* find the first space, make it null, and update the
237 * params pointer. 293 * params pointer.
238 */ 294 */
239 for (cp = buf; *cp != '\0'; cp++) 295 for (params = buf; *params; params++)
240 if (*cp == ' ') 296 if (*params == ' ')
241 { 297 {
242 *cp = '\0';
243 params = cp + 1; 298 *params++ = 0;
244 break; 299 break;
245 } 300 }
246 301
247 if (!strcmp (buf, "image_info"))
248 send_image_info (ns, params);
249 else if (!strcmp (buf, "image_sums"))
250 send_image_sums (ns, params);
251 else if (!strcmp (buf, "skill_info")) 302 if (!strcmp (buf, "skill_info"))
252 send_skill_info (ns, params); 303 send_skill_info (ns, params);
253 else if (!strcmp (buf, "spell_paths")) 304 else if (!strcmp (buf, "spell_paths"))
254 send_spell_paths (ns, params); 305 send_spell_paths (ns, params);
255 else 306 else
256 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 }
257} 314}
258 315
259void 316void
260ExtCmd (char *buf, int len, player *pl) 317ExtCmd (char *buf, int len, player *pl)
261{ 318{
… …
264 321
265void 322void
266ExtiCmd (char *buf, int len, client *ns) 323ExtiCmd (char *buf, int len, client *ns)
267{ 324{
268 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;
269} 414}
270 415
271void 416void
272MapInfoCmd (char *buf, int len, player *pl) 417MapInfoCmd (char *buf, int len, player *pl)
273{ 418{
274 // <mapinfo tag spatial tile-path 419 // <mapinfo tag spatial tile-path
275 // >mapinfo tag spatial flags x y w h hash 420 // >mapinfo tag spatial flags x y w h hash
276 421
277 char bigbuf[MAX_BUF], *token;
278
279 token = buf; 422 char *token = buf;
280 // copy token 423
281 if (!(buf = strchr (buf, ' '))) 424 if (!(buf = strchr (buf, ' ')))
282 return; 425 return;
283 426
284 *buf++ = 0;
285
286 if (!strncmp (buf, "spatial ", 8)) 427 if (!strncmp (buf, " spatial ", 9))
287 { 428 {
288 buf += 8; 429 char *copy = strdup (token);
430 copy [buf - token] = 0;
289 431
290 // initial map and its origin 432#if 0
291 maptile *map = pl->ob->map; 433 // this makes only sense when we flush the buffer immediately
292 sint16 dx, dy; 434 if (pl->ns->mapinfo_try (copy))
293 int mapx = pl->ns->mapx / 2 - pl->ob->x; 435 free (copy);
294 int mapy = pl->ns->mapy / 2 - pl->ob->y;
295 int max_distance = 8; // limit maximum path length to something generous
296
297 while (*buf && map && max_distance)
298 {
299 int dir = *buf++;
300
301 switch (dir)
302 {
303 case '1':
304 dx = 0;
305 dy = -1;
306 map = map->xy_find (dx, dy);
307 map && (mapy -= map->height);
308 break;
309 case '2':
310 mapx += map->width;
311 dx = map->width;
312 dy = 0;
313 map = map->xy_find (dx, dy);
314 break;
315 case '3':
316 mapy += map->height;
317 dx = 0;
318 dy = map->height;
319 map = map->xy_find (dx, dy);
320 break;
321 case '4':
322 dx = -1;
323 dy = 0;
324 map = map->xy_find (dx, dy);
325 map && (mapx -= map->width);
326 break;
327 }
328
329 --max_distance;
330 }
331
332 if (!max_distance)
333 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
334 else if (map && map->path[0])
335 {
336 int flags = 0;
337
338 if (map->tile_path[0])
339 flags |= 1;
340 if (map->tile_path[1])
341 flags |= 2;
342 if (map->tile_path[2])
343 flags |= 4;
344 if (map->tile_path[3])
345 flags |= 8;
346
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
348 }
349 else 436 else
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 437#endif
438 pl->ns->mapinfo_queue.push_back (copy);
351 } 439 }
352 else 440 else
353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 441 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
354
355 pl->ns->send_packet (bigbuf);
356} 442}
357 443
358/** This is the Setup cmd - easy first implementation */ 444/** This is the Setup cmd */
359void 445void
360SetUp (char *buf, int len, client * ns) 446SetUp (char *buf, int len, client * ns)
361{ 447{
362 int s, slen; 448 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
363 char *cmd, *param, cmdback[HUGE_BUF];
364
365 /* run through the cmds of setup
366 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
367 *
368 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
369 * The client then must sort this out
370 */
371
372 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
373
374 strcpy (cmdback, "setup");
375 for (s = 0; s < len; )
376 {
377 cmd = &buf[s];
378
379 /* find the next space, and put a null there */
380 for (; buf[s] && buf[s] != ' '; s++)
381 ;
382
383 buf[s++] = 0;
384
385 while (buf[s] == ' ')
386 s++;
387
388 if (s >= len)
389 break;
390
391 param = &buf[s];
392
393 for (; buf[s] && buf[s] != ' '; s++)
394 ;
395
396 buf[s++] = 0;
397
398 while (buf[s] == ' ')
399 s++;
400
401 slen = strlen (cmdback);
402 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
403 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
404 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
405
406 if (!strcmp (cmd, "sound"))
407 {
408 ns->sound = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 }
411 else if (!strcmp (cmd, "exp64"))
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 else if (!strcmp (cmd, "spellmon"))
414 {
415 ns->monitor_spells = atoi (param);
416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
417 }
418 else if (!strcmp (cmd, "darkness"))
419 {
420 ns->darkness = atoi (param);
421 safe_strcat (cmdback, param, &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1cmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1Cmd;
427 /* if beyond this size, need to use map1cmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1Cmd;
430 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "map1acmd"))
433 {
434 if (atoi (param))
435 ns->mapmode = Map1aCmd;
436 /* if beyond this size, need to use map1acmd no matter what */
437 if (ns->mapx > 11 || ns->mapy > 11)
438 ns->mapmode = Map1aCmd;
439 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
440 }
441 else if (!strcmp (cmd, "newmapcmd"))
442 {
443 ns->newmapcmd = atoi (param);
444 safe_strcat (cmdback, param, &slen, HUGE_BUF);
445// } else if (!strcmp(cmd,"plugincmd")) {
446// ns->plugincmd = atoi(param);
447// safe_strcat(cmdback, param, &slen, HUGE_BUF);
448 }
449 else if (!strcmp (cmd, "mapinfocmd"))
450 {
451 ns->mapinfocmd = atoi (param);
452 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453 }
454 else if (!strcmp (cmd, "extcmd"))
455 {
456 ns->extcmd = atoi (param);
457 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458 }
459 else if (!strcmp (cmd, "extmap"))
460 {
461 ns->extmap = atoi (param);
462 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
463 }
464 else if (!strcmp (cmd, "facecache"))
465 {
466 ns->facecache = atoi (param);
467 safe_strcat (cmdback, param, &slen, HUGE_BUF);
468 }
469 else if (!strcmp (cmd, "faceset"))
470 {
471 char tmpbuf[20];
472 int q = atoi (param);
473
474 if (is_valid_faceset (q))
475 ns->faceset = q;
476 sprintf (tmpbuf, "%d", ns->faceset);
477 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
478 /* if the client is using faceset, it knows about image2 command */
479 ns->image2 = 1;
480 }
481 else if (!strcmp (cmd, "itemcmd"))
482 {
483 /* Version of the item protocol command to use. Currently,
484 * only supported versions are 1 and 2. Using a numeric
485 * value will make it very easy to extend this in the future.
486 */
487 char tmpbuf[20];
488 int q = atoi (param);
489
490 if (q < 1 || q > 2)
491 {
492 strcpy (tmpbuf, "FALSE");
493 }
494 else
495 {
496 ns->itemcmd = q;
497 sprintf (tmpbuf, "%d", ns->itemcmd);
498 }
499 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
500 }
501 else if (!strcmp (cmd, "mapsize"))
502 {
503 int x, y = 0;
504 char tmpbuf[MAX_BUF], *cp;
505
506 x = atoi (param);
507 for (cp = param; *cp != 0; cp++)
508 if (*cp == 'x' || *cp == 'X')
509 {
510 y = atoi (cp + 1);
511 break;
512 }
513 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
514 {
515 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
516 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517 }
518 else
519 {
520 ns->mapx = x;
521 ns->mapy = y;
522 /* better to send back what we are really using and not the
523 * param as given to us in case it gets parsed differently.
524 */
525 sprintf (tmpbuf, "%dx%d", x, y);
526 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
527 /* If beyond this size and still using orig map command, need to
528 * go to map1cmd.
529 */
530 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
531 ns->mapmode = Map1Cmd;
532 }
533 }
534 else if (!strcmp (cmd, "extendedMapInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the mapextended command
538 */
539 char tmpbuf[20];
540
541 ns->ext_mapinfos = (atoi (param));
542 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
543 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
544 }
545 else if (!strcmp (cmd, "extendedTextInfos"))
546 {
547 /* Added by tchize
548 * prepare to use the extended text commands
549 * Client toggle this to non zero to get exttext
550 */
551 char tmpbuf[20];
552
553 ns->has_readable_type = (atoi (param));
554 sprintf (tmpbuf, "%d", ns->has_readable_type);
555 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
556 }
557 else
558 {
559 /* Didn't get a setup command we understood -
560 * report a failure to the client.
561 */
562 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
563 }
564 } /* for processing all the setup commands */
565
566 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
567 ns->send_packet (cmdback);
568} 449}
569 450
570/** 451/**
571 * The client has requested to be added to the game. 452 * The client has requested to be added to the game.
572 * This is what takes care of it. We tell the client how things worked out. 453 * This is what takes care of it. We tell the client how things worked out.
573 * I am not sure if this file is the best place for this function. however, 454 * I am not sure if this file is the best place for this function. however,
574 * it either has to be here or init_sockets needs to be exported. 455 * it either has to be here or init_sockets needs to be exported.
575 */ 456 */
576void 457void
577AddMeCmd (char *buf, int len, client * ns) 458AddMeCmd (char *buf, int len, client *ns)
578{ 459{
579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 460 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
580} 461}
581 462
582/** Reply to ExtendedInfos command */ 463//+GPL
583void
584ToggleExtendedInfos (char *buf, int len, client * ns)
585{
586 char cmdback[MAX_BUF];
587 char command[50];
588 int info, nextinfo;
589
590 cmdback[0] = '\0';
591 nextinfo = 0;
592
593 while (1)
594 {
595 /* 1. Extract an info */
596 info = nextinfo;
597
598 while ((info < len) && (buf[info] == ' '))
599 info++;
600
601 if (info >= len)
602 break;
603
604 nextinfo = info + 1;
605
606 while ((nextinfo < len) && (buf[nextinfo] != ' '))
607 nextinfo++;
608
609 if (nextinfo - info >= 49) /*Erroneous info asked */
610 continue;
611
612 strncpy (command, &(buf[info]), nextinfo - info);
613
614 /* 2. Interpret info */
615 if (!strcmp ("smooth", command))
616 /* Toggle smoothing */
617 ns->EMI_smooth = !ns->EMI_smooth;
618 else
619 /*bad value */;
620
621 /*3. Next info */
622 }
623
624 strcpy (cmdback, "ExtendedInfoSet");
625
626 if (ns->EMI_smooth)
627 {
628 strcat (cmdback, " ");
629 strcat (cmdback, "smoothing");
630 }
631
632 ns->send_packet (cmdback);
633}
634
635/*
636#define MSG_TYPE_BOOK 1
637#define MSG_TYPE_CARD 2
638#define MSG_TYPE_PAPER 3
639#define MSG_TYPE_SIGN 4
640#define MSG_TYPE_MONUMENT 5
641#define MSG_TYPE_SCRIPTED_DIALOG 6*/
642
643/** Reply to ExtendedInfos command */
644void
645ToggleExtendedText (char *buf, int len, client * ns)
646{
647 char cmdback[MAX_BUF];
648 char temp[10];
649 char command[50];
650 int info, nextinfo, i, flag;
651
652 cmdback[0] = '\0';
653
654 nextinfo = 0;
655 while (1)
656 {
657 /* 1. Extract an info */
658 info = nextinfo;
659
660 while ((info < len) && (buf[info] == ' '))
661 info++;
662
663 if (info >= len)
664 break;
665
666 nextinfo = info + 1;
667
668 while ((nextinfo < len) && (buf[nextinfo] != ' '))
669 nextinfo++;
670
671 if (nextinfo - info >= 49) /*Erroneous info asked */
672 continue;
673
674 strncpy (command, &(buf[info]), nextinfo - info);
675 command[nextinfo - info] = '\0';
676 /* 2. Interpret info */
677 i = sscanf (command, "%d", &flag);
678
679 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
680 ns->supported_readables |= (1 << flag);
681 /*3. Next info */
682 }
683
684 /* Send resulting state */
685 strcpy (cmdback, "ExtendedTextSet");
686
687 for (i = 0; i <= MSG_TYPE_LAST; i++)
688 if (ns->supported_readables & (1 << i))
689 {
690 strcat (cmdback, " ");
691 snprintf (temp, sizeof (temp), "%d", i);
692 strcat (cmdback, temp);
693 }
694
695 ns->send_packet (cmdback);
696}
697
698/**
699 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
700 * Basically, it makes no sense to wait for the client to request a
701 * a piece of data from us that we know the client wants. So
702 * if we know the client wants it, might as well push it to the
703 * client.
704 */
705static void
706SendSmooth (client *ns, uint16 face)
707{
708 uint16 smoothface;
709
710 /* If we can't find a face, return and set it so we won't try to send this
711 * again.
712 */
713 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
714 {
715
716 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718 return;
719 }
720
721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
722 esrv_send_face (ns, smoothface, 0);
723
724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
725
726 packet sl ("smooth");
727
728 sl << uint16 (face)
729 << uint16 (smoothface);
730
731 ns->send_packet (sl);
732}
733
734 /**
735 * Tells client the picture it has to use
736 * to smooth a picture number given as argument.
737 */
738void
739AskSmooth (char *buf, int len, client *ns)
740{
741 SendSmooth (ns, atoi (buf));
742}
743 464
744/** 465/**
745 * 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,
746 * etc.) 467 * etc.)
747 */ 468 */
… …
760 return; 481 return;
761 482
762 buf++; 483 buf++;
763 } 484 }
764 485
765 execute_newserver_command (pl->ob, (char *) buf); 486 execute_newserver_command (pl->ob, (char *)buf);
766 487
767 /* Perhaps something better should be done with a left over count. 488 /* Perhaps something better should be done with a left over count.
768 * Cleaning up the input should probably be done first - all actions 489 * Cleaning up the input should probably be done first - all actions
769 * 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
770 * commands. 491 * commands.
771 */ 492 */
772 pl->count = 0; 493 pl->count = 0;
773} 494}
774 495
775
776/** 496/**
777 * 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,
778 * 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
779 * '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
780 * can throttle. 500 * can throttle.
… …
782void 502void
783NewPlayerCmd (char *buf, int len, player *pl) 503NewPlayerCmd (char *buf, int len, player *pl)
784{ 504{
785 if (len <= 6) 505 if (len <= 6)
786 { 506 {
787 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);
788 return; 508 return;
789 } 509 }
790 510
791 uint16 cmdid = net_uint16 ((uint8 *)buf); 511 uint16 cmdid = net_uint16 ((uint8 *)buf);
792 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 512 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
805 * commands. 525 * commands.
806 */ 526 */
807 pl->count = 0; 527 pl->count = 0;
808 528
809 //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
810 int time = fabs (pl->ob->speed) < 0.001 530 int time = pl->ob->has_active_speed ()
811 ? time = MAX_TIME * 100
812 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 531 ? (int) (MAX_TIME / pl->ob->speed)
532 : MAX_TIME * 100;
813 533
814 /* Send confirmation of command execution now */ 534 /* Send confirmation of command execution now */
815 packet sl ("comc"); 535 packet sl ("comc");
816 sl << uint16 (cmdid) << uint32 (time); 536 sl << uint16 (cmdid) << uint32 (time);
817 pl->ns->send_packet (sl); 537 pl->ns->send_packet (sl);
… …
849 { 569 {
850 case ST_PLAYING: 570 case ST_PLAYING:
851 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 571 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
852 break; 572 break;
853 573
854 case ST_CHANGE_CLASS:
855 key_change_class (pl->ob, buf[0]);
856 break;
857
858 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 574 case ST_GET_PARTY_PASSWORD: /* Get password for party */
859 receive_party_password (pl->ob, 13); 575 receive_party_password (pl->ob, 13);
860 break; 576 break;
861 577
862 default: 578 default:
863 LOG (llevError, "Unknown input state: %d\n", ns->state); 579 LOG (llevError, "Unknown input state: %d\n", ns->state);
864 } 580 }
865} 581}
866 582
867/** 583/**
868 * Client tells its version. If there is a mismatch, we close the 584 * Client tells its version info.
869 * socket. In real life, all we should care about is the client having
870 * something older than the server. If we assume the client will be
871 * backwards compatible, having it be a later version should not be a
872 * problem.
873 */ 585 */
874void 586void
875VersionCmd (char *buf, int len, client * ns) 587VersionCmd (char *buf, int len, client *ns)
876{ 588{
877 if (!buf) 589 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
878 {
879 LOG (llevError, "CS: received corrupted version command\n");
880 return;
881 }
882
883 ns->cs_version = atoi (buf);
884 ns->sc_version = ns->cs_version;
885
886 LOG (llevDebug, "connection from client <%s>\n", buf);
887
888
889 //TODO: should log here just for statistics
890
891 //if (VERSION_CS != ns->cs_version)
892 // unchecked;
893
894 char *cp = strchr (buf + 1, ' ');
895 if (!cp)
896 return;
897
898 ns->sc_version = atoi (cp);
899
900 //if (VERSION_SC != ns->sc_version)
901 // unchecked;
902
903 cp = strchr (cp + 1, ' ');
904
905 if (cp)
906 {
907 assign (ns->version, cp + 1);
908
909 if (ns->sc_version < 1026)
910 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
911 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
912 }
913} 590}
914 591
915/** sound related functions. */ 592/** sound related functions. */
916void 593void
917SetSound (char *buf, int len, client * ns) 594SetSound (char *buf, int len, client * ns)
… …
935 * syntax is: move (to) (tag) (nrof) 612 * syntax is: move (to) (tag) (nrof)
936 */ 613 */
937void 614void
938MoveCmd (char *buf, int len, player *pl) 615MoveCmd (char *buf, int len, player *pl)
939{ 616{
940 int vals[3], i; 617 int to, tag, nrof;
941 618
942 /* A little funky here. We only cycle for 2 records, because 619 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
943 * we obviously are not going to find a space after the third
944 * record. Perhaps we should just replace this with a
945 * sscanf?
946 */
947 for (i = 0; i < 2; i++)
948 { 620 {
949 vals[i] = atoi (buf);
950
951 if (!(buf = strchr (buf, ' ')))
952 {
953 LOG (llevError, "Incomplete move command: %s\n", buf); 621 LOG (llevError, "Incomplete move command: %s\n", buf);
954 return; 622 return;
955 }
956
957 buf++;
958 } 623 }
959 624
960 vals[2] = atoi (buf); 625 esrv_move_object (pl->ob, to, tag, nrof);
961
962/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
964} 626}
965 627
966/****************************************************************************** 628/******************************************************************************
967 * 629 *
968 * Start of commands the server sends to the client. 630 * Start of commands the server sends to the client.
… …
972/** 634/**
973 * Asks the client to query the user. This way, the client knows 635 * Asks the client to query the user. This way, the client knows
974 * it needs to send something back (vs just printing out a message) 636 * it needs to send something back (vs just printing out a message)
975 */ 637 */
976void 638void
977send_query (client *ns, uint8 flags, char *text) 639send_query (client *ns, uint8 flags, const char *text)
978{ 640{
979 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 641 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
642}
643
644/**
645 * Get player's current range attack in obuf.
646 */
647static void
648rangetostring (player *pl, char *obuf)
649{
650 dynbuf_text &buf = msg_dynbuf; buf.clear ();
651
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
661
662 if (pl->ranged_ob)
663 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
664
665 if (pl->combat_ob)
666 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
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?
675 if (pl->golem)
676 buf << " Golem*: " << pl->golem->name;
677
678 buf << '\0';
679 buf.linearise (obuf);
980} 680}
981 681
982#define AddIfInt64(Old,New,Type) if (Old != New) {\ 682#define AddIfInt64(Old,New,Type) if (Old != New) {\
983 Old = New; \ 683 Old = New; \
984 sl << uint8 (Type) << uint64 (New); \ 684 sl << uint8 (Type) << uint64 (New); \
… …
992#define AddIfShort(Old,New,Type) if (Old != New) {\ 692#define AddIfShort(Old,New,Type) if (Old != New) {\
993 Old = New; \ 693 Old = New; \
994 sl << uint8 (Type) << uint16 (New); \ 694 sl << uint8 (Type) << uint16 (New); \
995 } 695 }
996 696
997#define AddIfFloat(Old,New,Type) if (Old != New) {\ 697#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
998 Old = New; \ 698 Old = New; \
999 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 699 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1000 } 700 }
1001 701
1002#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 702#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1003 free(Old); Old = strdup (New);\ 703 free(Old); Old = strdup (New);\
1004 sl << uint8 (Type) << data8 (New); \ 704 sl << uint8 (Type) << data8 (New); \
… …
1018 718
1019 client *ns = pl->ns; 719 client *ns = pl->ns;
1020 if (!ns) 720 if (!ns)
1021 return; 721 return;
1022 722
1023 object *ob = pl->ob; 723 object *ob = pl->observe;
1024 if (!ob) 724 if (!ob)
1025 return; 725 return;
726
727 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1026 728
1027 packet sl ("stats"); 729 packet sl ("stats");
1028 730
1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 731 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 732 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1038 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 740 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1039 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 741 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1040 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 742 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 743 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1042 744
1043 for (int s = 0; s < NUM_SKILLS; s++) 745 for (int s = 0; s < CS_NUM_SKILLS; s++)
1044 if (object *skill = pl->last_skill_ob[s]) 746 if (object *skill = opl->last_skill_ob [s])
1045 if (skill->stats.exp != ns->last_skill_exp [s]) 747 if (skill->stats.exp != ns->last_skill_exp [s])
1046 { 748 {
1047 ns->last_skill_exp [s] = skill->stats.exp; 749 ns->last_skill_exp [s] = skill->stats.exp;
1048 750
1049 /* Always send along the level if exp changes. This is only 751 /* Always send along the level if exp changes. This is only
1050 * 1 extra byte, but keeps processing simpler. 752 * 1 extra byte, but keeps processing simpler.
1051 */ 753 */
1052 sl << uint8 (s + CS_STAT_SKILLINFO) 754 sl << uint8 (CS_STAT_SKILLINFO + s)
1053 << uint8 (skill->level) 755 << uint8 (skill->level)
1054 << uint64 (skill->stats.exp); 756 << uint64 (skill->stats.exp);
1055 } 757 }
1056 758
1057 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 759 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 760 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 761 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 762 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 763 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 764 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 765 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1064 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 766 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
1065 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 767 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1066 768
1067 flags = 0; 769 flags = (opl->fire_on ? SF_FIREON : 0)
1068 770 | (opl->run_on ? SF_RUNON : 0);
1069 if (pl->fire_on)
1070 flags |= SF_FIREON;
1071
1072 if (pl->run_on)
1073 flags |= SF_RUNON;
1074 771
1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 772 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1076 773
1077 if (ns->sc_version < 1025)
1078 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1079 else
1080 for (int i = 0; i < NROFATTACKS; i++) 774 for (int i = 0; i < NROFATTACKS; i++)
1081 {
1082 /* Skip ones we won't send */ 775 /* Skip ones we won't send */
1083 if (atnr_cs_stat[i] == -1) 776 if (atnr_cs_stat[i] >= 0)
1084 continue;
1085
1086 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 777 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1087 }
1088 778
1089 if (pl->ns->monitor_spells) 779 if (pl->ns->monitor_spells)
1090 { 780 {
1091 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 781 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1092 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 782 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1093 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 783 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1094 } 784 }
1095 785
1096 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 786 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 787 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1098 set_title (ob, buf); 788 set_title (ob, buf);
1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 789 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1100 790
1101 /* Only send it away if we have some actual data */ 791 /* Only send it away if we have some actual data */
… …
1105 795
1106/** 796/**
1107 * Tells the client that here is a player it should start using. 797 * Tells the client that here is a player it should start using.
1108 */ 798 */
1109void 799void
1110esrv_new_player (player *pl, uint32 weight) 800esrv_new_player (player *pl)
1111{ 801{
802 sint32 weight = pl->ob->client_weight ();
803
1112 packet sl ("player"); 804 packet sl ("player");
1113 805
1114 sl << uint32 (pl->ob->count) 806 sl << uint32 (pl->ob->count)
1115 << uint32 (weight) 807 << uint32 (weight)
1116 << uint32 (pl->ob->face->number) 808 << uint32 (pl->ob->face)
1117 << data8 (pl->ob->name); 809 << data8 (pl->ob->name);
1118 810
1119 pl->ns->last_weight = weight; 811 pl->ns->last_weight = weight;
1120 pl->ns->send_packet (sl); 812 pl->ns->send_packet (sl);
1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1122} 813}
1123
1124/**
1125 * Need to send an animation sequence to the client.
1126 * We will send appropriate face commands to the client if we haven't
1127 * sent them the face yet (this can become quite costly in terms of
1128 * how much we are sending - on the other hand, this should only happen
1129 * when the player logs in and picks stuff up.
1130 */
1131void
1132esrv_send_animation (client * ns, short anim_num)
1133{
1134 /* Do some checking on the anim_num we got. Note that the animations
1135 * are added in contigous order, so if the number is in the valid
1136 * range, it must be a valid animation.
1137 */
1138 if (anim_num < 0 || anim_num > num_animations)
1139 {
1140 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1141 return;
1142 }
1143
1144 packet sl ("anim");
1145
1146 sl << uint16 (anim_num)
1147 << uint16 (0); /* flags - not used right now */
1148
1149 /* Build up the list of faces. Also, send any information (ie, the
1150 * the face itself) down to the client.
1151 */
1152 for (int i = 0; i < animations[anim_num].num_animations; i++)
1153 {
1154 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1155 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1156
1157 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1158 }
1159
1160 ns->send_packet (sl);
1161
1162 ns->anims_sent[anim_num] = 1;
1163}
1164
1165 814
1166/****************************************************************************** 815/******************************************************************************
1167 * 816 *
1168 * Start of map related commands. 817 * Start of map related commands.
1169 * 818 *
1170 ******************************************************************************/ 819 ******************************************************************************/
1171 820
1172/**
1173 * This adds face_num to a map cell at x,y. If the client doesn't have
1174 * the face yet, we will also send it.
1175 */
1176static void
1177esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1178{
1179 if (newmap->cells[x][y].count >= MAP_LAYERS)
1180 {
1181 //TODO: one or the other, can't both have abort and return, verify and act
1182 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1183 return;
1184 abort ();
1185 }
1186
1187 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1188 newmap->cells[x][y].count++;
1189
1190 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1191 esrv_send_face (ns, face_num, 0);
1192}
1193
1194/** Clears a map cell */ 821/** Clears a map cell */
1195static void 822static void
1196map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 823map_clearcell (struct MapCell *cell, int count)
1197{ 824{
1198 cell->faces[0] = face0; 825 cell->faces[0] = 0;
1199 cell->faces[1] = face1; 826 cell->faces[1] = 0;
1200 cell->faces[2] = face2; 827 cell->faces[2] = 0;
828 cell->smooth[0] = 0;
829 cell->smooth[1] = 0;
830 cell->smooth[2] = 0;
1201 cell->count = count; 831 cell->count = count;
1202 cell->stat_hp = 0; 832 cell->stat_hp = 0;
1203 cell->flags = 0; 833 cell->flags = 0;
1204 cell->player = 0; 834 cell->player = 0;
1205} 835}
1206 836
1207#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1208#define MAX_LAYERS 3 837#define MAX_LAYERS 3
1209
1210/* Using a global really isn't a good approach, but saves the over head of
1211 * allocating and deallocating such a block of data each time run through,
1212 * and saves the space of allocating this in the socket object when we only
1213 * need it for this cycle. If the server is ever threaded, this needs to be
1214 * re-examined.
1215 */
1216static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1217
1218/**
1219 * Returns true if any of the heads for this
1220 * space is set. Returns false if all are blank - this is used
1221 * for empty space checking.
1222 */
1223static inline int
1224have_head (int ax, int ay)
1225{
1226 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1227 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1228 return 1;
1229
1230 return 0;
1231}
1232
1233/**
1234 * check_head is a bit simplistic version of update_space below.
1235 * basically, it only checks the that the head on space ax,ay at layer
1236 * needs to get sent - if so, it adds the data, sending the head
1237 * if needed, and returning 1. If this no data needs to get
1238 * sent, it returns zero.
1239 */
1240static int
1241check_head (packet &sl, client &ns, int ax, int ay, int layer)
1242{
1243 short face_num;
1244
1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1246 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1247 else
1248 face_num = 0;
1249
1250 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1251 {
1252 sl << uint16 (face_num);
1253 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1254 esrv_send_face (&ns, face_num, 0);
1255
1256 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1257 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1258 return 1;
1259 }
1260
1261 return 0; /* No change */
1262}
1263 838
1264/** 839/**
1265 * Removes the need to replicate the same code for each layer. 840 * Removes the need to replicate the same code for each layer.
1266 * this returns true if this space is now in fact different than 841 * this returns true if this space is now in fact different than
1267 * it was. 842 * it was.
1268 * sl is the socklist this data is going into. 843 * sl is the socklist this data is going into.
1269 * ns is the socket we are working on - all the info we care 844 * ns is the socket we are working on - all the info we care
1270 * about is in this socket structure, so now need not pass the 845 * about is in this socket structure, so now need not pass the
1271 * entire player object. 846 * entire player object.
1272 * mx and my are map coordinate offsets for map mp
1273 * sx and sy are the offsets into the socket structure that
1274 * holds the old values.
1275 * layer is the layer to update, with 2 being the floor and 0 the 847 * layer is the layer to update, with 2 being the floor and 0 the
1276 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 848 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1277 * take. Interesting to note that before this function, the map1 function 849 * take. Interesting to note that before this function, the map1 function
1278 * numbers the spaces differently - I think this was a leftover from 850 * numbers the spaces differently - I think this was a leftover from
1279 * the map command, where the faces stack up. Sinces that is no longer 851 * the map command, where the faces stack up. Sinces that is no longer
1280 * the case, it seems to make more sense to have these layer values 852 * the case, it seems to make more sense to have these layer values
1281 * actually match. 853 * actually match.
1282 */ 854 */
1283static int 855static int
1284update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 856update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1285{ 857{
1286 object *ob, *head; 858 object *ob = ms.faces_obj [layer];
1287 uint16 face_num;
1288 int bx, by, i;
1289
1290 /* If there is a multipart object stored away, treat that as more important.
1291 * If not, then do the normal processing.
1292 */
1293 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1294
1295 /* Check to see if this head is part of the set of objects
1296 * we would normally send for this space. If so, then
1297 * don't use the head value. We need to do the check
1298 * here and not when setting up the heads[] value for two reasons -
1299 * 1) the heads[] values will get used even if the space is not visible.
1300 * 2) its possible the head is not on the same map as a part, and I'd
1301 * rather not need to do the map translation overhead.
1302 * 3) We need to do some extra checking to make sure that we will
1303 * otherwise send the image as this layer, eg, either it matches
1304 * the head value, or is not multipart.
1305 */
1306 if (head && !head->more)
1307 {
1308 for (i = 0; i < MAP_LAYERS; i++)
1309 {
1310 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1311 if (!ob)
1312 continue;
1313
1314 if (ob->head)
1315 ob = ob->head;
1316
1317 if (ob == head)
1318 {
1319 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1320 head = NULL;
1321 break;
1322 }
1323 }
1324 }
1325
1326 ob = head;
1327 if (!ob)
1328 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1329 859
1330 /* If there is no object for this space, or if the face for the object 860 /* If there is no object for this space, or if the face for the object
1331 * is the blank face, set the face number to zero. 861 * is the blank face, set the face number to zero.
1332 * else if we have the stored head object for this space, that takes 862 * else if we have the stored head object for this space, that takes
1333 * precedence over the other object for this space. 863 * precedence over the other object for this space.
1334 * otherwise, we do special head processing 864 * otherwise, we do special head processing
1335 */ 865 */
1336 if (!ob || ob->face == blank_face) 866 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1337 face_num = 0;
1338 else if (head)
1339 {
1340 /* if this is a head that had previously been stored */
1341 face_num = ob->face->number;
1342 }
1343 else
1344 {
1345 /* if the faces for the different parts of a multipart object
1346 * are the same, we only want to send the bottom right most
1347 * portion of the object. That info is in the tail_.. values
1348 * of the head. Note that for the head itself, ob->head will
1349 * be null, so we only do this block if we are working on
1350 * a tail piece.
1351 */
1352
1353 /* tail_x and tail_y will only be set in the head object. If
1354 * this is the head object and these are set, we proceed
1355 * with logic to only send bottom right. Similarly, if
1356 * this is one of the more parts but the head has those values
1357 * set, we want to do the processing. There can be cases where
1358 * the head is not visible but one of its parts is, so we just
1359 * can always expect that ob->arch->tail_x will be true for all
1360 * object we may want to display.
1361 */
1362 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1363 {
1364
1365 if (ob->head)
1366 head = ob->head;
1367 else
1368 head = ob;
1369
1370 /* Basically figure out where the offset is from where we are right
1371 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1372 * piece is from the head, and the tail is where the tail is from the
1373 * head. Note that bx and by will equal sx and sy if we are already working
1374 * on the bottom right corner. If ob is the head, the clone values
1375 * will be zero, so the right thing will still happen.
1376 */
1377 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1378 by = sy + head->arch->tail_y - ob->arch->clone.y;
1379
1380 /* I don't think this can ever happen, but better to check for it just
1381 * in case.
1382 */
1383 if (bx < sx || by < sy)
1384 {
1385 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1386 face_num = 0;
1387 }
1388 /* single part object, multipart object with non merged faces,
1389 * of multipart object already at lower right.
1390 */
1391 else if (bx == sx && by == sy)
1392 {
1393 face_num = ob->face->number;
1394
1395 /* if this face matches one stored away, clear that one away.
1396 * this code relies on the fact that the map1 commands
1397 * goes from 2 down to 0.
1398 */
1399 for (i = 0; i < MAP_LAYERS; i++)
1400 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1401 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1402 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1403 }
1404 else
1405 {
1406 /* If this head is stored away, clear it - otherwise,
1407 * there can be cases where a object is on multiple layers -
1408 * we only want to send it once.
1409 */
1410 face_num = head->face->number;
1411 for (i = 0; i < MAP_LAYERS; i++)
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1413 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1415
1416 /* First, try to put the new head on the same layer. If that is used up,
1417 * then find another layer.
1418 */
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1420 {
1421 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1422 }
1423 else
1424 for (i = 0; i < MAX_LAYERS; i++)
1425 {
1426 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1427 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1428 {
1429 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1430 }
1431 }
1432 face_num = 0; /* Don't send this object - we'll send the head later */
1433 }
1434 }
1435 else
1436 {
1437 /* In this case, we are already at the lower right or single part object,
1438 * so nothing special
1439 */
1440 face_num = ob->face->number;
1441
1442 /* clear out any head entries that have the same face as this one */
1443 for (bx = 0; bx < layer; bx++)
1444 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1445 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1446 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1447 }
1448 } /* else not already head object or blank face */
1449
1450 /* This is a real hack. Basically, if we have nothing to send for this layer,
1451 * but there is a head on the next layer, send that instead.
1452 * Without this, what happens is you can get the case where the player stands
1453 * on the same space as the head. However, if you have overlapping big objects
1454 * of the same type, what happens then is it doesn't think it needs to send
1455 * This tends to make stacking also work/look better.
1456 */
1457 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1458 {
1459 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1460 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1461 }
1462
1463 /* Another hack - because of heads and whatnot, this face may match one
1464 * we already sent for a lower layer. In that case, don't send
1465 * this one.
1466 */
1467 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1468 face_num = 0;
1469 867
1470 /* We've gotten what face we want to use for the object. Now see if 868 /* We've gotten what face we want to use for the object. Now see if
1471 * if it has changed since we last sent it to the client. 869 * if it has changed since we last sent it to the client.
1472 */ 870 */
1473 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 871 if (lastcell.faces[layer] != face_num)
1474 { 872 {
1475 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 873 lastcell.faces[layer] = face_num;
874
1476 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 875 if (!ns.faces_sent[face_num])
876 if (ob)
877 ns.send_faces (ob);
878 else
1477 esrv_send_face (&ns, face_num, 0); 879 ns.send_face (face_num, 10);
1478 880
1479 sl << uint16 (face_num); 881 sl << uint16 (face_num);
1480 return 1; 882 return 1;
1481 } 883 }
1482 884
1483 /* Nothing changed */ 885 /* Nothing changed */
1484 return 0; 886 return 0;
1485} 887}
1486 888
1487/** 889//-GPL
1488 * This function is mainly a copy of update_space,
1489 * except it handles update of the smoothing updates,
1490 * not the face updates.
1491 * Removes the need to replicate the same code for each layer.
1492 * this returns true if this smooth is now in fact different
1493 * than it was.
1494 * sl is the socklist this data is going into.
1495 * ns is the socket we are working on - all the info we care
1496 * about is in this socket structure, so know need to pass the
1497 * entire player object.
1498 * mx and my are map coordinate offsets for map mp
1499 * sx and sy are the offsets into the socket structure that
1500 * holds the old values.
1501 * layer is the layer to update, with 2 being the floor and 0 the
1502 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1503 * take.
1504 */
1505
1506static inline int
1507update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1508{
1509 object *ob;
1510 int smoothlevel; /* old face_num; */
1511
1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1513
1514 /* If there is no object for this space, or if the face for the object
1515 * is the blank face, set the smoothlevel to zero.
1516 */
1517 if (!ob || ob->face == blank_face)
1518 smoothlevel = 0;
1519 else
1520 {
1521 smoothlevel = ob->smoothlevel;
1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1523 SendSmooth (&ns, ob->face->number);
1524 } /* else not already head object or blank face */
1525
1526 /* We've gotten what face we want to use for the object. Now see if
1527 * if it has changed since we last sent it to the client.
1528 */
1529 if (smoothlevel > 255)
1530 smoothlevel = 255;
1531 else if (smoothlevel < 0)
1532 smoothlevel = 0;
1533
1534 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1535 {
1536 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1537 sl << uint8 (smoothlevel);
1538 return 1;
1539 }
1540
1541 /* Nothing changed */
1542 return 0;
1543}
1544
1545/**
1546 * Returns the size of a data for a map square as returned by
1547 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1548 * available.
1549 */
1550int
1551getExtendedMapInfoSize (client * ns)
1552{
1553 int result = 0;
1554
1555 if (ns->ext_mapinfos)
1556 {
1557 if (ns->EMI_smooth)
1558 result += 1; /*One byte for smoothlevel */
1559 }
1560
1561 return result;
1562}
1563 890
1564// prefetch (and touch) all maps within a specific distancd 891// prefetch (and touch) all maps within a specific distancd
1565static void 892static void
1566prefetch_surrounding_maps (maptile *map, int distance) 893prefetch_surrounding_maps (maptile *map, int distance)
1567{ 894{
1568 map->last_access = runtime; 895 map->touch ();
1569 896
1570 if (--distance) 897 if (--distance)
1571 for (int dir = 4; --dir; ) 898 for (int dir = 4; dir--; )
1572 if (const shstr &path = map->tile_path [dir]) 899 if (const shstr &path = map->tile_path [dir])
1573 if (maptile *&neigh = map->tile_map [dir]) 900 if (maptile *&neigh = map->tile_map [dir])
1574 prefetch_surrounding_maps (neigh, distance); 901 prefetch_surrounding_maps (neigh, distance);
1575 else 902 else
1576 neigh = maptile::find_async (path, map); 903 neigh = maptile::find_async (path, map);
… …
1581prefetch_surrounding_maps (object *op) 908prefetch_surrounding_maps (object *op)
1582{ 909{
1583 prefetch_surrounding_maps (op->map, 3); 910 prefetch_surrounding_maps (op->map, 3);
1584} 911}
1585 912
913//+GPL
914
1586/** 915/**
1587 * This function uses the new map1 protocol command to send the map 916 * Draws client map.
1588 * to the client. It is necessary because the old map command supports
1589 * a maximum map size of 15x15.
1590 * This function is much simpler than the old one. This is because
1591 * the old function optimized to send as few face identifiers as possible,
1592 * at the expense of sending more coordinate location (coordinates were
1593 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1594 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1595 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1596 * and use the other 4 bits for other informatiion. For full documentation
1597 * of what we send, see the doc/Protocol file.
1598 * I will describe internally what we do:
1599 * the ns->lastmap shows how the map last looked when sent to the client.
1600 * in the lastmap structure, there is a cells array, which is set to the
1601 * maximum viewable size (As set in config.h).
1602 * in the cells, there are faces and a count value.
1603 * we use the count value to hold the darkness value. If -1, then this space
1604 * is not viewable.
1605 * we use faces[0] faces[1] faces[2] to hold what the three layers
1606 * look like.
1607 */ 917 */
1608void 918void
1609draw_client_map1 (object *pl) 919draw_client_map (player *pl)
1610{ 920{
1611 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 921 object *ob = pl->viewpoint;
1612 sint16 nx, ny;
1613 int estartlen, eoldlen;
1614 uint16 mask, emask;
1615 uint8 eentrysize;
1616 uint16 ewhatstart, ewhatflag;
1617 uint8 extendedinfos;
1618 maptile *m;
1619
1620 client &socket = *pl->contr->ns;
1621
1622 if (!pl->active) 922 if (!pl->observe->active)
1623 return; 923 return;
1624
1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1627
1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1629 packet esl;
1630
1631 startlen = sl.length ();
1632
1633 /*Extendedmapinfo structure initialisation */
1634 if (socket.ext_mapinfos)
1635 {
1636 extendedinfos = EMI_NOREDRAW;
1637
1638 if (socket.EMI_smooth)
1639 extendedinfos |= EMI_SMOOTH;
1640
1641 ewhatstart = esl.length ();
1642 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1643 could need to be taken away */
1644 eentrysize = getExtendedMapInfoSize (&socket);
1645 esl << "mapextended "
1646 << uint8 (extendedinfos)
1647 << uint8 (eentrysize);
1648
1649 estartlen = esl.length ();
1650 }
1651 else
1652 {
1653 /* suppress compiler warnings */
1654 ewhatstart = 0;
1655 ewhatflag = 0;
1656 estartlen = 0;
1657 }
1658
1659 /* Init data to zero */
1660 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1661
1662 /* x,y are the real map locations. ax, ay are viewport relative
1663 * locations.
1664 */
1665 ay = 0;
1666
1667 /* We could do this logic as conditionals in the if statement,
1668 * but that started to get a bit messy to look at.
1669 */
1670 max_x = pl->x + (socket.mapx + 1) / 2;
1671 max_y = pl->y + (socket.mapy + 1) / 2;
1672
1673 if (socket.mapmode == Map1aCmd)
1674 {
1675 max_x += MAX_HEAD_OFFSET;
1676 max_y += MAX_HEAD_OFFSET;
1677 }
1678
1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1680 {
1681 ax = 0;
1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1683 {
1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1685
1686 /* If this space is out of the normal viewable area, we only check
1687 * the heads value ax or ay will only be greater than what
1688 * the client wants if using the map1a command - this is because
1689 * if the map1a command is not used, max_x and max_y will be
1690 * set to lower values.
1691 */
1692 if (ax >= socket.mapx || ay >= socket.mapy)
1693 {
1694 int i, got_one;
1695
1696 oldlen = sl.length ();
1697
1698 sl << uint16 (mask);
1699
1700 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1701 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1702 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1703
1704 /* If all we are doing is sending 0 (blank) faces, we don't
1705 * actually need to send that - just the coordinates
1706 * with no faces tells the client to blank out the
1707 * space.
1708 */
1709 got_one = 0;
1710 for (i = oldlen + 2; i < sl.length (); i++)
1711 if (sl[i])
1712 got_one = 1;
1713
1714 if (got_one && (mask & 0xf))
1715 sl[oldlen + 1] = mask & 0xff;
1716 else
1717 { /*either all faces blank, either no face at all */
1718 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1719 sl.reset (oldlen + 2);
1720 else
1721 sl.reset (oldlen);
1722 }
1723
1724 /*What concerns extendinfos, nothing to be done for now
1725 * (perhaps effects layer later)
1726 */
1727 continue; /* don't do processing below */
1728 }
1729
1730 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1731
1732 d = pl->contr->blocked_los[ax][ay];
1733
1734 /* If the coordinates are not valid, or it is too dark to see,
1735 * we tell the client as such
1736 */
1737 nx = x;
1738 ny = y;
1739 m = get_map_from_coord (pl->map, &nx, &ny);
1740
1741 if (!m)
1742 {
1743 /* space is out of map. Update space and clear values
1744 * if this hasn't already been done. If the space is out
1745 * of the map, it shouldn't have a head
1746 */
1747 if (lastcell.count != -1)
1748 {
1749 sl << uint16 (mask);
1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1751 }
1752 }
1753 else if (d > 3)
1754 {
1755 m->touch ();
1756
1757 int need_send = 0, count;
1758
1759 /* This block deals with spaces that are not visible for whatever
1760 * reason. Still may need to send the head for this space.
1761 */
1762
1763 oldlen = sl.length ();
1764
1765 sl << uint16 (mask);
1766
1767 if (lastcell.count != -1)
1768 need_send = 1;
1769
1770 count = -1;
1771
1772 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1773 {
1774 /* Now check to see if any heads need to be sent */
1775
1776 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1777 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1778 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1779
1780 lastcell.count = count;
1781 }
1782 else
1783 {
1784 /* properly clear a previously sent big face */
1785 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1786 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1787 need_send = 1;
1788
1789 map_clearcell (&lastcell, 0, 0, 0, count);
1790 }
1791
1792 if ((mask & 0xf) || need_send)
1793 sl[oldlen + 1] = mask & 0xff;
1794 else
1795 sl.reset (oldlen);
1796 }
1797 else
1798 {
1799 m->touch ();
1800
1801 /* In this block, the space is visible or there are head objects
1802 * we need to send.
1803 */
1804
1805 /* Rather than try to figure out what everything that we might
1806 * need to send is, then form the packet after that,
1807 * we presume that we will in fact form a packet, and update
1808 * the bits by what we do actually send. If we send nothing,
1809 * we just back out sl.length () to the old value, and no harm
1810 * is done.
1811 * I think this is simpler than doing a bunch of checks to see
1812 * what if anything we need to send, setting the bits, then
1813 * doing those checks again to add the real data.
1814 */
1815 oldlen = sl.length ();
1816 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817 eoldlen = esl.length ();
1818 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1819 sl << uint16 (mask);
1820
1821 if (socket.ext_mapinfos)
1822 esl << uint16 (emask);
1823
1824 unsigned char dummy;
1825 unsigned char *last_ext = &dummy;
1826
1827 /* Darkness changed */
1828 if (lastcell.count != d && socket.darkness)
1829 {
1830 mask |= 0x8;
1831
1832 if (socket.extmap)
1833 {
1834 *last_ext |= 0x80;
1835 last_ext = &sl[sl.length ()];
1836 sl << uint8 (d);
1837 }
1838 else
1839 sl << uint8 (255 - 64 * d);
1840 }
1841
1842 lastcell.count = d;
1843
1844 if (socket.extmap)
1845 {
1846 uint8 stat_hp = 0;
1847 uint8 stat_width = 0;
1848 uint8 flags = 0;
1849 UUID player = 0;
1850
1851 // send hp information, if applicable
1852 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1853 {
1854 if (op->head || op->invisible)
1855 ; // do not show
1856 else if (op->type == PLAYER
1857 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1858 {
1859 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1860 {
1861 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1862 stat_width = op->arch->tail_x;
1863 }
1864 }
1865
1866 if (op->msg && op->msg[0] == '@')
1867 flags |= 1;
1868
1869 if (op->type == PLAYER && op != pl)
1870 player = op->count;
1871 }
1872
1873 if (lastcell.stat_hp != stat_hp)
1874 {
1875 lastcell.stat_hp = stat_hp;
1876
1877 mask |= 0x8;
1878 *last_ext |= 0x80;
1879 last_ext = &sl[sl.length ()];
1880
1881 sl << uint8 (5) << uint8 (stat_hp);
1882
1883 if (stat_width > 1)
1884 {
1885 *last_ext |= 0x80;
1886 last_ext = &sl[sl.length ()];
1887
1888 sl << uint8 (6) << uint8 (stat_width);
1889 }
1890 }
1891
1892 if (lastcell.player != player)
1893 {
1894 lastcell.player = player;
1895
1896 mask |= 0x8;
1897 *last_ext |= 0x80;
1898 last_ext = &sl[sl.length ()];
1899
1900 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1901 }
1902
1903 if (lastcell.flags != flags)
1904 {
1905 lastcell.flags = flags;
1906
1907 mask |= 0x8;
1908 *last_ext |= 0x80;
1909 last_ext = &sl[sl.length ()];
1910
1911 sl << uint8 (8) << uint8 (flags);
1912 }
1913 }
1914
1915 /* Floor face */
1916 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1917 mask |= 0x4;
1918
1919 if (socket.EMI_smooth)
1920 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1921 emask |= 0x4;
1922
1923 /* Middle face */
1924 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1925 mask |= 0x2;
1926
1927 if (socket.EMI_smooth)
1928 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1929 emask |= 0x2;
1930
1931 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1932 {
1933 if (lastcell.faces[0] != pl->face->number)
1934 {
1935 lastcell.faces[0] = pl->face->number;
1936 mask |= 0x1;
1937
1938 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1939 esrv_send_face (&socket, pl->face->number, 0);
1940
1941 sl << uint16 (pl->face->number);
1942 }
1943 }
1944 else
1945 {
1946 /* Top face */
1947 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1948 mask |= 0x1;
1949
1950 if (socket.EMI_smooth)
1951 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1952 emask |= 0x1;
1953 }
1954
1955 /* Check to see if we are in fact sending anything for this
1956 * space by checking the mask. If so, update the mask.
1957 * if not, reset the len to that from before adding the mask
1958 * value, so we don't send those bits.
1959 */
1960 if (mask & 0xf)
1961 sl[oldlen + 1] = mask & 0xff;
1962 else
1963 sl.reset (oldlen);
1964
1965 if (emask & 0xf)
1966 esl[eoldlen + 1] = emask & 0xff;
1967 else
1968 esl.reset (eoldlen);
1969 } /* else this is a viewable space */
1970 } /* for x loop */
1971 } /* for y loop */
1972
1973 /* Verify that we in fact do need to send this */
1974 if (socket.ext_mapinfos)
1975 {
1976 if (!(sl.length () > startlen || socket.sent_scroll))
1977 {
1978 /* No map data will follow, so don't say the client
1979 * it doesn't need draw!
1980 */
1981 ewhatflag &= (~EMI_NOREDRAW);
1982 esl[ewhatstart + 1] = ewhatflag & 0xff;
1983 }
1984
1985 if (esl.length () > estartlen)
1986 socket.send_packet (esl);
1987 }
1988
1989 if (sl.length () > startlen || socket.sent_scroll)
1990 {
1991 socket.send_packet (sl);
1992 socket.sent_scroll = 0;
1993 }
1994}
1995
1996/**
1997 * Draws client map.
1998 */
1999void
2000draw_client_map (object *pl)
2001{
2002 int i, j;
2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2004 facetile *face, *floor;
2005 facetile *floor2;
2006 int d, mflags;
2007 struct Map newmap;
2008 maptile *m, *pm;
2009
2010 if (pl->type != PLAYER)
2011 {
2012 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2013 return;
2014 }
2015
2016 pm = pl->map;
2017 924
2018 /* If player is just joining the game, he isn't here yet, so the map 925 /* If player is just joining the game, he isn't here yet, so the map
2019 * can get swapped out. If so, don't try to send them a map. All will 926 * can get swapped out. If so, don't try to send them a map. All will
2020 * be OK once they really log in. 927 * be OK once they really log in.
2021 */ 928 */
2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 929 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
2023 return; 930 return;
2024 931
2025 memset (&newmap, 0, sizeof (struct Map)); 932 int startlen, oldlen;
2026 933
2027 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 934 check_map_change (pl);
2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 935 prefetch_surrounding_maps (pl->ob);
936
937 /* do LOS after calls to update_position */
938 /* unfortunately, we need to udpate los when observing, currently */
939 if (pl->do_los || pl->viewpoint != pl->ob)
940 {
941 pl->do_los = 0;
942 pl->update_los ();
943 }
944
945 /**
946 * This function uses the new map1 protocol command to send the map
947 * to the client. It is necessary because the old map command supports
948 * a maximum map size of 15x15.
949 * This function is much simpler than the old one. This is because
950 * the old function optimized to send as few face identifiers as possible,
951 * at the expense of sending more coordinate location (coordinates were
952 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
953 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
954 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
955 * and use the other 4 bits for other informatiion. For full documentation
956 * of what we send, see the doc/Protocol file.
957 * I will describe internally what we do:
958 * the ns->lastmap shows how the map last looked when sent to the client.
959 * in the lastmap structure, there is a cells array, which is set to the
960 * maximum viewable size (As set in config.h).
961 * in the cells, there are faces and a count value.
962 * we use the count value to hold the darkness value. If -1, then this space
963 * is not viewable.
964 * we use faces[0] faces[1] faces[2] to hold what the three layers
965 * look like.
966 */
967
968 client &socket = *pl->ns;
969
970 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
971
972 startlen = sl.length ();
973
974 int hx = socket.mapx / 2;
975 int hy = socket.mapy / 2;
976
977 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
978 int ax = dx + hx;
979 int ay = dy + hy;
980
981 int mask = (ax << 10) | (ay << 4);
982 MapCell &lastcell = socket.lastmap.cells[ax][ay];
983
984 /* If the coordinates are not valid, or it is too dark to see,
985 * we tell the client as such
986 */
987 if (!m)
2029 { 988 {
2030 ax = i; 989 /* space is out of map. Update space and clear values
2031 ay = j; 990 * if this hasn't already been done. If the space is out
2032 m = pm; 991 * of the map, it shouldn't have a head.
2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2035 if (mflags & P_OUT_OF_MAP)
2036 continue;
2037
2038 /* If a map is visible to the player, we don't want to swap it out
2039 * just to reload it. This should really call something like
2040 * swap_map, but this is much more efficient and 'good enough'
2041 */ 992 */
2042 if (mflags & P_NEW_MAP) 993 if (lastcell.count != -1)
2043 m->timeout = 50; 994 {
995 sl << uint16 (mask);
996 map_clearcell (&lastcell, -1);
997 }
998
999 continue;
2044 } 1000 }
2045 1001
2046 /* do LOS after calls to update_position */ 1002 int d = pl->blocked_los_uc (dx, dy);
2047 if (pl->contr->do_los) 1003
1004 if (d > 3)
2048 { 1005 {
2049 update_los (pl); 1006 /* This block deals with spaces that are not visible for whatever
2050 pl->contr->do_los = 0; 1007 * reason. Still may need to send the head for this space.
1008 */
1009 if (lastcell.count != -1
1010 || lastcell.faces[0]
1011 || lastcell.faces[1]
1012 || lastcell.faces[2]
1013 || lastcell.stat_hp
1014 || lastcell.flags
1015 || lastcell.player)
1016 sl << uint16 (mask);
1017
1018 /* properly clear a previously sent big face */
1019 map_clearcell (&lastcell, -1);
2051 } 1020 }
2052 1021 else
2053 /* Big maps need a different drawing mechanism to work */
2054 draw_client_map1 (pl);
2055}
2056
2057
2058/*****************************************************************************/
2059
2060/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2061
2062/* a player. Of course, the client need to know the command to be able to */
2063
2064/* manage it ! */
2065
2066/*****************************************************************************/
2067void
2068send_plugin_custom_message (object *pl, char *buf)
2069{
2070 pl->contr->ns->send_packet (buf);
2071}
2072
2073/**
2074 * This sends the skill number to name mapping. We ignore
2075 * the params - we always send the same info no matter what.
2076 */
2077void
2078send_skill_info (client *ns, char *params)
2079{
2080 packet sl;
2081 sl << "replyinfo skill_info\n";
2082
2083 for (int i = 1; i < NUM_SKILLS; i++)
2084 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2085
2086 if (sl.length () >= MAXSOCKBUF)
2087 { 1022 {
2088 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1023 /* In this block, the space is visible.
2089 fatal (0); 1024 */
1025
1026 /* Rather than try to figure out what everything that we might
1027 * need to send is, then form the packet after that,
1028 * we presume that we will in fact form a packet, and update
1029 * the bits by what we do actually send. If we send nothing,
1030 * we just back out sl.length () to the old value, and no harm
1031 * is done.
1032 * I think this is simpler than doing a bunch of checks to see
1033 * what if anything we need to send, setting the bits, then
1034 * doing those checks again to add the real data.
1035 */
1036 oldlen = sl.length ();
1037
1038 sl << uint16 (mask);
1039
1040 unsigned char dummy;
1041 unsigned char *last_ext = &dummy;
1042
1043 /* Darkness changed */
1044 if (lastcell.count != d)
1045 {
1046 mask |= 0x8;
1047
1048 *last_ext |= 0x80;
1049 last_ext = &sl[sl.length ()];
1050 sl << uint8 (d);
1051 }
1052
1053 lastcell.count = d;
1054
1055 mapspace &ms = m->at (nx, ny);
1056 ms.update ();
1057
1058 // extmap handling
1059 uint8 stat_hp = 0;
1060 uint8 stat_width = 0;
1061 uint8 flags = 0;
1062 tag_t player = 0;
1063
1064 // send hp information, if applicable
1065 if (object *op = ms.faces_obj [0])
1066 if (op->is_head () && !op->invisible)
1067 {
1068 if (op->stats.maxhp > op->stats.hp
1069 && op->stats.maxhp > 0
1070 && (op->type == PLAYER
1071 || op->type == DOOR // does not work, have maxhp 0
1072 || op->flag [FLAG_MONSTER]
1073 || op->flag [FLAG_ALIVE]
1074 || op->flag [FLAG_GENERATOR]))
1075 {
1076 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1077 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1078 }
1079
1080 if (expect_false (op->has_dialogue ()))
1081 flags |= 1;
1082
1083 if (expect_false (op->type == PLAYER))
1084 player = op == ob ? pl->ob->count
1085 : op == pl->ob ? ob->count
1086 : op->count;
1087 }
1088
1089 if (expect_false (lastcell.stat_hp != stat_hp))
1090 {
1091 lastcell.stat_hp = stat_hp;
1092
1093 mask |= 0x8;
1094 *last_ext |= 0x80;
1095 last_ext = &sl[sl.length ()];
1096
1097 sl << uint8 (5) << uint8 (stat_hp);
1098
1099 if (stat_width > 1)
1100 {
1101 *last_ext |= 0x80;
1102 last_ext = &sl[sl.length ()];
1103
1104 sl << uint8 (6) << uint8 (stat_width);
1105 }
1106 }
1107
1108 if (expect_false (lastcell.player != player))
1109 {
1110 lastcell.player = player;
1111
1112 mask |= 0x8;
1113 *last_ext |= 0x80;
1114 last_ext = &sl[sl.length ()];
1115
1116 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1117 }
1118
1119 if (expect_false (lastcell.flags != flags))
1120 {
1121 lastcell.flags = flags;
1122
1123 mask |= 0x8;
1124 *last_ext |= 0x80;
1125 last_ext = &sl[sl.length ()];
1126
1127 sl << uint8 (8) << uint8 (flags);
1128 }
1129
1130 // faces
1131
1132 /* Floor face */
1133 if (update_space (sl, socket, ms, lastcell, 2))
1134 mask |= 0x4;
1135
1136 /* Middle face */
1137 if (update_space (sl, socket, ms, lastcell, 1))
1138 mask |= 0x2;
1139
1140 if (expect_false (ob->invisible)
1141 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1142 && ms.player () == ob)
1143 {
1144 // force player to be visible to himself if invisible
1145 if (lastcell.faces[0] != ob->face)
1146 {
1147 lastcell.faces[0] = ob->face;
1148
1149 mask |= 0x1;
1150 sl << uint16 (ob->face);
1151
1152 socket.send_faces (ob);
1153 }
1154 }
1155 /* Top face */
1156 else if (update_space (sl, socket, ms, lastcell, 0))
1157 mask |= 0x1;
1158
1159 /* Check to see if we are in fact sending anything for this
1160 * space by checking the mask. If so, update the mask.
1161 * if not, reset the len to that from before adding the mask
1162 * value, so we don't send those bits.
1163 */
1164 if (mask & 0xf)
1165 sl[oldlen + 1] = mask & 0xff;
1166 else
1167 sl.reset (oldlen);
1168 } /* else this is a viewable space */
1169 ordered_mapwalk_end
1170
1171 socket.flush_fx ();
1172
1173 if (sl.length () > startlen || socket.sent_scroll)
2090 } 1174 {
2091
2092 ns->send_packet (sl); 1175 socket.send_packet (sl);
2093} 1176 socket.sent_scroll = 0;
2094
2095/**
2096 * This sends the spell path to name mapping. We ignore
2097 * the params - we always send the same info no matter what.
2098 */
2099void
2100send_spell_paths (client * ns, char *params)
2101{
2102 packet sl;
2103
2104 sl << "replyinfo spell_paths\n";
2105
2106 for (int i = 0; i < NRSPELLPATHS; i++)
2107 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2108
2109 if (sl.length () >= MAXSOCKBUF)
2110 { 1177 }
2111 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2112 fatal (0);
2113 }
2114
2115 ns->send_packet (sl);
2116} 1178}
2117 1179
2118/** 1180/**
2119 * This looks for any spells the player may have that have changed their stats. 1181 * This looks for any spells the player may have that have changed their stats.
2120 * it then sends an updspell packet for each spell that has changed in this way 1182 * it then sends an updspell packet for each spell that has changed in this way
… …
2123esrv_update_spells (player *pl) 1185esrv_update_spells (player *pl)
2124{ 1186{
2125 if (!pl->ns) 1187 if (!pl->ns)
2126 return; 1188 return;
2127 1189
1190 pl->ns->update_spells = false;
1191
2128 if (!pl->ns->monitor_spells) 1192 if (!pl->ns->monitor_spells)
2129 return; 1193 return;
2130 1194
2131 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1195 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2132 {
2133 if (spell->type == SPELL) 1196 if (spell->type == SPELL)
2134 { 1197 {
2135 int flags = 0; 1198 int flags = 0;
1199 int val;
2136 1200
2137 /* check if we need to update it */ 1201 /* check if we need to update it */
2138 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1202 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1203 if (spell->cached_sp != val)
2139 { 1204 {
2140 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1205 spell->cached_sp = val;
2141 flags |= UPD_SP_MANA; 1206 flags |= UPD_SP_MANA;
2142 } 1207 }
2143 1208
2144 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1209 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1210 if (spell->cached_grace != val)
2145 { 1211 {
2146 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1212 spell->cached_grace = val;
2147 flags |= UPD_SP_GRACE; 1213 flags |= UPD_SP_GRACE;
2148 } 1214 }
2149 1215
2150 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1216 val = casting_level (pl->ob, spell);
1217 if (spell->cached_eat != val)
2151 { 1218 {
2152 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1219 spell->cached_eat = val;
2153 flags |= UPD_SP_DAMAGE; 1220 flags |= UPD_SP_LEVEL;
2154 } 1221 }
2155 1222
2156 if (flags) 1223 if (flags)
2157 { 1224 {
2158 packet sl; 1225 packet sl;
2159 1226
2160 sl << "updspell " 1227 sl << "updspell "
2161 << uint8 (flags) 1228 << uint8 (flags)
2162 << uint32 (spell->count); 1229 << uint32 (spell->count);
2163 1230
2164 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1231 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2165 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1232 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
2166 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1233 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
2167 1234
2168 pl->ns->send_packet (sl); 1235 pl->ns->send_packet (sl);
2169 } 1236 }
2170 } 1237 }
2171 }
2172} 1238}
2173 1239
2174void 1240void
2175esrv_remove_spell (player *pl, object *spell) 1241esrv_remove_spell (player *pl, object *spell)
2176{ 1242{
… …
2192 1258
2193/* appends the spell *spell to the Socklist we will send the data to. */ 1259/* appends the spell *spell to the Socklist we will send the data to. */
2194static void 1260static void
2195append_spell (player *pl, packet &sl, object *spell) 1261append_spell (player *pl, packet &sl, object *spell)
2196{ 1262{
2197 int len, i, skill = 0; 1263 int i, skill = 0;
2198 1264
2199 if (!(spell->name)) 1265 if (!(spell->name))
2200 { 1266 {
2201 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1267 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2202 return; 1268 return;
2203 } 1269 }
2204 1270
2205 /* store costs and damage in the object struct, to compare to later */ 1271 /* store costs and damage in the object struct, to compare to later */
2206 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1272 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2207 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1273 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2208 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1274 spell->cached_eat = casting_level (pl->ob, spell);
2209 1275
2210 /* figure out which skill it uses, if it uses one */ 1276 /* figure out which skill it uses, if it uses one */
2211 if (spell->skill) 1277 if (spell->skill)
2212 { 1278 if (object *tmp = pl->find_skill (spell->skill))
2213 for (i = 1; i < NUM_SKILLS; i++) 1279 skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
2214 if (!strcmp (spell->skill, skill_names[i])) 1280
2215 { 1281 // spells better have a face
2216 skill = i + CS_STAT_SKILLINFO; 1282 if (!spell->face)
2217 break;
2218 }
2219 } 1283 {
1284 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1285 spell->face = face_find ("burnout.x11", blank_face);
1286 }
1287
1288 pl->ns->send_face (spell->face);
2220 1289
2221 /* send the current values */ 1290 /* send the current values */
2222 sl << uint32 (spell->count) 1291 sl << uint32 (spell->count)
2223 << uint16 (spell->level) 1292 << uint16 (spell->level)
2224 << uint16 (spell->casting_time) 1293 << uint16 (spell->casting_time)
2225 << uint16 (spell->last_sp) 1294 << uint16 (spell->cached_sp)
2226 << uint16 (spell->last_grace) 1295 << uint16 (spell->cached_grace)
2227 << uint16 (spell->last_eat) 1296 << uint16 (spell->cached_eat)
2228 << uint8 (skill) 1297 << uint8 (skill)
2229 << uint32 (spell->path_attuned) 1298 << uint32 (spell->path_attuned)
2230 << uint32 (spell->face ? spell->face->number : 0) 1299 << uint32 (spell->face)
2231 << data8 (spell->name) 1300 << data8 (spell->name)
2232 << data16 (spell->msg); 1301 << data16 (spell->msg);
2233} 1302}
2234 1303
2235/** 1304/**
… …
2250 1319
2251 packet sl ("addspell"); 1320 packet sl ("addspell");
2252 1321
2253 if (!spell) 1322 if (!spell)
2254 { 1323 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1324 for (spell = pl->ob->inv; spell; spell = spell->below)
2256 { 1325 {
2257 /* were we to simply keep appending data here, we could exceed 1326 /* were we to simply keep appending data here, we could exceed
2258 * MAXSOCKBUF if the player has enough spells to add, we know that 1327 * MAXSOCKBUF if the player has enough spells to add, we know that
2259 * append_spells will always append 19 data bytes, plus 4 length 1328 * append_spells will always append 19 data bytes, plus 4 length
2260 * bytes and 3 strings (because that is the spec) so we need to 1329 * bytes and 3 strings (because that is the spec) so we need to
2261 * check that the length of those 3 strings, plus the 23 bytes, 1330 * check that the length of those 3 strings, plus the 23 bytes,
2262 * won't take us over the length limit for the socket, if it does, 1331 * won't take us over the length limit for the socket, if it does,
2263 * we need to send what we already have, and restart packet formation 1332 * we need to send what we already have, and restart packet formation
2264 */ 1333 */
1334 if (spell->type != SPELL)
1335 continue;
1336
2265 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1337 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2266 * to show add_spell is 26 bytes + 2 strings. However, the overun 1338 * to show add_spell is 26 bytes + 2 strings. However, the overun
2267 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1339 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2268 * like it will fix this 1340 * like it will fix this
2269 */ 1341 */
2270 if (spell->type != SPELL)
2271 continue;
2272
2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1342 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2274 { 1343 {
1344 pl->ns->flush_fx ();
2275 pl->ns->send_packet (sl); 1345 pl->ns->send_packet (sl);
2276 1346
2277 sl.reset (); 1347 sl.reset ();
2278 sl << "addspell "; 1348 sl << "addspell ";
2279 } 1349 }
… …
2287 return; 1357 return;
2288 } 1358 }
2289 else 1359 else
2290 append_spell (pl, sl, spell); 1360 append_spell (pl, sl, spell);
2291 1361
2292 if (sl.length () >= MAXSOCKBUF) 1362 if (sl.length () > MAXSOCKBUF)
2293 { 1363 {
2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1364 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2295 fatal (0); 1365 fatal (0);
2296 } 1366 }
2297 1367
2298 /* finally, we can send the packet */ 1368 /* finally, we can send the packet */
1369 pl->ns->flush_fx ();
2299 pl->ns->send_packet (sl); 1370 pl->ns->send_packet (sl);
2300} 1371}
2301 1372
1373//-GPL
1374

Diff Legend

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