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.77 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.106 by root, Thu Jun 7 17:30:43 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.
… …
132static void 132static void
133clear_map (player *pl) 133clear_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}
… …
143/** check for map/region change and send new map data */ 145/** check for map/region change and send new map data */
144static void 146static void
145check_map_change (player *pl) 147check_map_change (player *pl)
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->observe;
149 char buf[MAX_BUF]; /* eauugggh */
150 151
151 if (socket.current_map != ob->map) 152 if (socket.current_map != ob->map || socket.force_newmap)
152 { 153 {
154 clear_map (pl);
153 socket.current_map = ob->map; 155 socket.current_map = ob->map;
154
155 clear_map (pl);
156 156
157 if (socket.mapinfocmd) 157 if (socket.mapinfocmd)
158 { 158 {
159 if (ob->map && ob->map->path[0]) 159 if (ob->map && ob->map->path[0])
160 { 160 {
161 int flags = 0; 161 int flags = 0;
162 162
163 if (ob->map->tile_path[0]) 163 if (ob->map->tile_path[0]) flags |= 1;
164 flags |= 1;
165 if (ob->map->tile_path[1]) 164 if (ob->map->tile_path[1]) flags |= 2;
166 flags |= 2;
167 if (ob->map->tile_path[2]) 165 if (ob->map->tile_path[2]) flags |= 4;
168 flags |= 4;
169 if (ob->map->tile_path[3]) 166 if (ob->map->tile_path[3]) flags |= 8;
170 flags |= 8;
171 167
172 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",
173 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);
174 } 171 }
175 else 172 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
179 } 174 }
180 } 175 }
181 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)
182 { 177 {
183 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
… …
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0]) 320 else if (map && map->path[0])
326 { 321 {
327 int flags = 0; 322 int flags = 0;
328 323
329 if (map->tile_path[0]) 324 if (map->tile_path[0]) flags |= 1;
330 flags |= 1;
331 if (map->tile_path[1]) 325 if (map->tile_path[1]) flags |= 2;
332 flags |= 2;
333 if (map->tile_path[2]) 326 if (map->tile_path[2]) flags |= 4;
334 flags |= 4;
335 if (map->tile_path[3]) 327 if (map->tile_path[3]) flags |= 8;
336 flags |= 8;
337 328
338 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);
339 } 330 }
340 else 331 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 336
346 pl->ns->send_packet (bigbuf); 337 pl->ns->send_packet (bigbuf);
347} 338}
348 339
349/** This is the Setup cmd - easy first implementation */ 340/** This is the Setup cmd */
350void 341void
351SetUp (char *buf, int len, client * ns) 342SetUp (char *buf, int len, client * ns)
352{ 343{
353 int s, slen; 344 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} 345}
559 346
560/** 347/**
561 * The client has requested to be added to the game. 348 * 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. 349 * 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. 351 * it either has to be here or init_sockets needs to be exported.
565 */ 352 */
566void 353void
567AddMeCmd (char *buf, int len, client *ns) 354AddMeCmd (char *buf, int len, client *ns)
568{ 355{
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 "*** I will proceed as if face caching were enabled.\n"
582 "\n"
583 "***\n",
584 NDI_RED
585 );
586 //ns->facecache = true;
587 }
588
589 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
590} 357}
591 358
592/** Reply to ExtendedInfos command */ 359/** Reply to ExtendedInfos command */
593void 360void
… …
721 */ 488 */
722void 489void
723AskSmooth (char *buf, int len, client *ns) 490AskSmooth (char *buf, int len, client *ns)
724{ 491{
725 ns->send_face (atoi (buf)); 492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
726} 494}
727 495
728/** 496/**
729 * 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,
730 * etc.) 498 * etc.)
… …
753 * 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
754 * commands. 522 * commands.
755 */ 523 */
756 pl->count = 0; 524 pl->count = 0;
757} 525}
758
759 526
760/** 527/**
761 * 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,
762 * 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
763 * '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
… …
833 { 600 {
834 case ST_PLAYING: 601 case ST_PLAYING:
835 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 602 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
836 break; 603 break;
837 604
838 case ST_CHANGE_CLASS:
839 key_change_class (pl->ob, buf[0]);
840 break;
841
842 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 605 case ST_GET_PARTY_PASSWORD: /* Get password for party */
843 receive_party_password (pl->ob, 13); 606 receive_party_password (pl->ob, 13);
844 break; 607 break;
845 608
846 default: 609 default:
… …
885 648
886 cp = strchr (cp + 1, ' '); 649 cp = strchr (cp + 1, ' ');
887 650
888 if (cp) 651 if (cp)
889 { 652 {
890 assign (ns->version, cp + 1); 653 ns->version = cp + 1;
891 654
892 if (ns->sc_version < 1026) 655 if (ns->sc_version < 1026)
893 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 656 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
894 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 657 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
895 } 658 }
… …
955/** 718/**
956 * 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
957 * 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)
958 */ 721 */
959void 722void
960send_query (client *ns, uint8 flags, char *text) 723send_query (client *ns, uint8 flags, const char *text)
961{ 724{
962 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.linearise (obuf);
753 obuf [buf.size ()] = 0;
963} 754}
964 755
965#define AddIfInt64(Old,New,Type) if (Old != New) {\ 756#define AddIfInt64(Old,New,Type) if (Old != New) {\
966 Old = New; \ 757 Old = New; \
967 sl << uint8 (Type) << uint64 (New); \ 758 sl << uint8 (Type) << uint64 (New); \
… …
975#define AddIfShort(Old,New,Type) if (Old != New) {\ 766#define AddIfShort(Old,New,Type) if (Old != New) {\
976 Old = New; \ 767 Old = New; \
977 sl << uint8 (Type) << uint16 (New); \ 768 sl << uint8 (Type) << uint16 (New); \
978 } 769 }
979 770
980#define AddIfFloat(Old,New,Type) if (Old != New) {\ 771#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
981 Old = New; \ 772 Old = New; \
982 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 773 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
983 } 774 }
984 775
985#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 776#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
986 free(Old); Old = strdup (New);\ 777 free(Old); Old = strdup (New);\
987 sl << uint8 (Type) << data8 (New); \ 778 sl << uint8 (Type) << data8 (New); \
… …
1001 792
1002 client *ns = pl->ns; 793 client *ns = pl->ns;
1003 if (!ns) 794 if (!ns)
1004 return; 795 return;
1005 796
1006 object *ob = pl->ob; 797 object *ob = pl->observe;
1007 if (!ob) 798 if (!ob)
1008 return; 799 return;
800
801 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1009 802
1010 packet sl ("stats"); 803 packet sl ("stats");
1011 804
1012 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 805 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1013 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 806 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1022 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1023 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1024 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1025 818
1026 for (int s = 0; s < NUM_SKILLS; s++) 819 for (int s = 0; s < NUM_SKILLS; s++)
1027 if (object *skill = pl->last_skill_ob[s]) 820 if (object *skill = opl->last_skill_ob[s])
1028 if (skill->stats.exp != ns->last_skill_exp [s]) 821 if (skill->stats.exp != ns->last_skill_exp [s])
1029 { 822 {
1030 ns->last_skill_exp [s] = skill->stats.exp; 823 ns->last_skill_exp [s] = skill->stats.exp;
1031 824
1032 /* Always send along the level if exp changes. This is only 825 /* Always send along the level if exp changes. This is only
… …
1040 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 833 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1041 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 834 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1042 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 835 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1043 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 836 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1044 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 837 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1045 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 838 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1046 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 839 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1047 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);
1048 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);
1049 842
1050 flags = 0; 843 flags = 0;
1051 844
1052 if (pl->fire_on) 845 if (opl->fire_on)
1053 flags |= SF_FIREON; 846 flags |= SF_FIREON;
1054 847
1055 if (pl->run_on) 848 if (opl->run_on)
1056 flags |= SF_RUNON; 849 flags |= SF_RUNON;
1057 850
1058 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 851 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1059 852
1060 if (ns->sc_version < 1025) 853 if (ns->sc_version < 1025)
… …
1074 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);
1075 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);
1076 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);
1077 } 870 }
1078 871
1079 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 */
1080 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 873 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1081 set_title (ob, buf); 874 set_title (ob, buf);
1082 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 875 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1083 876
1084 /* Only send it away if we have some actual data */ 877 /* Only send it away if we have some actual data */
… …
1218{ 1011{
1219 prefetch_surrounding_maps (op->map, 3); 1012 prefetch_surrounding_maps (op->map, 3);
1220} 1013}
1221 1014
1222/** 1015/**
1223 * This function uses the new map1 protocol command to send the map 1016 * Draws client map.
1224 * to the client. It is necessary because the old map command supports
1225 * a maximum map size of 15x15.
1226 * This function is much simpler than the old one. This is because
1227 * the old function optimized to send as few face identifiers as possible,
1228 * at the expense of sending more coordinate location (coordinates were
1229 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1230 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1231 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1232 * and use the other 4 bits for other informatiion. For full documentation
1233 * of what we send, see the doc/Protocol file.
1234 * I will describe internally what we do:
1235 * the ns->lastmap shows how the map last looked when sent to the client.
1236 * in the lastmap structure, there is a cells array, which is set to the
1237 * maximum viewable size (As set in config.h).
1238 * in the cells, there are faces and a count value.
1239 * we use the count value to hold the darkness value. If -1, then this space
1240 * is not viewable.
1241 * we use faces[0] faces[1] faces[2] to hold what the three layers
1242 * look like.
1243 */ 1017 */
1244void 1018void
1245draw_client_map1 (object *pl) 1019draw_client_map (player *pl)
1246{ 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
1247 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1248 sint16 nx, ny; 1035 sint16 nx, ny;
1249 int estartlen, eoldlen; 1036 int estartlen, eoldlen;
1250 uint8 eentrysize; 1037 uint8 eentrysize;
1251 uint16 ewhatstart, ewhatflag; 1038 uint16 ewhatstart, ewhatflag;
1252 uint8 extendedinfos; 1039 uint8 extendedinfos;
1253 maptile *m; 1040 maptile *m;
1254 1041
1255 client &socket = *pl->contr->ns;
1256
1257 if (!pl->active)
1258 return;
1259
1260 check_map_change (pl->contr); 1042 check_map_change (pl);
1261 prefetch_surrounding_maps (pl); 1043 prefetch_surrounding_maps (pl->ob);
1044
1045 /* do LOS after calls to update_position */
1046 if (ob != pl->ob)
1047 clear_los (pl);
1048 else if (pl->do_los)
1049 {
1050 update_los (ob);
1051 pl->do_los = 0;
1052 }
1053
1054 /**
1055 * This function uses the new map1 protocol command to send the map
1056 * to the client. It is necessary because the old map command supports
1057 * a maximum map size of 15x15.
1058 * This function is much simpler than the old one. This is because
1059 * the old function optimized to send as few face identifiers as possible,
1060 * at the expense of sending more coordinate location (coordinates were
1061 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1062 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1063 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1064 * and use the other 4 bits for other informatiion. For full documentation
1065 * of what we send, see the doc/Protocol file.
1066 * I will describe internally what we do:
1067 * the ns->lastmap shows how the map last looked when sent to the client.
1068 * in the lastmap structure, there is a cells array, which is set to the
1069 * maximum viewable size (As set in config.h).
1070 * in the cells, there are faces and a count value.
1071 * we use the count value to hold the darkness value. If -1, then this space
1072 * is not viewable.
1073 * we use faces[0] faces[1] faces[2] to hold what the three layers
1074 * look like.
1075 */
1076
1077 client &socket = *pl->ns;
1262 1078
1263 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1079 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1264 packet esl; 1080 packet esl;
1265 1081
1266 startlen = sl.length (); 1082 startlen = sl.length ();
… …
1290 ay = 0; 1106 ay = 0;
1291 1107
1292 /* We could do this logic as conditionals in the if statement, 1108 /* We could do this logic as conditionals in the if statement,
1293 * but that started to get a bit messy to look at. 1109 * but that started to get a bit messy to look at.
1294 */ 1110 */
1295 max_x = pl->x + (socket.mapx + 1) / 2; 1111 max_x = ob->x + (socket.mapx + 1) / 2;
1296 max_y = pl->y + (socket.mapy + 1) / 2; 1112 max_y = ob->y + (socket.mapy + 1) / 2;
1297 1113
1298 maptile *plmap = pl->map;
1299
1300 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1114 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1301 { 1115 {
1302 ax = 0; 1116 ax = 0;
1303 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1117 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1304 { 1118 {
1305 int emask, mask; 1119 int emask, mask;
1306 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1120 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1307 1121
1308 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1122 MapCell &lastcell = socket.lastmap.cells[ax][ay];
… …
1329 continue; 1143 continue;
1330 } 1144 }
1331 1145
1332 m->touch (); 1146 m->touch ();
1333 1147
1334 int d = pl->contr->blocked_los[ax][ay]; 1148 int d = pl->blocked_los[ax][ay];
1335 1149
1336 if (d > 3) 1150 if (d > 3)
1337 { 1151 {
1338 1152
1339 int need_send = 0, count; 1153 int need_send = 0, count;
… …
1405 1219
1406 mapspace &ms = m->at (nx, ny); 1220 mapspace &ms = m->at (nx, ny);
1407 1221
1408 if (socket.extmap) 1222 if (socket.extmap)
1409 { 1223 {
1410 uint8 stat_hp = 0; 1224 uint8 stat_hp = 0;
1411 uint8 stat_width = 0; 1225 uint8 stat_width = 0;
1412 uint8 flags = 0; 1226 uint8 flags = 0;
1413 UUID player = 0; 1227 tag_t player = 0;
1414 1228
1415 // send hp information, if applicable 1229 // send hp information, if applicable
1416 if (object *op = ms.faces_obj [0]) 1230 if (object *op = ms.faces_obj [0])
1417 { 1231 {
1418 if (op->head || op->invisible) 1232 if (op->head || op->invisible)
… …
1421 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1235 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1422 { 1236 {
1423 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1237 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1424 { 1238 {
1425 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1239 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1426 stat_width = op->arch->tail_x; 1240 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1427 } 1241 }
1428 } 1242 }
1429 1243
1430 if (op->msg && op->msg[0] == '@') 1244 if (op->msg && op->msg[0] == '@')
1431 flags |= 1; 1245 flags |= 1;
1432 1246
1433 if (op->type == PLAYER && op != pl) 1247 if (op->type == PLAYER && op != ob)
1434 player = op->count; 1248 player = op->count;
1435 } 1249 }
1436 1250
1437 if (lastcell.stat_hp != stat_hp) 1251 if (lastcell.stat_hp != stat_hp)
1438 { 1252 {
… …
1459 1273
1460 mask |= 0x8; 1274 mask |= 0x8;
1461 *last_ext |= 0x80; 1275 *last_ext |= 0x80;
1462 last_ext = &sl[sl.length ()]; 1276 last_ext = &sl[sl.length ()];
1463 1277
1464 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1278 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1465 } 1279 }
1466 1280
1467 if (lastcell.flags != flags) 1281 if (lastcell.flags != flags)
1468 { 1282 {
1469 lastcell.flags = flags; 1283 lastcell.flags = flags;
… …
1482 1296
1483 /* Middle face */ 1297 /* Middle face */
1484 if (update_space (sl, socket, ms, lastcell, 1)) 1298 if (update_space (sl, socket, ms, lastcell, 1))
1485 mask |= 0x2; 1299 mask |= 0x2;
1486 1300
1487 if (ms.player () == pl 1301 if (ms.player () == ob
1488 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1302 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1489 { 1303 {
1490 // force player to be visible to himself if invisible 1304 // force player to be visible to himself if invisible
1491 if (lastcell.faces[0] != pl->face) 1305 if (lastcell.faces[0] != ob->face)
1492 { 1306 {
1493 lastcell.faces[0] = pl->face; 1307 lastcell.faces[0] = ob->face;
1494 1308
1495 mask |= 0x1; 1309 mask |= 0x1;
1496 sl << uint16 (pl->face); 1310 sl << uint16 (ob->face);
1497 1311
1498 socket.send_faces (pl); 1312 socket.send_faces (ob);
1499 } 1313 }
1500 } 1314 }
1501 /* Top face */ 1315 /* Top face */
1502 else if (update_space (sl, socket, ms, lastcell, 0)) 1316 else if (update_space (sl, socket, ms, lastcell, 0))
1503 mask |= 0x1; 1317 mask |= 0x1;
1504
1505 1318
1506 /* Check to see if we are in fact sending anything for this 1319 /* Check to see if we are in fact sending anything for this
1507 * space by checking the mask. If so, update the mask. 1320 * space by checking the mask. If so, update the mask.
1508 * if not, reset the len to that from before adding the mask 1321 * if not, reset the len to that from before adding the mask
1509 * value, so we don't send those bits. 1322 * value, so we don't send those bits.
… …
1543 } 1356 }
1544 } /* else this is a viewable space */ 1357 } /* else this is a viewable space */
1545 } /* for x loop */ 1358 } /* for x loop */
1546 } /* for y loop */ 1359 } /* for y loop */
1547 1360
1361 socket.flush_fx ();
1362
1548 /* Verify that we in fact do need to send this */ 1363 /* Verify that we in fact do need to send this */
1549 if (socket.ext_mapinfos) 1364 if (socket.ext_mapinfos)
1550 { 1365 {
1551 if (!(sl.length () > startlen || socket.sent_scroll)) 1366 if (!(sl.length () > startlen || socket.sent_scroll))
1552 { 1367 {
… …
1566 socket.send_packet (sl); 1381 socket.send_packet (sl);
1567 socket.sent_scroll = 0; 1382 socket.sent_scroll = 0;
1568 } 1383 }
1569} 1384}
1570 1385
1571/**
1572 * Draws client map.
1573 */
1574void
1575draw_client_map (object *pl)
1576{
1577 int i, j;
1578 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1579 int mflags;
1580 struct Map newmap;
1581 maptile *m, *pm;
1582
1583 if (pl->type != PLAYER)
1584 {
1585 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1586 return;
1587 }
1588
1589 pm = pl->map;
1590
1591 /* If player is just joining the game, he isn't here yet, so the map
1592 * can get swapped out. If so, don't try to send them a map. All will
1593 * be OK once they really log in.
1594 */
1595 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1596 return;
1597
1598 memset (&newmap, 0, sizeof (struct Map));
1599
1600 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1601 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1602 {
1603 ax = i;
1604 ay = j;
1605 m = pm;
1606 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1607
1608 if (mflags & P_OUT_OF_MAP)
1609 continue;
1610
1611 /* If a map is visible to the player, we don't want to swap it out
1612 * just to reload it. This should really call something like
1613 * swap_map, but this is much more efficient and 'good enough'
1614 */
1615 if (mflags & P_NEW_MAP)
1616 m->timeout = 50;
1617 }
1618
1619 /* do LOS after calls to update_position */
1620 if (pl->contr->do_los)
1621 {
1622 update_los (pl);
1623 pl->contr->do_los = 0;
1624 }
1625
1626 /* Big maps need a different drawing mechanism to work */
1627 draw_client_map1 (pl);
1628}
1629
1630
1631/*****************************************************************************/ 1386/*****************************************************************************/
1632
1633/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1387/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1634
1635/* a player. Of course, the client need to know the command to be able to */ 1388/* a player. Of course, the client need to know the command to be able to */
1636
1637/* manage it ! */ 1389/* manage it ! */
1638
1639/*****************************************************************************/ 1390/*****************************************************************************/
1640void 1391void
1641send_plugin_custom_message (object *pl, char *buf) 1392send_plugin_custom_message (object *pl, char *buf)
1642{ 1393{
1643 pl->contr->ns->send_packet (buf); 1394 pl->contr->ns->send_packet (buf);

Diff Legend

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