ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.80 by root, Fri Mar 16 02:51:08 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 03:16:56 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
… …
145/** check for map/region change and send new map data */ 145/** check for map/region change and send new map data */
146static void 146static void
147check_map_change (player *pl) 147check_map_change (player *pl)
148{ 148{
149 client &socket = *pl->ns; 149 client &socket = *pl->ns;
150 object *ob = pl->ob; 150 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */
152 151
153 if (socket.force_newmap && 0) 152 if (socket.current_map != ob->map || socket.force_newmap)
154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
157 socket.current_map = ob->map;
158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 { 153 {
162 clear_map (pl); 154 clear_map (pl);
163 socket.current_map = ob->map; 155 socket.current_map = ob->map;
164 156
165 if (socket.mapinfocmd) 157 if (socket.mapinfocmd)
166 { 158 {
167 if (ob->map && ob->map->path[0]) 159 if (ob->map && ob->map->path[0])
168 { 160 {
169 int flags = 0; 161 int flags = 0;
170 162
171 if (ob->map->tile_path[0]) 163 if (ob->map->tile_path[0]) flags |= 1;
172 flags |= 1;
173 if (ob->map->tile_path[1]) 164 if (ob->map->tile_path[1]) flags |= 2;
174 flags |= 2;
175 if (ob->map->tile_path[2]) 165 if (ob->map->tile_path[2]) flags |= 4;
176 flags |= 4;
177 if (ob->map->tile_path[3]) 166 if (ob->map->tile_path[3]) flags |= 8;
178 flags |= 8;
179 167
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
182 } 171 }
183 else 172 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
187 } 174 }
188 } 175 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 176 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 177 {
191 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
… …
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333 else if (map && map->path[0]) 320 else if (map && map->path[0])
334 { 321 {
335 int flags = 0; 322 int flags = 0;
336 323
337 if (map->tile_path[0]) 324 if (map->tile_path[0]) flags |= 1;
338 flags |= 1;
339 if (map->tile_path[1]) 325 if (map->tile_path[1]) flags |= 2;
340 flags |= 2;
341 if (map->tile_path[2]) 326 if (map->tile_path[2]) flags |= 4;
342 flags |= 4;
343 if (map->tile_path[3]) 327 if (map->tile_path[3]) flags |= 8;
344 flags |= 8;
345 328
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347 } 330 }
348 else 331 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
353 336
354 pl->ns->send_packet (bigbuf); 337 pl->ns->send_packet (bigbuf);
355} 338}
356 339
357/** This is the Setup cmd - easy first implementation */ 340/** This is the Setup cmd */
358void 341void
359SetUp (char *buf, int len, client * ns) 342SetUp (char *buf, int len, client * ns)
360{ 343{
361 int s, slen; 344 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
362 char *cmd, *param, cmdback[HUGE_BUF];
363
364 /* run through the cmds of setup
365 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
366 *
367 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
368 * The client then must sort this out
369 */
370
371 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
372
373 strcpy (cmdback, "setup");
374 for (s = 0; s < len; )
375 {
376 cmd = &buf[s];
377
378 /* find the next space, and put a null there */
379 for (; buf[s] && buf[s] != ' '; s++)
380 ;
381
382 buf[s++] = 0;
383
384 while (buf[s] == ' ')
385 s++;
386
387 if (s >= len)
388 break;
389
390 param = &buf[s];
391
392 for (; buf[s] && buf[s] != ' '; s++)
393 ;
394
395 buf[s++] = 0;
396
397 while (buf[s] == ' ')
398 s++;
399
400 slen = strlen (cmdback);
401 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
403 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
404
405 if (!strcmp (cmd, "sound"))
406 {
407 ns->sound = atoi (param);
408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "exp64"))
411 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 else if (!strcmp (cmd, "spellmon"))
413 {
414 ns->monitor_spells = atoi (param);
415 safe_strcat (cmdback, param, &slen, HUGE_BUF);
416 }
417 else if (!strcmp (cmd, "darkness"))
418 {
419 ns->darkness = atoi (param);
420 safe_strcat (cmdback, param, &slen, HUGE_BUF);
421 }
422 else if (!strcmp (cmd, "map1cmd"))
423 {
424 if (atoi (param))
425 ns->mapmode = Map1Cmd;
426 /* if beyond this size, need to use map1cmd no matter what */
427 if (ns->mapx > 11 || ns->mapy > 11)
428 ns->mapmode = Map1Cmd;
429 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
430 }
431 else if (!strcmp (cmd, "map1acmd"))
432 {
433 if (atoi (param))
434 ns->mapmode = Map1aCmd;
435 /* if beyond this size, need to use map1acmd no matter what */
436 if (ns->mapx > 11 || ns->mapy > 11)
437 ns->mapmode = Map1aCmd;
438 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
439 }
440 else if (!strcmp (cmd, "newmapcmd"))
441 {
442 ns->newmapcmd = atoi (param);
443 safe_strcat (cmdback, param, &slen, HUGE_BUF);
444 }
445 else if (!strcmp (cmd, "mapinfocmd"))
446 {
447 ns->mapinfocmd = atoi (param);
448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
449 }
450 else if (!strcmp (cmd, "extcmd"))
451 {
452 ns->extcmd = atoi (param);
453 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
454 }
455 else if (!strcmp (cmd, "extmap"))
456 {
457 ns->extmap = atoi (param);
458 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
459 }
460 else if (!strcmp (cmd, "facecache"))
461 {
462 ns->facecache = atoi (param);
463 safe_strcat (cmdback, param, &slen, HUGE_BUF);
464 }
465 else if (!strcmp (cmd, "faceset"))
466 {
467 char tmpbuf[20];
468 int q = atoi (param);
469
470 if (is_valid_faceset (q))
471 ns->faceset = q;
472
473 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1;
477 }
478 else if (!strcmp (cmd, "itemcmd"))
479 {
480 /* Version of the item protocol command to use. Currently,
481 * only supported versions are 1 and 2. Using a numeric
482 * value will make it very easy to extend this in the future.
483 */
484 char tmpbuf[20];
485 int q = atoi (param);
486
487 if (q < 1 || q > 2)
488 {
489 strcpy (tmpbuf, "FALSE");
490 }
491 else
492 {
493 ns->itemcmd = q;
494 sprintf (tmpbuf, "%d", ns->itemcmd);
495 }
496 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
497 }
498 else if (!strcmp (cmd, "mapsize"))
499 {
500 int x, y = 0;
501 char tmpbuf[MAX_BUF], *cp;
502
503 x = atoi (param);
504 for (cp = param; *cp != 0; cp++)
505 if (*cp == 'x' || *cp == 'X')
506 {
507 y = atoi (cp + 1);
508 break;
509 }
510
511 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
512 {
513 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
515 }
516 else
517 {
518 ns->mapx = x;
519 ns->mapy = y;
520 /* better to send back what we are really using and not the
521 * param as given to us in case it gets parsed differently.
522 */
523 sprintf (tmpbuf, "%dx%d", x, y);
524 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
525 /* If beyond this size and still using orig map command, need to
526 * go to map1cmd.
527 */
528 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
529 ns->mapmode = Map1Cmd;
530 }
531 }
532 else if (!strcmp (cmd, "extendedMapInfos"))
533 {
534 /* Added by tchize
535 * prepare to use the mapextended command
536 */
537 char tmpbuf[20];
538
539 ns->ext_mapinfos = (atoi (param));
540 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
541 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
542 }
543 else if (!strcmp (cmd, "extendedTextInfos"))
544 {
545 /* Added by tchize
546 * prepare to use the extended text commands
547 * Client toggle this to non zero to get exttext
548 */
549 char tmpbuf[20];
550
551 ns->has_readable_type = (atoi (param));
552 sprintf (tmpbuf, "%d", ns->has_readable_type);
553 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
554 }
555 else
556 {
557 /* Didn't get a setup command we understood -
558 * report a failure to the client.
559 */
560 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
561 }
562 } /* for processing all the setup commands */
563
564 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
565 ns->send_packet (cmdback);
566} 345}
567 346
568/** 347/**
569 * The client has requested to be added to the game. 348 * The client has requested to be added to the game.
570 * This is what takes care of it. We tell the client how things worked out. 349 * This is what takes care of it. We tell the client how things worked out.
… …
572 * it either has to be here or init_sockets needs to be exported. 351 * it either has to be here or init_sockets needs to be exported.
573 */ 352 */
574void 353void
575AddMeCmd (char *buf, int len, client *ns) 354AddMeCmd (char *buf, int len, client *ns)
576{ 355{
577 // face caching is mandatory
578 if (!ns->facecache)
579 {
580 ns->send_drawinfo (
581 "\n"
582 "\n"
583 "***\n"
584 "*** WARNING:\n"
585 "*** Your client does not support face/image caching,\n"
586 "*** or it has been disabled. Face caching is mandatory\n"
587 "*** so please enable it or use a newer client.\n"
588 "***\n"
589 "*** Look at your client preferences:\n"
590 "***\n"
591 "*** CFPlus: all known versions automatically enable the facecache.\n"
592 "*** cfclient: use the -cache commandline option.\n"
593 "*** cfclient: map will not redraw automatically (bug).\n"
594 "*** gcfclient: use -cache commandline option, or enable\n"
595 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597 "***\n"
598 "***\n",
599 NDI_RED
600 );
601
602 if (strstr (ns->version, "jcrossclient"))
603 /* let them, for now*/;
604 else
605 {
606 ns->flush ();
607 //ns->destroy ();
608 }
609 //ns->facecache = true;
610 }
611
612 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
613} 357}
614 358
615/** Reply to ExtendedInfos command */ 359/** Reply to ExtendedInfos command */
616void 360void
… …
733 * before flushing. 477 * before flushing.
734 */ 478 */
735void 479void
736AskFaceCmd (char *buf, int len, client *ns) 480AskFaceCmd (char *buf, int len, client *ns)
737{ 481{
738 ns->askface.push_back (atoi (buf)); 482 ns->ixface.push_back (atoi (buf));
739} 483}
740 484
741/** 485/**
742 * Tells client the picture it has to use 486 * Tells client the picture it has to use
743 * to smooth a picture number given as argument. 487 * to smooth a picture number given as argument.
744 */ 488 */
745void 489void
746AskSmooth (char *buf, int len, client *ns) 490AskSmooth (char *buf, int len, client *ns)
747{ 491{
748 ns->send_face (atoi (buf)); 492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
749} 494}
750 495
751/** 496/**
752 * This handles the general commands from the client (ie, north, fire, cast, 497 * This handles the general commands from the client (ie, north, fire, cast,
753 * etc.) 498 * etc.)
… …
776 * for the command that issued the count should be done before any other 521 * for the command that issued the count should be done before any other
777 * commands. 522 * commands.
778 */ 523 */
779 pl->count = 0; 524 pl->count = 0;
780} 525}
781
782 526
783/** 527/**
784 * This handles the general commands from the client (ie, north, fire, cast, 528 * This handles the general commands from the client (ie, north, fire, cast,
785 * etc.). It is a lot like PlayerCmd above, but is called with the 529 * etc.). It is a lot like PlayerCmd above, but is called with the
786 * 'ncom' method which gives more information back to the client so it 530 * 'ncom' method which gives more information back to the client so it
… …
856 { 600 {
857 case ST_PLAYING: 601 case ST_PLAYING:
858 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 602 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
859 break; 603 break;
860 604
861 case ST_CHANGE_CLASS:
862 key_change_class (pl->ob, buf[0]);
863 break;
864
865 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 605 case ST_GET_PARTY_PASSWORD: /* Get password for party */
866 receive_party_password (pl->ob, 13); 606 receive_party_password (pl->ob, 13);
867 break; 607 break;
868 608
869 default: 609 default:
… …
908 648
909 cp = strchr (cp + 1, ' '); 649 cp = strchr (cp + 1, ' ');
910 650
911 if (cp) 651 if (cp)
912 { 652 {
913 assign (ns->version, cp + 1); 653 ns->version = cp + 1;
914 654
915 if (ns->sc_version < 1026) 655 if (ns->sc_version < 1026)
916 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 656 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
917 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 657 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
918 } 658 }
… …
978/** 718/**
979 * Asks the client to query the user. This way, the client knows 719 * Asks the client to query the user. This way, the client knows
980 * it needs to send something back (vs just printing out a message) 720 * it needs to send something back (vs just printing out a message)
981 */ 721 */
982void 722void
983send_query (client *ns, uint8 flags, char *text) 723send_query (client *ns, uint8 flags, const char *text)
984{ 724{
985 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 725 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
726}
727
728/**
729 * Get player's current range attack in obuf.
730 */
731static void
732rangetostring (player *pl, char *obuf)
733{
734 dynbuf_text buf;
735
736 if (pl->ranged_ob)
737 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
738
739 if (pl->combat_ob)
740 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
741
742#if 0
743 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name;
746#endif
747
748 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name;
751
752 buf << '\0';
753 buf.linearise (obuf);
986} 754}
987 755
988#define AddIfInt64(Old,New,Type) if (Old != New) {\ 756#define AddIfInt64(Old,New,Type) if (Old != New) {\
989 Old = New; \ 757 Old = New; \
990 sl << uint8 (Type) << uint64 (New); \ 758 sl << uint8 (Type) << uint64 (New); \
… …
998#define AddIfShort(Old,New,Type) if (Old != New) {\ 766#define AddIfShort(Old,New,Type) if (Old != New) {\
999 Old = New; \ 767 Old = New; \
1000 sl << uint8 (Type) << uint16 (New); \ 768 sl << uint8 (Type) << uint16 (New); \
1001 } 769 }
1002 770
1003#define AddIfFloat(Old,New,Type) if (Old != New) {\ 771#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1004 Old = New; \ 772 Old = New; \
1005 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 773 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1006 } 774 }
1007 775
1008#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 776#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1009 free(Old); Old = strdup (New);\ 777 free(Old); Old = strdup (New);\
1010 sl << uint8 (Type) << data8 (New); \ 778 sl << uint8 (Type) << data8 (New); \
… …
1024 792
1025 client *ns = pl->ns; 793 client *ns = pl->ns;
1026 if (!ns) 794 if (!ns)
1027 return; 795 return;
1028 796
1029 object *ob = pl->ob; 797 object *ob = pl->observe;
1030 if (!ob) 798 if (!ob)
1031 return; 799 return;
800
801 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1032 802
1033 packet sl ("stats"); 803 packet sl ("stats");
1034 804
1035 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 805 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1036 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 806 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1045 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1046 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1047 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1048 818
1049 for (int s = 0; s < NUM_SKILLS; s++) 819 for (int s = 0; s < NUM_SKILLS; s++)
1050 if (object *skill = pl->last_skill_ob[s]) 820 if (object *skill = opl->last_skill_ob[s])
1051 if (skill->stats.exp != ns->last_skill_exp [s]) 821 if (skill->stats.exp != ns->last_skill_exp [s])
1052 { 822 {
1053 ns->last_skill_exp [s] = skill->stats.exp; 823 ns->last_skill_exp [s] = skill->stats.exp;
1054 824
1055 /* Always send along the level if exp changes. This is only 825 /* Always send along the level if exp changes. This is only
… …
1063 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 833 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1064 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 834 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1065 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 835 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1066 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 836 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1067 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 837 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1068 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 838 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1069 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 839 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1070 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 840 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1071 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 841 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1072 842
1073 flags = 0; 843 flags = 0;
1074 844
1075 if (pl->fire_on) 845 if (opl->fire_on)
1076 flags |= SF_FIREON; 846 flags |= SF_FIREON;
1077 847
1078 if (pl->run_on) 848 if (opl->run_on)
1079 flags |= SF_RUNON; 849 flags |= SF_RUNON;
1080 850
1081 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 851 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1082 852
1083 if (ns->sc_version < 1025) 853 if (ns->sc_version < 1025)
… …
1097 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 867 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1098 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 868 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1099 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 869 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1100 } 870 }
1101 871
1102 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 872 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1103 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 873 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1104 set_title (ob, buf); 874 set_title (ob, buf);
1105 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 875 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1106 876
1107 /* Only send it away if we have some actual data */ 877 /* Only send it away if we have some actual data */
… …
1241{ 1011{
1242 prefetch_surrounding_maps (op->map, 3); 1012 prefetch_surrounding_maps (op->map, 3);
1243} 1013}
1244 1014
1245/** 1015/**
1246 * This function uses the new map1 protocol command to send the map 1016 * Draws client map.
1247 * to the client. It is necessary because the old map command supports
1248 * a maximum map size of 15x15.
1249 * This function is much simpler than the old one. This is because
1250 * the old function optimized to send as few face identifiers as possible,
1251 * at the expense of sending more coordinate location (coordinates were
1252 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1253 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1254 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1255 * and use the other 4 bits for other informatiion. For full documentation
1256 * of what we send, see the doc/Protocol file.
1257 * I will describe internally what we do:
1258 * the ns->lastmap shows how the map last looked when sent to the client.
1259 * in the lastmap structure, there is a cells array, which is set to the
1260 * maximum viewable size (As set in config.h).
1261 * in the cells, there are faces and a count value.
1262 * we use the count value to hold the darkness value. If -1, then this space
1263 * is not viewable.
1264 * we use faces[0] faces[1] faces[2] to hold what the three layers
1265 * look like.
1266 */ 1017 */
1267void 1018void
1268draw_client_map1 (object *pl) 1019draw_client_map (player *pl)
1269{ 1020{
1021 object *ob = pl->observe;
1022 if (!ob->active)
1023 return;
1024
1025 maptile *plmap = ob->map;
1026
1027 /* If player is just joining the game, he isn't here yet, so the map
1028 * can get swapped out. If so, don't try to send them a map. All will
1029 * be OK once they really log in.
1030 */
1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1032 return;
1033
1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1271 sint16 nx, ny;
1272 int estartlen, eoldlen; 1035 int estartlen, eoldlen;
1273 uint8 eentrysize; 1036 uint8 eentrysize;
1274 uint16 ewhatstart, ewhatflag; 1037 uint16 ewhatstart, ewhatflag;
1275 uint8 extendedinfos; 1038 uint8 extendedinfos;
1276 maptile *m;
1277 1039
1278 client &socket = *pl->contr->ns;
1279
1280 if (!pl->active)
1281 return;
1282
1283 check_map_change (pl->contr); 1040 check_map_change (pl);
1284 prefetch_surrounding_maps (pl); 1041 prefetch_surrounding_maps (pl->ob);
1042
1043 /* do LOS after calls to update_position */
1044 if (ob != pl->ob)
1045 clear_los (pl);
1046 else if (pl->do_los)
1047 {
1048 update_los (ob);
1049 pl->do_los = 0;
1050 }
1051
1052 /**
1053 * This function uses the new map1 protocol command to send the map
1054 * to the client. It is necessary because the old map command supports
1055 * a maximum map size of 15x15.
1056 * This function is much simpler than the old one. This is because
1057 * the old function optimized to send as few face identifiers as possible,
1058 * at the expense of sending more coordinate location (coordinates were
1059 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1060 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1061 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1062 * and use the other 4 bits for other informatiion. For full documentation
1063 * of what we send, see the doc/Protocol file.
1064 * I will describe internally what we do:
1065 * the ns->lastmap shows how the map last looked when sent to the client.
1066 * in the lastmap structure, there is a cells array, which is set to the
1067 * maximum viewable size (As set in config.h).
1068 * in the cells, there are faces and a count value.
1069 * we use the count value to hold the darkness value. If -1, then this space
1070 * is not viewable.
1071 * we use faces[0] faces[1] faces[2] to hold what the three layers
1072 * look like.
1073 */
1074
1075 client &socket = *pl->ns;
1285 1076
1286 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1077 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1287 packet esl; 1078 packet esl;
1288 1079
1289 startlen = sl.length (); 1080 startlen = sl.length ();
… …
1313 ay = 0; 1104 ay = 0;
1314 1105
1315 /* We could do this logic as conditionals in the if statement, 1106 /* We could do this logic as conditionals in the if statement,
1316 * but that started to get a bit messy to look at. 1107 * but that started to get a bit messy to look at.
1317 */ 1108 */
1318 max_x = pl->x + (socket.mapx + 1) / 2; 1109 max_x = ob->x + (socket.mapx + 1) / 2;
1319 max_y = pl->y + (socket.mapy + 1) / 2; 1110 max_y = ob->y + (socket.mapy + 1) / 2;
1320 1111
1321 maptile *plmap = pl->map;
1322
1323 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1324 { 1113 {
1114 sint16 nx, ny;
1115 maptile *m = 0;
1116
1325 ax = 0; 1117 ax = 0;
1326 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1118 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1327 { 1119 {
1120 // check to see if we can simply go one right quickly
1121 ++nx;
1122 if (m && nx >= m->width)
1123 m = 0;
1124
1125 if (!m)
1126 {
1127 nx = x; ny = y; m = plmap;
1128
1129 if (!xy_normalise (m, nx, ny))
1130 m = 0;
1131 }
1132
1328 int emask, mask; 1133 int emask, mask;
1329 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1134 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1330 1135
1331 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1136 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1332 1137
1333 /* If the coordinates are not valid, or it is too dark to see, 1138 /* If the coordinates are not valid, or it is too dark to see,
1334 * we tell the client as such 1139 * we tell the client as such
1335 */ 1140 */
1336 nx = x;
1337 ny = y;
1338 m = get_map_from_coord (plmap, &nx, &ny);
1339
1340 if (!m) 1141 if (!m)
1341 { 1142 {
1342 /* space is out of map. Update space and clear values 1143 /* space is out of map. Update space and clear values
1343 * if this hasn't already been done. If the space is out 1144 * if this hasn't already been done. If the space is out
1344 * of the map, it shouldn't have a head 1145 * of the map, it shouldn't have a head
… …
1352 continue; 1153 continue;
1353 } 1154 }
1354 1155
1355 m->touch (); 1156 m->touch ();
1356 1157
1357 int d = pl->contr->blocked_los[ax][ay]; 1158 int d = pl->blocked_los[ax][ay];
1358 1159
1359 if (d > 3) 1160 if (d > 3)
1360 { 1161 {
1361 1162
1362 int need_send = 0, count; 1163 int need_send = 0, count;
… …
1425 } 1226 }
1426 1227
1427 lastcell.count = d; 1228 lastcell.count = d;
1428 1229
1429 mapspace &ms = m->at (nx, ny); 1230 mapspace &ms = m->at (nx, ny);
1231 ms.update ();
1430 1232
1431 if (socket.extmap) 1233 if (socket.extmap)
1432 { 1234 {
1433 uint8 stat_hp = 0; 1235 uint8 stat_hp = 0;
1434 uint8 stat_width = 0; 1236 uint8 stat_width = 0;
1435 uint8 flags = 0; 1237 uint8 flags = 0;
1436 UUID player = 0; 1238 tag_t player = 0;
1437 1239
1438 // send hp information, if applicable 1240 // send hp information, if applicable
1439 if (object *op = ms.faces_obj [0]) 1241 if (object *op = ms.faces_obj [0])
1440 { 1242 {
1441 if (op->head || op->invisible) 1243 if (op->head || op->invisible)
… …
1444 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1246 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1445 { 1247 {
1446 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1248 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1447 { 1249 {
1448 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1250 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1449 stat_width = op->arch->tail_x; 1251 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1450 } 1252 }
1451 } 1253 }
1452 1254
1453 if (op->msg && op->msg[0] == '@') 1255 if (op->msg && op->msg[0] == '@')
1454 flags |= 1; 1256 flags |= 1;
1455 1257
1456 if (op->type == PLAYER && op != pl) 1258 if (op->type == PLAYER && op != ob)
1457 player = op->count; 1259 player = op->count;
1458 } 1260 }
1459 1261
1460 if (lastcell.stat_hp != stat_hp) 1262 if (lastcell.stat_hp != stat_hp)
1461 { 1263 {
… …
1482 1284
1483 mask |= 0x8; 1285 mask |= 0x8;
1484 *last_ext |= 0x80; 1286 *last_ext |= 0x80;
1485 last_ext = &sl[sl.length ()]; 1287 last_ext = &sl[sl.length ()];
1486 1288
1487 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1289 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1488 } 1290 }
1489 1291
1490 if (lastcell.flags != flags) 1292 if (lastcell.flags != flags)
1491 { 1293 {
1492 lastcell.flags = flags; 1294 lastcell.flags = flags;
… …
1505 1307
1506 /* Middle face */ 1308 /* Middle face */
1507 if (update_space (sl, socket, ms, lastcell, 1)) 1309 if (update_space (sl, socket, ms, lastcell, 1))
1508 mask |= 0x2; 1310 mask |= 0x2;
1509 1311
1510 if (ms.player () == pl 1312 if (ms.player () == ob
1511 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1313 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1512 { 1314 {
1513 // force player to be visible to himself if invisible 1315 // force player to be visible to himself if invisible
1514 if (lastcell.faces[0] != pl->face) 1316 if (lastcell.faces[0] != ob->face)
1515 { 1317 {
1516 lastcell.faces[0] = pl->face; 1318 lastcell.faces[0] = ob->face;
1517 1319
1518 mask |= 0x1; 1320 mask |= 0x1;
1519 sl << uint16 (pl->face); 1321 sl << uint16 (ob->face);
1520 1322
1521 socket.send_faces (pl); 1323 socket.send_faces (ob);
1522 } 1324 }
1523 } 1325 }
1524 /* Top face */ 1326 /* Top face */
1525 else if (update_space (sl, socket, ms, lastcell, 0)) 1327 else if (update_space (sl, socket, ms, lastcell, 0))
1526 mask |= 0x1; 1328 mask |= 0x1;
1527
1528 1329
1529 /* Check to see if we are in fact sending anything for this 1330 /* Check to see if we are in fact sending anything for this
1530 * space by checking the mask. If so, update the mask. 1331 * space by checking the mask. If so, update the mask.
1531 * if not, reset the len to that from before adding the mask 1332 * if not, reset the len to that from before adding the mask
1532 * value, so we don't send those bits. 1333 * value, so we don't send those bits.
… …
1566 } 1367 }
1567 } /* else this is a viewable space */ 1368 } /* else this is a viewable space */
1568 } /* for x loop */ 1369 } /* for x loop */
1569 } /* for y loop */ 1370 } /* for y loop */
1570 1371
1372 socket.flush_fx ();
1373
1571 /* Verify that we in fact do need to send this */ 1374 /* Verify that we in fact do need to send this */
1572 if (socket.ext_mapinfos) 1375 if (socket.ext_mapinfos)
1573 { 1376 {
1574 if (!(sl.length () > startlen || socket.sent_scroll)) 1377 if (!(sl.length () > startlen || socket.sent_scroll))
1575 { 1378 {
… …
1589 socket.send_packet (sl); 1392 socket.send_packet (sl);
1590 socket.sent_scroll = 0; 1393 socket.sent_scroll = 0;
1591 } 1394 }
1592} 1395}
1593 1396
1594/**
1595 * Draws client map.
1596 */
1597void
1598draw_client_map (object *pl)
1599{
1600 int i, j;
1601 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1602 int mflags;
1603 struct Map newmap;
1604 maptile *m, *pm;
1605
1606 if (pl->type != PLAYER)
1607 {
1608 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1609 return;
1610 }
1611
1612 pm = pl->map;
1613
1614 /* If player is just joining the game, he isn't here yet, so the map
1615 * can get swapped out. If so, don't try to send them a map. All will
1616 * be OK once they really log in.
1617 */
1618 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1619 return;
1620
1621 memset (&newmap, 0, sizeof (struct Map));
1622
1623 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1624 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1625 {
1626 ax = i;
1627 ay = j;
1628 m = pm;
1629 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1630
1631 if (mflags & P_OUT_OF_MAP)
1632 continue;
1633
1634 /* If a map is visible to the player, we don't want to swap it out
1635 * just to reload it. This should really call something like
1636 * swap_map, but this is much more efficient and 'good enough'
1637 */
1638 if (mflags & P_NEW_MAP)
1639 m->timeout = 50;
1640 }
1641
1642 /* do LOS after calls to update_position */
1643 if (pl->contr->do_los)
1644 {
1645 update_los (pl);
1646 pl->contr->do_los = 0;
1647 }
1648
1649 /* Big maps need a different drawing mechanism to work */
1650 draw_client_map1 (pl);
1651}
1652
1653
1654/*****************************************************************************/ 1397/*****************************************************************************/
1655
1656/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1398/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1657
1658/* a player. Of course, the client need to know the command to be able to */ 1399/* a player. Of course, the client need to know the command to be able to */
1659
1660/* manage it ! */ 1400/* manage it ! */
1661
1662/*****************************************************************************/ 1401/*****************************************************************************/
1663void 1402void
1664send_plugin_custom_message (object *pl, char *buf) 1403send_plugin_custom_message (object *pl, char *buf)
1665{ 1404{
1666 pl->contr->ns->send_packet (buf); 1405 pl->contr->ns->send_packet (buf);

Diff Legend

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