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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines