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.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.178 by root, Fri Apr 22 06:10:34 2011 UTC

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

Diff Legend

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