1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | * Copyright (C) 2001 Mark Wedel |
5 | * Copyright (C) 2001 Mark Wedel |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | * |
7 | * |
… | |
… | |
132 | static void |
132 | static void |
133 | clear_map (player *pl) |
133 | clear_map (player *pl) |
134 | { |
134 | { |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | |
136 | |
|
|
137 | pl->ns->force_newmap = false; |
|
|
138 | |
137 | if (pl->ns->newmapcmd == 1) |
139 | if (pl->ns->newmapcmd == 1) |
138 | pl->ns->send_packet ("newmap"); |
140 | pl->ns->send_packet ("newmap"); |
139 | |
141 | |
140 | pl->ns->floorbox_reset (); |
142 | pl->ns->floorbox_reset (); |
141 | } |
143 | } |
… | |
… | |
146 | { |
148 | { |
147 | client &socket = *pl->ns; |
149 | client &socket = *pl->ns; |
148 | object *ob = pl->ob; |
150 | object *ob = pl->ob; |
149 | char buf[MAX_BUF]; /* eauugggh */ |
151 | 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 | snprintf (buf, MAX_BUF, "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, ob->map->width, ob->map->height, &ob->map->path); |
174 | } |
171 | } |
175 | else |
172 | else |
… | |
… | |
324 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
321 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
325 | else if (map && map->path[0]) |
322 | else if (map && map->path[0]) |
326 | { |
323 | { |
327 | int flags = 0; |
324 | int flags = 0; |
328 | |
325 | |
329 | if (map->tile_path[0]) |
326 | if (map->tile_path[0]) flags |= 1; |
330 | flags |= 1; |
|
|
331 | if (map->tile_path[1]) |
327 | if (map->tile_path[1]) flags |= 2; |
332 | flags |= 2; |
|
|
333 | if (map->tile_path[2]) |
328 | if (map->tile_path[2]) flags |= 4; |
334 | flags |= 4; |
|
|
335 | if (map->tile_path[3]) |
329 | if (map->tile_path[3]) flags |= 8; |
336 | flags |= 8; |
|
|
337 | |
330 | |
338 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
331 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
339 | } |
332 | } |
340 | else |
333 | else |
341 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
334 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
… | |
… | |
344 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
337 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | |
338 | |
346 | pl->ns->send_packet (bigbuf); |
339 | pl->ns->send_packet (bigbuf); |
347 | } |
340 | } |
348 | |
341 | |
349 | /** This is the Setup cmd - easy first implementation */ |
342 | /** This is the Setup cmd */ |
350 | void |
343 | void |
351 | SetUp (char *buf, int len, client * ns) |
344 | SetUp (char *buf, int len, client * ns) |
352 | { |
345 | { |
353 | int s, slen; |
346 | 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 | |
|
|
465 | sprintf (tmpbuf, "%d", ns->faceset); |
|
|
466 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
467 | /* if the client is using faceset, it knows about image2 command */ |
|
|
468 | ns->image2 = 1; |
|
|
469 | } |
|
|
470 | else if (!strcmp (cmd, "itemcmd")) |
|
|
471 | { |
|
|
472 | /* Version of the item protocol command to use. Currently, |
|
|
473 | * only supported versions are 1 and 2. Using a numeric |
|
|
474 | * value will make it very easy to extend this in the future. |
|
|
475 | */ |
|
|
476 | char tmpbuf[20]; |
|
|
477 | int q = atoi (param); |
|
|
478 | |
|
|
479 | if (q < 1 || q > 2) |
|
|
480 | { |
|
|
481 | strcpy (tmpbuf, "FALSE"); |
|
|
482 | } |
|
|
483 | else |
|
|
484 | { |
|
|
485 | ns->itemcmd = q; |
|
|
486 | sprintf (tmpbuf, "%d", ns->itemcmd); |
|
|
487 | } |
|
|
488 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
489 | } |
|
|
490 | else if (!strcmp (cmd, "mapsize")) |
|
|
491 | { |
|
|
492 | int x, y = 0; |
|
|
493 | char tmpbuf[MAX_BUF], *cp; |
|
|
494 | |
|
|
495 | x = atoi (param); |
|
|
496 | for (cp = param; *cp != 0; cp++) |
|
|
497 | if (*cp == 'x' || *cp == 'X') |
|
|
498 | { |
|
|
499 | y = atoi (cp + 1); |
|
|
500 | break; |
|
|
501 | } |
|
|
502 | |
|
|
503 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
|
|
504 | { |
|
|
505 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
|
|
506 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
507 | } |
|
|
508 | else |
|
|
509 | { |
|
|
510 | ns->mapx = x; |
|
|
511 | ns->mapy = y; |
|
|
512 | /* better to send back what we are really using and not the |
|
|
513 | * param as given to us in case it gets parsed differently. |
|
|
514 | */ |
|
|
515 | sprintf (tmpbuf, "%dx%d", x, y); |
|
|
516 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
517 | /* If beyond this size and still using orig map command, need to |
|
|
518 | * go to map1cmd. |
|
|
519 | */ |
|
|
520 | if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) |
|
|
521 | ns->mapmode = Map1Cmd; |
|
|
522 | } |
|
|
523 | } |
|
|
524 | else if (!strcmp (cmd, "extendedMapInfos")) |
|
|
525 | { |
|
|
526 | /* Added by tchize |
|
|
527 | * prepare to use the mapextended command |
|
|
528 | */ |
|
|
529 | char tmpbuf[20]; |
|
|
530 | |
|
|
531 | ns->ext_mapinfos = (atoi (param)); |
|
|
532 | sprintf (tmpbuf, "%d", ns->ext_mapinfos); |
|
|
533 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
534 | } |
|
|
535 | else if (!strcmp (cmd, "extendedTextInfos")) |
|
|
536 | { |
|
|
537 | /* Added by tchize |
|
|
538 | * prepare to use the extended text commands |
|
|
539 | * Client toggle this to non zero to get exttext |
|
|
540 | */ |
|
|
541 | char tmpbuf[20]; |
|
|
542 | |
|
|
543 | ns->has_readable_type = (atoi (param)); |
|
|
544 | sprintf (tmpbuf, "%d", ns->has_readable_type); |
|
|
545 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
546 | } |
|
|
547 | else |
|
|
548 | { |
|
|
549 | /* Didn't get a setup command we understood - |
|
|
550 | * report a failure to the client. |
|
|
551 | */ |
|
|
552 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
|
|
553 | } |
|
|
554 | } /* for processing all the setup commands */ |
|
|
555 | |
|
|
556 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
|
|
557 | ns->send_packet (cmdback); |
|
|
558 | } |
347 | } |
559 | |
348 | |
560 | /** |
349 | /** |
561 | * The client has requested to be added to the game. |
350 | * The client has requested to be added to the game. |
562 | * This is what takes care of it. We tell the client how things worked out. |
351 | * This is what takes care of it. We tell the client how things worked out. |
… | |
… | |
564 | * it either has to be here or init_sockets needs to be exported. |
353 | * it either has to be here or init_sockets needs to be exported. |
565 | */ |
354 | */ |
566 | void |
355 | void |
567 | AddMeCmd (char *buf, int len, client *ns) |
356 | AddMeCmd (char *buf, int len, client *ns) |
568 | { |
357 | { |
569 | // face caching is mandatory |
|
|
570 | if (!ns->facecache) |
|
|
571 | { |
|
|
572 | ns->send_drawinfo ( |
|
|
573 | "\n" |
|
|
574 | "\n" |
|
|
575 | "***\n" |
|
|
576 | "*** WARNING:\n" |
|
|
577 | "*** Your client does not support face/image caching,\n" |
|
|
578 | "*** or it has been disabled. Face caching is mandatory\n" |
|
|
579 | "*** so please enable it or use a newer client.\n" |
|
|
580 | "***\n" |
|
|
581 | "*** Look at your client preferences:\n" |
|
|
582 | "***\n" |
|
|
583 | "*** CFPlus: all known versions automatically enable the facecache.\n" |
|
|
584 | "*** cfclient: use the -cache commandline option.\n" |
|
|
585 | "*** cfclient: map will not redraw automatically (bug).\n" |
|
|
586 | "*** gcfclient: use -cache commandline option, or enable\n" |
|
|
587 | "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n" |
|
|
588 | "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n" |
|
|
589 | "***\n" |
|
|
590 | "***\n", |
|
|
591 | NDI_RED |
|
|
592 | ); |
|
|
593 | |
|
|
594 | if (strstr (ns->version, "jcrossclient")) |
|
|
595 | /* let them, for now*/; |
|
|
596 | else |
|
|
597 | { |
|
|
598 | ns->flush (); |
|
|
599 | //ns->destroy (); |
|
|
600 | } |
|
|
601 | //ns->facecache = true; |
|
|
602 | } |
|
|
603 | |
|
|
604 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
358 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
605 | } |
359 | } |
606 | |
360 | |
607 | /** Reply to ExtendedInfos command */ |
361 | /** Reply to ExtendedInfos command */ |
608 | void |
362 | void |
… | |
… | |
736 | */ |
490 | */ |
737 | void |
491 | void |
738 | AskSmooth (char *buf, int len, client *ns) |
492 | AskSmooth (char *buf, int len, client *ns) |
739 | { |
493 | { |
740 | ns->send_face (atoi (buf)); |
494 | ns->send_face (atoi (buf)); |
|
|
495 | ns->flush_fx (); |
741 | } |
496 | } |
742 | |
497 | |
743 | /** |
498 | /** |
744 | * This handles the general commands from the client (ie, north, fire, cast, |
499 | * This handles the general commands from the client (ie, north, fire, cast, |
745 | * etc.) |
500 | * etc.) |
… | |
… | |
848 | { |
603 | { |
849 | case ST_PLAYING: |
604 | case ST_PLAYING: |
850 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
605 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
851 | break; |
606 | break; |
852 | |
607 | |
853 | case ST_CHANGE_CLASS: |
|
|
854 | key_change_class (pl->ob, buf[0]); |
|
|
855 | break; |
|
|
856 | |
|
|
857 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
608 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
858 | receive_party_password (pl->ob, 13); |
609 | receive_party_password (pl->ob, 13); |
859 | break; |
610 | break; |
860 | |
611 | |
861 | default: |
612 | default: |
… | |
… | |
900 | |
651 | |
901 | cp = strchr (cp + 1, ' '); |
652 | cp = strchr (cp + 1, ' '); |
902 | |
653 | |
903 | if (cp) |
654 | if (cp) |
904 | { |
655 | { |
905 | assign (ns->version, cp + 1); |
656 | ns->version = cp + 1; |
906 | |
657 | |
907 | if (ns->sc_version < 1026) |
658 | if (ns->sc_version < 1026) |
908 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
659 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
909 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
660 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
910 | } |
661 | } |
… | |
… | |
970 | /** |
721 | /** |
971 | * Asks the client to query the user. This way, the client knows |
722 | * Asks the client to query the user. This way, the client knows |
972 | * it needs to send something back (vs just printing out a message) |
723 | * it needs to send something back (vs just printing out a message) |
973 | */ |
724 | */ |
974 | void |
725 | void |
975 | send_query (client *ns, uint8 flags, char *text) |
726 | send_query (client *ns, uint8 flags, const char *text) |
976 | { |
727 | { |
977 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
728 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
|
|
729 | } |
|
|
730 | |
|
|
731 | /** |
|
|
732 | * Get player's current range attack in obuf. |
|
|
733 | */ |
|
|
734 | static void |
|
|
735 | rangetostring (player *pl, char *obuf) |
|
|
736 | { |
|
|
737 | dynbuf_text buf; |
|
|
738 | |
|
|
739 | if (pl->ranged_ob) |
|
|
740 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
|
|
741 | |
|
|
742 | if (pl->combat_ob) |
|
|
743 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
|
|
744 | |
|
|
745 | //TODO: remove this when slot system is working, this is only for debugging |
|
|
746 | if (pl->ob->chosen_skill) |
|
|
747 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
748 | |
|
|
749 | //TODO: maybe golem should become the current_weapon, quite simply? |
|
|
750 | if (pl->golem) |
|
|
751 | buf << " Golem*: " << pl->golem->name; |
|
|
752 | |
|
|
753 | buf.linearise (obuf); |
|
|
754 | obuf [buf.size ()] = 0; |
978 | } |
755 | } |
979 | |
756 | |
980 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
757 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
981 | Old = New; \ |
758 | Old = New; \ |
982 | sl << uint8 (Type) << uint64 (New); \ |
759 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
990 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
767 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
991 | Old = New; \ |
768 | Old = New; \ |
992 | sl << uint8 (Type) << uint16 (New); \ |
769 | sl << uint8 (Type) << uint16 (New); \ |
993 | } |
770 | } |
994 | |
771 | |
995 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
772 | #define AddIfFloat(Old,New,Type,mult) if (Old != New) {\ |
996 | Old = New; \ |
773 | Old = New; \ |
997 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
774 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \ |
998 | } |
775 | } |
999 | |
776 | |
1000 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
777 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1001 | free(Old); Old = strdup (New);\ |
778 | free(Old); Old = strdup (New);\ |
1002 | sl << uint8 (Type) << data8 (New); \ |
779 | sl << uint8 (Type) << data8 (New); \ |
… | |
… | |
1055 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
832 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1056 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
833 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1057 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
834 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1058 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
835 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1059 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
836 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1060 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
837 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); |
1061 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
838 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1062 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
839 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
1063 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
840 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1064 | |
841 | |
1065 | flags = 0; |
842 | flags = 0; |
1066 | |
843 | |
1067 | if (pl->fire_on) |
844 | if (pl->fire_on) |
… | |
… | |
1089 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
866 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1090 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
867 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1091 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
868 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1092 | } |
869 | } |
1093 | |
870 | |
1094 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
871 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
1095 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
872 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1096 | set_title (ob, buf); |
873 | set_title (ob, buf); |
1097 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
874 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1098 | |
875 | |
1099 | /* Only send it away if we have some actual data */ |
876 | /* Only send it away if we have some actual data */ |
… | |
… | |
1420 | |
1197 | |
1421 | mapspace &ms = m->at (nx, ny); |
1198 | mapspace &ms = m->at (nx, ny); |
1422 | |
1199 | |
1423 | if (socket.extmap) |
1200 | if (socket.extmap) |
1424 | { |
1201 | { |
1425 | uint8 stat_hp = 0; |
1202 | uint8 stat_hp = 0; |
1426 | uint8 stat_width = 0; |
1203 | uint8 stat_width = 0; |
1427 | uint8 flags = 0; |
1204 | uint8 flags = 0; |
1428 | UUID player = 0; |
1205 | tag_t player = 0; |
1429 | |
1206 | |
1430 | // send hp information, if applicable |
1207 | // send hp information, if applicable |
1431 | if (object *op = ms.faces_obj [0]) |
1208 | if (object *op = ms.faces_obj [0]) |
1432 | { |
1209 | { |
1433 | if (op->head || op->invisible) |
1210 | if (op->head || op->invisible) |
… | |
… | |
1474 | |
1251 | |
1475 | mask |= 0x8; |
1252 | mask |= 0x8; |
1476 | *last_ext |= 0x80; |
1253 | *last_ext |= 0x80; |
1477 | last_ext = &sl[sl.length ()]; |
1254 | last_ext = &sl[sl.length ()]; |
1478 | |
1255 | |
1479 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1256 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1480 | } |
1257 | } |
1481 | |
1258 | |
1482 | if (lastcell.flags != flags) |
1259 | if (lastcell.flags != flags) |
1483 | { |
1260 | { |
1484 | lastcell.flags = flags; |
1261 | lastcell.flags = flags; |
… | |
… | |
1557 | esl.reset (eoldlen); |
1334 | esl.reset (eoldlen); |
1558 | } |
1335 | } |
1559 | } /* else this is a viewable space */ |
1336 | } /* else this is a viewable space */ |
1560 | } /* for x loop */ |
1337 | } /* for x loop */ |
1561 | } /* for y loop */ |
1338 | } /* for y loop */ |
|
|
1339 | |
|
|
1340 | socket.flush_fx (); |
1562 | |
1341 | |
1563 | /* Verify that we in fact do need to send this */ |
1342 | /* Verify that we in fact do need to send this */ |
1564 | if (socket.ext_mapinfos) |
1343 | if (socket.ext_mapinfos) |
1565 | { |
1344 | { |
1566 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1345 | if (!(sl.length () > startlen || socket.sent_scroll)) |