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.182 by root, Thu May 5 18:59:43 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 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[0])
164 {
165 int flags = 0;
166
167 if (ob->map->tile_path[0]) flags |= 0x01;
168 if (ob->map->tile_path[1]) flags |= 0x02;
169 if (ob->map->tile_path[2]) flags |= 0x04;
170 if (ob->map->tile_path[3]) flags |= 0x08;
171 // these two are debatable
172 if (ob->map->tile_path[4]) flags |= 0x10;
173 if (ob->map->tile_path[5]) flags |= 0x20;
174
175 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
176 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
177 ob->map->width, ob->map->height, &ob->map->path);
178 }
179 else
180 socket.send_packet ("mapinfo current");
181 }
143} 182}
144 183
145/** check for map/region change and send new map data */ 184/** check for map/region change and send new map data */
146static void 185static void
147check_map_change (player *pl) 186check_map_change (player *pl)
148{ 187{
149 client &socket = *pl->ns; 188 client &socket = *pl->ns;
150 object *ob = pl->ob; 189 object *ob = pl->viewpoint;
151 char buf[MAX_BUF]; /* eauugggh */
152 190
153 if (socket.force_newmap && 0) 191 region *reg = ob->region ();
192 if (socket.current_region != reg)
193 {
194 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
195 socket.current_region = reg;
154 { 196 }
155 // force newmap is used for clients that do not redraw their map 197
156 // after image uploads. 198 // first try to aovid a full newmap on tiled map scrolls
199 if (socket.current_map != ob->map && !socket.force_newmap)
200 {
201 rv_vector rv;
202
203 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
204
205 // manhattan distance is very handy here
206 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
207 {
157 socket.current_map = ob->map; 208 socket.current_map = ob->map;
158 clear_map (pl); 209 socket.current_x = ob->x;
210 socket.current_y = ob->y;
211
212 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
213 socket.floorbox_reset ();
214 send_map_info (pl);
215 }
159 } 216 }
160 else if (socket.current_map != ob->map) 217
218 if (socket.current_map != ob->map || socket.force_newmap)
161 { 219 {
162 clear_map (pl); 220 clear_map (pl);
163 socket.current_map = ob->map; 221 socket.current_map = ob->map;
164 222 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 } 223 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 224 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 225 {
191 int dx = ob->x - socket.current_x; 226 int dx = ob->x - socket.current_x;
192 int dy = ob->y - socket.current_y; 227 int dy = ob->y - socket.current_y;
193 228
194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
196 else
197 {
198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 229 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
199 socket.floorbox_reset (); 230 socket.floorbox_reset ();
200 }
201 } 231 }
202 232
203 socket.current_x = ob->x; 233 socket.current_x = ob->x;
204 socket.current_y = ob->y; 234 socket.current_y = ob->y;
235}
205 236
206 region *reg = ob->region (); 237/**
207 if (socket.current_region != reg) 238 * This sends the skill number to name mapping. We ignore
208 { 239 * the params - we always send the same info no matter what.
209 socket.current_region = reg; 240 */
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 241static void
211 } 242send_skill_info (client *ns, char *params)
243{
244 packet sl;
245 sl << "replyinfo skill_info\n";
246
247 for (int i = 0; i < skillvec.size (); ++i)
248 sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
249
250 if (sl.length () > MAXSOCKBUF)
251 cleanup ("buffer overflow in send_skill_info!");
252
253 ns->send_packet (sl);
254}
255
256/**
257 * This sends the spell path to name mapping. We ignore
258 * the params - we always send the same info no matter what.
259 */
260static void
261send_spell_paths (client * ns, char *params)
262{
263 packet sl;
264
265 sl << "replyinfo spell_paths\n";
266
267 for (int i = 0; i < NRSPELLPATHS; i++)
268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
269
270 if (sl.length () > MAXSOCKBUF)
271 cleanup ("buffer overflow in send_spell_paths!");
272
273 ns->send_packet (sl);
212} 274}
213 275
214/** 276/**
215 * RequestInfo is sort of a meta command. There is some specific 277 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 278 * request of information, but we call other functions to provide
217 * that information. 279 * that information.
218 */ 280 */
219void 281void
220RequestInfo (char *buf, int len, client * ns) 282RequestInfo (char *buf, int len, client *ns)
221{ 283{
222 char *params = NULL, *cp; 284 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 285
235 /* find the first space, make it null, and update the 286 /* find the first space, make it null, and update the
236 * params pointer. 287 * params pointer.
237 */ 288 */
238 for (cp = buf; *cp != '\0'; cp++) 289 for (params = buf; *params; params++)
239 if (*cp == ' ') 290 if (*params == ' ')
240 { 291 {
241 *cp = '\0';
242 params = cp + 1; 292 *params++ = 0;
243 break; 293 break;
244 } 294 }
245 295
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")) 296 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 297 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 298 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 299 send_spell_paths (ns, params);
254 else 300 else
255 ns->send_packet (bigbuf, len); 301 {
302 // undo tokenisation above and send replyinfo with the request unchanged
303 if (*params)
304 *--params = ' ';
305
306 ns->send_packet_printf ("replyinfo %s", buf);
307 }
256} 308}
257 309
258void 310void
259ExtCmd (char *buf, int len, player *pl) 311ExtCmd (char *buf, int len, player *pl)
260{ 312{
263 315
264void 316void
265ExtiCmd (char *buf, int len, client *ns) 317ExtiCmd (char *buf, int len, client *ns)
266{ 318{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 319 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
320}
321
322//-GPL
323
324void
325client::mapinfo_queue_clear ()
326{
327 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
328 free (*i);
329
330 mapinfo_queue.clear ();
331}
332
333bool
334client::mapinfo_try (char *buf)
335{
336 char *token = buf;
337 buf += strlen (buf) + 9;
338
339 // initial map and its origin
340 maptile *map = pl->viewpoint->map;
341 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
342 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
343 int max_distance = 8; // limit maximum path length to something generous
344
345 while (*buf && map && max_distance)
346 {
347 int dir = *buf++ - '1';
348
349 // maybe we should only allow the four flat directions
350 if (dir >= 0 && dir < array_length (map->tile_path))
351 {
352 if (!map->tile_path [dir])
353 map = 0;
354 else if (map->tile_available (dir, false))
355 {
356 maptile *neigh = map->tile_map [dir];
357
358 switch (dir)
359 {
360 case 0: mapy -= neigh->height; break;
361 case 2: mapy += map ->height; break;
362 case 3: mapx -= neigh->width ; break;
363 case 1: mapx += map ->width ; break;
364 }
365
366 map = neigh;
367 --max_distance;
368 }
369 else
370 return 0;
371 }
372 else
373 max_distance = 0;
374 }
375
376 if (!max_distance)
377 send_packet_printf ("mapinfo %s error", token);
378 else if (!map || !map->path)
379 send_packet_printf ("mapinfo %s nomap", token);
380 else
381 {
382 int flags = 0;
383
384 if (map->tile_path[0]) flags |= 0x01;
385 if (map->tile_path[1]) flags |= 0x02;
386 if (map->tile_path[2]) flags |= 0x04;
387 if (map->tile_path[3]) flags |= 0x08;
388 // these two are debatable
389 if (map->tile_path[4]) flags |= 0x10;
390 if (map->tile_path[5]) flags |= 0x20;
391
392 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
393 }
394
395 return 1;
396}
397
398void
399client::mapinfo_queue_run ()
400{
401 if (mapinfo_queue.empty () || !pl)
402 return;
403
404 for (int i = 0; i < mapinfo_queue.size (); ++i)
405 if (mapinfo_try (mapinfo_queue [i]))
406 {
407 free (mapinfo_queue [i]);
408 mapinfo_queue.erase (i);
409 }
410 else
411 ++i;
268} 412}
269 413
270void 414void
271MapInfoCmd (char *buf, int len, player *pl) 415MapInfoCmd (char *buf, int len, player *pl)
272{ 416{
273 // <mapinfo tag spatial tile-path 417 // <mapinfo tag spatial tile-path
274 // >mapinfo tag spatial flags x y w h hash 418 // >mapinfo tag spatial flags x y w h hash
275 419
276 char bigbuf[MAX_BUF], *token;
277
278 token = buf; 420 char *token = buf;
279 // copy token 421
280 if (!(buf = strchr (buf, ' '))) 422 if (!(buf = strchr (buf, ' ')))
281 return; 423 return;
282 424
283 *buf++ = 0;
284
285 if (!strncmp (buf, "spatial ", 8)) 425 if (!strncmp (buf, " spatial ", 9))
286 { 426 {
287 buf += 8; 427 char *copy = strdup (token);
428 copy [buf - token] = 0;
288 429
289 // initial map and its origin 430#if 0
290 maptile *map = pl->ob->map; 431 // this makes only sense when we flush the buffer immediately
291 sint16 dx, dy; 432 if (pl->ns->mapinfo_try (copy))
292 int mapx = pl->ns->mapx / 2 - pl->ob->x; 433 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 434 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 435#endif
436 pl->ns->mapinfo_queue.push_back (copy);
350 } 437 }
351 else 438 else
352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 439 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354 pl->ns->send_packet (bigbuf);
355} 440}
356 441
357/** This is the Setup cmd - easy first implementation */ 442/** This is the Setup cmd */
358void 443void
359SetUp (char *buf, int len, client * ns) 444SetUp (char *buf, int len, client * ns)
360{ 445{
361 int s, slen; 446 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} 447}
567 448
568/** 449/**
569 * The client has requested to be added to the game. 450 * 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. 451 * 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. 453 * it either has to be here or init_sockets needs to be exported.
573 */ 454 */
574void 455void
575AddMeCmd (char *buf, int len, client *ns) 456AddMeCmd (char *buf, int len, client *ns)
576{ 457{
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)); 458 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
613} 459}
614 460
615/** Reply to ExtendedInfos command */ 461//+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 462
751/** 463/**
752 * This handles the general commands from the client (ie, north, fire, cast, 464 * This handles the general commands from the client (ie, north, fire, cast,
753 * etc.) 465 * etc.)
754 */ 466 */
767 return; 479 return;
768 480
769 buf++; 481 buf++;
770 } 482 }
771 483
772 execute_newserver_command (pl->ob, (char *) buf); 484 execute_newserver_command (pl->ob, (char *)buf);
773 485
774 /* Perhaps something better should be done with a left over count. 486 /* Perhaps something better should be done with a left over count.
775 * Cleaning up the input should probably be done first - all actions 487 * 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 488 * for the command that issued the count should be done before any other
777 * commands. 489 * commands.
778 */ 490 */
779 pl->count = 0; 491 pl->count = 0;
780} 492}
781 493
782
783/** 494/**
784 * This handles the general commands from the client (ie, north, fire, cast, 495 * This handles the general commands from the client (ie, north, fire, cast,
785 * etc.). It is a lot like PlayerCmd above, but is called with the 496 * etc.). It is a lot like PlayerCmd above, but is called with the
786 * 'ncom' method which gives more information back to the client so it 497 * 'ncom' method which gives more information back to the client so it
787 * can throttle. 498 * can throttle.
789void 500void
790NewPlayerCmd (char *buf, int len, player *pl) 501NewPlayerCmd (char *buf, int len, player *pl)
791{ 502{
792 if (len <= 6) 503 if (len <= 6)
793 { 504 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 505 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
795 return; 506 return;
796 } 507 }
797 508
798 uint16 cmdid = net_uint16 ((uint8 *)buf); 509 uint16 cmdid = net_uint16 ((uint8 *)buf);
799 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 510 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
812 * commands. 523 * commands.
813 */ 524 */
814 pl->count = 0; 525 pl->count = 0;
815 526
816 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 527 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
817 int time = fabs (pl->ob->speed) < 0.001 528 int time = pl->ob->has_active_speed ()
818 ? time = MAX_TIME * 100
819 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 529 ? (int) (MAX_TIME / pl->ob->speed)
530 : MAX_TIME * 100;
820 531
821 /* Send confirmation of command execution now */ 532 /* Send confirmation of command execution now */
822 packet sl ("comc"); 533 packet sl ("comc");
823 sl << uint16 (cmdid) << uint32 (time); 534 sl << uint16 (cmdid) << uint32 (time);
824 pl->ns->send_packet (sl); 535 pl->ns->send_packet (sl);
856 { 567 {
857 case ST_PLAYING: 568 case ST_PLAYING:
858 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 569 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
859 break; 570 break;
860 571
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 */ 572 case ST_GET_PARTY_PASSWORD: /* Get password for party */
866 receive_party_password (pl->ob, 13); 573 receive_party_password (pl->ob, 13);
867 break; 574 break;
868 575
869 default: 576 default:
870 LOG (llevError, "Unknown input state: %d\n", ns->state); 577 LOG (llevError, "Unknown input state: %d\n", ns->state);
871 } 578 }
872} 579}
873 580
874/** 581/**
875 * Client tells its version. If there is a mismatch, we close the 582 * 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 */ 583 */
881void 584void
882VersionCmd (char *buf, int len, client * ns) 585VersionCmd (char *buf, int len, client *ns)
883{ 586{
884 if (!buf) 587 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} 588}
920 589
921/** sound related functions. */ 590/** sound related functions. */
922void 591void
923SetSound (char *buf, int len, client * ns) 592SetSound (char *buf, int len, client * ns)
941 * syntax is: move (to) (tag) (nrof) 610 * syntax is: move (to) (tag) (nrof)
942 */ 611 */
943void 612void
944MoveCmd (char *buf, int len, player *pl) 613MoveCmd (char *buf, int len, player *pl)
945{ 614{
946 int vals[3], i; 615 int to, tag, nrof;
947 616
948 /* A little funky here. We only cycle for 2 records, because 617 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 { 618 {
955 vals[i] = atoi (buf);
956
957 if (!(buf = strchr (buf, ' ')))
958 {
959 LOG (llevError, "Incomplete move command: %s\n", buf); 619 LOG (llevError, "Incomplete move command: %s\n", buf);
960 return; 620 return;
961 }
962
963 buf++;
964 } 621 }
965 622
966 vals[2] = atoi (buf); 623 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} 624}
971 625
972/****************************************************************************** 626/******************************************************************************
973 * 627 *
974 * Start of commands the server sends to the client. 628 * Start of commands the server sends to the client.
978/** 632/**
979 * Asks the client to query the user. This way, the client knows 633 * Asks the client to query the user. This way, the client knows
980 * it needs to send something back (vs just printing out a message) 634 * it needs to send something back (vs just printing out a message)
981 */ 635 */
982void 636void
983send_query (client *ns, uint8 flags, char *text) 637send_query (client *ns, uint8 flags, const char *text)
984{ 638{
985 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 639 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
640}
641
642/**
643 * Get player's current range attack in obuf.
644 */
645static void
646rangetostring (player *pl, char *obuf)
647{
648 dynbuf_text &buf = msg_dynbuf; buf.clear ();
649
650#if 0
651 // print ranged/chosen_skill etc. objects every call
652 printf ("%s %s => %s (%s)\n",
653 pl->ranged_ob ? &pl->ranged_ob->name : "-",
654 pl->combat_ob ? &pl->combat_ob->name : "-",
655 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
656 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
657 );
658#endif
659
660 if (pl->ranged_ob)
661 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
662
663 if (pl->combat_ob)
664 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
665
666#if 0
667 //TODO: remove this when slot system is working, this is only for debugging
668 if (pl->ob->chosen_skill)
669 buf << " Skill*: " << pl->ob->chosen_skill->name;
670#endif
671
672 //TODO: maybe golem should become the current_weapon, quite simply?
673 if (pl->golem)
674 buf << " Golem*: " << pl->golem->name;
675
676 buf << '\0';
677 buf.linearise (obuf);
986} 678}
987 679
988#define AddIfInt64(Old,New,Type) if (Old != New) {\ 680#define AddIfInt64(Old,New,Type) if (Old != New) {\
989 Old = New; \ 681 Old = New; \
990 sl << uint8 (Type) << uint64 (New); \ 682 sl << uint8 (Type) << uint64 (New); \
998#define AddIfShort(Old,New,Type) if (Old != New) {\ 690#define AddIfShort(Old,New,Type) if (Old != New) {\
999 Old = New; \ 691 Old = New; \
1000 sl << uint8 (Type) << uint16 (New); \ 692 sl << uint8 (Type) << uint16 (New); \
1001 } 693 }
1002 694
1003#define AddIfFloat(Old,New,Type) if (Old != New) {\ 695#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1004 Old = New; \ 696 Old = New; \
1005 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 697 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1006 } 698 }
1007 699
1008#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 700#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1009 free(Old); Old = strdup (New);\ 701 free(Old); Old = strdup (New);\
1010 sl << uint8 (Type) << data8 (New); \ 702 sl << uint8 (Type) << data8 (New); \
1017 * commands for now. 709 * commands for now.
1018 */ 710 */
1019void 711void
1020esrv_update_stats (player *pl) 712esrv_update_stats (player *pl)
1021{ 713{
1022 char buf[MAX_BUF];
1023 uint16 flags;
1024
1025 client *ns = pl->ns; 714 client *ns = pl->ns;
1026 if (!ns) 715 if (!ns)
1027 return; 716 return;
1028 717
1029 object *ob = pl->ob; 718 object *ob = pl->observe;
1030 if (!ob) 719 if (!ob)
1031 return; 720 return;
721
722 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1032 723
1033 packet sl ("stats"); 724 packet sl ("stats");
1034 725
1035 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 726 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1036 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 727 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1044 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); 735 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1045 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 736 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1046 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 737 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1047 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 738 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1048 739
1049 for (int s = 0; s < NUM_SKILLS; s++) 740 for (int s = 0; s < CS_NUM_SKILLS; s++)
1050 if (object *skill = pl->last_skill_ob[s]) 741 if (object *skill = opl->last_skill_ob [s])
1051 if (skill->stats.exp != ns->last_skill_exp [s]) 742 if (skill->stats.exp != ns->last_skill_exp [s])
1052 { 743 {
1053 ns->last_skill_exp [s] = skill->stats.exp; 744 ns->last_skill_exp [s] = skill->stats.exp;
1054 745
1055 /* Always send along the level if exp changes. This is only 746 /* Always send along the level if exp changes. This is only
1056 * 1 extra byte, but keeps processing simpler. 747 * 1 extra byte, but keeps processing simpler.
1057 */ 748 */
1058 sl << uint8 (s + CS_STAT_SKILLINFO) 749 sl << uint8 (CS_STAT_SKILLINFO + s)
1059 << uint8 (skill->level) 750 << uint8 (skill->level)
1060 << uint64 (skill->stats.exp); 751 << uint64 (skill->stats.exp);
1061 } 752 }
1062 753
1063 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 754 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1064 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 755 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1065 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 756 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1066 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 757 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1067 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 758 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1068 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 759 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
1069 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 760 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1070 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 761 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
1071 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 762 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1072 763
1073 flags = 0; 764 int flags = (opl->fire_on ? SF_FIREON : 0)
1074 765 | (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 766
1081 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 767 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1082 768
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++) 769 for (int i = 0; i < NROFATTACKS; i++)
1087 {
1088 /* Skip ones we won't send */ 770 /* Skip ones we won't send */
1089 if (atnr_cs_stat[i] == -1) 771 if (atnr_cs_stat[i] >= 0)
1090 continue;
1091
1092 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 772 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1093 }
1094 773
1095 if (pl->ns->monitor_spells) 774 if (pl->ns->monitor_spells)
1096 { 775 {
1097 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 776 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); 777 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); 778 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1100 } 779 }
1101 780
781 char buf[MAX_BUF];
1102 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 782 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1103 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 783 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1104 set_title (ob, buf); 784 set_title (ob, buf);
1105 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 785 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1106 786
1107 /* Only send it away if we have some actual data */ 787 /* Only send it away if we have some actual data */
1111 791
1112/** 792/**
1113 * Tells the client that here is a player it should start using. 793 * Tells the client that here is a player it should start using.
1114 */ 794 */
1115void 795void
1116esrv_new_player (player *pl, uint32 weight) 796esrv_new_player (player *pl)
1117{ 797{
798 sint32 weight = pl->ob->client_weight ();
799
1118 packet sl ("player"); 800 packet sl ("player");
1119 801
1120 sl << uint32 (pl->ob->count) 802 sl << uint32 (pl->ob->count)
1121 << uint32 (weight) 803 << uint32 (weight)
1122 << uint32 (pl->ob->face) 804 << uint32 (pl->ob->face)
1123 << data8 (pl->ob->name); 805 << data8 (pl->ob->name);
1124 806
1125 pl->ns->last_weight = weight; 807 pl->ns->last_weight = weight;
1126 pl->ns->send_packet (sl); 808 pl->ns->send_packet (sl);
1127 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1128} 809}
1129 810
1130/****************************************************************************** 811/******************************************************************************
1131 * 812 *
1132 * Start of map related commands. 813 * Start of map related commands.
1189 870
1190 if (!ns.faces_sent[face_num]) 871 if (!ns.faces_sent[face_num])
1191 if (ob) 872 if (ob)
1192 ns.send_faces (ob); 873 ns.send_faces (ob);
1193 else 874 else
1194 ns.send_face (face_num); 875 ns.send_face (face_num, 10);
1195 876
1196 sl << uint16 (face_num); 877 sl << uint16 (face_num);
1197 return 1; 878 return 1;
1198 } 879 }
1199 880
1200 /* Nothing changed */ 881 /* Nothing changed */
1201 return 0; 882 return 0;
1202} 883}
1203 884
1204/** 885//-GPL
1205 * Returns the size of a data for a map square as returned by
1206 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1207 * available.
1208 */
1209int
1210getExtendedMapInfoSize (client * ns)
1211{
1212 int result = 0;
1213 886
1214 if (ns->ext_mapinfos) 887// prefetch some flat area around the player
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 888static void
1225prefetch_surrounding_maps (maptile *map, int distance) 889prefetch_surrounding_area (object *op, maptile *map, int range)
1226{ 890{
1227 map->last_access = runtime; 891 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
1228 892 op->x - range , op->y - range ,
1229 if (--distance) 893 op->x + range + 1, op->y + range + 1);
1230 for (int dir = 4; --dir; ) 894 rect->m;
1231 if (const shstr &path = map->tile_path [dir]) 895 ++rect)
1232 if (maptile *&neigh = map->tile_map [dir]) 896 {
1233 prefetch_surrounding_maps (neigh, distance); 897 rect->m->touch ();
1234 else 898 rect->m->activate ();
1235 neigh = maptile::find_async (path, map); 899 }
1236} 900}
1237 901
1238// prefetch a generous area around the player 902// prefetch a generous area around the player, also up and down
1239static void 903void
1240prefetch_surrounding_maps (object *op) 904object::prefetch_surrounding_maps ()
1241{ 905{
1242 prefetch_surrounding_maps (op->map, 3); 906 prefetch_surrounding_area (this, map, 40);
1243}
1244 907
908 if (maptile *m = map->tile_available (TILE_DOWN))
909 prefetch_surrounding_area (this, m, 20);
910
911 if (maptile *m = map->tile_available (TILE_UP))
912 prefetch_surrounding_area (this, m, 20);
913}
914
915//+GPL
916
1245/** 917/**
1246 * This function uses the new map1 protocol command to send the map 918 * Draws client 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 */ 919 */
1267void 920void
1268draw_client_map1 (object *pl) 921draw_client_map (player *pl)
1269{ 922{
1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 923 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) 924 if (!pl->observe->active)
1281 return; 925 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 926
1614 /* If player is just joining the game, he isn't here yet, so the map 927 /* 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 928 * can get swapped out. If so, don't try to send them a map. All will
1616 * be OK once they really log in. 929 * be OK once they really log in.
1617 */ 930 */
1618 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 931 if (!ob->map || ob->map->state != MAP_ACTIVE)
1619 return; 932 return;
1620 933
1621 memset (&newmap, 0, sizeof (struct Map)); 934 int startlen, oldlen;
1622 935
1623 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 936 check_map_change (pl);
1624 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 937 pl->ob->prefetch_surrounding_maps ();
938
939 /* do LOS after calls to update_position */
940 /* unfortunately, we need to udpate los when observing, currently */
941 if (pl->do_los || pl->viewpoint != pl->ob)
942 {
943 pl->do_los = 0;
944 pl->update_los ();
945 }
946
947 /**
948 * This function uses the new map1 protocol command to send the map
949 * to the client. It is necessary because the old map command supports
950 * a maximum map size of 15x15.
951 * This function is much simpler than the old one. This is because
952 * the old function optimized to send as few face identifiers as possible,
953 * at the expense of sending more coordinate location (coordinates were
954 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
955 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
956 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
957 * and use the other 4 bits for other informatiion. For full documentation
958 * of what we send, see the doc/Protocol file.
959 * I will describe internally what we do:
960 * the ns->lastmap shows how the map last looked when sent to the client.
961 * in the lastmap structure, there is a cells array, which is set to the
962 * maximum viewable size (As set in config.h).
963 * in the cells, there are faces and a count value.
964 * we use the count value to hold the darkness value. If -1, then this space
965 * is not viewable.
966 * we use faces[0] faces[1] faces[2] to hold what the three layers
967 * look like.
968 */
969
970 client &socket = *pl->ns;
971
972 packet sl ("map1a");
973
974 startlen = sl.length ();
975
976 int hx = socket.mapx / 2;
977 int hy = socket.mapy / 2;
978
979 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
980 int ax = dx + hx;
981 int ay = dy + hy;
982
983 int mask = (ax << 10) | (ay << 4);
984 MapCell &lastcell = socket.lastmap.cells[ax][ay];
985
986 /* If the coordinates are not valid, or it is too dark to see,
987 * we tell the client as such
988 */
989 if (!m)
1625 { 990 {
1626 ax = i; 991 /* space is out of map. Update space and clear values
1627 ay = j; 992 * if this hasn't already been done. If the space is out
1628 m = pm; 993 * 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 */ 994 */
1638 if (mflags & P_NEW_MAP) 995 if (lastcell.count != -1)
1639 m->timeout = 50; 996 {
997 sl << uint16 (mask);
998 map_clearcell (&lastcell, -1);
999 }
1000
1001 continue;
1640 } 1002 }
1641 1003
1642 /* do LOS after calls to update_position */ 1004 int d = pl->blocked_los_uc (dx, dy);
1643 if (pl->contr->do_los) 1005
1006 if (d > 3)
1644 { 1007 {
1645 update_los (pl); 1008 /* This block deals with spaces that are not visible for whatever
1646 pl->contr->do_los = 0; 1009 * reason. Still may need to send the head for this space.
1010 */
1011 if (lastcell.count != -1
1012 || lastcell.faces[0]
1013 || lastcell.faces[1]
1014 || lastcell.faces[2]
1015 || lastcell.stat_hp
1016 || lastcell.flags
1017 || lastcell.player)
1018 sl << uint16 (mask);
1019
1020 /* properly clear a previously sent big face */
1021 map_clearcell (&lastcell, -1);
1647 } 1022 }
1648 1023 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 { 1024 {
1684 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1025 /* In this block, the space is visible.
1685 fatal (0); 1026 */
1027
1028 /* Rather than try to figure out what everything that we might
1029 * need to send is, then form the packet after that,
1030 * we presume that we will in fact form a packet, and update
1031 * the bits by what we do actually send. If we send nothing,
1032 * we just back out sl.length () to the old value, and no harm
1033 * is done.
1034 * I think this is simpler than doing a bunch of checks to see
1035 * what if anything we need to send, setting the bits, then
1036 * doing those checks again to add the real data.
1037 */
1038 oldlen = sl.length ();
1039
1040 sl << uint16 (mask);
1041
1042 unsigned char dummy;
1043 unsigned char *last_ext = &dummy;
1044
1045 /* Darkness changed */
1046 if (lastcell.count != d)
1047 {
1048 mask |= 0x8;
1049
1050 *last_ext |= 0x80;
1051 last_ext = &sl[sl.length ()];
1052 sl << uint8 (d);
1053 }
1054
1055 lastcell.count = d;
1056
1057 mapspace &ms = m->at (nx, ny);
1058 ms.update ();
1059
1060 // extmap handling
1061 uint8 stat_hp = 0;
1062 uint8 stat_width = 0;
1063 uint8 flags = 0;
1064 tag_t player = 0;
1065
1066 // send hp information, if applicable
1067 if (object *op = ms.faces_obj [0])
1068 if (op->is_head () && !op->invisible)
1069 {
1070 if (op->stats.maxhp > op->stats.hp
1071 && op->stats.maxhp > 0
1072 && (op->type == PLAYER
1073 || op->type == DOOR // does not work, have maxhp 0
1074 || op->flag [FLAG_MONSTER]
1075 || op->flag [FLAG_ALIVE]
1076 || op->flag [FLAG_GENERATOR]))
1077 {
1078 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1079 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1080 }
1081
1082 if (expect_false (op->has_dialogue ()))
1083 flags |= 1;
1084
1085 if (expect_false (op->type == PLAYER))
1086 player = op == ob ? pl->ob->count
1087 : op == pl->ob ? ob->count
1088 : op->count;
1089 }
1090
1091 if (expect_false (lastcell.stat_hp != stat_hp))
1092 {
1093 lastcell.stat_hp = stat_hp;
1094
1095 mask |= 0x8;
1096 *last_ext |= 0x80;
1097 last_ext = &sl[sl.length ()];
1098
1099 sl << uint8 (5) << uint8 (stat_hp);
1100
1101 if (stat_width > 1)
1102 {
1103 *last_ext |= 0x80;
1104 last_ext = &sl[sl.length ()];
1105
1106 sl << uint8 (6) << uint8 (stat_width);
1107 }
1108 }
1109
1110 if (expect_false (lastcell.player != player))
1111 {
1112 lastcell.player = player;
1113
1114 mask |= 0x8;
1115 *last_ext |= 0x80;
1116 last_ext = &sl[sl.length ()];
1117
1118 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1119 }
1120
1121 if (expect_false (lastcell.flags != flags))
1122 {
1123 lastcell.flags = flags;
1124
1125 mask |= 0x8;
1126 *last_ext |= 0x80;
1127 last_ext = &sl[sl.length ()];
1128
1129 sl << uint8 (8) << uint8 (flags);
1130 }
1131
1132 // faces
1133
1134 /* Floor face */
1135 if (update_space (sl, socket, ms, lastcell, 2))
1136 mask |= 0x4;
1137
1138 /* Middle face */
1139 if (update_space (sl, socket, ms, lastcell, 1))
1140 mask |= 0x2;
1141
1142 if (expect_false (ob->invisible)
1143 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1144 && ms.player () == ob)
1145 {
1146 // force player to be visible to himself if invisible
1147 if (lastcell.faces[0] != ob->face)
1148 {
1149 lastcell.faces[0] = ob->face;
1150
1151 mask |= 0x1;
1152 sl << uint16 (ob->face);
1153
1154 socket.send_faces (ob);
1155 }
1156 }
1157 /* Top face */
1158 else if (update_space (sl, socket, ms, lastcell, 0))
1159 mask |= 0x1;
1160
1161 /* Check to see if we are in fact sending anything for this
1162 * space by checking the mask. If so, update the mask.
1163 * if not, reset the len to that from before adding the mask
1164 * value, so we don't send those bits.
1165 */
1166 if (mask & 0xf)
1167 sl[oldlen + 1] = mask & 0xff;
1168 else
1169 sl.reset (oldlen);
1170 } /* else this is a viewable space */
1171 ordered_mapwalk_end
1172
1173 socket.flush_fx ();
1174
1175 if (sl.length () > startlen || socket.sent_scroll)
1686 } 1176 {
1687
1688 ns->send_packet (sl); 1177 socket.send_packet (sl);
1689} 1178 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 { 1179 }
1707 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1708 fatal (0);
1709 }
1710
1711 ns->send_packet (sl);
1712} 1180}
1713 1181
1714/** 1182/**
1715 * This looks for any spells the player may have that have changed their stats. 1183 * 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 1184 * it then sends an updspell packet for each spell that has changed in this way
1719esrv_update_spells (player *pl) 1187esrv_update_spells (player *pl)
1720{ 1188{
1721 if (!pl->ns) 1189 if (!pl->ns)
1722 return; 1190 return;
1723 1191
1192 pl->ns->update_spells = false;
1193
1724 if (!pl->ns->monitor_spells) 1194 if (!pl->ns->monitor_spells)
1725 return; 1195 return;
1726 1196
1727 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1197 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1728 {
1729 if (spell->type == SPELL) 1198 if (spell->type == SPELL)
1730 { 1199 {
1731 int flags = 0; 1200 int flags = 0;
1201 int val;
1732 1202
1733 /* check if we need to update it */ 1203 /* check if we need to update it */
1734 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1204 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1205 if (spell->cached_sp != val)
1735 { 1206 {
1736 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1207 spell->cached_sp = val;
1737 flags |= UPD_SP_MANA; 1208 flags |= UPD_SP_MANA;
1738 } 1209 }
1739 1210
1740 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1211 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1212 if (spell->cached_grace != val)
1741 { 1213 {
1742 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1214 spell->cached_grace = val;
1743 flags |= UPD_SP_GRACE; 1215 flags |= UPD_SP_GRACE;
1744 } 1216 }
1745 1217
1746 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1218 val = casting_level (pl->ob, spell);
1219 if (spell->cached_eat != val)
1747 { 1220 {
1748 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1221 spell->cached_eat = val;
1749 flags |= UPD_SP_DAMAGE; 1222 flags |= UPD_SP_LEVEL;
1750 } 1223 }
1751 1224
1752 if (flags) 1225 if (flags)
1753 { 1226 {
1754 packet sl; 1227 packet sl;
1755 1228
1756 sl << "updspell " 1229 sl << "updspell "
1757 << uint8 (flags) 1230 << uint8 (flags)
1758 << uint32 (spell->count); 1231 << uint32 (spell->count);
1759 1232
1760 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1233 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1761 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1234 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1762 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1235 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1763 1236
1764 pl->ns->send_packet (sl); 1237 pl->ns->send_packet (sl);
1765 } 1238 }
1766 } 1239 }
1767 }
1768} 1240}
1769 1241
1770void 1242void
1771esrv_remove_spell (player *pl, object *spell) 1243esrv_remove_spell (player *pl, object *spell)
1772{ 1244{
1797 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1269 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1798 return; 1270 return;
1799 } 1271 }
1800 1272
1801 /* store costs and damage in the object struct, to compare to later */ 1273 /* 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); 1274 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); 1275 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); 1276 spell->cached_eat = casting_level (pl->ob, spell);
1805 1277
1806 /* figure out which skill it uses, if it uses one */ 1278 /* figure out which skill it uses, if it uses one */
1807 if (spell->skill) 1279 if (spell->skill)
1808 { 1280 if (object *tmp = pl->find_skill (spell->skill))
1809 for (i = 1; i < NUM_SKILLS; i++) 1281 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 1282
1817 // spells better have a face 1283 // spells better have a face
1818 if (!spell->face) 1284 if (!spell->face)
1819 { 1285 {
1820 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1286 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821 spell->face = face_find ("burnout.x11", blank_face); 1287 spell->face = face_find ("burnout.x11", blank_face);
1822 } 1288 }
1289
1290 pl->ns->send_face (spell->face);
1823 1291
1824 /* send the current values */ 1292 /* send the current values */
1825 sl << uint32 (spell->count) 1293 sl << uint32 (spell->count)
1826 << uint16 (spell->level) 1294 << uint16 (spell->level)
1827 << uint16 (spell->casting_time) 1295 << uint16 (spell->casting_time)
1828 << uint16 (spell->last_sp) 1296 << uint16 (spell->cached_sp)
1829 << uint16 (spell->last_grace) 1297 << uint16 (spell->cached_grace)
1830 << uint16 (spell->last_eat) 1298 << uint16 (spell->cached_eat)
1831 << uint8 (skill) 1299 << uint8 (skill)
1832 << uint32 (spell->path_attuned) 1300 << uint32 (spell->path_attuned)
1833 << uint32 (spell->face) 1301 << uint32 (spell->face)
1834 << data8 (spell->name) 1302 << data8 (spell->name)
1835 << data16 (spell->msg); 1303 << data16 (spell->msg);
1863 * bytes and 3 strings (because that is the spec) so we need to 1331 * 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, 1332 * 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, 1333 * 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 1334 * we need to send what we already have, and restart packet formation
1867 */ 1335 */
1336 if (spell->type != SPELL)
1337 continue;
1338
1868 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1339 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1869 * to show add_spell is 26 bytes + 2 strings. However, the overun 1340 * 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 1341 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1871 * like it will fix this 1342 * like it will fix this
1872 */ 1343 */
1873 if (spell->type != SPELL)
1874 continue;
1875
1876 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1344 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1877 { 1345 {
1346 pl->ns->flush_fx ();
1878 pl->ns->send_packet (sl); 1347 pl->ns->send_packet (sl);
1879 1348
1880 sl.reset (); 1349 sl.reset ();
1881 sl << "addspell "; 1350 sl << "addspell ";
1882 } 1351 }
1890 return; 1359 return;
1891 } 1360 }
1892 else 1361 else
1893 append_spell (pl, sl, spell); 1362 append_spell (pl, sl, spell);
1894 1363
1895 if (sl.length () >= MAXSOCKBUF) 1364 if (sl.length () > MAXSOCKBUF)
1896 {
1897 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1365 cleanup ("buffer overflow in esrv_add_spells!");
1898 fatal (0);
1899 }
1900 1366
1901 /* finally, we can send the packet */ 1367 /* finally, we can send the packet */
1368 pl->ns->flush_fx ();
1902 pl->ns->send_packet (sl); 1369 pl->ns->send_packet (sl);
1903} 1370}
1904 1371
1372//-GPL
1373

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines