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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.97 by root, Thu May 17 14:14:56 2007 UTC

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 *
… …
98 * that much difference in bandwidth. 98 * that much difference in bandwidth.
99 */ 99 */
100 mx = ns->mapx; 100 mx = ns->mapx;
101 my = ns->mapy; 101 my = ns->mapy;
102 102
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108
109 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
110 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
111 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
112 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
113 * are preserved, and the check_head thinks it needs to clear them. 107 * are preserved, and the check_head thinks it needs to clear them.
… …
138static void 132static void
139clear_map (player *pl) 133clear_map (player *pl)
140{ 134{
141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
142 136
137 pl->ns->force_newmap = false;
138
143 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
144 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
145 141
146 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
147} 143}
… …
152{ 148{
153 client &socket = *pl->ns; 149 client &socket = *pl->ns;
154 object *ob = pl->ob; 150 object *ob = pl->ob;
155 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
156 152
157 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
158 { 154 {
155 clear_map (pl);
159 socket.current_map = ob->map; 156 socket.current_map = ob->map;
160
161 clear_map (pl);
162 157
163 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
164 { 159 {
165 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
166 { 161 {
167 int flags = 0; 162 int flags = 0;
168 163
169 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
170 flags |= 1;
171 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
172 flags |= 2;
173 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
174 flags |= 4;
175 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
176 flags |= 8;
177 168
178 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",
179 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);
180 } 171 }
181 else 172 else
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
331 else if (map && map->path[0]) 322 else if (map && map->path[0])
332 { 323 {
333 int flags = 0; 324 int flags = 0;
334 325
335 if (map->tile_path[0]) 326 if (map->tile_path[0]) flags |= 1;
336 flags |= 1;
337 if (map->tile_path[1]) 327 if (map->tile_path[1]) flags |= 2;
338 flags |= 2;
339 if (map->tile_path[2]) 328 if (map->tile_path[2]) flags |= 4;
340 flags |= 4;
341 if (map->tile_path[3]) 329 if (map->tile_path[3]) flags |= 8;
342 flags |= 8;
343 330
344 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);
345 } 332 }
346 else 333 else
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
351 338
352 pl->ns->send_packet (bigbuf); 339 pl->ns->send_packet (bigbuf);
353} 340}
354 341
355/** This is the Setup cmd - easy first implementation */ 342/** This is the Setup cmd */
356void 343void
357SetUp (char *buf, int len, client * ns) 344SetUp (char *buf, int len, client * ns)
358{ 345{
359 int s, slen; 346 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
360 char *cmd, *param, cmdback[HUGE_BUF];
361
362 /* run through the cmds of setup
363 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
364 *
365 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
366 * The client then must sort this out
367 */
368
369 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
370
371 strcpy (cmdback, "setup");
372 for (s = 0; s < len; )
373 {
374 cmd = &buf[s];
375
376 /* find the next space, and put a null there */
377 for (; buf[s] && buf[s] != ' '; s++)
378 ;
379
380 buf[s++] = 0;
381
382 while (buf[s] == ' ')
383 s++;
384
385 if (s >= len)
386 break;
387
388 param = &buf[s];
389
390 for (; buf[s] && buf[s] != ' '; s++)
391 ;
392
393 buf[s++] = 0;
394
395 while (buf[s] == ' ')
396 s++;
397
398 slen = strlen (cmdback);
399 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
400 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
401 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402
403 if (!strcmp (cmd, "sound"))
404 {
405 ns->sound = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "exp64"))
409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 else if (!strcmp (cmd, "spellmon"))
411 {
412 ns->monitor_spells = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "darkness"))
416 {
417 ns->darkness = atoi (param);
418 safe_strcat (cmdback, param, &slen, HUGE_BUF);
419 }
420 else if (!strcmp (cmd, "map1cmd"))
421 {
422 if (atoi (param))
423 ns->mapmode = Map1Cmd;
424 /* if beyond this size, need to use map1cmd no matter what */
425 if (ns->mapx > 11 || ns->mapy > 11)
426 ns->mapmode = Map1Cmd;
427 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
428 }
429 else if (!strcmp (cmd, "map1acmd"))
430 {
431 if (atoi (param))
432 ns->mapmode = Map1aCmd;
433 /* if beyond this size, need to use map1acmd no matter what */
434 if (ns->mapx > 11 || ns->mapy > 11)
435 ns->mapmode = Map1aCmd;
436 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
437 }
438 else if (!strcmp (cmd, "newmapcmd"))
439 {
440 ns->newmapcmd = atoi (param);
441 safe_strcat (cmdback, param, &slen, HUGE_BUF);
442// } else if (!strcmp(cmd,"plugincmd")) {
443// ns->plugincmd = atoi(param);
444// safe_strcat(cmdback, param, &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "mapinfocmd"))
447 {
448 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extcmd"))
452 {
453 ns->extcmd = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "extmap"))
457 {
458 ns->extmap = atoi (param);
459 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "facecache"))
462 {
463 ns->facecache = atoi (param);
464 safe_strcat (cmdback, param, &slen, HUGE_BUF);
465 }
466 else if (!strcmp (cmd, "faceset"))
467 {
468 char tmpbuf[20];
469 int q = atoi (param);
470
471 if (is_valid_faceset (q))
472 ns->faceset = q;
473 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1;
477 }
478 else if (!strcmp (cmd, "itemcmd"))
479 {
480 /* Version of the item protocol command to use. Currently,
481 * only supported versions are 1 and 2. Using a numeric
482 * value will make it very easy to extend this in the future.
483 */
484 char tmpbuf[20];
485 int q = atoi (param);
486
487 if (q < 1 || q > 2)
488 {
489 strcpy (tmpbuf, "FALSE");
490 }
491 else
492 {
493 ns->itemcmd = q;
494 sprintf (tmpbuf, "%d", ns->itemcmd);
495 }
496 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
497 }
498 else if (!strcmp (cmd, "mapsize"))
499 {
500 int x, y = 0;
501 char tmpbuf[MAX_BUF], *cp;
502
503 x = atoi (param);
504 for (cp = param; *cp != 0; cp++)
505 if (*cp == 'x' || *cp == 'X')
506 {
507 y = atoi (cp + 1);
508 break;
509 }
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 }
515 else
516 {
517 ns->mapx = x;
518 ns->mapy = y;
519 /* better to send back what we are really using and not the
520 * param as given to us in case it gets parsed differently.
521 */
522 sprintf (tmpbuf, "%dx%d", x, y);
523 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
524 /* If beyond this size and still using orig map command, need to
525 * go to map1cmd.
526 */
527 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
528 ns->mapmode = Map1Cmd;
529 }
530 }
531 else if (!strcmp (cmd, "extendedMapInfos"))
532 {
533 /* Added by tchize
534 * prepare to use the mapextended command
535 */
536 char tmpbuf[20];
537
538 ns->ext_mapinfos = (atoi (param));
539 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
540 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
541 }
542 else if (!strcmp (cmd, "extendedTextInfos"))
543 {
544 /* Added by tchize
545 * prepare to use the extended text commands
546 * Client toggle this to non zero to get exttext
547 */
548 char tmpbuf[20];
549
550 ns->has_readable_type = (atoi (param));
551 sprintf (tmpbuf, "%d", ns->has_readable_type);
552 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
553 }
554 else
555 {
556 /* Didn't get a setup command we understood -
557 * report a failure to the client.
558 */
559 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
560 }
561 } /* for processing all the setup commands */
562
563 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
564 ns->send_packet (cmdback);
565} 347}
566 348
567/** 349/**
568 * The client has requested to be added to the game. 350 * The client has requested to be added to the game.
569 * This is what takes care of it. We tell the client how things worked out. 351 * This is what takes care of it. We tell the client how things worked out.
570 * I am not sure if this file is the best place for this function. however, 352 * I am not sure if this file is the best place for this function. however,
571 * it either has to be here or init_sockets needs to be exported. 353 * it either has to be here or init_sockets needs to be exported.
572 */ 354 */
573void 355void
574AddMeCmd (char *buf, int len, client * ns) 356AddMeCmd (char *buf, int len, client *ns)
575{ 357{
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 358 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 359}
578 360
579/** Reply to ExtendedInfos command */ 361/** Reply to ExtendedInfos command */
… …
691 473
692 ns->send_packet (cmdback); 474 ns->send_packet (cmdback);
693} 475}
694 476
695/** 477/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 478 * client requested an image. send it rate-limited
697 * Basically, it makes no sense to wait for the client to request a 479 * before flushing.
698 * a piece of data from us that we know the client wants. So
699 * if we know the client wants it, might as well push it to the
700 * client.
701 */
702static void
703SendSmooth (client *ns, uint16 face)
704{
705 uint16 smoothface;
706
707 /* If we can't find a face, return and set it so we won't try to send this
708 * again.
709 */ 480 */
710 if (!FindSmooth (face, &smoothface)) 481void
711 { 482AskFaceCmd (char *buf, int len, client *ns)
712 483{
713 LOG (llevError, "could not findsmooth for %d.\n", face); 484 ns->askface.push_back (atoi (buf));
714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
715 return;
716 }
717
718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
719 esrv_send_face (ns, smoothface, 0);
720
721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722
723 packet sl ("smooth");
724
725 sl << uint16 (face)
726 << uint16 (smoothface);
727
728 ns->send_packet (sl);
729} 485}
730 486
731/** 487/**
732 * Tells client the picture it has to use 488 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 489 * to smooth a picture number given as argument.
734 */ 490 */
735void 491void
736AskSmooth (char *buf, int len, client *ns) 492AskSmooth (char *buf, int len, client *ns)
737{ 493{
738 SendSmooth (ns, atoi (buf)); 494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
739} 496}
740 497
741/** 498/**
742 * 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,
743 * etc.) 500 * etc.)
… …
846 { 603 {
847 case ST_PLAYING: 604 case ST_PLAYING:
848 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 605 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
849 break; 606 break;
850 607
851 case ST_CHANGE_CLASS:
852 key_change_class (pl->ob, buf[0]);
853 break;
854
855 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 608 case ST_GET_PARTY_PASSWORD: /* Get password for party */
856 receive_party_password (pl->ob, 13); 609 receive_party_password (pl->ob, 13);
857 break; 610 break;
858 611
859 default: 612 default:
… …
880 ns->cs_version = atoi (buf); 633 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 634 ns->sc_version = ns->cs_version;
882 635
883 LOG (llevDebug, "connection from client <%s>\n", buf); 636 LOG (llevDebug, "connection from client <%s>\n", buf);
884 637
885
886 //TODO: should log here just for statistics 638 //TODO: should log here just for statistics
887 639
888 //if (VERSION_CS != ns->cs_version) 640 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 641 // unchecked;
890 642
… …
899 651
900 cp = strchr (cp + 1, ' '); 652 cp = strchr (cp + 1, ' ');
901 653
902 if (cp) 654 if (cp)
903 { 655 {
904 assign (ns->version, cp + 1); 656 ns->version = cp + 1;
905 657
906 if (ns->sc_version < 1026) 658 if (ns->sc_version < 1026)
907 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 659 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 660 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
909 } 661 }
… …
969/** 721/**
970 * 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
971 * 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)
972 */ 724 */
973void 725void
974send_query (client *ns, uint8 flags, char *text) 726send_query (client *ns, uint8 flags, const char *text)
975{ 727{
976 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 */
734static void
735rangetostring (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: maybe golem should become the current_weapon, quite simply?
746 if (pl->golem)
747 buf << " Golem*: " << pl->golem->name;
748
749 buf.linearise (obuf);
750 obuf [buf.size ()] = 0;
977} 751}
978 752
979#define AddIfInt64(Old,New,Type) if (Old != New) {\ 753#define AddIfInt64(Old,New,Type) if (Old != New) {\
980 Old = New; \ 754 Old = New; \
981 sl << uint8 (Type) << uint64 (New); \ 755 sl << uint8 (Type) << uint64 (New); \
… …
1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 862 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 863 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 864 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1091 } 865 }
1092 866
1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 867 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 868 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1095 set_title (ob, buf); 869 set_title (ob, buf);
1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 870 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1097 871
1098 /* Only send it away if we have some actual data */ 872 /* Only send it away if we have some actual data */
… …
1115 889
1116 pl->ns->last_weight = weight; 890 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 891 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 892 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 893}
1120
1121/**
1122 * Need to send an animation sequence to the client.
1123 * We will send appropriate face commands to the client if we haven't
1124 * sent them the face yet (this can become quite costly in terms of
1125 * how much we are sending - on the other hand, this should only happen
1126 * when the player logs in and picks stuff up.
1127 */
1128void
1129esrv_send_animation (client * ns, short anim_num)
1130{
1131 /* Do some checking on the anim_num we got. Note that the animations
1132 * are added in contigous order, so if the number is in the valid
1133 * range, it must be a valid animation.
1134 */
1135 if (anim_num < 0 || anim_num > num_animations)
1136 {
1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1138 return;
1139 }
1140
1141 packet sl ("anim");
1142
1143 sl << uint16 (anim_num)
1144 << uint16 (0); /* flags - not used right now */
1145
1146 /* Build up the list of faces. Also, send any information (ie, the
1147 * the face itself) down to the client.
1148 */
1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1150 {
1151 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1154 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1155 }
1156
1157 ns->send_packet (sl);
1158
1159 ns->anims_sent[anim_num] = 1;
1160}
1161
1162 894
1163/****************************************************************************** 895/******************************************************************************
1164 * 896 *
1165 * Start of map related commands. 897 * Start of map related commands.
1166 * 898 *
… …
1168 900
1169/** Clears a map cell */ 901/** Clears a map cell */
1170static void 902static void
1171map_clearcell (struct MapCell *cell, int count) 903map_clearcell (struct MapCell *cell, int count)
1172{ 904{
1173 cell->faces[0] = 0; 905 cell->faces[0] = 0;
1174 cell->faces[1] = 0; 906 cell->faces[1] = 0;
1175 cell->faces[2] = 0; 907 cell->faces[2] = 0;
908 cell->smooth[0] = 0;
909 cell->smooth[1] = 0;
910 cell->smooth[2] = 0;
1176 cell->count = count; 911 cell->count = count;
1177 cell->stat_hp = 0; 912 cell->stat_hp = 0;
1178 cell->flags = 0; 913 cell->flags = 0;
1179 cell->player = 0; 914 cell->player = 0;
1180} 915}
1181 916
1182#define MAX_LAYERS 3 917#define MAX_LAYERS 3
1183 918
1184/** 919/**
… …
1187 * it was. 922 * it was.
1188 * sl is the socklist this data is going into. 923 * sl is the socklist this data is going into.
1189 * ns is the socket we are working on - all the info we care 924 * ns is the socket we are working on - all the info we care
1190 * about is in this socket structure, so now need not pass the 925 * about is in this socket structure, so now need not pass the
1191 * entire player object. 926 * entire player object.
1192 * mx and my are map coordinate offsets for map mp
1193 * sx and sy are the offsets into the socket structure that
1194 * holds the old values.
1195 * layer is the layer to update, with 2 being the floor and 0 the 927 * layer is the layer to update, with 2 being the floor and 0 the
1196 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 928 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1197 * take. Interesting to note that before this function, the map1 function 929 * take. Interesting to note that before this function, the map1 function
1198 * numbers the spaces differently - I think this was a leftover from 930 * numbers the spaces differently - I think this was a leftover from
1199 * the map command, where the faces stack up. Sinces that is no longer 931 * the map command, where the faces stack up. Sinces that is no longer
1200 * the case, it seems to make more sense to have these layer values 932 * the case, it seems to make more sense to have these layer values
1201 * actually match. 933 * actually match.
1202 */ 934 */
1203static int 935static int
1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 936update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1205{ 937{
1206 uint16 face_num; 938 object *ob = ms.faces_obj [layer];
1207 int bx, by, i;
1208
1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1210 939
1211 /* If there is no object for this space, or if the face for the object 940 /* If there is no object for this space, or if the face for the object
1212 * is the blank face, set the face number to zero. 941 * is the blank face, set the face number to zero.
1213 * else if we have the stored head object for this space, that takes 942 * else if we have the stored head object for this space, that takes
1214 * precedence over the other object for this space. 943 * precedence over the other object for this space.
1215 * otherwise, we do special head processing 944 * otherwise, we do special head processing
1216 */ 945 */
1217 if (!ob || ob->face == blank_face) 946 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1218 face_num = 0;
1219 else
1220 /* In this case, we are already at the lower right or single part object,
1221 * so nothing special
1222 */
1223 face_num = ob->face;
1224 947
1225 /* We've gotten what face we want to use for the object. Now see if 948 /* We've gotten what face we want to use for the object. Now see if
1226 * if it has changed since we last sent it to the client. 949 * if it has changed since we last sent it to the client.
1227 */ 950 */
1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 951 if (lastcell.faces[layer] != face_num)
1229 { 952 {
1230 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 953 lastcell.faces[layer] = face_num;
954
1231 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 955 if (!ns.faces_sent[face_num])
956 if (ob)
957 ns.send_faces (ob);
958 else
1232 esrv_send_face (&ns, face_num, 0); 959 ns.send_face (face_num);
1233 960
1234 sl << uint16 (face_num); 961 sl << uint16 (face_num);
1235 return 1;
1236 }
1237
1238 /* Nothing changed */
1239 return 0;
1240}
1241
1242/**
1243 * This function is mainly a copy of update_space,
1244 * except it handles update of the smoothing updates,
1245 * not the face updates.
1246 * Removes the need to replicate the same code for each layer.
1247 * this returns true if this smooth is now in fact different
1248 * than it was.
1249 * sl is the socklist this data is going into.
1250 * ns is the socket we are working on - all the info we care
1251 * about is in this socket structure, so know need to pass the
1252 * entire player object.
1253 * mx and my are map coordinate offsets for map mp
1254 * sx and sy are the offsets into the socket structure that
1255 * holds the old values.
1256 * layer is the layer to update, with 2 being the floor and 0 the
1257 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1258 * take.
1259 */
1260
1261static inline int
1262update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1263{
1264 object *ob;
1265 int smoothlevel; /* old face_num; */
1266
1267 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1268
1269 /* If there is no object for this space, or if the face for the object
1270 * is the blank face, set the smoothlevel to zero.
1271 */
1272 if (!ob || ob->face == blank_face)
1273 smoothlevel = 0;
1274 else
1275 {
1276 smoothlevel = ob->smoothlevel;
1277 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1278 SendSmooth (&ns, ob->face);
1279 } /* else not already head object or blank face */
1280
1281 /* We've gotten what face we want to use for the object. Now see if
1282 * if it has changed since we last sent it to the client.
1283 */
1284 if (smoothlevel > 255)
1285 smoothlevel = 255;
1286 else if (smoothlevel < 0)
1287 smoothlevel = 0;
1288
1289 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1290 {
1291 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1292 sl << uint8 (smoothlevel);
1293 return 1; 962 return 1;
1294 } 963 }
1295 964
1296 /* Nothing changed */ 965 /* Nothing changed */
1297 return 0; 966 return 0;
… …
1361 * look like. 1030 * look like.
1362 */ 1031 */
1363void 1032void
1364draw_client_map1 (object *pl) 1033draw_client_map1 (object *pl)
1365{ 1034{
1366 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1035 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1367 sint16 nx, ny; 1036 sint16 nx, ny;
1368 int estartlen, eoldlen; 1037 int estartlen, eoldlen;
1369 uint16 mask, emask;
1370 uint8 eentrysize; 1038 uint8 eentrysize;
1371 uint16 ewhatstart, ewhatflag; 1039 uint16 ewhatstart, ewhatflag;
1372 uint8 extendedinfos; 1040 uint8 extendedinfos;
1373 maptile *m; 1041 maptile *m;
1374 1042
… …
1401 << uint8 (extendedinfos) 1069 << uint8 (extendedinfos)
1402 << uint8 (eentrysize); 1070 << uint8 (eentrysize);
1403 1071
1404 estartlen = esl.length (); 1072 estartlen = esl.length ();
1405 } 1073 }
1406 else
1407 {
1408 /* suppress compiler warnings */
1409 ewhatstart = 0;
1410 ewhatflag = 0;
1411 estartlen = 0;
1412 }
1413 1074
1414 /* x,y are the real map locations. ax, ay are viewport relative 1075 /* x,y are the real map locations. ax, ay are viewport relative
1415 * locations. 1076 * locations.
1416 */ 1077 */
1417 ay = 0; 1078 ay = 0;
… …
1420 * but that started to get a bit messy to look at. 1081 * but that started to get a bit messy to look at.
1421 */ 1082 */
1422 max_x = pl->x + (socket.mapx + 1) / 2; 1083 max_x = pl->x + (socket.mapx + 1) / 2;
1423 max_y = pl->y + (socket.mapy + 1) / 2; 1084 max_y = pl->y + (socket.mapy + 1) / 2;
1424 1085
1425 if (socket.mapmode == Map1aCmd) 1086 maptile *plmap = pl->map;
1426 {
1427 max_x += MAX_HEAD_OFFSET;
1428 max_y += MAX_HEAD_OFFSET;
1429 }
1430 1087
1431 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1088 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1432 { 1089 {
1433 ax = 0; 1090 ax = 0;
1434 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1091 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1435 { 1092 {
1093 int emask, mask;
1436 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1094 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1437 1095
1438 /* If this space is out of the normal viewable area, we only check
1439 * the heads value ax or ay will only be greater than what
1440 * the client wants if using the map1a command - this is because
1441 * if the map1a command is not used, max_x and max_y will be
1442 * set to lower values.
1443 */
1444 if (ax >= socket.mapx || ay >= socket.mapy)
1445 {
1446 int i, got_one;
1447
1448 oldlen = sl.length ();
1449
1450 sl << uint16 (mask);
1451
1452 /* If all we are doing is sending 0 (blank) faces, we don't
1453 * actually need to send that - just the coordinates
1454 * with no faces tells the client to blank out the
1455 * space.
1456 */
1457 got_one = 0;
1458 for (i = oldlen + 2; i < sl.length (); i++)
1459 if (sl[i])
1460 got_one = 1;
1461
1462 if (got_one && (mask & 0xf))
1463 sl[oldlen + 1] = mask & 0xff;
1464 else
1465 { /*either all faces blank, either no face at all */
1466 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1467 sl.reset (oldlen + 2);
1468 else
1469 sl.reset (oldlen);
1470 }
1471
1472 /*What concerns extendinfos, nothing to be done for now
1473 * (perhaps effects layer later)
1474 */
1475 continue; /* don't do processing below */
1476 }
1477
1478 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1096 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1479
1480 d = pl->contr->blocked_los[ax][ay];
1481 1097
1482 /* If the coordinates are not valid, or it is too dark to see, 1098 /* If the coordinates are not valid, or it is too dark to see,
1483 * we tell the client as such 1099 * we tell the client as such
1484 */ 1100 */
1485 nx = x; 1101 nx = x;
1486 ny = y; 1102 ny = y;
1487 m = get_map_from_coord (pl->map, &nx, &ny); 1103 m = get_map_from_coord (plmap, &nx, &ny);
1488 1104
1489 if (!m) 1105 if (!m)
1490 { 1106 {
1491 /* space is out of map. Update space and clear values 1107 /* space is out of map. Update space and clear values
1492 * if this hasn't already been done. If the space is out 1108 * if this hasn't already been done. If the space is out
… …
1495 if (lastcell.count != -1) 1111 if (lastcell.count != -1)
1496 { 1112 {
1497 sl << uint16 (mask); 1113 sl << uint16 (mask);
1498 map_clearcell (&lastcell, -1); 1114 map_clearcell (&lastcell, -1);
1499 } 1115 }
1116
1117 continue;
1500 } 1118 }
1119
1120 m->touch ();
1121
1122 int d = pl->contr->blocked_los[ax][ay];
1123
1501 else if (d > 3) 1124 if (d > 3)
1502 { 1125 {
1503 m->touch ();
1504 1126
1505 int need_send = 0, count; 1127 int need_send = 0, count;
1506 1128
1507 /* This block deals with spaces that are not visible for whatever 1129 /* This block deals with spaces that are not visible for whatever
1508 * reason. Still may need to send the head for this space. 1130 * reason. Still may need to send the head for this space.
1509 */ 1131 */
1510 1132
1511 oldlen = sl.length (); 1133 oldlen = sl.length ();
1512 1134
1513 sl << uint16 (mask); 1135 sl << uint16 (mask);
… …
1516 need_send = 1; 1138 need_send = 1;
1517 1139
1518 count = -1; 1140 count = -1;
1519 1141
1520 /* properly clear a previously sent big face */ 1142 /* properly clear a previously sent big face */
1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1143 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1522 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1144 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1523 need_send = 1; 1145 need_send = 1;
1524 1146
1525 map_clearcell (&lastcell, count); 1147 map_clearcell (&lastcell, count);
1526 1148
… …
1529 else 1151 else
1530 sl.reset (oldlen); 1152 sl.reset (oldlen);
1531 } 1153 }
1532 else 1154 else
1533 { 1155 {
1534 m->touch ();
1535
1536 /* In this block, the space is visible or there are head objects 1156 /* In this block, the space is visible.
1537 * we need to send.
1538 */ 1157 */
1539 1158
1540 /* Rather than try to figure out what everything that we might 1159 /* Rather than try to figure out what everything that we might
1541 * need to send is, then form the packet after that, 1160 * need to send is, then form the packet after that,
1542 * we presume that we will in fact form a packet, and update 1161 * we presume that we will in fact form a packet, and update
… …
1545 * is done. 1164 * is done.
1546 * I think this is simpler than doing a bunch of checks to see 1165 * I think this is simpler than doing a bunch of checks to see
1547 * what if anything we need to send, setting the bits, then 1166 * what if anything we need to send, setting the bits, then
1548 * doing those checks again to add the real data. 1167 * doing those checks again to add the real data.
1549 */ 1168 */
1550 oldlen = sl.length (); 1169 oldlen = sl.length ();
1551 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1552 eoldlen = esl.length (); 1170 eoldlen = esl.length ();
1553 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1171
1554 sl << uint16 (mask); 1172 sl << uint16 (mask);
1555
1556 if (socket.ext_mapinfos)
1557 esl << uint16 (emask);
1558 1173
1559 unsigned char dummy; 1174 unsigned char dummy;
1560 unsigned char *last_ext = &dummy; 1175 unsigned char *last_ext = &dummy;
1561 1176
1562 /* Darkness changed */ 1177 /* Darkness changed */
… …
1574 sl << uint8 (255 - 64 * d); 1189 sl << uint8 (255 - 64 * d);
1575 } 1190 }
1576 1191
1577 lastcell.count = d; 1192 lastcell.count = d;
1578 1193
1194 mapspace &ms = m->at (nx, ny);
1195
1579 if (socket.extmap) 1196 if (socket.extmap)
1580 { 1197 {
1581 uint8 stat_hp = 0; 1198 uint8 stat_hp = 0;
1582 uint8 stat_width = 0; 1199 uint8 stat_width = 0;
1583 uint8 flags = 0; 1200 uint8 flags = 0;
1584 UUID player = 0; 1201 tag_t player = 0;
1585 1202
1586 // send hp information, if applicable 1203 // send hp information, if applicable
1587 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1204 if (object *op = ms.faces_obj [0])
1588 { 1205 {
1589 if (op->head || op->invisible) 1206 if (op->head || op->invisible)
1590 ; // do not show 1207 ; // do not show
1591 else if (op->type == PLAYER 1208 else if (op->type == PLAYER
1592 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1209 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1630 1247
1631 mask |= 0x8; 1248 mask |= 0x8;
1632 *last_ext |= 0x80; 1249 *last_ext |= 0x80;
1633 last_ext = &sl[sl.length ()]; 1250 last_ext = &sl[sl.length ()];
1634 1251
1635 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1252 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1636 } 1253 }
1637 1254
1638 if (lastcell.flags != flags) 1255 if (lastcell.flags != flags)
1639 { 1256 {
1640 lastcell.flags = flags; 1257 lastcell.flags = flags;
… …
1646 sl << uint8 (8) << uint8 (flags); 1263 sl << uint8 (8) << uint8 (flags);
1647 } 1264 }
1648 } 1265 }
1649 1266
1650 /* Floor face */ 1267 /* Floor face */
1651 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1268 if (update_space (sl, socket, ms, lastcell, 2))
1652 mask |= 0x4; 1269 mask |= 0x4;
1653 1270
1654 if (socket.EMI_smooth)
1655 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1656 emask |= 0x4;
1657
1658 /* Middle face */ 1271 /* Middle face */
1659 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1272 if (update_space (sl, socket, ms, lastcell, 1))
1660 mask |= 0x2; 1273 mask |= 0x2;
1661 1274
1662 if (socket.EMI_smooth) 1275 if (ms.player () == pl
1663 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1276 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1664 emask |= 0x2;
1665
1666 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1667 { 1277 {
1278 // force player to be visible to himself if invisible
1668 if (lastcell.faces[0] != pl->face) 1279 if (lastcell.faces[0] != pl->face)
1669 { 1280 {
1670 lastcell.faces[0] = pl->face; 1281 lastcell.faces[0] = pl->face;
1282
1671 mask |= 0x1; 1283 mask |= 0x1;
1672
1673 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1674 esrv_send_face (&socket, pl->face, 0);
1675
1676 sl << uint16 (pl->face); 1284 sl << uint16 (pl->face);
1285
1286 socket.send_faces (pl);
1677 } 1287 }
1678 } 1288 }
1679 else
1680 {
1681 /* Top face */ 1289 /* Top face */
1682 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1290 else if (update_space (sl, socket, ms, lastcell, 0))
1683 mask |= 0x1; 1291 mask |= 0x1;
1684
1685 if (socket.EMI_smooth)
1686 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1687 emask |= 0x1;
1688 } 1292
1689 1293
1690 /* Check to see if we are in fact sending anything for this 1294 /* Check to see if we are in fact sending anything for this
1691 * space by checking the mask. If so, update the mask. 1295 * space by checking the mask. If so, update the mask.
1692 * if not, reset the len to that from before adding the mask 1296 * if not, reset the len to that from before adding the mask
1693 * value, so we don't send those bits. 1297 * value, so we don't send those bits.
… …
1695 if (mask & 0xf) 1299 if (mask & 0xf)
1696 sl[oldlen + 1] = mask & 0xff; 1300 sl[oldlen + 1] = mask & 0xff;
1697 else 1301 else
1698 sl.reset (oldlen); 1302 sl.reset (oldlen);
1699 1303
1304 if (socket.ext_mapinfos)
1305 esl << uint16 (emask);
1306
1307 if (socket.EMI_smooth)
1308 {
1309 for (int layer = 2+1; layer--; )
1310 {
1311 object *ob = ms.faces_obj [layer];
1312
1313 // If there is no object for this space, or if the face for the object
1314 // is the blank face, set the smoothlevel to zero.
1315 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1316
1317 // We've gotten what face we want to use for the object. Now see if
1318 // if it has changed since we last sent it to the client.
1319 if (lastcell.smooth[layer] != smoothlevel)
1320 {
1321 lastcell.smooth[layer] = smoothlevel;
1322 esl << uint8 (smoothlevel);
1323 emask |= 1 << layer;
1324 }
1325 }
1326
1700 if (emask & 0xf) 1327 if (emask & 0xf)
1701 esl[eoldlen + 1] = emask & 0xff; 1328 esl[eoldlen + 1] = emask & 0xff;
1702 else 1329 else
1703 esl.reset (eoldlen); 1330 esl.reset (eoldlen);
1331 }
1704 } /* else this is a viewable space */ 1332 } /* else this is a viewable space */
1705 } /* for x loop */ 1333 } /* for x loop */
1706 } /* for y loop */ 1334 } /* for y loop */
1335
1336 socket.flush_fx ();
1707 1337
1708 /* Verify that we in fact do need to send this */ 1338 /* Verify that we in fact do need to send this */
1709 if (socket.ext_mapinfos) 1339 if (socket.ext_mapinfos)
1710 { 1340 {
1711 if (!(sl.length () > startlen || socket.sent_scroll)) 1341 if (!(sl.length () > startlen || socket.sent_scroll))
1712 { 1342 {
1713 /* No map data will follow, so don't say the client 1343 /* No map data will follow, so don't say the client
1714 * it doesn't need draw! 1344 * it doesn't need draw!
1715 */ 1345 */
1716 ewhatflag &= (~EMI_NOREDRAW); 1346 ewhatflag &= ~EMI_NOREDRAW;
1717 esl[ewhatstart + 1] = ewhatflag & 0xff; 1347 esl[ewhatstart + 1] = ewhatflag & 0xff;
1718 } 1348 }
1719 1349
1720 if (esl.length () > estartlen) 1350 if (esl.length () > estartlen)
1721 socket.send_packet (esl); 1351 socket.send_packet (esl);

Diff Legend

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