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.73 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_map (player *pl)
134{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137
138 pl->ns->force_newmap = false;
136 139
137 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
139 142
140 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
… …
143/** check for map/region change and send new map data */ 146/** check for map/region change and send new map data */
144static void 147static void
145check_map_change (player *pl) 148check_map_change (player *pl)
146{ 149{
147 client &socket = *pl->ns; 150 client &socket = *pl->ns;
148 object *ob = pl->ob; 151 object *ob = pl->observe;
149 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
152 { 154 {
155 clear_map (pl);
153 socket.current_map = ob->map; 156 socket.current_map = ob->map;
154
155 clear_map (pl);
156 157
157 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
158 { 159 {
159 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
160 { 161 {
161 int flags = 0; 162 int flags = 0;
162 163
163 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
164 flags |= 1;
165 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
166 flags |= 2;
167 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
168 flags |= 4;
169 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
170 flags |= 8;
171 168
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
174 } 172 }
175 else 173 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
179 } 175 }
180 } 176 }
181 else if (socket.current_x != ob->x || socket.current_y != ob->y) 177 else if (socket.current_x != ob->x || socket.current_y != ob->y)
182 { 178 {
183 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
196 socket.current_y = ob->y; 192 socket.current_y = ob->y;
197 193
198 region *reg = ob->region (); 194 region *reg = ob->region ();
199 if (socket.current_region != reg) 195 if (socket.current_region != reg)
200 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
201 socket.current_region = reg; 198 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 } 199 }
204} 200}
205 201
206/** 202/**
207 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
209 * that information. 205 * that information.
210 */ 206 */
211void 207void
212RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
213{ 209{
214 char *params = NULL, *cp; 210 char *params;
215
216 /* No match */
217 char bigbuf[MAX_BUF];
218 int slen;
219
220 /* Set up replyinfo before we modify any of the buffers - this is used
221 * if we don't find a match.
222 */
223 strcpy (bigbuf, "replyinfo ");
224 slen = strlen (bigbuf);
225 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226 211
227 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
228 * params pointer. 213 * params pointer.
229 */ 214 */
230 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
231 if (*cp == ' ') 216 if (*params == ' ')
232 { 217 {
233 *cp = '\0';
234 params = cp + 1; 218 *params++ = 0;
235 break; 219 break;
236 } 220 }
237 221
238 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
242 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 227 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
246 else 230 else
247 ns->send_packet (bigbuf, len); 231 {
232 // undo tokenisation above and send replyinfo with the request unchanged
233 if (*params)
234 *--params = ' ';
235
236 ns->send_packet_printf ("replyinfo %s", buf);
237 }
248} 238}
249 239
250void 240void
251ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
252{ 242{
… …
255 245
256void 246void
257ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
258{ 248{
259 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250}
251
252void
253client::mapinfo_queue_clear ()
254{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i);
257
258 mapinfo_queue.clear ();
259}
260
261bool
262client::mapinfo_try (char *buf)
263{
264 char *token = buf;
265 buf += strlen (buf) + 9;
266
267 // initial map and its origin
268 maptile *map = pl->ob->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path[0])
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
260} 336}
261 337
262void 338void
263MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
264{ 340{
265 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
267 343
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 344 char *token = buf;
271 // copy token 345
272 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
273 return; 347 return;
274 348
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
278 { 350 {
279 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
280 353
281 // initial map and its origin 354#if 0
282 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
286 int max_distance = 8; // limit maximum path length to something generous
287
288 while (*buf && map && max_distance)
289 {
290 int dir = *buf++;
291
292 switch (dir)
293 {
294 case '1':
295 dx = 0;
296 dy = -1;
297 map = map->xy_find (dx, dy);
298 map && (mapy -= map->height);
299 break;
300 case '2':
301 mapx += map->width;
302 dx = map->width;
303 dy = 0;
304 map = map->xy_find (dx, dy);
305 break;
306 case '3':
307 mapy += map->height;
308 dx = 0;
309 dy = map->height;
310 map = map->xy_find (dx, dy);
311 break;
312 case '4':
313 dx = -1;
314 dy = 0;
315 map = map->xy_find (dx, dy);
316 map && (mapx -= map->width);
317 break;
318 }
319
320 --max_distance;
321 }
322
323 if (!max_distance)
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0])
326 {
327 int flags = 0;
328
329 if (map->tile_path[0])
330 flags |= 1;
331 if (map->tile_path[1])
332 flags |= 2;
333 if (map->tile_path[2])
334 flags |= 4;
335 if (map->tile_path[3])
336 flags |= 8;
337
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 }
340 else 358 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
342 } 361 }
343 else 362 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 364}
348 365
349/** This is the Setup cmd - easy first implementation */ 366/** This is the Setup cmd */
350void 367void
351SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
352{ 369{
353 int s, slen; 370 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 371}
558 372
559/** 373/**
560 * The client has requested to be added to the game. 374 * The client has requested to be added to the game.
561 * This is what takes care of it. We tell the client how things worked out. 375 * This is what takes care of it. We tell the client how things worked out.
562 * I am not sure if this file is the best place for this function. however, 376 * I am not sure if this file is the best place for this function. however,
563 * it either has to be here or init_sockets needs to be exported. 377 * it either has to be here or init_sockets needs to be exported.
564 */ 378 */
565void 379void
566AddMeCmd (char *buf, int len, client * ns) 380AddMeCmd (char *buf, int len, client *ns)
567{ 381{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 382 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 383}
570 384
571/** Reply to ExtendedInfos command */ 385/** Reply to ExtendedInfos command */
… …
683 497
684 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
685} 499}
686 500
687/** 501/**
688 * Tells client the picture it has to use
689 * to smooth a picture number given as argument.
690 */
691void
692AskSmooth (char *buf, int len, client *ns)
693{
694 ns->send_smooth (atoi (buf));
695}
696
697/**
698 * This handles the general commands from the client (ie, north, fire, cast, 502 * This handles the general commands from the client (ie, north, fire, cast,
699 * etc.) 503 * etc.)
700 */ 504 */
701void 505void
702PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
723 * commands. 527 * commands.
724 */ 528 */
725 pl->count = 0; 529 pl->count = 0;
726} 530}
727 531
728
729/** 532/**
730 * This handles the general commands from the client (ie, north, fire, cast, 533 * This handles the general commands from the client (ie, north, fire, cast,
731 * etc.). It is a lot like PlayerCmd above, but is called with the 534 * etc.). It is a lot like PlayerCmd above, but is called with the
732 * 'ncom' method which gives more information back to the client so it 535 * 'ncom' method which gives more information back to the client so it
733 * can throttle. 536 * can throttle.
… …
735void 538void
736NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
737{ 540{
738 if (len <= 6) 541 if (len <= 6)
739 { 542 {
740 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
741 return; 544 return;
742 } 545 }
743 546
744 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
745 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
802 { 605 {
803 case ST_PLAYING: 606 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 608 break;
806 609
807 case ST_CHANGE_CLASS:
808 key_change_class (pl->ob, buf[0]);
809 break;
810
811 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
813 break; 612 break;
814 613
815 default: 614 default:
… …
854 653
855 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
856 655
857 if (cp) 656 if (cp)
858 { 657 {
859 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
860 659
861 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
862 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864 } 663 }
… …
924/** 723/**
925 * Asks the client to query the user. This way, the client knows 724 * Asks the client to query the user. This way, the client knows
926 * it needs to send something back (vs just printing out a message) 725 * it needs to send something back (vs just printing out a message)
927 */ 726 */
928void 727void
929send_query (client *ns, uint8 flags, char *text) 728send_query (client *ns, uint8 flags, const char *text)
930{ 729{
931 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
731}
732
733/**
734 * Get player's current range attack in obuf.
735 */
736static void
737rangetostring (player *pl, char *obuf)
738{
739 dynbuf_text buf;
740
741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746
747#if 0
748 //TODO: remove this when slot system is working, this is only for debugging
749 if (pl->ob->chosen_skill)
750 buf << " Skill*: " << pl->ob->chosen_skill->name;
751#endif
752
753 //TODO: maybe golem should become the current_weapon, quite simply?
754 if (pl->golem)
755 buf << " Golem*: " << pl->golem->name;
756
757 buf << '\0';
758 buf.linearise (obuf);
932} 759}
933 760
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
935 Old = New; \ 762 Old = New; \
936 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
… …
944#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
945 Old = New; \ 772 Old = New; \
946 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
947 } 774 }
948 775
949#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950 Old = New; \ 777 Old = New; \
951 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952 } 779 }
953 780
954#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
956 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
970 797
971 client *ns = pl->ns; 798 client *ns = pl->ns;
972 if (!ns) 799 if (!ns)
973 return; 800 return;
974 801
975 object *ob = pl->ob; 802 object *ob = pl->observe;
976 if (!ob) 803 if (!ob)
977 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978 807
979 packet sl ("stats"); 808 packet sl ("stats");
980 809
981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994 823
995 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
996 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob[s])
997 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
998 { 827 {
999 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
1000 829
1001 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018 847
1019 flags = 0; 848 flags = 0;
1020 849
1021 if (pl->fire_on) 850 if (opl->fire_on)
1022 flags |= SF_FIREON; 851 flags |= SF_FIREON;
1023 852
1024 if (pl->run_on) 853 if (opl->run_on)
1025 flags |= SF_RUNON; 854 flags |= SF_RUNON;
1026 855
1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028 857
1029 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046 } 875 }
1047 876
1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050 set_title (ob, buf); 879 set_title (ob, buf);
1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052 881
1053 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
1081 910
1082/** Clears a map cell */ 911/** Clears a map cell */
1083static void 912static void
1084map_clearcell (struct MapCell *cell, int count) 913map_clearcell (struct MapCell *cell, int count)
1085{ 914{
1086 cell->faces[0] = 0; 915 cell->faces[0] = 0;
1087 cell->faces[1] = 0; 916 cell->faces[1] = 0;
1088 cell->faces[2] = 0; 917 cell->faces[2] = 0;
918 cell->smooth[0] = 0;
919 cell->smooth[1] = 0;
920 cell->smooth[2] = 0;
1089 cell->count = count; 921 cell->count = count;
1090 cell->stat_hp = 0; 922 cell->stat_hp = 0;
1091 cell->flags = 0; 923 cell->flags = 0;
1092 cell->player = 0; 924 cell->player = 0;
1093} 925}
1094 926
1095#define MAX_LAYERS 3 927#define MAX_LAYERS 3
1096 928
1097/** 929/**
… …
1100 * it was. 932 * it was.
1101 * sl is the socklist this data is going into. 933 * sl is the socklist this data is going into.
1102 * ns is the socket we are working on - all the info we care 934 * ns is the socket we are working on - all the info we care
1103 * about is in this socket structure, so now need not pass the 935 * about is in this socket structure, so now need not pass the
1104 * entire player object. 936 * entire player object.
1105 * mx and my are map coordinate offsets for map mp
1106 * sx and sy are the offsets into the socket structure that
1107 * holds the old values.
1108 * layer is the layer to update, with 2 being the floor and 0 the 937 * layer is the layer to update, with 2 being the floor and 0 the
1109 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 938 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110 * take. Interesting to note that before this function, the map1 function 939 * take. Interesting to note that before this function, the map1 function
1111 * numbers the spaces differently - I think this was a leftover from 940 * numbers the spaces differently - I think this was a leftover from
1112 * the map command, where the faces stack up. Sinces that is no longer 941 * the map command, where the faces stack up. Sinces that is no longer
1113 * the case, it seems to make more sense to have these layer values 942 * the case, it seems to make more sense to have these layer values
1114 * actually match. 943 * actually match.
1115 */ 944 */
1116static int 945static int
1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 946update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118{ 947{
1119 uint16 face_num; 948 object *ob = ms.faces_obj [layer];
1120 int bx, by, i;
1121
1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123 949
1124 /* If there is no object for this space, or if the face for the object 950 /* If there is no object for this space, or if the face for the object
1125 * is the blank face, set the face number to zero. 951 * is the blank face, set the face number to zero.
1126 * else if we have the stored head object for this space, that takes 952 * else if we have the stored head object for this space, that takes
1127 * precedence over the other object for this space. 953 * precedence over the other object for this space.
1128 * otherwise, we do special head processing 954 * otherwise, we do special head processing
1129 */ 955 */
1130 if (!ob || ob->face == blank_face) 956 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131 face_num = 0;
1132 else
1133 /* In this case, we are already at the lower right or single part object,
1134 * so nothing special
1135 */
1136 face_num = ob->face;
1137 957
1138 /* We've gotten what face we want to use for the object. Now see if 958 /* We've gotten what face we want to use for the object. Now see if
1139 * if it has changed since we last sent it to the client. 959 * if it has changed since we last sent it to the client.
1140 */ 960 */
1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 961 if (lastcell.faces[layer] != face_num)
1142 { 962 {
1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 963 lastcell.faces[layer] = face_num;
1144 964
1145 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 965 if (!ns.faces_sent[face_num])
1146 if (ob) 966 if (ob)
1147 ns.send_faces (ob); 967 ns.send_faces (ob);
1148 else 968 else
1149 ns.send_face (face_num); 969 ns.send_face (face_num, 10);
1150 970
1151 sl << uint16 (face_num); 971 sl << uint16 (face_num);
1152 return 1;
1153 }
1154
1155 /* Nothing changed */
1156 return 0;
1157}
1158
1159/**
1160 * This function is mainly a copy of update_space,
1161 * except it handles update of the smoothing updates,
1162 * not the face updates.
1163 * Removes the need to replicate the same code for each layer.
1164 * this returns true if this smooth is now in fact different
1165 * than it was.
1166 * sl is the socklist this data is going into.
1167 * ns is the socket we are working on - all the info we care
1168 * about is in this socket structure, so know need to pass the
1169 * entire player object.
1170 * mx and my are map coordinate offsets for map mp
1171 * sx and sy are the offsets into the socket structure that
1172 * holds the old values.
1173 * layer is the layer to update, with 2 being the floor and 0 the
1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175 * take.
1176 */
1177static inline int
1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179{
1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182 /* If there is no object for this space, or if the face for the object
1183 * is the blank face, set the smoothlevel to zero.
1184 */
1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187 /* We've gotten what face we want to use for the object. Now see if
1188 * if it has changed since we last sent it to the client.
1189 */
1190 if (smoothlevel > 255)
1191 smoothlevel = 255;
1192 else if (smoothlevel < 0)
1193 smoothlevel = 0;
1194
1195 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196 {
1197 if (smoothlevel)
1198 ns.send_smooth (ob->face);
1199
1200 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1201 sl << uint8 (smoothlevel);
1202 return 1; 972 return 1;
1203 } 973 }
1204 974
1205 /* Nothing changed */ 975 /* Nothing changed */
1206 return 0; 976 return 0;
… …
1246{ 1016{
1247 prefetch_surrounding_maps (op->map, 3); 1017 prefetch_surrounding_maps (op->map, 3);
1248} 1018}
1249 1019
1250/** 1020/**
1251 * This function uses the new map1 protocol command to send the map 1021 * Draws client map.
1252 * to the client. It is necessary because the old map command supports
1253 * a maximum map size of 15x15.
1254 * This function is much simpler than the old one. This is because
1255 * the old function optimized to send as few face identifiers as possible,
1256 * at the expense of sending more coordinate location (coordinates were
1257 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1258 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1259 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1260 * and use the other 4 bits for other informatiion. For full documentation
1261 * of what we send, see the doc/Protocol file.
1262 * I will describe internally what we do:
1263 * the ns->lastmap shows how the map last looked when sent to the client.
1264 * in the lastmap structure, there is a cells array, which is set to the
1265 * maximum viewable size (As set in config.h).
1266 * in the cells, there are faces and a count value.
1267 * we use the count value to hold the darkness value. If -1, then this space
1268 * is not viewable.
1269 * we use faces[0] faces[1] faces[2] to hold what the three layers
1270 * look like.
1271 */ 1022 */
1272void 1023void
1273draw_client_map1 (object *pl) 1024draw_client_map (player *pl)
1274{ 1025{
1026 object *ob = pl->observe;
1027 if (!ob->active)
1028 return;
1029
1030 maptile *plmap = ob->map;
1031
1032 /* If player is just joining the game, he isn't here yet, so the map
1033 * can get swapped out. If so, don't try to send them a map. All will
1034 * be OK once they really log in.
1035 */
1036 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1037 return;
1038
1275 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1276 sint16 nx, ny;
1277 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1278 uint8 eentrysize; 1041 uint8 eentrysize;
1279 uint16 ewhatstart, ewhatflag; 1042 uint16 ewhatstart, ewhatflag;
1280 uint8 extendedinfos; 1043 uint8 extendedinfos;
1281 maptile *m;
1282 1044
1283 client &socket = *pl->contr->ns;
1284
1285 if (!pl->active)
1286 return;
1287
1288 check_map_change (pl->contr); 1045 check_map_change (pl);
1289 prefetch_surrounding_maps (pl); 1046 prefetch_surrounding_maps (pl->ob);
1047
1048 /* do LOS after calls to update_position */
1049 if (ob != pl->ob)
1050 clear_los (pl);
1051 else if (pl->do_los)
1052 {
1053 update_los (ob);
1054 pl->do_los = 0;
1055 }
1056
1057 /**
1058 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports
1060 * a maximum map size of 15x15.
1061 * This function is much simpler than the old one. This is because
1062 * the old function optimized to send as few face identifiers as possible,
1063 * at the expense of sending more coordinate location (coordinates were
1064 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1065 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1066 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1067 * and use the other 4 bits for other informatiion. For full documentation
1068 * of what we send, see the doc/Protocol file.
1069 * I will describe internally what we do:
1070 * the ns->lastmap shows how the map last looked when sent to the client.
1071 * in the lastmap structure, there is a cells array, which is set to the
1072 * maximum viewable size (As set in config.h).
1073 * in the cells, there are faces and a count value.
1074 * we use the count value to hold the darkness value. If -1, then this space
1075 * is not viewable.
1076 * we use faces[0] faces[1] faces[2] to hold what the three layers
1077 * look like.
1078 */
1079
1080 client &socket = *pl->ns;
1290 1081
1291 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1292 packet esl; 1083 packet esl;
1293 1084
1294 startlen = sl.length (); 1085 startlen = sl.length ();
… …
1309 << uint8 (extendedinfos) 1100 << uint8 (extendedinfos)
1310 << uint8 (eentrysize); 1101 << uint8 (eentrysize);
1311 1102
1312 estartlen = esl.length (); 1103 estartlen = esl.length ();
1313 } 1104 }
1314 else
1315 {
1316 /* suppress compiler warnings */
1317 ewhatstart = 0;
1318 ewhatflag = 0;
1319 estartlen = 0;
1320 }
1321 1105
1322 /* x,y are the real map locations. ax, ay are viewport relative 1106 /* x,y are the real map locations. ax, ay are viewport relative
1323 * locations. 1107 * locations.
1324 */ 1108 */
1325 ay = 0; 1109 ay = 0;
1326 1110
1327 /* We could do this logic as conditionals in the if statement, 1111 /* We could do this logic as conditionals in the if statement,
1328 * but that started to get a bit messy to look at. 1112 * but that started to get a bit messy to look at.
1329 */ 1113 */
1330 max_x = pl->x + (socket.mapx + 1) / 2; 1114 max_x = ob->x + (socket.mapx + 1) / 2;
1331 max_y = pl->y + (socket.mapy + 1) / 2; 1115 max_y = ob->y + (socket.mapy + 1) / 2;
1332 1116
1333 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1334 { 1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1335 ax = 0; 1122 ax = 0;
1336 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1337 { 1124 {
1125 // check to see if we can simply go one right quickly
1126 ++nx;
1127 if (m && nx >= m->width)
1128 m = 0;
1129
1130 if (!m)
1131 {
1132 nx = x; ny = y; m = plmap;
1133
1134 if (!xy_normalise (m, nx, ny))
1135 m = 0;
1136 }
1137
1338 int emask, mask; 1138 int emask, mask;
1339 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1139 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1340 1140
1341 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1141 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1342 1142
1343 /* If the coordinates are not valid, or it is too dark to see, 1143 /* If the coordinates are not valid, or it is too dark to see,
1344 * we tell the client as such 1144 * we tell the client as such
1345 */ 1145 */
1346 nx = x;
1347 ny = y;
1348 m = get_map_from_coord (pl->map, &nx, &ny);
1349
1350 if (!m) 1146 if (!m)
1351 { 1147 {
1352 /* space is out of map. Update space and clear values 1148 /* space is out of map. Update space and clear values
1353 * if this hasn't already been done. If the space is out 1149 * if this hasn't already been done. If the space is out
1354 * of the map, it shouldn't have a head 1150 * of the map, it shouldn't have a head
… …
1362 continue; 1158 continue;
1363 } 1159 }
1364 1160
1365 m->touch (); 1161 m->touch ();
1366 1162
1367 int d = pl->contr->blocked_los[ax][ay]; 1163 int d = pl->blocked_los[ax][ay];
1368 1164
1369 if (d > 3) 1165 if (d > 3)
1370 { 1166 {
1371 1167
1372 int need_send = 0, count; 1168 int need_send = 0, count;
… …
1414 oldlen = sl.length (); 1210 oldlen = sl.length ();
1415 eoldlen = esl.length (); 1211 eoldlen = esl.length ();
1416 1212
1417 sl << uint16 (mask); 1213 sl << uint16 (mask);
1418 1214
1419 if (socket.ext_mapinfos)
1420 esl << uint16 (emask);
1421
1422 unsigned char dummy; 1215 unsigned char dummy;
1423 unsigned char *last_ext = &dummy; 1216 unsigned char *last_ext = &dummy;
1424 1217
1425 /* Darkness changed */ 1218 /* Darkness changed */
1426 if (lastcell.count != d && socket.darkness) 1219 if (lastcell.count != d && socket.darkness)
… …
1437 sl << uint8 (255 - 64 * d); 1230 sl << uint8 (255 - 64 * d);
1438 } 1231 }
1439 1232
1440 lastcell.count = d; 1233 lastcell.count = d;
1441 1234
1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1237
1442 if (socket.extmap) 1238 if (socket.extmap)
1443 { 1239 {
1444 uint8 stat_hp = 0; 1240 uint8 stat_hp = 0;
1445 uint8 stat_width = 0; 1241 uint8 stat_width = 0;
1446 uint8 flags = 0; 1242 uint8 flags = 0;
1447 UUID player = 0; 1243 tag_t player = 0;
1448 1244
1449 // send hp information, if applicable 1245 // send hp information, if applicable
1450 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1246 if (object *op = ms.faces_obj [0])
1451 { 1247 {
1452 if (op->head || op->invisible) 1248 if (op->head || op->invisible)
1453 ; // do not show 1249 ; // do not show
1454 else if (op->type == PLAYER 1250 else if (op->type == PLAYER
1455 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1456 { 1252 {
1457 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1458 { 1254 {
1459 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1460 stat_width = op->arch->tail_x; 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1461 } 1257 }
1462 } 1258 }
1463 1259
1464 if (op->msg && op->msg[0] == '@') 1260 if (op->msg && op->msg[0] == '@')
1465 flags |= 1; 1261 flags |= 1;
1466 1262
1467 if (op->type == PLAYER && op != pl) 1263 if (op->type == PLAYER && op != ob)
1468 player = op->count; 1264 player = op->count;
1469 } 1265 }
1470 1266
1471 if (lastcell.stat_hp != stat_hp) 1267 if (lastcell.stat_hp != stat_hp)
1472 { 1268 {
… …
1493 1289
1494 mask |= 0x8; 1290 mask |= 0x8;
1495 *last_ext |= 0x80; 1291 *last_ext |= 0x80;
1496 last_ext = &sl[sl.length ()]; 1292 last_ext = &sl[sl.length ()];
1497 1293
1498 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1294 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1499 } 1295 }
1500 1296
1501 if (lastcell.flags != flags) 1297 if (lastcell.flags != flags)
1502 { 1298 {
1503 lastcell.flags = flags; 1299 lastcell.flags = flags;
… …
1509 sl << uint8 (8) << uint8 (flags); 1305 sl << uint8 (8) << uint8 (flags);
1510 } 1306 }
1511 } 1307 }
1512 1308
1513 /* Floor face */ 1309 /* Floor face */
1514 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1310 if (update_space (sl, socket, ms, lastcell, 2))
1515 mask |= 0x4; 1311 mask |= 0x4;
1516 1312
1517 if (socket.EMI_smooth)
1518 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1519 emask |= 0x4;
1520
1521 /* Middle face */ 1313 /* Middle face */
1522 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1314 if (update_space (sl, socket, ms, lastcell, 1))
1523 mask |= 0x2; 1315 mask |= 0x2;
1524 1316
1525 if (socket.EMI_smooth) 1317 if (ms.player () == ob
1526 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1527 emask |= 0x2;
1528
1529 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1530 { 1319 {
1320 // force player to be visible to himself if invisible
1531 if (lastcell.faces[0] != pl->face) 1321 if (lastcell.faces[0] != ob->face)
1532 { 1322 {
1533 lastcell.faces[0] = pl->face; 1323 lastcell.faces[0] = ob->face;
1324
1534 mask |= 0x1; 1325 mask |= 0x1;
1535
1536 socket.send_faces (pl);
1537
1538 sl << uint16 (pl->face); 1326 sl << uint16 (ob->face);
1327
1328 socket.send_faces (ob);
1539 } 1329 }
1540 } 1330 }
1541 else
1542 {
1543 /* Top face */ 1331 /* Top face */
1544 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1332 else if (update_space (sl, socket, ms, lastcell, 0))
1545 mask |= 0x1; 1333 mask |= 0x1;
1546
1547 if (socket.EMI_smooth)
1548 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1549 emask |= 0x1;
1550 }
1551 1334
1552 /* Check to see if we are in fact sending anything for this 1335 /* Check to see if we are in fact sending anything for this
1553 * space by checking the mask. If so, update the mask. 1336 * space by checking the mask. If so, update the mask.
1554 * if not, reset the len to that from before adding the mask 1337 * if not, reset the len to that from before adding the mask
1555 * value, so we don't send those bits. 1338 * value, so we don't send those bits.
… …
1557 if (mask & 0xf) 1340 if (mask & 0xf)
1558 sl[oldlen + 1] = mask & 0xff; 1341 sl[oldlen + 1] = mask & 0xff;
1559 else 1342 else
1560 sl.reset (oldlen); 1343 sl.reset (oldlen);
1561 1344
1345 if (socket.ext_mapinfos)
1346 esl << uint16 (emask);
1347
1348 if (socket.EMI_smooth)
1349 {
1350 for (int layer = 2+1; layer--; )
1351 {
1352 object *ob = ms.faces_obj [layer];
1353
1354 // If there is no object for this space, or if the face for the object
1355 // is the blank face, set the smoothlevel to zero.
1356 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1357
1358 // We've gotten what face we want to use for the object. Now see if
1359 // if it has changed since we last sent it to the client.
1360 if (lastcell.smooth[layer] != smoothlevel)
1361 {
1362 lastcell.smooth[layer] = smoothlevel;
1363 esl << uint8 (smoothlevel);
1364 emask |= 1 << layer;
1365 }
1366 }
1367
1562 if (emask & 0xf) 1368 if (emask & 0xf)
1563 esl[eoldlen + 1] = emask & 0xff; 1369 esl[eoldlen + 1] = emask & 0xff;
1564 else 1370 else
1565 esl.reset (eoldlen); 1371 esl.reset (eoldlen);
1372 }
1566 } /* else this is a viewable space */ 1373 } /* else this is a viewable space */
1567 } /* for x loop */ 1374 } /* for x loop */
1568 } /* for y loop */ 1375 } /* for y loop */
1376
1377 socket.flush_fx ();
1569 1378
1570 /* Verify that we in fact do need to send this */ 1379 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos) 1380 if (socket.ext_mapinfos)
1572 { 1381 {
1573 if (!(sl.length () > startlen || socket.sent_scroll)) 1382 if (!(sl.length () > startlen || socket.sent_scroll))
… …
1588 socket.send_packet (sl); 1397 socket.send_packet (sl);
1589 socket.sent_scroll = 0; 1398 socket.sent_scroll = 0;
1590 } 1399 }
1591} 1400}
1592 1401
1593/**
1594 * Draws client map.
1595 */
1596void
1597draw_client_map (object *pl)
1598{
1599 int i, j;
1600 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1601 int mflags;
1602 struct Map newmap;
1603 maptile *m, *pm;
1604
1605 if (pl->type != PLAYER)
1606 {
1607 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1608 return;
1609 }
1610
1611 pm = pl->map;
1612
1613 /* If player is just joining the game, he isn't here yet, so the map
1614 * can get swapped out. If so, don't try to send them a map. All will
1615 * be OK once they really log in.
1616 */
1617 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1618 return;
1619
1620 memset (&newmap, 0, sizeof (struct Map));
1621
1622 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1623 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1624 {
1625 ax = i;
1626 ay = j;
1627 m = pm;
1628 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
1630 if (mflags & P_OUT_OF_MAP)
1631 continue;
1632
1633 /* If a map is visible to the player, we don't want to swap it out
1634 * just to reload it. This should really call something like
1635 * swap_map, but this is much more efficient and 'good enough'
1636 */
1637 if (mflags & P_NEW_MAP)
1638 m->timeout = 50;
1639 }
1640
1641 /* do LOS after calls to update_position */
1642 if (pl->contr->do_los)
1643 {
1644 update_los (pl);
1645 pl->contr->do_los = 0;
1646 }
1647
1648 /* Big maps need a different drawing mechanism to work */
1649 draw_client_map1 (pl);
1650}
1651
1652
1653/*****************************************************************************/ 1402/*****************************************************************************/
1654
1655/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1403/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1656
1657/* a player. Of course, the client need to know the command to be able to */ 1404/* a player. Of course, the client need to know the command to be able to */
1658
1659/* manage it ! */ 1405/* manage it ! */
1660
1661/*****************************************************************************/ 1406/*****************************************************************************/
1662void 1407void
1663send_plugin_custom_message (object *pl, char *buf) 1408send_plugin_custom_message (object *pl, char *buf)
1664{ 1409{
1665 pl->contr->ns->send_packet (buf); 1410 pl->contr->ns->send_packet (buf);
… …
1676 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
1677 1422
1678 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
1679 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1680 1425
1681 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
1682 { 1427 {
1683 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1684 fatal (0); 1429 fatal (0);
1685 } 1430 }
1686 1431
… …
1699 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
1700 1445
1701 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
1702 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1703 1448
1704 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1705 { 1450 {
1706 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1707 fatal (0); 1452 fatal (0);
1708 } 1453 }
1709 1454
… …
1817 if (!spell->face) 1562 if (!spell->face)
1818 { 1563 {
1819 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820 spell->face = face_find ("burnout.x11", blank_face); 1565 spell->face = face_find ("burnout.x11", blank_face);
1821 } 1566 }
1567
1568 pl->ns->send_face (spell->face);
1822 1569
1823 /* send the current values */ 1570 /* send the current values */
1824 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
1825 << uint16 (spell->level) 1572 << uint16 (spell->level)
1826 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
… …
1862 * bytes and 3 strings (because that is the spec) so we need to 1609 * bytes and 3 strings (because that is the spec) so we need to
1863 * check that the length of those 3 strings, plus the 23 bytes, 1610 * check that the length of those 3 strings, plus the 23 bytes,
1864 * won't take us over the length limit for the socket, if it does, 1611 * won't take us over the length limit for the socket, if it does,
1865 * we need to send what we already have, and restart packet formation 1612 * we need to send what we already have, and restart packet formation
1866 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
1867 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1868 * to show add_spell is 26 bytes + 2 strings. However, the overun 1618 * to show add_spell is 26 bytes + 2 strings. However, the overun
1869 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1619 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1870 * like it will fix this 1620 * like it will fix this
1871 */ 1621 */
1872 if (spell->type != SPELL)
1873 continue;
1874
1875 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1622 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1876 { 1623 {
1624 pl->ns->flush_fx ();
1877 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
1878 1626
1879 sl.reset (); 1627 sl.reset ();
1880 sl << "addspell "; 1628 sl << "addspell ";
1881 } 1629 }
… …
1889 return; 1637 return;
1890 } 1638 }
1891 else 1639 else
1892 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
1893 1641
1894 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
1895 { 1643 {
1896 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1897 fatal (0); 1645 fatal (0);
1898 } 1646 }
1899 1647
1900 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
1901 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
1902} 1651}
1903 1652

Diff Legend

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