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.100 by root, Mon May 28 21:22:26 2007 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors 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 *
64 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
65 * program to the value we use when sending STATS command to the 67 * program to the value we use when sending STATS command to the
66 * client. If a value is -1, then we don't send that to the 68 * client. If a value is -1, then we don't send that to the
67 * client. 69 * client.
68 */ 70 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
99 */ 101 */
100 mx = ns->mapx; 102 mx = ns->mapx;
101 my = ns->mapy; 103 my = ns->mapy;
102 104
103 /* the x and y here are coordinates for the new map, i.e. if we moved 105 /* the x and y here are coordinates for the new map, i.e. if we moved
104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 106 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105 * if the destination x or y coordinate is outside the viewable 107 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 108 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 109 * are preserved, and the check_head thinks it needs to clear them.
108 */ 110 */
109 for (x = 0; x < mx; x++) 111 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 112 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 113 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 114 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 115 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) 116 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 */ 117 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 119 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 121
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 122 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 123
126 /* Make sure that the next "map1" command will be sent (even if it is 124 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 125 * empty).
130} 128}
131 129
132static void 130static void
133clear_map (player *pl) 131clear_map (player *pl)
134{ 132{
133 pl->ns->mapinfo_queue_clear ();
134
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false; 137 pl->ns->force_newmap = false;
138 138
139 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
141 141
142 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
143}
144
145static void
146send_map_info (player *pl)
147{
148 client &socket = *pl->ns;
149 object *ob = pl->viewpoint;
150
151 if (socket.mapinfocmd)
152 {
153 if (ob->map && ob->map->path[0])
154 {
155 int flags = 0;
156
157 if (ob->map->tile_path[0]) flags |= 1;
158 if (ob->map->tile_path[1]) flags |= 2;
159 if (ob->map->tile_path[2]) flags |= 4;
160 if (ob->map->tile_path[3]) flags |= 8;
161
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path);
165 }
166 else
167 socket.send_packet ("mapinfo current");
168 }
143} 169}
144 170
145/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
146static void 172static void
147check_map_change (player *pl) 173check_map_change (player *pl)
148{ 174{
149 client &socket = *pl->ns; 175 client &socket = *pl->ns;
150 object *ob = pl->ob; 176 object *ob = pl->viewpoint;
151 char buf[MAX_BUF]; /* eauugggh */ 177
178 region *reg = ob->region ();
179 if (socket.current_region != reg)
180 {
181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
182 socket.current_region = reg;
183 }
184
185 // first try to aovid a full newmap on tiled map scrolls
186 if (socket.current_map != ob->map && !socket.force_newmap)
187 {
188 rv_vector rv;
189
190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
191
192 // manhattan distance is very handy here
193 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
194 {
195 socket.current_map = ob->map;
196 socket.current_x = ob->x;
197 socket.current_y = ob->y;
198
199 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
200 socket.floorbox_reset ();
201 send_map_info (pl);
202 }
203 }
152 204
153 if (socket.current_map != ob->map || socket.force_newmap) 205 if (socket.current_map != ob->map || socket.force_newmap)
154 { 206 {
155 clear_map (pl); 207 clear_map (pl);
156 socket.current_map = ob->map; 208 socket.current_map = ob->map;
157 209 send_map_info (pl);
158 if (socket.mapinfocmd)
159 {
160 if (ob->map && ob->map->path[0])
161 {
162 int flags = 0;
163
164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8;
168
169 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 snprintf (buf, MAX_BUF, "mapinfo current");
174
175 socket.send_packet (buf);
176 }
177 } 210 }
178 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
179 { 212 {
180 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
181 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
182 215
183 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
184 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
185 else
186 {
187 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 216 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
188 socket.floorbox_reset (); 217 socket.floorbox_reset ();
189 }
190 } 218 }
191 219
192 socket.current_x = ob->x; 220 socket.current_x = ob->x;
193 socket.current_y = ob->y; 221 socket.current_y = ob->y;
194
195 region *reg = ob->region ();
196 if (socket.current_region != reg)
197 {
198 socket.current_region = reg;
199 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
200 }
201} 222}
202 223
203/** 224/**
204 * RequestInfo is sort of a meta command. There is some specific 225 * RequestInfo is sort of a meta command. There is some specific
205 * request of information, but we call other functions to provide 226 * request of information, but we call other functions to provide
206 * that information. 227 * that information.
207 */ 228 */
208void 229void
209RequestInfo (char *buf, int len, client * ns) 230RequestInfo (char *buf, int len, client *ns)
210{ 231{
211 char *params = NULL, *cp; 232 char *params;
212
213 /* No match */
214 char bigbuf[MAX_BUF];
215 int slen;
216
217 /* Set up replyinfo before we modify any of the buffers - this is used
218 * if we don't find a match.
219 */
220 strcpy (bigbuf, "replyinfo ");
221 slen = strlen (bigbuf);
222 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
223 233
224 /* find the first space, make it null, and update the 234 /* find the first space, make it null, and update the
225 * params pointer. 235 * params pointer.
226 */ 236 */
227 for (cp = buf; *cp != '\0'; cp++) 237 for (params = buf; *params; params++)
228 if (*cp == ' ') 238 if (*params == ' ')
229 { 239 {
230 *cp = '\0';
231 params = cp + 1; 240 *params++ = 0;
232 break; 241 break;
233 } 242 }
234 243
235 if (!strcmp (buf, "image_info"))
236 send_image_info (ns, params);
237 else if (!strcmp (buf, "image_sums"))
238 send_image_sums (ns, params);
239 else if (!strcmp (buf, "skill_info")) 244 if (!strcmp (buf, "skill_info"))
240 send_skill_info (ns, params); 245 send_skill_info (ns, params);
241 else if (!strcmp (buf, "spell_paths")) 246 else if (!strcmp (buf, "spell_paths"))
242 send_spell_paths (ns, params); 247 send_spell_paths (ns, params);
243 else 248 else
244 ns->send_packet (bigbuf, len); 249 {
250 // undo tokenisation above and send replyinfo with the request unchanged
251 if (*params)
252 *--params = ' ';
253
254 ns->send_packet_printf ("replyinfo %s", buf);
255 }
245} 256}
246 257
247void 258void
248ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
249{ 260{
252 263
253void 264void
254ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
255{ 266{
256 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
268}
269
270//-GPL
271
272void
273client::mapinfo_queue_clear ()
274{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i);
277
278 mapinfo_queue.clear ();
279}
280
281bool
282client::mapinfo_try (char *buf)
283{
284 char *token = buf;
285 buf += strlen (buf) + 9;
286
287 // initial map and its origin
288 maptile *map = pl->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291 int max_distance = 8; // limit maximum path length to something generous
292
293 while (*buf && map && max_distance)
294 {
295 int dir = *buf++ - '1';
296
297 if (dir >= 0 && dir <= 3)
298 {
299 if (!map->tile_path [dir])
300 map = 0;
301 else if (map->tile_available (dir, false))
302 {
303 maptile *neigh = map->tile_map [dir];
304
305 switch (dir)
306 {
307 case 0: mapy -= neigh->height; break;
308 case 2: mapy += map ->height; break;
309 case 3: mapx -= neigh->width ; break;
310 case 1: mapx += map ->width ; break;
311 }
312
313 map = neigh;
314 --max_distance;
315 }
316 else
317 return 0;
318 }
319 else
320 max_distance = 0;
321 }
322
323 if (!max_distance)
324 send_packet_printf ("mapinfo %s error", token);
325 else if (!map || !map->path)
326 send_packet_printf ("mapinfo %s nomap", token);
327 else
328 {
329 int flags = 0;
330
331 if (map->tile_path[0]) flags |= 1;
332 if (map->tile_path[1]) flags |= 2;
333 if (map->tile_path[2]) flags |= 4;
334 if (map->tile_path[3]) flags |= 8;
335
336 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
337 }
338
339 return 1;
340}
341
342void
343client::mapinfo_queue_run ()
344{
345 if (mapinfo_queue.empty () || !pl)
346 return;
347
348 for (int i = 0; i < mapinfo_queue.size (); ++i)
349 if (mapinfo_try (mapinfo_queue [i]))
350 {
351 free (mapinfo_queue [i]);
352 mapinfo_queue.erase (i);
353 }
354 else
355 ++i;
257} 356}
258 357
259void 358void
260MapInfoCmd (char *buf, int len, player *pl) 359MapInfoCmd (char *buf, int len, player *pl)
261{ 360{
262 // <mapinfo tag spatial tile-path 361 // <mapinfo tag spatial tile-path
263 // >mapinfo tag spatial flags x y w h hash 362 // >mapinfo tag spatial flags x y w h hash
264 363
265 char bigbuf[MAX_BUF], *token;
266
267 token = buf; 364 char *token = buf;
268 // copy token 365
269 if (!(buf = strchr (buf, ' '))) 366 if (!(buf = strchr (buf, ' ')))
270 return; 367 return;
271 368
272 *buf++ = 0;
273
274 if (!strncmp (buf, "spatial ", 8)) 369 if (!strncmp (buf, " spatial ", 9))
275 { 370 {
276 buf += 8; 371 char *copy = strdup (token);
372 copy [buf - token] = 0;
277 373
278 // initial map and its origin 374#if 0
279 maptile *map = pl->ob->map; 375 // this makes only sense when we flush the buffer immediately
280 sint16 dx, dy; 376 if (pl->ns->mapinfo_try (copy))
281 int mapx = pl->ns->mapx / 2 - pl->ob->x; 377 free (copy);
282 int mapy = pl->ns->mapy / 2 - pl->ob->y;
283 int max_distance = 8; // limit maximum path length to something generous
284
285 while (*buf && map && max_distance)
286 {
287 int dir = *buf++;
288
289 switch (dir)
290 {
291 case '1':
292 dx = 0;
293 dy = -1;
294 map = map->xy_find (dx, dy);
295 map && (mapy -= map->height);
296 break;
297 case '2':
298 mapx += map->width;
299 dx = map->width;
300 dy = 0;
301 map = map->xy_find (dx, dy);
302 break;
303 case '3':
304 mapy += map->height;
305 dx = 0;
306 dy = map->height;
307 map = map->xy_find (dx, dy);
308 break;
309 case '4':
310 dx = -1;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 map && (mapx -= map->width);
314 break;
315 }
316
317 --max_distance;
318 }
319
320 if (!max_distance)
321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
322 else if (map && map->path[0])
323 {
324 int flags = 0;
325
326 if (map->tile_path[0]) flags |= 1;
327 if (map->tile_path[1]) flags |= 2;
328 if (map->tile_path[2]) flags |= 4;
329 if (map->tile_path[3]) flags |= 8;
330
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
332 }
333 else 378 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 379#endif
380 pl->ns->mapinfo_queue.push_back (copy);
335 } 381 }
336 else 382 else
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 383 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
338
339 pl->ns->send_packet (bigbuf);
340} 384}
341 385
342/** This is the Setup cmd */ 386/** This is the Setup cmd */
343void 387void
344SetUp (char *buf, int len, client * ns) 388SetUp (char *buf, int len, client * ns)
356AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
357{ 401{
358 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
359} 403}
360 404
361/** Reply to ExtendedInfos command */ 405//+GPL
362void
363ToggleExtendedInfos (char *buf, int len, client * ns)
364{
365 char cmdback[MAX_BUF];
366 char command[50];
367 int info, nextinfo;
368
369 cmdback[0] = '\0';
370 nextinfo = 0;
371
372 while (1)
373 {
374 /* 1. Extract an info */
375 info = nextinfo;
376
377 while ((info < len) && (buf[info] == ' '))
378 info++;
379
380 if (info >= len)
381 break;
382
383 nextinfo = info + 1;
384
385 while ((nextinfo < len) && (buf[nextinfo] != ' '))
386 nextinfo++;
387
388 if (nextinfo - info >= 49) /*Erroneous info asked */
389 continue;
390
391 strncpy (command, &(buf[info]), nextinfo - info);
392
393 /* 2. Interpret info */
394 if (!strcmp ("smooth", command))
395 /* Toggle smoothing */
396 ns->EMI_smooth = !ns->EMI_smooth;
397 else
398 /*bad value */;
399
400 /*3. Next info */
401 }
402
403 strcpy (cmdback, "ExtendedInfoSet");
404
405 if (ns->EMI_smooth)
406 {
407 strcat (cmdback, " ");
408 strcat (cmdback, "smoothing");
409 }
410
411 ns->send_packet (cmdback);
412}
413 406
414/* 407/*
415#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
416#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
417#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
434 while (1) 427 while (1)
435 { 428 {
436 /* 1. Extract an info */ 429 /* 1. Extract an info */
437 info = nextinfo; 430 info = nextinfo;
438 431
439 while ((info < len) && (buf[info] == ' ')) 432 while ((info < len) && (buf [info] == ' '))
440 info++; 433 info++;
441 434
442 if (info >= len) 435 if (info >= len)
443 break; 436 break;
444 437
445 nextinfo = info + 1; 438 nextinfo = info + 1;
446 439
447 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 440 while ((nextinfo < len) && (buf [nextinfo] != ' '))
448 nextinfo++; 441 nextinfo++;
449 442
450 if (nextinfo - info >= 49) /*Erroneous info asked */ 443 if (nextinfo - info >= 49) /*Erroneous info asked */
451 continue; 444 continue;
452 445
453 strncpy (command, &(buf[info]), nextinfo - info); 446 memcpy (command, buf + info, nextinfo - info);
454 command[nextinfo - info] = '\0'; 447 command [nextinfo - info] = 0;
448
455 /* 2. Interpret info */ 449 /* 2. Interpret info */
456 i = sscanf (command, "%d", &flag); 450 i = sscanf (command, "%d", &flag);
457 451
458 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 452 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
459 ns->supported_readables |= (1 << flag); 453 ns->supported_readables |= (1 << flag);
473 467
474 ns->send_packet (cmdback); 468 ns->send_packet (cmdback);
475} 469}
476 470
477/** 471/**
478 * client requested an image. send it rate-limited
479 * before flushing.
480 */
481void
482AskFaceCmd (char *buf, int len, client *ns)
483{
484 ns->askface.push_back (atoi (buf));
485}
486
487/**
488 * Tells client the picture it has to use
489 * to smooth a picture number given as argument.
490 */
491void
492AskSmooth (char *buf, int len, client *ns)
493{
494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
496}
497
498/**
499 * This handles the general commands from the client (ie, north, fire, cast, 472 * This handles the general commands from the client (ie, north, fire, cast,
500 * etc.) 473 * etc.)
501 */ 474 */
502void 475void
503PlayerCmd (char *buf, int len, player *pl) 476PlayerCmd (char *buf, int len, player *pl)
514 return; 487 return;
515 488
516 buf++; 489 buf++;
517 } 490 }
518 491
519 execute_newserver_command (pl->ob, (char *) buf); 492 execute_newserver_command (pl->ob, (char *)buf);
520 493
521 /* Perhaps something better should be done with a left over count. 494 /* Perhaps something better should be done with a left over count.
522 * Cleaning up the input should probably be done first - all actions 495 * Cleaning up the input should probably be done first - all actions
523 * for the command that issued the count should be done before any other 496 * for the command that issued the count should be done before any other
524 * commands. 497 * commands.
525 */ 498 */
526 pl->count = 0; 499 pl->count = 0;
527} 500}
528 501
529
530/** 502/**
531 * This handles the general commands from the client (ie, north, fire, cast, 503 * This handles the general commands from the client (ie, north, fire, cast,
532 * etc.). It is a lot like PlayerCmd above, but is called with the 504 * etc.). It is a lot like PlayerCmd above, but is called with the
533 * 'ncom' method which gives more information back to the client so it 505 * 'ncom' method which gives more information back to the client so it
534 * can throttle. 506 * can throttle.
536void 508void
537NewPlayerCmd (char *buf, int len, player *pl) 509NewPlayerCmd (char *buf, int len, player *pl)
538{ 510{
539 if (len <= 6) 511 if (len <= 6)
540 { 512 {
541 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 513 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
542 return; 514 return;
543 } 515 }
544 516
545 uint16 cmdid = net_uint16 ((uint8 *)buf); 517 uint16 cmdid = net_uint16 ((uint8 *)buf);
546 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 518 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
684 * syntax is: move (to) (tag) (nrof) 656 * syntax is: move (to) (tag) (nrof)
685 */ 657 */
686void 658void
687MoveCmd (char *buf, int len, player *pl) 659MoveCmd (char *buf, int len, player *pl)
688{ 660{
689 int vals[3], i; 661 int to, tag, nrof;
690 662
691 /* A little funky here. We only cycle for 2 records, because 663 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
692 * we obviously are not going to find a space after the third
693 * record. Perhaps we should just replace this with a
694 * sscanf?
695 */
696 for (i = 0; i < 2; i++)
697 { 664 {
698 vals[i] = atoi (buf);
699
700 if (!(buf = strchr (buf, ' ')))
701 {
702 LOG (llevError, "Incomplete move command: %s\n", buf); 665 LOG (llevError, "Incomplete move command: %s\n", buf);
703 return; 666 return;
704 }
705
706 buf++;
707 } 667 }
708 668
709 vals[2] = atoi (buf); 669 esrv_move_object (pl->ob, to, tag, nrof);
710
711/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
712 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
713} 670}
714 671
715/****************************************************************************** 672/******************************************************************************
716 * 673 *
717 * Start of commands the server sends to the client. 674 * Start of commands the server sends to the client.
732 * Get player's current range attack in obuf. 689 * Get player's current range attack in obuf.
733 */ 690 */
734static void 691static void
735rangetostring (player *pl, char *obuf) 692rangetostring (player *pl, char *obuf)
736{ 693{
737 dynbuf_text buf; 694 dynbuf_text &buf = msg_dynbuf; buf.clear ();
738 695
739 if (pl->ranged_ob) 696 if (pl->ranged_ob)
740 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 697 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
741 698
742 if (pl->combat_ob) 699 if (pl->combat_ob)
743 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 700 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
744 701
702#if 0
745 //TODO: remove this when slot system is working, this is only for debugging 703 //TODO: remove this when slot system is working, this is only for debugging
746 if (pl->ob->chosen_skill) 704 if (pl->ob->chosen_skill)
747 buf << " Skill*: " << pl->ob->chosen_skill->name; 705 buf << " Skill*: " << pl->ob->chosen_skill->name;
706#endif
748 707
749 //TODO: maybe golem should become the current_weapon, quite simply? 708 //TODO: maybe golem should become the current_weapon, quite simply?
750 if (pl->golem) 709 if (pl->golem)
751 buf << " Golem*: " << pl->golem->name; 710 buf << " Golem*: " << pl->golem->name;
752 711
712 buf << '\0';
753 buf.linearise (obuf); 713 buf.linearise (obuf);
754 obuf [buf.size ()] = 0;
755} 714}
756 715
757#define AddIfInt64(Old,New,Type) if (Old != New) {\ 716#define AddIfInt64(Old,New,Type) if (Old != New) {\
758 Old = New; \ 717 Old = New; \
759 sl << uint8 (Type) << uint64 (New); \ 718 sl << uint8 (Type) << uint64 (New); \
793 752
794 client *ns = pl->ns; 753 client *ns = pl->ns;
795 if (!ns) 754 if (!ns)
796 return; 755 return;
797 756
798 object *ob = pl->ob; 757 object *ob = pl->observe;
799 if (!ob) 758 if (!ob)
800 return; 759 return;
760
761 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
801 762
802 packet sl ("stats"); 763 packet sl ("stats");
803 764
804 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 765 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
805 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 766 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
814 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 775 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
815 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 776 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
816 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 777 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
817 778
818 for (int s = 0; s < NUM_SKILLS; s++) 779 for (int s = 0; s < NUM_SKILLS; s++)
819 if (object *skill = pl->last_skill_ob[s]) 780 if (object *skill = opl->last_skill_ob [s])
820 if (skill->stats.exp != ns->last_skill_exp [s]) 781 if (skill->stats.exp != ns->last_skill_exp [s])
821 { 782 {
822 ns->last_skill_exp [s] = skill->stats.exp; 783 ns->last_skill_exp [s] = skill->stats.exp;
823 784
824 /* Always send along the level if exp changes. This is only 785 /* Always send along the level if exp changes. This is only
839 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 800 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
840 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 801 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
841 802
842 flags = 0; 803 flags = 0;
843 804
844 if (pl->fire_on) 805 if (opl->fire_on)
845 flags |= SF_FIREON; 806 flags |= SF_FIREON;
846 807
847 if (pl->run_on) 808 if (opl->run_on)
848 flags |= SF_RUNON; 809 flags |= SF_RUNON;
849 810
850 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 811 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
851 812
852 if (ns->sc_version < 1025) 813 if (ns->sc_version < 1025)
866 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 827 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
867 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 828 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
868 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 829 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
869 } 830 }
870 831
871 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 832 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
872 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 833 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
873 set_title (ob, buf); 834 set_title (ob, buf);
874 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 835 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
875 836
876 /* Only send it away if we have some actual data */ 837 /* Only send it away if we have some actual data */
880 841
881/** 842/**
882 * Tells the client that here is a player it should start using. 843 * Tells the client that here is a player it should start using.
883 */ 844 */
884void 845void
885esrv_new_player (player *pl, uint32 weight) 846esrv_new_player (player *pl)
886{ 847{
848 sint32 weight = pl->ob->client_weight ();
849
887 packet sl ("player"); 850 packet sl ("player");
888 851
889 sl << uint32 (pl->ob->count) 852 sl << uint32 (pl->ob->count)
890 << uint32 (weight) 853 << uint32 (weight)
891 << uint32 (pl->ob->face) 854 << uint32 (pl->ob->face)
892 << data8 (pl->ob->name); 855 << data8 (pl->ob->name);
893 856
894 pl->ns->last_weight = weight; 857 pl->ns->last_weight = weight;
895 pl->ns->send_packet (sl); 858 pl->ns->send_packet (sl);
896 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
897} 859}
898 860
899/****************************************************************************** 861/******************************************************************************
900 * 862 *
901 * Start of map related commands. 863 * Start of map related commands.
958 920
959 if (!ns.faces_sent[face_num]) 921 if (!ns.faces_sent[face_num])
960 if (ob) 922 if (ob)
961 ns.send_faces (ob); 923 ns.send_faces (ob);
962 else 924 else
963 ns.send_face (face_num); 925 ns.send_face (face_num, 10);
964 926
965 sl << uint16 (face_num); 927 sl << uint16 (face_num);
966 return 1; 928 return 1;
967 } 929 }
968 930
969 /* Nothing changed */ 931 /* Nothing changed */
970 return 0; 932 return 0;
971} 933}
972 934
973/** 935//-GPL
974 * Returns the size of a data for a map square as returned by
975 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
976 * available.
977 */
978int
979getExtendedMapInfoSize (client * ns)
980{
981 int result = 0;
982
983 if (ns->ext_mapinfos)
984 {
985 if (ns->EMI_smooth)
986 result += 1; /*One byte for smoothlevel */
987 }
988
989 return result;
990}
991 936
992// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
993static void 938static void
994prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
995{ 940{
996 map->last_access = runtime; 941 map->touch ();
997 942
998 if (--distance) 943 if (--distance)
999 for (int dir = 4; --dir; ) 944 for (int dir = 4; --dir; )
1000 if (const shstr &path = map->tile_path [dir]) 945 if (const shstr &path = map->tile_path [dir])
1001 if (maptile *&neigh = map->tile_map [dir]) 946 if (maptile *&neigh = map->tile_map [dir])
1009prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
1010{ 955{
1011 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
1012} 957}
1013 958
959//+GPL
960
1014/** 961/**
1015 * This function uses the new map1 protocol command to send the map 962 * Draws client map.
1016 * to the client. It is necessary because the old map command supports
1017 * a maximum map size of 15x15.
1018 * This function is much simpler than the old one. This is because
1019 * the old function optimized to send as few face identifiers as possible,
1020 * at the expense of sending more coordinate location (coordinates were
1021 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1022 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1023 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1024 * and use the other 4 bits for other informatiion. For full documentation
1025 * of what we send, see the doc/Protocol file.
1026 * I will describe internally what we do:
1027 * the ns->lastmap shows how the map last looked when sent to the client.
1028 * in the lastmap structure, there is a cells array, which is set to the
1029 * maximum viewable size (As set in config.h).
1030 * in the cells, there are faces and a count value.
1031 * we use the count value to hold the darkness value. If -1, then this space
1032 * is not viewable.
1033 * we use faces[0] faces[1] faces[2] to hold what the three layers
1034 * look like.
1035 */ 963 */
1036void 964void
1037draw_client_map1 (object *pl) 965draw_client_map (player *pl)
1038{ 966{
1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 967 object *ob = pl->viewpoint;
1040 sint16 nx, ny;
1041 int estartlen, eoldlen;
1042 uint8 eentrysize;
1043 uint16 ewhatstart, ewhatflag;
1044 uint8 extendedinfos;
1045 maptile *m;
1046
1047 client &socket = *pl->contr->ns;
1048
1049 if (!pl->active) 968 if (!pl->observe->active)
1050 return; 969 return;
1051
1052 check_map_change (pl->contr);
1053 prefetch_surrounding_maps (pl);
1054
1055 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1056 packet esl;
1057
1058 startlen = sl.length ();
1059
1060 /*Extendedmapinfo structure initialisation */
1061 if (socket.ext_mapinfos)
1062 {
1063 extendedinfos = EMI_NOREDRAW;
1064
1065 if (socket.EMI_smooth)
1066 extendedinfos |= EMI_SMOOTH;
1067
1068 ewhatstart = esl.length ();
1069 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1070 could need to be taken away */
1071 eentrysize = getExtendedMapInfoSize (&socket);
1072 esl << "mapextended "
1073 << uint8 (extendedinfos)
1074 << uint8 (eentrysize);
1075
1076 estartlen = esl.length ();
1077 }
1078
1079 /* x,y are the real map locations. ax, ay are viewport relative
1080 * locations.
1081 */
1082 ay = 0;
1083
1084 /* We could do this logic as conditionals in the if statement,
1085 * but that started to get a bit messy to look at.
1086 */
1087 max_x = pl->x + (socket.mapx + 1) / 2;
1088 max_y = pl->y + (socket.mapy + 1) / 2;
1089
1090 maptile *plmap = pl->map;
1091
1092 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1093 {
1094 ax = 0;
1095 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1096 {
1097 int emask, mask;
1098 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1099
1100 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1101
1102 /* If the coordinates are not valid, or it is too dark to see,
1103 * we tell the client as such
1104 */
1105 nx = x;
1106 ny = y;
1107 m = get_map_from_coord (plmap, &nx, &ny);
1108
1109 if (!m)
1110 {
1111 /* space is out of map. Update space and clear values
1112 * if this hasn't already been done. If the space is out
1113 * of the map, it shouldn't have a head
1114 */
1115 if (lastcell.count != -1)
1116 {
1117 sl << uint16 (mask);
1118 map_clearcell (&lastcell, -1);
1119 }
1120
1121 continue;
1122 }
1123
1124 m->touch ();
1125
1126 int d = pl->contr->blocked_los[ax][ay];
1127
1128 if (d > 3)
1129 {
1130
1131 int need_send = 0, count;
1132
1133 /* This block deals with spaces that are not visible for whatever
1134 * reason. Still may need to send the head for this space.
1135 */
1136
1137 oldlen = sl.length ();
1138
1139 sl << uint16 (mask);
1140
1141 if (lastcell.count != -1)
1142 need_send = 1;
1143
1144 count = -1;
1145
1146 /* properly clear a previously sent big face */
1147 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1148 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1149 need_send = 1;
1150
1151 map_clearcell (&lastcell, count);
1152
1153 if ((mask & 0xf) || need_send)
1154 sl[oldlen + 1] = mask & 0xff;
1155 else
1156 sl.reset (oldlen);
1157 }
1158 else
1159 {
1160 /* In this block, the space is visible.
1161 */
1162
1163 /* Rather than try to figure out what everything that we might
1164 * need to send is, then form the packet after that,
1165 * we presume that we will in fact form a packet, and update
1166 * the bits by what we do actually send. If we send nothing,
1167 * we just back out sl.length () to the old value, and no harm
1168 * is done.
1169 * I think this is simpler than doing a bunch of checks to see
1170 * what if anything we need to send, setting the bits, then
1171 * doing those checks again to add the real data.
1172 */
1173 oldlen = sl.length ();
1174 eoldlen = esl.length ();
1175
1176 sl << uint16 (mask);
1177
1178 unsigned char dummy;
1179 unsigned char *last_ext = &dummy;
1180
1181 /* Darkness changed */
1182 if (lastcell.count != d && socket.darkness)
1183 {
1184 mask |= 0x8;
1185
1186 if (socket.extmap)
1187 {
1188 *last_ext |= 0x80;
1189 last_ext = &sl[sl.length ()];
1190 sl << uint8 (d);
1191 }
1192 else
1193 sl << uint8 (255 - 64 * d);
1194 }
1195
1196 lastcell.count = d;
1197
1198 mapspace &ms = m->at (nx, ny);
1199
1200 if (socket.extmap)
1201 {
1202 uint8 stat_hp = 0;
1203 uint8 stat_width = 0;
1204 uint8 flags = 0;
1205 tag_t player = 0;
1206
1207 // send hp information, if applicable
1208 if (object *op = ms.faces_obj [0])
1209 {
1210 if (op->head || op->invisible)
1211 ; // do not show
1212 else if (op->type == PLAYER
1213 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1214 {
1215 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1216 {
1217 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1218 stat_width = op->arch->tail_x;
1219 }
1220 }
1221
1222 if (op->msg && op->msg[0] == '@')
1223 flags |= 1;
1224
1225 if (op->type == PLAYER && op != pl)
1226 player = op->count;
1227 }
1228
1229 if (lastcell.stat_hp != stat_hp)
1230 {
1231 lastcell.stat_hp = stat_hp;
1232
1233 mask |= 0x8;
1234 *last_ext |= 0x80;
1235 last_ext = &sl[sl.length ()];
1236
1237 sl << uint8 (5) << uint8 (stat_hp);
1238
1239 if (stat_width > 1)
1240 {
1241 *last_ext |= 0x80;
1242 last_ext = &sl[sl.length ()];
1243
1244 sl << uint8 (6) << uint8 (stat_width);
1245 }
1246 }
1247
1248 if (lastcell.player != player)
1249 {
1250 lastcell.player = player;
1251
1252 mask |= 0x8;
1253 *last_ext |= 0x80;
1254 last_ext = &sl[sl.length ()];
1255
1256 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1257 }
1258
1259 if (lastcell.flags != flags)
1260 {
1261 lastcell.flags = flags;
1262
1263 mask |= 0x8;
1264 *last_ext |= 0x80;
1265 last_ext = &sl[sl.length ()];
1266
1267 sl << uint8 (8) << uint8 (flags);
1268 }
1269 }
1270
1271 /* Floor face */
1272 if (update_space (sl, socket, ms, lastcell, 2))
1273 mask |= 0x4;
1274
1275 /* Middle face */
1276 if (update_space (sl, socket, ms, lastcell, 1))
1277 mask |= 0x2;
1278
1279 if (ms.player () == pl
1280 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1281 {
1282 // force player to be visible to himself if invisible
1283 if (lastcell.faces[0] != pl->face)
1284 {
1285 lastcell.faces[0] = pl->face;
1286
1287 mask |= 0x1;
1288 sl << uint16 (pl->face);
1289
1290 socket.send_faces (pl);
1291 }
1292 }
1293 /* Top face */
1294 else if (update_space (sl, socket, ms, lastcell, 0))
1295 mask |= 0x1;
1296
1297
1298 /* Check to see if we are in fact sending anything for this
1299 * space by checking the mask. If so, update the mask.
1300 * if not, reset the len to that from before adding the mask
1301 * value, so we don't send those bits.
1302 */
1303 if (mask & 0xf)
1304 sl[oldlen + 1] = mask & 0xff;
1305 else
1306 sl.reset (oldlen);
1307
1308 if (socket.ext_mapinfos)
1309 esl << uint16 (emask);
1310
1311 if (socket.EMI_smooth)
1312 {
1313 for (int layer = 2+1; layer--; )
1314 {
1315 object *ob = ms.faces_obj [layer];
1316
1317 // If there is no object for this space, or if the face for the object
1318 // is the blank face, set the smoothlevel to zero.
1319 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1320
1321 // We've gotten what face we want to use for the object. Now see if
1322 // if it has changed since we last sent it to the client.
1323 if (lastcell.smooth[layer] != smoothlevel)
1324 {
1325 lastcell.smooth[layer] = smoothlevel;
1326 esl << uint8 (smoothlevel);
1327 emask |= 1 << layer;
1328 }
1329 }
1330
1331 if (emask & 0xf)
1332 esl[eoldlen + 1] = emask & 0xff;
1333 else
1334 esl.reset (eoldlen);
1335 }
1336 } /* else this is a viewable space */
1337 } /* for x loop */
1338 } /* for y loop */
1339
1340 socket.flush_fx ();
1341
1342 /* Verify that we in fact do need to send this */
1343 if (socket.ext_mapinfos)
1344 {
1345 if (!(sl.length () > startlen || socket.sent_scroll))
1346 {
1347 /* No map data will follow, so don't say the client
1348 * it doesn't need draw!
1349 */
1350 ewhatflag &= ~EMI_NOREDRAW;
1351 esl[ewhatstart + 1] = ewhatflag & 0xff;
1352 }
1353
1354 if (esl.length () > estartlen)
1355 socket.send_packet (esl);
1356 }
1357
1358 if (sl.length () > startlen || socket.sent_scroll)
1359 {
1360 socket.send_packet (sl);
1361 socket.sent_scroll = 0;
1362 }
1363}
1364
1365/**
1366 * Draws client map.
1367 */
1368void
1369draw_client_map (object *pl)
1370{
1371 int i, j;
1372 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1373 int mflags;
1374 struct Map newmap;
1375 maptile *m, *pm;
1376
1377 if (pl->type != PLAYER)
1378 {
1379 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1380 return;
1381 }
1382
1383 pm = pl->map;
1384 970
1385 /* If player is just joining the game, he isn't here yet, so the map 971 /* If player is just joining the game, he isn't here yet, so the map
1386 * can get swapped out. If so, don't try to send them a map. All will 972 * can get swapped out. If so, don't try to send them a map. All will
1387 * be OK once they really log in. 973 * be OK once they really log in.
1388 */ 974 */
1389 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 975 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1390 return; 976 return;
1391 977
1392 memset (&newmap, 0, sizeof (struct Map)); 978 int startlen, oldlen;
1393 979
1394 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 980 check_map_change (pl);
1395 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 981 prefetch_surrounding_maps (pl->ob);
982
983 /* do LOS after calls to update_position */
984 /* unfortunately, we need to udpate los when observing, currently */
985 if (pl->do_los || pl->viewpoint != pl->ob)
986 {
987 pl->do_los = 0;
988 pl->update_los ();
989 }
990
991 /**
992 * This function uses the new map1 protocol command to send the map
993 * to the client. It is necessary because the old map command supports
994 * a maximum map size of 15x15.
995 * This function is much simpler than the old one. This is because
996 * the old function optimized to send as few face identifiers as possible,
997 * at the expense of sending more coordinate location (coordinates were
998 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
999 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1000 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1001 * and use the other 4 bits for other informatiion. For full documentation
1002 * of what we send, see the doc/Protocol file.
1003 * I will describe internally what we do:
1004 * the ns->lastmap shows how the map last looked when sent to the client.
1005 * in the lastmap structure, there is a cells array, which is set to the
1006 * maximum viewable size (As set in config.h).
1007 * in the cells, there are faces and a count value.
1008 * we use the count value to hold the darkness value. If -1, then this space
1009 * is not viewable.
1010 * we use faces[0] faces[1] faces[2] to hold what the three layers
1011 * look like.
1012 */
1013
1014 client &socket = *pl->ns;
1015
1016 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1017
1018 startlen = sl.length ();
1019
1020 int hx = socket.mapx / 2;
1021 int hy = socket.mapy / 2;
1022
1023 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1024 int ax = dx + hx;
1025 int ay = dy + hy;
1026
1027 int mask = (ax << 10) | (ay << 4);
1028 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1029
1030 /* If the coordinates are not valid, or it is too dark to see,
1031 * we tell the client as such
1032 */
1033 if (!m)
1396 { 1034 {
1397 ax = i; 1035 /* space is out of map. Update space and clear values
1398 ay = j; 1036 * if this hasn't already been done. If the space is out
1399 m = pm; 1037 * of the map, it shouldn't have a head.
1400 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1401
1402 if (mflags & P_OUT_OF_MAP)
1403 continue;
1404
1405 /* If a map is visible to the player, we don't want to swap it out
1406 * just to reload it. This should really call something like
1407 * swap_map, but this is much more efficient and 'good enough'
1408 */ 1038 */
1409 if (mflags & P_NEW_MAP) 1039 if (lastcell.count != -1)
1410 m->timeout = 50; 1040 {
1041 sl << uint16 (mask);
1042 map_clearcell (&lastcell, -1);
1043 }
1044
1045 continue;
1411 } 1046 }
1047
1048 int d = pl->blocked_los_uc (dx, dy);
1412 1049
1413 /* do LOS after calls to update_position */ 1050 if (d > 3)
1414 if (pl->contr->do_los)
1415 { 1051 {
1416 update_los (pl); 1052 /* This block deals with spaces that are not visible for whatever
1417 pl->contr->do_los = 0; 1053 * reason. Still may need to send the head for this space.
1054 */
1055 if (lastcell.count != -1
1056 || lastcell.faces[0]
1057 || lastcell.faces[1]
1058 || lastcell.faces[2]
1059 || lastcell.stat_hp
1060 || lastcell.flags
1061 || lastcell.player)
1062 sl << uint16 (mask);
1063
1064 /* properly clear a previously sent big face */
1065 map_clearcell (&lastcell, -1);
1418 } 1066 }
1067 else
1068 {
1069 /* In this block, the space is visible.
1070 */
1419 1071
1420 /* Big maps need a different drawing mechanism to work */ 1072 /* Rather than try to figure out what everything that we might
1421 draw_client_map1 (pl); 1073 * need to send is, then form the packet after that,
1422} 1074 * we presume that we will in fact form a packet, and update
1075 * the bits by what we do actually send. If we send nothing,
1076 * we just back out sl.length () to the old value, and no harm
1077 * is done.
1078 * I think this is simpler than doing a bunch of checks to see
1079 * what if anything we need to send, setting the bits, then
1080 * doing those checks again to add the real data.
1081 */
1082 oldlen = sl.length ();
1423 1083
1084 sl << uint16 (mask);
1085
1086 unsigned char dummy;
1087 unsigned char *last_ext = &dummy;
1088
1089 /* Darkness changed */
1090 if (lastcell.count != d)
1091 {
1092 mask |= 0x8;
1093
1094 *last_ext |= 0x80;
1095 last_ext = &sl[sl.length ()];
1096 sl << uint8 (d);
1097 }
1098
1099 lastcell.count = d;
1100
1101 mapspace &ms = m->at (nx, ny);
1102 ms.update ();
1103
1104 // extmap handling
1105 uint8 stat_hp = 0;
1106 uint8 stat_width = 0;
1107 uint8 flags = 0;
1108 tag_t player = 0;
1109
1110 // send hp information, if applicable
1111 if (object *op = ms.faces_obj [0])
1112 if (op->is_head () && !op->invisible)
1113 {
1114 if (op->stats.maxhp > op->stats.hp
1115 && op->stats.maxhp > 0
1116 && (op->type == PLAYER
1117 || op->type == DOOR // does not work, have maxhp 0
1118 || QUERY_FLAG (op, FLAG_MONSTER)
1119 || QUERY_FLAG (op, FLAG_ALIVE)
1120 || QUERY_FLAG (op, FLAG_GENERATOR)))
1121 {
1122 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1123 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1124 }
1125
1126 if (expect_false (op->has_dialogue ()))
1127 flags |= 1;
1128
1129 if (expect_false (op->type == PLAYER))
1130 player = op == ob ? pl->ob->count
1131 : op == pl->ob ? ob->count
1132 : op->count;
1133 }
1134
1135 if (expect_false (lastcell.stat_hp != stat_hp))
1136 {
1137 lastcell.stat_hp = stat_hp;
1138
1139 mask |= 0x8;
1140 *last_ext |= 0x80;
1141 last_ext = &sl[sl.length ()];
1142
1143 sl << uint8 (5) << uint8 (stat_hp);
1144
1145 if (stat_width > 1)
1146 {
1147 *last_ext |= 0x80;
1148 last_ext = &sl[sl.length ()];
1149
1150 sl << uint8 (6) << uint8 (stat_width);
1151 }
1152 }
1153
1154 if (expect_false (lastcell.player != player))
1155 {
1156 lastcell.player = player;
1157
1158 mask |= 0x8;
1159 *last_ext |= 0x80;
1160 last_ext = &sl[sl.length ()];
1161
1162 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1163 }
1164
1165 if (expect_false (lastcell.flags != flags))
1166 {
1167 lastcell.flags = flags;
1168
1169 mask |= 0x8;
1170 *last_ext |= 0x80;
1171 last_ext = &sl[sl.length ()];
1172
1173 sl << uint8 (8) << uint8 (flags);
1174 }
1175
1176 // faces
1177
1178 /* Floor face */
1179 if (update_space (sl, socket, ms, lastcell, 2))
1180 mask |= 0x4;
1181
1182 /* Middle face */
1183 if (update_space (sl, socket, ms, lastcell, 1))
1184 mask |= 0x2;
1185
1186 if (expect_false (ob->invisible)
1187 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1188 && ms.player () == ob)
1189 {
1190 // force player to be visible to himself if invisible
1191 if (lastcell.faces[0] != ob->face)
1192 {
1193 lastcell.faces[0] = ob->face;
1194
1195 mask |= 0x1;
1196 sl << uint16 (ob->face);
1197
1198 socket.send_faces (ob);
1199 }
1200 }
1201 /* Top face */
1202 else if (update_space (sl, socket, ms, lastcell, 0))
1203 mask |= 0x1;
1204
1205 /* Check to see if we are in fact sending anything for this
1206 * space by checking the mask. If so, update the mask.
1207 * if not, reset the len to that from before adding the mask
1208 * value, so we don't send those bits.
1209 */
1210 if (mask & 0xf)
1211 sl[oldlen + 1] = mask & 0xff;
1212 else
1213 sl.reset (oldlen);
1214 } /* else this is a viewable space */
1215 ordered_mapwalk_end
1216
1217 socket.flush_fx ();
1218
1219 if (sl.length () > startlen || socket.sent_scroll)
1220 {
1221 socket.send_packet (sl);
1222 socket.sent_scroll = 0;
1223 }
1224}
1424 1225
1425/*****************************************************************************/ 1226/*****************************************************************************/
1426
1427/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1227/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1428
1429/* a player. Of course, the client need to know the command to be able to */ 1228/* a player. Of course, the client need to know the command to be able to */
1430
1431/* manage it ! */ 1229/* manage it ! */
1432
1433/*****************************************************************************/ 1230/*****************************************************************************/
1434void 1231void
1435send_plugin_custom_message (object *pl, char *buf) 1232send_plugin_custom_message (object *pl, char *buf)
1436{ 1233{
1437 pl->contr->ns->send_packet (buf); 1234 pl->contr->ns->send_packet (buf);
1446{ 1243{
1447 packet sl; 1244 packet sl;
1448 sl << "replyinfo skill_info\n"; 1245 sl << "replyinfo skill_info\n";
1449 1246
1450 for (int i = 1; i < NUM_SKILLS; i++) 1247 for (int i = 1; i < NUM_SKILLS; i++)
1451 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1248 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1452 1249
1453 if (sl.length () >= MAXSOCKBUF) 1250 if (sl.length () > MAXSOCKBUF)
1454 { 1251 {
1455 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1456 fatal (0); 1253 fatal (0);
1457 } 1254 }
1458 1255
1471 sl << "replyinfo spell_paths\n"; 1268 sl << "replyinfo spell_paths\n";
1472 1269
1473 for (int i = 0; i < NRSPELLPATHS; i++) 1270 for (int i = 0; i < NRSPELLPATHS; i++)
1474 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1271 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1475 1272
1476 if (sl.length () >= MAXSOCKBUF) 1273 if (sl.length () > MAXSOCKBUF)
1477 { 1274 {
1478 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1275 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1479 fatal (0); 1276 fatal (0);
1480 } 1277 }
1481 1278
1500 if (spell->type == SPELL) 1297 if (spell->type == SPELL)
1501 { 1298 {
1502 int flags = 0; 1299 int flags = 0;
1503 1300
1504 /* check if we need to update it */ 1301 /* check if we need to update it */
1505 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1302 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1506 { 1303 {
1507 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1508 flags |= UPD_SP_MANA; 1305 flags |= UPD_SP_MANA;
1509 } 1306 }
1510 1307
1511 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1308 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1512 { 1309 {
1513 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1514 flags |= UPD_SP_GRACE; 1311 flags |= UPD_SP_GRACE;
1515 } 1312 }
1516 1313
1517 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1314 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1518 { 1315 {
1519 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1520 flags |= UPD_SP_DAMAGE; 1317 flags |= UPD_SP_DAMAGE;
1521 } 1318 }
1522 1319
1523 if (flags) 1320 if (flags)
1524 { 1321 {
1526 1323
1527 sl << "updspell " 1324 sl << "updspell "
1528 << uint8 (flags) 1325 << uint8 (flags)
1529 << uint32 (spell->count); 1326 << uint32 (spell->count);
1530 1327
1531 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1532 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1533 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1534 1331
1535 pl->ns->send_packet (sl); 1332 pl->ns->send_packet (sl);
1536 } 1333 }
1537 } 1334 }
1538 } 1335 }
1568 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1365 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1569 return; 1366 return;
1570 } 1367 }
1571 1368
1572 /* store costs and damage in the object struct, to compare to later */ 1369 /* store costs and damage in the object struct, to compare to later */
1573 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1370 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1574 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1575 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1576 1373
1577 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1578 if (spell->skill) 1375 if (spell->skill)
1579 { 1376 if (object *tmp = pl->find_skill (spell->skill))
1580 for (i = 1; i < NUM_SKILLS; i++)
1581 if (!strcmp (spell->skill, skill_names[i]))
1582 {
1583 skill = i + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
1584 break;
1585 }
1586 }
1587 1378
1588 // spells better have a face 1379 // spells better have a face
1589 if (!spell->face) 1380 if (!spell->face)
1590 { 1381 {
1591 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1382 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1592 spell->face = face_find ("burnout.x11", blank_face); 1383 spell->face = face_find ("burnout.x11", blank_face);
1593 } 1384 }
1385
1386 pl->ns->send_face (spell->face);
1594 1387
1595 /* send the current values */ 1388 /* send the current values */
1596 sl << uint32 (spell->count) 1389 sl << uint32 (spell->count)
1597 << uint16 (spell->level) 1390 << uint16 (spell->level)
1598 << uint16 (spell->casting_time) 1391 << uint16 (spell->casting_time)
1599 << uint16 (spell->last_sp) 1392 << uint16 (spell->cached_sp)
1600 << uint16 (spell->last_grace) 1393 << uint16 (spell->cached_grace)
1601 << uint16 (spell->last_eat) 1394 << uint16 (spell->cached_eat)
1602 << uint8 (skill) 1395 << uint8 (skill)
1603 << uint32 (spell->path_attuned) 1396 << uint32 (spell->path_attuned)
1604 << uint32 (spell->face) 1397 << uint32 (spell->face)
1605 << data8 (spell->name) 1398 << data8 (spell->name)
1606 << data16 (spell->msg); 1399 << data16 (spell->msg);
1634 * bytes and 3 strings (because that is the spec) so we need to 1427 * bytes and 3 strings (because that is the spec) so we need to
1635 * check that the length of those 3 strings, plus the 23 bytes, 1428 * check that the length of those 3 strings, plus the 23 bytes,
1636 * won't take us over the length limit for the socket, if it does, 1429 * won't take us over the length limit for the socket, if it does,
1637 * we need to send what we already have, and restart packet formation 1430 * we need to send what we already have, and restart packet formation
1638 */ 1431 */
1432 if (spell->type != SPELL)
1433 continue;
1434
1639 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1435 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1640 * to show add_spell is 26 bytes + 2 strings. However, the overun 1436 * to show add_spell is 26 bytes + 2 strings. However, the overun
1641 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1437 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1642 * like it will fix this 1438 * like it will fix this
1643 */ 1439 */
1644 if (spell->type != SPELL)
1645 continue;
1646
1647 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1440 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1648 { 1441 {
1442 pl->ns->flush_fx ();
1649 pl->ns->send_packet (sl); 1443 pl->ns->send_packet (sl);
1650 1444
1651 sl.reset (); 1445 sl.reset ();
1652 sl << "addspell "; 1446 sl << "addspell ";
1653 } 1447 }
1661 return; 1455 return;
1662 } 1456 }
1663 else 1457 else
1664 append_spell (pl, sl, spell); 1458 append_spell (pl, sl, spell);
1665 1459
1666 if (sl.length () >= MAXSOCKBUF) 1460 if (sl.length () > MAXSOCKBUF)
1667 { 1461 {
1668 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1669 fatal (0); 1463 fatal (0);
1670 } 1464 }
1671 1465
1672 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1467 pl->ns->flush_fx ();
1673 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1674} 1469}
1675 1470
1471//-GPL
1472

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines