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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines