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.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.143 by root, Tue Dec 23 06:58:24 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
98 * that much difference in bandwidth. 97 * that much difference in bandwidth.
99 */ 98 */
100 mx = ns->mapx; 99 mx = ns->mapx;
101 my = ns->mapy; 100 my = ns->mapy;
102 101
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108
109 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
110 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
111 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
112 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
113 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
114 */ 107 */
115 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
116 {
117 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
118 {
119 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
120 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
121 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
122 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
123 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
124 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
125 else 116 else
126 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
127 }
128 }
129 118
130 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
131 120
132 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
133 * empty). 122 * empty).
… …
136} 125}
137 126
138static void 127static void
139clear_map (player *pl) 128clear_map (player *pl)
140{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133
134 pl->ns->force_newmap = false;
142 135
143 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
144 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
145 138
146 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
140}
141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
147} 166}
148 167
149/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
150static void 169static void
151check_map_change (player *pl) 170check_map_change (player *pl)
152{ 171{
153 client &socket = *pl->ns; 172 client &socket = *pl->ns;
154 object *ob = pl->ob; 173 object *ob = pl->observe;
155 char buf[MAX_BUF]; /* eauugggh */
156 174
157 if (socket.current_map != ob->map) 175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
158 { 180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
202 if (socket.current_map != ob->map || socket.force_newmap)
203 {
204 clear_map (pl);
159 socket.current_map = ob->map; 205 socket.current_map = ob->map;
160 206 send_map_info (pl);
161 clear_map (pl);
162
163 if (socket.mapinfocmd)
164 {
165 if (ob->map && ob->map->path[0])
166 {
167 int flags = 0;
168
169 if (ob->map->tile_path[0])
170 flags |= 1;
171 if (ob->map->tile_path[1])
172 flags |= 2;
173 if (ob->map->tile_path[2])
174 flags |= 4;
175 if (ob->map->tile_path[3])
176 flags |= 8;
177
178 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
179 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
180 }
181 else
182 snprintf (buf, MAX_BUF, "mapinfo current");
183
184 socket.send_packet (buf);
185 }
186 } 207 }
187 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
188 { 209 {
189 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
190 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
198 } 219 }
199 } 220 }
200 221
201 socket.current_x = ob->x; 222 socket.current_x = ob->x;
202 socket.current_y = ob->y; 223 socket.current_y = ob->y;
203
204 region *reg = ob->region ();
205 if (socket.current_region != reg)
206 {
207 socket.current_region = reg;
208 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209 }
210} 224}
211 225
212/** 226/**
213 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
214 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
215 * that information. 229 * that information.
216 */ 230 */
217void 231void
218RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
219{ 233{
220 char *params = NULL, *cp; 234 char *params;
221
222 /* No match */
223 char bigbuf[MAX_BUF];
224 int slen;
225
226 /* Set up replyinfo before we modify any of the buffers - this is used
227 * if we don't find a match.
228 */
229 strcpy (bigbuf, "replyinfo ");
230 slen = strlen (bigbuf);
231 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
232 235
233 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
234 * params pointer. 237 * params pointer.
235 */ 238 */
236 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
237 if (*cp == ' ') 240 if (*params == ' ')
238 { 241 {
239 *cp = '\0';
240 params = cp + 1; 242 *params++ = 0;
241 break; 243 break;
242 } 244 }
243 245
244 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
245 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
248 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
249 send_skill_info (ns, params); 251 send_skill_info (ns, params);
250 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
251 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
252 else 254 else
253 ns->send_packet (bigbuf, len); 255 {
256 // undo tokenisation above and send replyinfo with the request unchanged
257 if (*params)
258 *--params = ' ';
259
260 ns->send_packet_printf ("replyinfo %s", buf);
261 }
254} 262}
255 263
256void 264void
257ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
258{ 266{
… …
261 269
262void 270void
263ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
264{ 272{
265 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274}
275
276void
277client::mapinfo_queue_clear ()
278{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i);
281
282 mapinfo_queue.clear ();
283}
284
285bool
286client::mapinfo_try (char *buf)
287{
288 char *token = buf;
289 buf += strlen (buf) + 9;
290
291 // initial map and its origin
292 maptile *map = pl->observe->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y;
295 int max_distance = 8; // limit maximum path length to something generous
296
297 while (*buf && map && max_distance)
298 {
299 int dir = *buf++ - '1';
300
301 if (dir >= 0 && dir <= 3)
302 {
303 if (!map->tile_path [dir])
304 map = 0;
305 else if (map->tile_available (dir, false))
306 {
307 maptile *neigh = map->tile_map [dir];
308
309 switch (dir)
310 {
311 case 0: mapy -= neigh->height; break;
312 case 2: mapy += map ->height; break;
313 case 3: mapx -= neigh->width ; break;
314 case 1: mapx += map ->width ; break;
315 }
316
317 map = neigh;
318 --max_distance;
319 }
320 else
321 return 0;
322 }
323 else
324 max_distance = 0;
325 }
326
327 if (!max_distance)
328 send_packet_printf ("mapinfo %s error", token);
329 else if (!map || !map->path)
330 send_packet_printf ("mapinfo %s nomap", token);
331 else
332 {
333 int flags = 0;
334
335 if (map->tile_path[0]) flags |= 1;
336 if (map->tile_path[1]) flags |= 2;
337 if (map->tile_path[2]) flags |= 4;
338 if (map->tile_path[3]) flags |= 8;
339
340 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 }
342
343 return 1;
344}
345
346void
347client::mapinfo_queue_run ()
348{
349 if (mapinfo_queue.empty () || !pl)
350 return;
351
352 for (int i = 0; i < mapinfo_queue.size (); ++i)
353 if (mapinfo_try (mapinfo_queue [i]))
354 {
355 free (mapinfo_queue [i]);
356 mapinfo_queue.erase (i);
357 }
358 else
359 ++i;
266} 360}
267 361
268void 362void
269MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
270{ 364{
271 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
272 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
273 367
274 char bigbuf[MAX_BUF], *token;
275
276 token = buf; 368 char *token = buf;
277 // copy token 369
278 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
279 return; 371 return;
280 372
281 *buf++ = 0;
282
283 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
284 { 374 {
285 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
286 377
287 // initial map and its origin 378#if 0
288 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
289 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
290 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
291 int mapy = pl->ns->mapy / 2 - pl->ob->y;
292 int max_distance = 8; // limit maximum path length to something generous
293
294 while (*buf && map && max_distance)
295 {
296 int dir = *buf++;
297
298 switch (dir)
299 {
300 case '1':
301 dx = 0;
302 dy = -1;
303 map = map->xy_find (dx, dy);
304 map && (mapy -= map->height);
305 break;
306 case '2':
307 mapx += map->width;
308 dx = map->width;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 break;
312 case '3':
313 mapy += map->height;
314 dx = 0;
315 dy = map->height;
316 map = map->xy_find (dx, dy);
317 break;
318 case '4':
319 dx = -1;
320 dy = 0;
321 map = map->xy_find (dx, dy);
322 map && (mapx -= map->width);
323 break;
324 }
325
326 --max_distance;
327 }
328
329 if (!max_distance)
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
331 else if (map && map->path[0])
332 {
333 int flags = 0;
334
335 if (map->tile_path[0])
336 flags |= 1;
337 if (map->tile_path[1])
338 flags |= 2;
339 if (map->tile_path[2])
340 flags |= 4;
341 if (map->tile_path[3])
342 flags |= 8;
343
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346 else 382 else
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
348 } 385 }
349 else 386 else
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
351
352 pl->ns->send_packet (bigbuf);
353} 388}
354 389
355/** This is the Setup cmd - easy first implementation */ 390/** This is the Setup cmd */
356void 391void
357SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
358{ 393{
359 int s, slen; 394 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
360 char *cmd, *param, cmdback[HUGE_BUF];
361
362 /* run through the cmds of setup
363 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
364 *
365 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
366 * The client then must sort this out
367 */
368
369 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
370
371 strcpy (cmdback, "setup");
372 for (s = 0; s < len; )
373 {
374 cmd = &buf[s];
375
376 /* find the next space, and put a null there */
377 for (; buf[s] && buf[s] != ' '; s++)
378 ;
379
380 buf[s++] = 0;
381
382 while (buf[s] == ' ')
383 s++;
384
385 if (s >= len)
386 break;
387
388 param = &buf[s];
389
390 for (; buf[s] && buf[s] != ' '; s++)
391 ;
392
393 buf[s++] = 0;
394
395 while (buf[s] == ' ')
396 s++;
397
398 slen = strlen (cmdback);
399 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
400 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
401 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402
403 if (!strcmp (cmd, "sound"))
404 {
405 ns->sound = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "exp64"))
409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 else if (!strcmp (cmd, "spellmon"))
411 {
412 ns->monitor_spells = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "darkness"))
416 {
417 ns->darkness = atoi (param);
418 safe_strcat (cmdback, param, &slen, HUGE_BUF);
419 }
420 else if (!strcmp (cmd, "map1cmd"))
421 {
422 if (atoi (param))
423 ns->mapmode = Map1Cmd;
424 /* if beyond this size, need to use map1cmd no matter what */
425 if (ns->mapx > 11 || ns->mapy > 11)
426 ns->mapmode = Map1Cmd;
427 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
428 }
429 else if (!strcmp (cmd, "map1acmd"))
430 {
431 if (atoi (param))
432 ns->mapmode = Map1aCmd;
433 /* if beyond this size, need to use map1acmd no matter what */
434 if (ns->mapx > 11 || ns->mapy > 11)
435 ns->mapmode = Map1aCmd;
436 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
437 }
438 else if (!strcmp (cmd, "newmapcmd"))
439 {
440 ns->newmapcmd = atoi (param);
441 safe_strcat (cmdback, param, &slen, HUGE_BUF);
442// } else if (!strcmp(cmd,"plugincmd")) {
443// ns->plugincmd = atoi(param);
444// safe_strcat(cmdback, param, &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "mapinfocmd"))
447 {
448 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extcmd"))
452 {
453 ns->extcmd = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "extmap"))
457 {
458 ns->extmap = atoi (param);
459 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "facecache"))
462 {
463 ns->facecache = atoi (param);
464 safe_strcat (cmdback, param, &slen, HUGE_BUF);
465 }
466 else if (!strcmp (cmd, "faceset"))
467 {
468 char tmpbuf[20];
469 int q = atoi (param);
470
471 if (is_valid_faceset (q))
472 ns->faceset = q;
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 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 }
515 else
516 {
517 ns->mapx = x;
518 ns->mapy = y;
519 /* better to send back what we are really using and not the
520 * param as given to us in case it gets parsed differently.
521 */
522 sprintf (tmpbuf, "%dx%d", x, y);
523 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
524 /* If beyond this size and still using orig map command, need to
525 * go to map1cmd.
526 */
527 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
528 ns->mapmode = Map1Cmd;
529 }
530 }
531 else if (!strcmp (cmd, "extendedMapInfos"))
532 {
533 /* Added by tchize
534 * prepare to use the mapextended command
535 */
536 char tmpbuf[20];
537
538 ns->ext_mapinfos = (atoi (param));
539 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
540 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
541 }
542 else if (!strcmp (cmd, "extendedTextInfos"))
543 {
544 /* Added by tchize
545 * prepare to use the extended text commands
546 * Client toggle this to non zero to get exttext
547 */
548 char tmpbuf[20];
549
550 ns->has_readable_type = (atoi (param));
551 sprintf (tmpbuf, "%d", ns->has_readable_type);
552 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
553 }
554 else
555 {
556 /* Didn't get a setup command we understood -
557 * report a failure to the client.
558 */
559 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
560 }
561 } /* for processing all the setup commands */
562
563 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
564 ns->send_packet (cmdback);
565} 395}
566 396
567/** 397/**
568 * The client has requested to be added to the game. 398 * The client has requested to be added to the game.
569 * This is what takes care of it. We tell the client how things worked out. 399 * This is what takes care of it. We tell the client how things worked out.
570 * I am not sure if this file is the best place for this function. however, 400 * I am not sure if this file is the best place for this function. however,
571 * it either has to be here or init_sockets needs to be exported. 401 * it either has to be here or init_sockets needs to be exported.
572 */ 402 */
573void 403void
574AddMeCmd (char *buf, int len, client * ns) 404AddMeCmd (char *buf, int len, client *ns)
575{ 405{
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 407}
578 408
579/** Reply to ExtendedInfos command */ 409/** Reply to ExtendedInfos command */
… …
691 521
692 ns->send_packet (cmdback); 522 ns->send_packet (cmdback);
693} 523}
694 524
695/** 525/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
697 * Basically, it makes no sense to wait for the client to request a
698 * a piece of data from us that we know the client wants. So
699 * if we know the client wants it, might as well push it to the
700 * client.
701 */
702static void
703SendSmooth (client *ns, uint16 face)
704{
705 uint16 smoothface;
706
707 /* If we can't find a face, return and set it so we won't try to send this
708 * again.
709 */
710 if (!FindSmooth (face, &smoothface))
711 {
712
713 LOG (llevError, "could not findsmooth for %d.\n", face);
714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
715 return;
716 }
717
718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
719 esrv_send_face (ns, smoothface, 0);
720
721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722
723 packet sl ("smooth");
724
725 sl << uint16 (face)
726 << uint16 (smoothface);
727
728 ns->send_packet (sl);
729}
730
731/**
732 * Tells client the picture it has to use
733 * to smooth a picture number given as argument.
734 */
735void
736AskSmooth (char *buf, int len, client *ns)
737{
738 SendSmooth (ns, atoi (buf));
739}
740
741/**
742 * This handles the general commands from the client (ie, north, fire, cast, 526 * This handles the general commands from the client (ie, north, fire, cast,
743 * etc.) 527 * etc.)
744 */ 528 */
745void 529void
746PlayerCmd (char *buf, int len, player *pl) 530PlayerCmd (char *buf, int len, player *pl)
… …
767 * commands. 551 * commands.
768 */ 552 */
769 pl->count = 0; 553 pl->count = 0;
770} 554}
771 555
772
773/** 556/**
774 * This handles the general commands from the client (ie, north, fire, cast, 557 * This handles the general commands from the client (ie, north, fire, cast,
775 * etc.). It is a lot like PlayerCmd above, but is called with the 558 * etc.). It is a lot like PlayerCmd above, but is called with the
776 * 'ncom' method which gives more information back to the client so it 559 * 'ncom' method which gives more information back to the client so it
777 * can throttle. 560 * can throttle.
… …
779void 562void
780NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
781{ 564{
782 if (len <= 6) 565 if (len <= 6)
783 { 566 {
784 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 567 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
785 return; 568 return;
786 } 569 }
787 570
788 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
789 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
846 { 629 {
847 case ST_PLAYING: 630 case ST_PLAYING:
848 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 631 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
849 break; 632 break;
850 633
851 case ST_CHANGE_CLASS:
852 key_change_class (pl->ob, buf[0]);
853 break;
854
855 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 634 case ST_GET_PARTY_PASSWORD: /* Get password for party */
856 receive_party_password (pl->ob, 13); 635 receive_party_password (pl->ob, 13);
857 break; 636 break;
858 637
859 default: 638 default:
… …
880 ns->cs_version = atoi (buf); 659 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 660 ns->sc_version = ns->cs_version;
882 661
883 LOG (llevDebug, "connection from client <%s>\n", buf); 662 LOG (llevDebug, "connection from client <%s>\n", buf);
884 663
885
886 //TODO: should log here just for statistics 664 //TODO: should log here just for statistics
887 665
888 //if (VERSION_CS != ns->cs_version) 666 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 667 // unchecked;
890 668
… …
899 677
900 cp = strchr (cp + 1, ' '); 678 cp = strchr (cp + 1, ' ');
901 679
902 if (cp) 680 if (cp)
903 { 681 {
904 assign (ns->version, cp + 1); 682 ns->version = cp + 1;
905 683
906 if (ns->sc_version < 1026) 684 if (ns->sc_version < 1026)
907 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 685 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 686 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
909 } 687 }
… …
932 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
933 */ 711 */
934void 712void
935MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
936{ 714{
937 int vals[3], i; 715 int to, tag, nrof;
938 716
939 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
940 * we obviously are not going to find a space after the third
941 * record. Perhaps we should just replace this with a
942 * sscanf?
943 */
944 for (i = 0; i < 2; i++)
945 { 718 {
946 vals[i] = atoi (buf);
947
948 if (!(buf = strchr (buf, ' ')))
949 {
950 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
951 return; 720 return;
952 }
953
954 buf++;
955 } 721 }
956 722
957 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
958
959/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
961} 724}
962 725
963/****************************************************************************** 726/******************************************************************************
964 * 727 *
965 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
969/** 732/**
970 * Asks the client to query the user. This way, the client knows 733 * Asks the client to query the user. This way, the client knows
971 * it needs to send something back (vs just printing out a message) 734 * it needs to send something back (vs just printing out a message)
972 */ 735 */
973void 736void
974send_query (client *ns, uint8 flags, char *text) 737send_query (client *ns, uint8 flags, const char *text)
975{ 738{
976 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 739 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
740}
741
742/**
743 * Get player's current range attack in obuf.
744 */
745static void
746rangetostring (player *pl, char *obuf)
747{
748 dynbuf_text buf;
749
750 if (pl->ranged_ob)
751 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752
753 if (pl->combat_ob)
754 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
755
756#if 0
757 //TODO: remove this when slot system is working, this is only for debugging
758 if (pl->ob->chosen_skill)
759 buf << " Skill*: " << pl->ob->chosen_skill->name;
760#endif
761
762 //TODO: maybe golem should become the current_weapon, quite simply?
763 if (pl->golem)
764 buf << " Golem*: " << pl->golem->name;
765
766 buf << '\0';
767 buf.linearise (obuf);
977} 768}
978 769
979#define AddIfInt64(Old,New,Type) if (Old != New) {\ 770#define AddIfInt64(Old,New,Type) if (Old != New) {\
980 Old = New; \ 771 Old = New; \
981 sl << uint8 (Type) << uint64 (New); \ 772 sl << uint8 (Type) << uint64 (New); \
… …
989#define AddIfShort(Old,New,Type) if (Old != New) {\ 780#define AddIfShort(Old,New,Type) if (Old != New) {\
990 Old = New; \ 781 Old = New; \
991 sl << uint8 (Type) << uint16 (New); \ 782 sl << uint8 (Type) << uint16 (New); \
992 } 783 }
993 784
994#define AddIfFloat(Old,New,Type) if (Old != New) {\ 785#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
995 Old = New; \ 786 Old = New; \
996 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 787 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
997 } 788 }
998 789
999#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 790#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1000 free(Old); Old = strdup (New);\ 791 free(Old); Old = strdup (New);\
1001 sl << uint8 (Type) << data8 (New); \ 792 sl << uint8 (Type) << data8 (New); \
… …
1015 806
1016 client *ns = pl->ns; 807 client *ns = pl->ns;
1017 if (!ns) 808 if (!ns)
1018 return; 809 return;
1019 810
1020 object *ob = pl->ob; 811 object *ob = pl->observe;
1021 if (!ob) 812 if (!ob)
1022 return; 813 return;
814
815 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1023 816
1024 packet sl ("stats"); 817 packet sl ("stats");
1025 818
1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 819 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 820 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1036 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1037 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1039 832
1040 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
1041 if (object *skill = pl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
1042 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
1043 { 836 {
1044 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
1045 838
1046 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1061 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 854 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 855 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063 856
1064 flags = 0; 857 flags = 0;
1065 858
1066 if (pl->fire_on) 859 if (opl->fire_on)
1067 flags |= SF_FIREON; 860 flags |= SF_FIREON;
1068 861
1069 if (pl->run_on) 862 if (opl->run_on)
1070 flags |= SF_RUNON; 863 flags |= SF_RUNON;
1071 864
1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1073 866
1074 if (ns->sc_version < 1025) 867 if (ns->sc_version < 1025)
… …
1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 881 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 882 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 883 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1091 } 884 }
1092 885
1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 886 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 887 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1095 set_title (ob, buf); 888 set_title (ob, buf);
1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 889 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1097 890
1098 /* Only send it away if we have some actual data */ 891 /* Only send it away if we have some actual data */
… …
1102 895
1103/** 896/**
1104 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
1105 */ 898 */
1106void 899void
1107esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
1108{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
1109 packet sl ("player"); 904 packet sl ("player");
1110 905
1111 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
1112 << uint32 (weight) 907 << uint32 (weight)
1113 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
1114 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
1115 910
1116 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 913}
1120
1121/**
1122 * Need to send an animation sequence to the client.
1123 * We will send appropriate face commands to the client if we haven't
1124 * sent them the face yet (this can become quite costly in terms of
1125 * how much we are sending - on the other hand, this should only happen
1126 * when the player logs in and picks stuff up.
1127 */
1128void
1129esrv_send_animation (client * ns, short anim_num)
1130{
1131 /* Do some checking on the anim_num we got. Note that the animations
1132 * are added in contigous order, so if the number is in the valid
1133 * range, it must be a valid animation.
1134 */
1135 if (anim_num < 0 || anim_num > num_animations)
1136 {
1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1138 return;
1139 }
1140
1141 packet sl ("anim");
1142
1143 sl << uint16 (anim_num)
1144 << uint16 (0); /* flags - not used right now */
1145
1146 /* Build up the list of faces. Also, send any information (ie, the
1147 * the face itself) down to the client.
1148 */
1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1150 {
1151 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1154 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1155 }
1156
1157 ns->send_packet (sl);
1158
1159 ns->anims_sent[anim_num] = 1;
1160}
1161
1162 914
1163/****************************************************************************** 915/******************************************************************************
1164 * 916 *
1165 * Start of map related commands. 917 * Start of map related commands.
1166 * 918 *
… …
1168 920
1169/** Clears a map cell */ 921/** Clears a map cell */
1170static void 922static void
1171map_clearcell (struct MapCell *cell, int count) 923map_clearcell (struct MapCell *cell, int count)
1172{ 924{
1173 cell->faces[0] = 0; 925 cell->faces[0] = 0;
1174 cell->faces[1] = 0; 926 cell->faces[1] = 0;
1175 cell->faces[2] = 0; 927 cell->faces[2] = 0;
928 cell->smooth[0] = 0;
929 cell->smooth[1] = 0;
930 cell->smooth[2] = 0;
1176 cell->count = count; 931 cell->count = count;
1177 cell->stat_hp = 0; 932 cell->stat_hp = 0;
1178 cell->flags = 0; 933 cell->flags = 0;
1179 cell->player = 0; 934 cell->player = 0;
1180} 935}
1181 936
1182#define MAX_LAYERS 3 937#define MAX_LAYERS 3
1183 938
1184/** 939/**
… …
1187 * it was. 942 * it was.
1188 * sl is the socklist this data is going into. 943 * sl is the socklist this data is going into.
1189 * ns is the socket we are working on - all the info we care 944 * ns is the socket we are working on - all the info we care
1190 * about is in this socket structure, so now need not pass the 945 * about is in this socket structure, so now need not pass the
1191 * entire player object. 946 * entire player object.
1192 * mx and my are map coordinate offsets for map mp
1193 * sx and sy are the offsets into the socket structure that
1194 * holds the old values.
1195 * layer is the layer to update, with 2 being the floor and 0 the 947 * layer is the layer to update, with 2 being the floor and 0 the
1196 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 948 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1197 * take. Interesting to note that before this function, the map1 function 949 * take. Interesting to note that before this function, the map1 function
1198 * numbers the spaces differently - I think this was a leftover from 950 * numbers the spaces differently - I think this was a leftover from
1199 * the map command, where the faces stack up. Sinces that is no longer 951 * the map command, where the faces stack up. Sinces that is no longer
1200 * the case, it seems to make more sense to have these layer values 952 * the case, it seems to make more sense to have these layer values
1201 * actually match. 953 * actually match.
1202 */ 954 */
1203static int 955static int
1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 956update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1205{ 957{
1206 uint16 face_num; 958 object *ob = ms.faces_obj [layer];
1207 int bx, by, i;
1208
1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1210 959
1211 /* If there is no object for this space, or if the face for the object 960 /* If there is no object for this space, or if the face for the object
1212 * is the blank face, set the face number to zero. 961 * is the blank face, set the face number to zero.
1213 * else if we have the stored head object for this space, that takes 962 * else if we have the stored head object for this space, that takes
1214 * precedence over the other object for this space. 963 * precedence over the other object for this space.
1215 * otherwise, we do special head processing 964 * otherwise, we do special head processing
1216 */ 965 */
1217 if (!ob || ob->face == blank_face) 966 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1218 face_num = 0;
1219 else
1220 /* In this case, we are already at the lower right or single part object,
1221 * so nothing special
1222 */
1223 face_num = ob->face;
1224 967
1225 /* We've gotten what face we want to use for the object. Now see if 968 /* We've gotten what face we want to use for the object. Now see if
1226 * if it has changed since we last sent it to the client. 969 * if it has changed since we last sent it to the client.
1227 */ 970 */
1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 971 if (lastcell.faces[layer] != face_num)
1229 { 972 {
1230 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 973 lastcell.faces[layer] = face_num;
974
1231 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 975 if (!ns.faces_sent[face_num])
976 if (ob)
977 ns.send_faces (ob);
978 else
1232 esrv_send_face (&ns, face_num, 0); 979 ns.send_face (face_num, 10);
1233 980
1234 sl << uint16 (face_num); 981 sl << uint16 (face_num);
1235 return 1;
1236 }
1237
1238 /* Nothing changed */
1239 return 0;
1240}
1241
1242/**
1243 * This function is mainly a copy of update_space,
1244 * except it handles update of the smoothing updates,
1245 * not the face updates.
1246 * Removes the need to replicate the same code for each layer.
1247 * this returns true if this smooth is now in fact different
1248 * than it was.
1249 * sl is the socklist this data is going into.
1250 * ns is the socket we are working on - all the info we care
1251 * about is in this socket structure, so know need to pass the
1252 * entire player object.
1253 * mx and my are map coordinate offsets for map mp
1254 * sx and sy are the offsets into the socket structure that
1255 * holds the old values.
1256 * layer is the layer to update, with 2 being the floor and 0 the
1257 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1258 * take.
1259 */
1260
1261static inline int
1262update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1263{
1264 object *ob;
1265 int smoothlevel; /* old face_num; */
1266
1267 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1268
1269 /* If there is no object for this space, or if the face for the object
1270 * is the blank face, set the smoothlevel to zero.
1271 */
1272 if (!ob || ob->face == blank_face)
1273 smoothlevel = 0;
1274 else
1275 {
1276 smoothlevel = ob->smoothlevel;
1277 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1278 SendSmooth (&ns, ob->face);
1279 } /* else not already head object or blank face */
1280
1281 /* We've gotten what face we want to use for the object. Now see if
1282 * if it has changed since we last sent it to the client.
1283 */
1284 if (smoothlevel > 255)
1285 smoothlevel = 255;
1286 else if (smoothlevel < 0)
1287 smoothlevel = 0;
1288
1289 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1290 {
1291 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1292 sl << uint8 (smoothlevel);
1293 return 1; 982 return 1;
1294 } 983 }
1295 984
1296 /* Nothing changed */ 985 /* Nothing changed */
1297 return 0; 986 return 0;
… …
1337{ 1026{
1338 prefetch_surrounding_maps (op->map, 3); 1027 prefetch_surrounding_maps (op->map, 3);
1339} 1028}
1340 1029
1341/** 1030/**
1342 * This function uses the new map1 protocol command to send the map 1031 * Draws client map.
1343 * to the client. It is necessary because the old map command supports
1344 * a maximum map size of 15x15.
1345 * This function is much simpler than the old one. This is because
1346 * the old function optimized to send as few face identifiers as possible,
1347 * at the expense of sending more coordinate location (coordinates were
1348 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1349 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1350 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1351 * and use the other 4 bits for other informatiion. For full documentation
1352 * of what we send, see the doc/Protocol file.
1353 * I will describe internally what we do:
1354 * the ns->lastmap shows how the map last looked when sent to the client.
1355 * in the lastmap structure, there is a cells array, which is set to the
1356 * maximum viewable size (As set in config.h).
1357 * in the cells, there are faces and a count value.
1358 * we use the count value to hold the darkness value. If -1, then this space
1359 * is not viewable.
1360 * we use faces[0] faces[1] faces[2] to hold what the three layers
1361 * look like.
1362 */ 1032 */
1363void 1033void
1364draw_client_map1 (object *pl) 1034draw_client_map (player *pl)
1365{ 1035{
1366 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1036 object *ob = pl->observe;
1367 sint16 nx, ny; 1037 if (!ob->active)
1038 return;
1039
1040 /* If player is just joining the game, he isn't here yet, so the map
1041 * can get swapped out. If so, don't try to send them a map. All will
1042 * be OK once they really log in.
1043 */
1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1045 return;
1046
1047 int startlen, oldlen;
1368 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1369 uint16 mask, emask;
1370 uint8 eentrysize; 1049 uint8 eentrysize;
1371 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1372 uint8 extendedinfos; 1051 uint8 extendedinfos;
1373 maptile *m;
1374 1052
1375 client &socket = *pl->contr->ns;
1376
1377 if (!pl->active)
1378 return;
1379
1380 check_map_change (pl->contr); 1053 check_map_change (pl);
1381 prefetch_surrounding_maps (pl); 1054 prefetch_surrounding_maps (pl->ob);
1055
1056 /* do LOS after calls to update_position */
1057 /* unfortunately, we need to udpate los when observing, currently */
1058 if (pl->do_los || pl->observe != pl->ob)
1059 {
1060 pl->do_los = 0;
1061 pl->update_los ();
1062 }
1063
1064 /**
1065 * This function uses the new map1 protocol command to send the map
1066 * to the client. It is necessary because the old map command supports
1067 * a maximum map size of 15x15.
1068 * This function is much simpler than the old one. This is because
1069 * the old function optimized to send as few face identifiers as possible,
1070 * at the expense of sending more coordinate location (coordinates were
1071 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1072 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1073 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1074 * and use the other 4 bits for other informatiion. For full documentation
1075 * of what we send, see the doc/Protocol file.
1076 * I will describe internally what we do:
1077 * the ns->lastmap shows how the map last looked when sent to the client.
1078 * in the lastmap structure, there is a cells array, which is set to the
1079 * maximum viewable size (As set in config.h).
1080 * in the cells, there are faces and a count value.
1081 * we use the count value to hold the darkness value. If -1, then this space
1082 * is not viewable.
1083 * we use faces[0] faces[1] faces[2] to hold what the three layers
1084 * look like.
1085 */
1086
1087 client &socket = *pl->ns;
1382 1088
1383 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1384 packet esl; 1090 packet esl;
1385 1091
1386 startlen = sl.length (); 1092 startlen = sl.length ();
… …
1401 << uint8 (extendedinfos) 1107 << uint8 (extendedinfos)
1402 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1403 1109
1404 estartlen = esl.length (); 1110 estartlen = esl.length ();
1405 } 1111 }
1406 else
1407 {
1408 /* suppress compiler warnings */
1409 ewhatstart = 0;
1410 ewhatflag = 0;
1411 estartlen = 0;
1412 }
1413
1414 /* x,y are the real map locations. ax, ay are viewport relative
1415 * locations.
1416 */
1417 ay = 0;
1418 1112
1419 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1420 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1421 */ 1115 */
1422 max_x = pl->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1423 max_y = pl->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1424 1118
1425 if (socket.mapmode == Map1aCmd) 1119 for (int dx = -hx; dx <= hx; dx++)
1426 {
1427 max_x += MAX_HEAD_OFFSET;
1428 max_y += MAX_HEAD_OFFSET;
1429 } 1120 {
1121 sint16 nx, ny;
1122 maptile *m = 0;
1430 1123
1431 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1124 for (int dy = -hy; dy <= hy; dy++)
1432 {
1433 ax = 0;
1434 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1435 { 1125 {
1126 // check to see if we can simply go one down quickly
1127 if (m && ++ny >= m->height)
1128 m = 0;
1129
1130 // no, so do it the slow way
1131 if (!m)
1132 {
1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1134
1135 if (xy_normalise (m, nx, ny))
1136 m->touch ();
1137 else
1138 m = 0;
1139 }
1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1144 int emask, mask;
1436 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1437 1146
1438 /* If this space is out of the normal viewable area, we only check
1439 * the heads value ax or ay will only be greater than what
1440 * the client wants if using the map1a command - this is because
1441 * if the map1a command is not used, max_x and max_y will be
1442 * set to lower values.
1443 */
1444 if (ax >= socket.mapx || ay >= socket.mapy)
1445 {
1446 int i, got_one;
1447
1448 oldlen = sl.length ();
1449
1450 sl << uint16 (mask);
1451
1452 /* If all we are doing is sending 0 (blank) faces, we don't
1453 * actually need to send that - just the coordinates
1454 * with no faces tells the client to blank out the
1455 * space.
1456 */
1457 got_one = 0;
1458 for (i = oldlen + 2; i < sl.length (); i++)
1459 if (sl[i])
1460 got_one = 1;
1461
1462 if (got_one && (mask & 0xf))
1463 sl[oldlen + 1] = mask & 0xff;
1464 else
1465 { /*either all faces blank, either no face at all */
1466 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1467 sl.reset (oldlen + 2);
1468 else
1469 sl.reset (oldlen);
1470 }
1471
1472 /*What concerns extendinfos, nothing to be done for now
1473 * (perhaps effects layer later)
1474 */
1475 continue; /* don't do processing below */
1476 }
1477
1478 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1479
1480 d = pl->contr->blocked_los[ax][ay];
1481 1148
1482 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1483 * we tell the client as such 1150 * we tell the client as such
1484 */ 1151 */
1485 nx = x;
1486 ny = y;
1487 m = get_map_from_coord (pl->map, &nx, &ny);
1488
1489 if (!m) 1152 if (!m)
1490 { 1153 {
1491 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1492 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1493 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1494 */ 1157 */
1495 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1496 { 1159 {
1497 sl << uint16 (mask); 1160 sl << uint16 (mask);
1498 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1499 } 1162 }
1163
1164 continue;
1500 } 1165 }
1166
1167 int d = pl->blocked_los_uc (dx, dy);
1168
1501 else if (d > 3) 1169 if (d > 3)
1502 { 1170 {
1503 m->touch ();
1504
1505 int need_send = 0, count; 1171 int need_send = 0, count;
1506 1172
1507 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1508 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1509 */ 1175 */
1510 1176
1511 oldlen = sl.length (); 1177 oldlen = sl.length ();
1512 1178
1513 sl << uint16 (mask); 1179 sl << uint16 (mask);
… …
1515 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1516 need_send = 1; 1182 need_send = 1;
1517 1183
1518 count = -1; 1184 count = -1;
1519 1185
1520 /* properly clear a previously sent big face */
1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1522 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1523 need_send = 1; 1188 need_send = 1;
1524 1189
1190 /* properly clear a previously sent big face */
1525 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1526 1192
1527 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1528 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1529 else 1195 else
1530 sl.reset (oldlen); 1196 sl.reset (oldlen);
1531 } 1197 }
1532 else 1198 else
1533 { 1199 {
1534 m->touch ();
1535
1536 /* In this block, the space is visible or there are head objects 1200 /* In this block, the space is visible.
1537 * we need to send.
1538 */ 1201 */
1539 1202
1540 /* Rather than try to figure out what everything that we might 1203 /* Rather than try to figure out what everything that we might
1541 * need to send is, then form the packet after that, 1204 * need to send is, then form the packet after that,
1542 * we presume that we will in fact form a packet, and update 1205 * we presume that we will in fact form a packet, and update
… …
1545 * is done. 1208 * is done.
1546 * I think this is simpler than doing a bunch of checks to see 1209 * I think this is simpler than doing a bunch of checks to see
1547 * what if anything we need to send, setting the bits, then 1210 * what if anything we need to send, setting the bits, then
1548 * doing those checks again to add the real data. 1211 * doing those checks again to add the real data.
1549 */ 1212 */
1550 oldlen = sl.length (); 1213 oldlen = sl.length ();
1551 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1552 eoldlen = esl.length (); 1214 eoldlen = esl.length ();
1553 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1215
1554 sl << uint16 (mask); 1216 sl << uint16 (mask);
1555
1556 if (socket.ext_mapinfos)
1557 esl << uint16 (emask);
1558 1217
1559 unsigned char dummy; 1218 unsigned char dummy;
1560 unsigned char *last_ext = &dummy; 1219 unsigned char *last_ext = &dummy;
1561 1220
1562 /* Darkness changed */ 1221 /* Darkness changed */
… …
1574 sl << uint8 (255 - 64 * d); 1233 sl << uint8 (255 - 64 * d);
1575 } 1234 }
1576 1235
1577 lastcell.count = d; 1236 lastcell.count = d;
1578 1237
1238 mapspace &ms = m->at (nx, ny);
1239 ms.update ();
1240
1579 if (socket.extmap) 1241 if (socket.extmap)
1580 { 1242 {
1581 uint8 stat_hp = 0; 1243 uint8 stat_hp = 0;
1582 uint8 stat_width = 0; 1244 uint8 stat_width = 0;
1583 uint8 flags = 0; 1245 uint8 flags = 0;
1584 UUID player = 0; 1246 tag_t player = 0;
1585 1247
1586 // send hp information, if applicable 1248 // send hp information, if applicable
1587 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1249 if (object *op = ms.faces_obj [0])
1588 {
1589 if (op->head || op->invisible) 1250 if (op->is_head () && !op->invisible)
1590 ; // do not show
1591 else if (op->type == PLAYER
1592 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1593 { 1251 {
1594 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1252 if (op->stats.maxhp > op->stats.hp
1253 && op->stats.maxhp > 0
1254 && (op->type == PLAYER
1255 || op->type == DOOR // does not work, have maxhp 0
1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1595 { 1259 {
1596 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1597 stat_width = op->arch->tail_x; 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1598 } 1262 }
1599 }
1600 1263
1601 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1602 flags |= 1; 1265 flags |= 1;
1603 1266
1604 if (op->type == PLAYER && op != pl) 1267 if (op->type == PLAYER)
1605 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1606 } 1271 }
1607 1272
1608 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1609 { 1274 {
1610 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1611 1276
… …
1630 1295
1631 mask |= 0x8; 1296 mask |= 0x8;
1632 *last_ext |= 0x80; 1297 *last_ext |= 0x80;
1633 last_ext = &sl[sl.length ()]; 1298 last_ext = &sl[sl.length ()];
1634 1299
1635 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1300 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1636 } 1301 }
1637 1302
1638 if (lastcell.flags != flags) 1303 if (lastcell.flags != flags)
1639 { 1304 {
1640 lastcell.flags = flags; 1305 lastcell.flags = flags;
… …
1646 sl << uint8 (8) << uint8 (flags); 1311 sl << uint8 (8) << uint8 (flags);
1647 } 1312 }
1648 } 1313 }
1649 1314
1650 /* Floor face */ 1315 /* Floor face */
1651 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1316 if (update_space (sl, socket, ms, lastcell, 2))
1652 mask |= 0x4; 1317 mask |= 0x4;
1653 1318
1654 if (socket.EMI_smooth)
1655 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1656 emask |= 0x4;
1657
1658 /* Middle face */ 1319 /* Middle face */
1659 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1660 mask |= 0x2; 1321 mask |= 0x2;
1661 1322
1662 if (socket.EMI_smooth) 1323 if (ob->invisible
1663 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1664 emask |= 0x2; 1325 && ms.player () == ob)
1665
1666 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1667 { 1326 {
1327 // force player to be visible to himself if invisible
1668 if (lastcell.faces[0] != pl->face) 1328 if (lastcell.faces[0] != ob->face)
1669 { 1329 {
1670 lastcell.faces[0] = pl->face; 1330 lastcell.faces[0] = ob->face;
1331
1671 mask |= 0x1; 1332 mask |= 0x1;
1672
1673 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1674 esrv_send_face (&socket, pl->face, 0);
1675
1676 sl << uint16 (pl->face); 1333 sl << uint16 (ob->face);
1334
1335 socket.send_faces (ob);
1677 } 1336 }
1678 } 1337 }
1679 else
1680 {
1681 /* Top face */ 1338 /* Top face */
1682 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1339 else if (update_space (sl, socket, ms, lastcell, 0))
1683 mask |= 0x1; 1340 mask |= 0x1;
1684
1685 if (socket.EMI_smooth)
1686 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1687 emask |= 0x1;
1688 }
1689 1341
1690 /* Check to see if we are in fact sending anything for this 1342 /* Check to see if we are in fact sending anything for this
1691 * space by checking the mask. If so, update the mask. 1343 * space by checking the mask. If so, update the mask.
1692 * if not, reset the len to that from before adding the mask 1344 * if not, reset the len to that from before adding the mask
1693 * value, so we don't send those bits. 1345 * value, so we don't send those bits.
… …
1695 if (mask & 0xf) 1347 if (mask & 0xf)
1696 sl[oldlen + 1] = mask & 0xff; 1348 sl[oldlen + 1] = mask & 0xff;
1697 else 1349 else
1698 sl.reset (oldlen); 1350 sl.reset (oldlen);
1699 1351
1352 if (socket.ext_mapinfos)
1353 esl << uint16 (emask);
1354
1355 if (socket.EMI_smooth)
1356 {
1357 for (int layer = 2+1; layer--; )
1358 {
1359 object *ob = ms.faces_obj [layer];
1360
1361 // If there is no object for this space, or if the face for the object
1362 // is the blank face, set the smoothlevel to zero.
1363 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1364
1365 // We've gotten what face we want to use for the object. Now see if
1366 // if it has changed since we last sent it to the client.
1367 if (lastcell.smooth[layer] != smoothlevel)
1368 {
1369 lastcell.smooth[layer] = smoothlevel;
1370 esl << uint8 (smoothlevel);
1371 emask |= 1 << layer;
1372 }
1373 }
1374
1700 if (emask & 0xf) 1375 if (emask & 0xf)
1701 esl[eoldlen + 1] = emask & 0xff; 1376 esl[eoldlen + 1] = emask & 0xff;
1702 else 1377 else
1703 esl.reset (eoldlen); 1378 esl.reset (eoldlen);
1379 }
1704 } /* else this is a viewable space */ 1380 } /* else this is a viewable space */
1705 } /* for x loop */ 1381 } /* for x loop */
1706 } /* for y loop */ 1382 } /* for y loop */
1383
1384 socket.flush_fx ();
1707 1385
1708 /* Verify that we in fact do need to send this */ 1386 /* Verify that we in fact do need to send this */
1709 if (socket.ext_mapinfos) 1387 if (socket.ext_mapinfos)
1710 { 1388 {
1711 if (!(sl.length () > startlen || socket.sent_scroll)) 1389 if (!(sl.length () > startlen || socket.sent_scroll))
1712 { 1390 {
1713 /* No map data will follow, so don't say the client 1391 /* No map data will follow, so don't say the client
1714 * it doesn't need draw! 1392 * it doesn't need draw!
1715 */ 1393 */
1716 ewhatflag &= (~EMI_NOREDRAW); 1394 ewhatflag &= ~EMI_NOREDRAW;
1717 esl[ewhatstart + 1] = ewhatflag & 0xff; 1395 esl[ewhatstart + 1] = ewhatflag & 0xff;
1718 } 1396 }
1719 1397
1720 if (esl.length () > estartlen) 1398 if (esl.length () > estartlen)
1721 socket.send_packet (esl); 1399 socket.send_packet (esl);
… …
1726 socket.send_packet (sl); 1404 socket.send_packet (sl);
1727 socket.sent_scroll = 0; 1405 socket.sent_scroll = 0;
1728 } 1406 }
1729} 1407}
1730 1408
1731/**
1732 * Draws client map.
1733 */
1734void
1735draw_client_map (object *pl)
1736{
1737 int i, j;
1738 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1739 int mflags;
1740 struct Map newmap;
1741 maptile *m, *pm;
1742
1743 if (pl->type != PLAYER)
1744 {
1745 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1746 return;
1747 }
1748
1749 pm = pl->map;
1750
1751 /* If player is just joining the game, he isn't here yet, so the map
1752 * can get swapped out. If so, don't try to send them a map. All will
1753 * be OK once they really log in.
1754 */
1755 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1756 return;
1757
1758 memset (&newmap, 0, sizeof (struct Map));
1759
1760 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1761 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1762 {
1763 ax = i;
1764 ay = j;
1765 m = pm;
1766 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1767
1768 if (mflags & P_OUT_OF_MAP)
1769 continue;
1770
1771 /* If a map is visible to the player, we don't want to swap it out
1772 * just to reload it. This should really call something like
1773 * swap_map, but this is much more efficient and 'good enough'
1774 */
1775 if (mflags & P_NEW_MAP)
1776 m->timeout = 50;
1777 }
1778
1779 /* do LOS after calls to update_position */
1780 if (pl->contr->do_los)
1781 {
1782 update_los (pl);
1783 pl->contr->do_los = 0;
1784 }
1785
1786 /* Big maps need a different drawing mechanism to work */
1787 draw_client_map1 (pl);
1788}
1789
1790
1791/*****************************************************************************/ 1409/*****************************************************************************/
1792
1793/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1410/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1794
1795/* a player. Of course, the client need to know the command to be able to */ 1411/* a player. Of course, the client need to know the command to be able to */
1796
1797/* manage it ! */ 1412/* manage it ! */
1798
1799/*****************************************************************************/ 1413/*****************************************************************************/
1800void 1414void
1801send_plugin_custom_message (object *pl, char *buf) 1415send_plugin_custom_message (object *pl, char *buf)
1802{ 1416{
1803 pl->contr->ns->send_packet (buf); 1417 pl->contr->ns->send_packet (buf);
… …
1812{ 1426{
1813 packet sl; 1427 packet sl;
1814 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1815 1429
1816 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1817 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1818 1432
1819 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1820 { 1434 {
1821 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1822 fatal (0); 1436 fatal (0);
1823 } 1437 }
1824 1438
… …
1837 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1838 1452
1839 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1840 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1841 1455
1842 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1843 { 1457 {
1844 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1845 fatal (0); 1459 fatal (0);
1846 } 1460 }
1847 1461
… …
1866 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1867 { 1481 {
1868 int flags = 0; 1482 int flags = 0;
1869 1483
1870 /* check if we need to update it */ 1484 /* check if we need to update it */
1871 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1872 { 1486 {
1873 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1874 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1875 } 1489 }
1876 1490
1877 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1878 { 1492 {
1879 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1880 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1881 } 1495 }
1882 1496
1883 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1884 { 1498 {
1885 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1886 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1887 } 1501 }
1888 1502
1889 if (flags) 1503 if (flags)
1890 { 1504 {
… …
1892 1506
1893 sl << "updspell " 1507 sl << "updspell "
1894 << uint8 (flags) 1508 << uint8 (flags)
1895 << uint32 (spell->count); 1509 << uint32 (spell->count);
1896 1510
1897 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1898 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1899 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1900 1514
1901 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1902 } 1516 }
1903 } 1517 }
1904 } 1518 }
… …
1934 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1548 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1935 return; 1549 return;
1936 } 1550 }
1937 1551
1938 /* store costs and damage in the object struct, to compare to later */ 1552 /* store costs and damage in the object struct, to compare to later */
1939 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1553 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1940 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1554 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1941 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1942 1556
1943 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1944 if (spell->skill) 1558 if (spell->skill)
1945 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1946 for (i = 1; i < NUM_SKILLS; i++)
1947 if (!strcmp (spell->skill, skill_names[i]))
1948 {
1949 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1950 break;
1951 }
1952 }
1953 1561
1954 // spells better have a face 1562 // spells better have a face
1955 if (!spell->face) 1563 if (!spell->face)
1956 { 1564 {
1957 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1958 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1959 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1960 1570
1961 /* send the current values */ 1571 /* send the current values */
1962 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1963 << uint16 (spell->level) 1573 << uint16 (spell->level)
1964 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1965 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1966 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1967 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1968 << uint8 (skill) 1578 << uint8 (skill)
1969 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1970 << uint32 (spell->face) 1580 << uint32 (spell->face)
1971 << data8 (spell->name) 1581 << data8 (spell->name)
1972 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
2000 * bytes and 3 strings (because that is the spec) so we need to 1610 * bytes and 3 strings (because that is the spec) so we need to
2001 * check that the length of those 3 strings, plus the 23 bytes, 1611 * check that the length of those 3 strings, plus the 23 bytes,
2002 * won't take us over the length limit for the socket, if it does, 1612 * won't take us over the length limit for the socket, if it does,
2003 * we need to send what we already have, and restart packet formation 1613 * we need to send what we already have, and restart packet formation
2004 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
2005 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2006 * to show add_spell is 26 bytes + 2 strings. However, the overun 1619 * to show add_spell is 26 bytes + 2 strings. However, the overun
2007 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1620 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2008 * like it will fix this 1621 * like it will fix this
2009 */ 1622 */
2010 if (spell->type != SPELL)
2011 continue;
2012
2013 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1623 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2014 { 1624 {
1625 pl->ns->flush_fx ();
2015 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
2016 1627
2017 sl.reset (); 1628 sl.reset ();
2018 sl << "addspell "; 1629 sl << "addspell ";
2019 } 1630 }
… …
2027 return; 1638 return;
2028 } 1639 }
2029 else 1640 else
2030 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
2031 1642
2032 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
2033 { 1644 {
2034 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2035 fatal (0); 1646 fatal (0);
2036 } 1647 }
2037 1648
2038 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
2039 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
2040} 1652}
2041 1653

Diff Legend

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