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.56 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.169 by root, Thu Apr 8 17:36:54 2010 UTC

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

Diff Legend

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