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

Diff Legend

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