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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.73 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.99 by root, Tue May 22 10:50:01 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 *
… …
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}
… …
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->ob;
149 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
152 { 154 {
155 clear_map (pl);
153 socket.current_map = ob->map; 156 socket.current_map = ob->map;
154
155 clear_map (pl);
156 157
157 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
158 { 159 {
159 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
160 { 161 {
161 int flags = 0; 162 int flags = 0;
162 163
163 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
164 flags |= 1;
165 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
166 flags |= 2;
167 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
168 flags |= 4;
169 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
170 flags |= 8;
171 168
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 169 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174 } 171 }
175 else 172 else
… …
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0]) 322 else if (map && map->path[0])
326 { 323 {
327 int flags = 0; 324 int flags = 0;
328 325
329 if (map->tile_path[0]) 326 if (map->tile_path[0]) flags |= 1;
330 flags |= 1;
331 if (map->tile_path[1]) 327 if (map->tile_path[1]) flags |= 2;
332 flags |= 2;
333 if (map->tile_path[2]) 328 if (map->tile_path[2]) flags |= 4;
334 flags |= 4;
335 if (map->tile_path[3]) 329 if (map->tile_path[3]) flags |= 8;
336 flags |= 8;
337 330
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 } 332 }
340 else 333 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 338
346 pl->ns->send_packet (bigbuf); 339 pl->ns->send_packet (bigbuf);
347} 340}
348 341
349/** This is the Setup cmd - easy first implementation */ 342/** This is the Setup cmd */
350void 343void
351SetUp (char *buf, int len, client * ns) 344SetUp (char *buf, int len, client * ns)
352{ 345{
353 int s, slen; 346 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 347}
558 348
559/** 349/**
560 * The client has requested to be added to the game. 350 * The client has requested to be added to the game.
561 * This is what takes care of it. We tell the client how things worked out. 351 * This is what takes care of it. We tell the client how things worked out.
562 * I am not sure if this file is the best place for this function. however, 352 * I am not sure if this file is the best place for this function. however,
563 * it either has to be here or init_sockets needs to be exported. 353 * it either has to be here or init_sockets needs to be exported.
564 */ 354 */
565void 355void
566AddMeCmd (char *buf, int len, client * ns) 356AddMeCmd (char *buf, int len, client *ns)
567{ 357{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 358 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 359}
570 360
571/** Reply to ExtendedInfos command */ 361/** Reply to ExtendedInfos command */
… …
683 473
684 ns->send_packet (cmdback); 474 ns->send_packet (cmdback);
685} 475}
686 476
687/** 477/**
478 * client requested an image. send it rate-limited
479 * before flushing.
480 */
481void
482AskFaceCmd (char *buf, int len, client *ns)
483{
484 ns->askface.push_back (atoi (buf));
485}
486
487/**
688 * Tells client the picture it has to use 488 * Tells client the picture it has to use
689 * to smooth a picture number given as argument. 489 * to smooth a picture number given as argument.
690 */ 490 */
691void 491void
692AskSmooth (char *buf, int len, client *ns) 492AskSmooth (char *buf, int len, client *ns)
693{ 493{
694 ns->send_smooth (atoi (buf)); 494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
695} 496}
696 497
697/** 498/**
698 * 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,
699 * etc.) 500 * etc.)
… …
802 { 603 {
803 case ST_PLAYING: 604 case ST_PLAYING:
804 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 605 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805 break; 606 break;
806 607
807 case ST_CHANGE_CLASS:
808 key_change_class (pl->ob, buf[0]);
809 break;
810
811 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 608 case ST_GET_PARTY_PASSWORD: /* Get password for party */
812 receive_party_password (pl->ob, 13); 609 receive_party_password (pl->ob, 13);
813 break; 610 break;
814 611
815 default: 612 default:
… …
854 651
855 cp = strchr (cp + 1, ' '); 652 cp = strchr (cp + 1, ' ');
856 653
857 if (cp) 654 if (cp)
858 { 655 {
859 assign (ns->version, cp + 1); 656 ns->version = cp + 1;
860 657
861 if (ns->sc_version < 1026) 658 if (ns->sc_version < 1026)
862 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 659 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 660 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864 } 661 }
… …
924/** 721/**
925 * 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
926 * 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)
927 */ 724 */
928void 725void
929send_query (client *ns, uint8 flags, char *text) 726send_query (client *ns, uint8 flags, const char *text)
930{ 727{
931 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: remove this when slot system is working, this is only for debugging
746 if (pl->ob->chosen_skill)
747 buf << " Skill*: " << pl->ob->chosen_skill->name;
748
749 //TODO: maybe golem should become the current_weapon, quite simply?
750 if (pl->golem)
751 buf << " Golem*: " << pl->golem->name;
752
753 buf.linearise (obuf);
754 obuf [buf.size ()] = 0;
932} 755}
933 756
934#define AddIfInt64(Old,New,Type) if (Old != New) {\ 757#define AddIfInt64(Old,New,Type) if (Old != New) {\
935 Old = New; \ 758 Old = New; \
936 sl << uint8 (Type) << uint64 (New); \ 759 sl << uint8 (Type) << uint64 (New); \
… …
944#define AddIfShort(Old,New,Type) if (Old != New) {\ 767#define AddIfShort(Old,New,Type) if (Old != New) {\
945 Old = New; \ 768 Old = New; \
946 sl << uint8 (Type) << uint16 (New); \ 769 sl << uint8 (Type) << uint16 (New); \
947 } 770 }
948 771
949#define AddIfFloat(Old,New,Type) if (Old != New) {\ 772#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950 Old = New; \ 773 Old = New; \
951 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 774 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952 } 775 }
953 776
954#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 777#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955 free(Old); Old = strdup (New);\ 778 free(Old); Old = strdup (New);\
956 sl << uint8 (Type) << data8 (New); \ 779 sl << uint8 (Type) << data8 (New); \
… …
1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 832 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 833 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 834 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 835 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 836 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 837 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 838 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 839 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 840 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018 841
1019 flags = 0; 842 flags = 0;
1020 843
1021 if (pl->fire_on) 844 if (pl->fire_on)
… …
1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 866 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 867 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 868 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046 } 869 }
1047 870
1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 871 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 872 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050 set_title (ob, buf); 873 set_title (ob, buf);
1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 874 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052 875
1053 /* Only send it away if we have some actual data */ 876 /* Only send it away if we have some actual data */
… …
1081 904
1082/** Clears a map cell */ 905/** Clears a map cell */
1083static void 906static void
1084map_clearcell (struct MapCell *cell, int count) 907map_clearcell (struct MapCell *cell, int count)
1085{ 908{
1086 cell->faces[0] = 0; 909 cell->faces[0] = 0;
1087 cell->faces[1] = 0; 910 cell->faces[1] = 0;
1088 cell->faces[2] = 0; 911 cell->faces[2] = 0;
912 cell->smooth[0] = 0;
913 cell->smooth[1] = 0;
914 cell->smooth[2] = 0;
1089 cell->count = count; 915 cell->count = count;
1090 cell->stat_hp = 0; 916 cell->stat_hp = 0;
1091 cell->flags = 0; 917 cell->flags = 0;
1092 cell->player = 0; 918 cell->player = 0;
1093} 919}
1094 920
1095#define MAX_LAYERS 3 921#define MAX_LAYERS 3
1096 922
1097/** 923/**
… …
1100 * it was. 926 * it was.
1101 * sl is the socklist this data is going into. 927 * sl is the socklist this data is going into.
1102 * ns is the socket we are working on - all the info we care 928 * ns is the socket we are working on - all the info we care
1103 * about is in this socket structure, so now need not pass the 929 * about is in this socket structure, so now need not pass the
1104 * entire player object. 930 * entire player object.
1105 * mx and my are map coordinate offsets for map mp
1106 * sx and sy are the offsets into the socket structure that
1107 * holds the old values.
1108 * layer is the layer to update, with 2 being the floor and 0 the 931 * layer is the layer to update, with 2 being the floor and 0 the
1109 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 932 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110 * take. Interesting to note that before this function, the map1 function 933 * take. Interesting to note that before this function, the map1 function
1111 * numbers the spaces differently - I think this was a leftover from 934 * numbers the spaces differently - I think this was a leftover from
1112 * the map command, where the faces stack up. Sinces that is no longer 935 * the map command, where the faces stack up. Sinces that is no longer
1113 * the case, it seems to make more sense to have these layer values 936 * the case, it seems to make more sense to have these layer values
1114 * actually match. 937 * actually match.
1115 */ 938 */
1116static int 939static int
1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 940update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118{ 941{
1119 uint16 face_num; 942 object *ob = ms.faces_obj [layer];
1120 int bx, by, i;
1121
1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123 943
1124 /* If there is no object for this space, or if the face for the object 944 /* If there is no object for this space, or if the face for the object
1125 * is the blank face, set the face number to zero. 945 * is the blank face, set the face number to zero.
1126 * else if we have the stored head object for this space, that takes 946 * else if we have the stored head object for this space, that takes
1127 * precedence over the other object for this space. 947 * precedence over the other object for this space.
1128 * otherwise, we do special head processing 948 * otherwise, we do special head processing
1129 */ 949 */
1130 if (!ob || ob->face == blank_face) 950 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131 face_num = 0;
1132 else
1133 /* In this case, we are already at the lower right or single part object,
1134 * so nothing special
1135 */
1136 face_num = ob->face;
1137 951
1138 /* We've gotten what face we want to use for the object. Now see if 952 /* We've gotten what face we want to use for the object. Now see if
1139 * if it has changed since we last sent it to the client. 953 * if it has changed since we last sent it to the client.
1140 */ 954 */
1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 955 if (lastcell.faces[layer] != face_num)
1142 { 956 {
1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 957 lastcell.faces[layer] = face_num;
1144 958
1145 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 959 if (!ns.faces_sent[face_num])
1146 if (ob) 960 if (ob)
1147 ns.send_faces (ob); 961 ns.send_faces (ob);
1148 else 962 else
1149 ns.send_face (face_num); 963 ns.send_face (face_num);
1150 964
1151 sl << uint16 (face_num); 965 sl << uint16 (face_num);
1152 return 1;
1153 }
1154
1155 /* Nothing changed */
1156 return 0;
1157}
1158
1159/**
1160 * This function is mainly a copy of update_space,
1161 * except it handles update of the smoothing updates,
1162 * not the face updates.
1163 * Removes the need to replicate the same code for each layer.
1164 * this returns true if this smooth is now in fact different
1165 * than it was.
1166 * sl is the socklist this data is going into.
1167 * ns is the socket we are working on - all the info we care
1168 * about is in this socket structure, so know need to pass the
1169 * entire player object.
1170 * mx and my are map coordinate offsets for map mp
1171 * sx and sy are the offsets into the socket structure that
1172 * holds the old values.
1173 * layer is the layer to update, with 2 being the floor and 0 the
1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175 * take.
1176 */
1177static inline int
1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179{
1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182 /* If there is no object for this space, or if the face for the object
1183 * is the blank face, set the smoothlevel to zero.
1184 */
1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187 /* We've gotten what face we want to use for the object. Now see if
1188 * if it has changed since we last sent it to the client.
1189 */
1190 if (smoothlevel > 255)
1191 smoothlevel = 255;
1192 else if (smoothlevel < 0)
1193 smoothlevel = 0;
1194
1195 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196 {
1197 if (smoothlevel)
1198 ns.send_smooth (ob->face);
1199
1200 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1201 sl << uint8 (smoothlevel);
1202 return 1; 966 return 1;
1203 } 967 }
1204 968
1205 /* Nothing changed */ 969 /* Nothing changed */
1206 return 0; 970 return 0;
… …
1309 << uint8 (extendedinfos) 1073 << uint8 (extendedinfos)
1310 << uint8 (eentrysize); 1074 << uint8 (eentrysize);
1311 1075
1312 estartlen = esl.length (); 1076 estartlen = esl.length ();
1313 } 1077 }
1314 else
1315 {
1316 /* suppress compiler warnings */
1317 ewhatstart = 0;
1318 ewhatflag = 0;
1319 estartlen = 0;
1320 }
1321 1078
1322 /* x,y are the real map locations. ax, ay are viewport relative 1079 /* x,y are the real map locations. ax, ay are viewport relative
1323 * locations. 1080 * locations.
1324 */ 1081 */
1325 ay = 0; 1082 ay = 0;
… …
1328 * but that started to get a bit messy to look at. 1085 * but that started to get a bit messy to look at.
1329 */ 1086 */
1330 max_x = pl->x + (socket.mapx + 1) / 2; 1087 max_x = pl->x + (socket.mapx + 1) / 2;
1331 max_y = pl->y + (socket.mapy + 1) / 2; 1088 max_y = pl->y + (socket.mapy + 1) / 2;
1332 1089
1090 maptile *plmap = pl->map;
1091
1333 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1092 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1334 { 1093 {
1335 ax = 0; 1094 ax = 0;
1336 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1095 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1337 { 1096 {
… …
1343 /* If the coordinates are not valid, or it is too dark to see, 1102 /* If the coordinates are not valid, or it is too dark to see,
1344 * we tell the client as such 1103 * we tell the client as such
1345 */ 1104 */
1346 nx = x; 1105 nx = x;
1347 ny = y; 1106 ny = y;
1348 m = get_map_from_coord (pl->map, &nx, &ny); 1107 m = get_map_from_coord (plmap, &nx, &ny);
1349 1108
1350 if (!m) 1109 if (!m)
1351 { 1110 {
1352 /* space is out of map. Update space and clear values 1111 /* space is out of map. Update space and clear values
1353 * if this hasn't already been done. If the space is out 1112 * if this hasn't already been done. If the space is out
… …
1414 oldlen = sl.length (); 1173 oldlen = sl.length ();
1415 eoldlen = esl.length (); 1174 eoldlen = esl.length ();
1416 1175
1417 sl << uint16 (mask); 1176 sl << uint16 (mask);
1418 1177
1419 if (socket.ext_mapinfos)
1420 esl << uint16 (emask);
1421
1422 unsigned char dummy; 1178 unsigned char dummy;
1423 unsigned char *last_ext = &dummy; 1179 unsigned char *last_ext = &dummy;
1424 1180
1425 /* Darkness changed */ 1181 /* Darkness changed */
1426 if (lastcell.count != d && socket.darkness) 1182 if (lastcell.count != d && socket.darkness)
… …
1437 sl << uint8 (255 - 64 * d); 1193 sl << uint8 (255 - 64 * d);
1438 } 1194 }
1439 1195
1440 lastcell.count = d; 1196 lastcell.count = d;
1441 1197
1198 mapspace &ms = m->at (nx, ny);
1199
1442 if (socket.extmap) 1200 if (socket.extmap)
1443 { 1201 {
1444 uint8 stat_hp = 0; 1202 uint8 stat_hp = 0;
1445 uint8 stat_width = 0; 1203 uint8 stat_width = 0;
1446 uint8 flags = 0; 1204 uint8 flags = 0;
1447 UUID player = 0; 1205 tag_t player = 0;
1448 1206
1449 // send hp information, if applicable 1207 // send hp information, if applicable
1450 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1208 if (object *op = ms.faces_obj [0])
1451 { 1209 {
1452 if (op->head || op->invisible) 1210 if (op->head || op->invisible)
1453 ; // do not show 1211 ; // do not show
1454 else if (op->type == PLAYER 1212 else if (op->type == PLAYER
1455 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1213 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1493 1251
1494 mask |= 0x8; 1252 mask |= 0x8;
1495 *last_ext |= 0x80; 1253 *last_ext |= 0x80;
1496 last_ext = &sl[sl.length ()]; 1254 last_ext = &sl[sl.length ()];
1497 1255
1498 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1256 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1499 } 1257 }
1500 1258
1501 if (lastcell.flags != flags) 1259 if (lastcell.flags != flags)
1502 { 1260 {
1503 lastcell.flags = flags; 1261 lastcell.flags = flags;
… …
1509 sl << uint8 (8) << uint8 (flags); 1267 sl << uint8 (8) << uint8 (flags);
1510 } 1268 }
1511 } 1269 }
1512 1270
1513 /* Floor face */ 1271 /* Floor face */
1514 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1272 if (update_space (sl, socket, ms, lastcell, 2))
1515 mask |= 0x4; 1273 mask |= 0x4;
1516 1274
1517 if (socket.EMI_smooth)
1518 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1519 emask |= 0x4;
1520
1521 /* Middle face */ 1275 /* Middle face */
1522 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1276 if (update_space (sl, socket, ms, lastcell, 1))
1523 mask |= 0x2; 1277 mask |= 0x2;
1524 1278
1525 if (socket.EMI_smooth) 1279 if (ms.player () == pl
1526 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1280 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1527 emask |= 0x2;
1528
1529 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1530 { 1281 {
1282 // force player to be visible to himself if invisible
1531 if (lastcell.faces[0] != pl->face) 1283 if (lastcell.faces[0] != pl->face)
1532 { 1284 {
1533 lastcell.faces[0] = pl->face; 1285 lastcell.faces[0] = pl->face;
1286
1534 mask |= 0x1; 1287 mask |= 0x1;
1288 sl << uint16 (pl->face);
1535 1289
1536 socket.send_faces (pl); 1290 socket.send_faces (pl);
1537
1538 sl << uint16 (pl->face);
1539 } 1291 }
1540 } 1292 }
1541 else
1542 {
1543 /* Top face */ 1293 /* Top face */
1544 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1294 else if (update_space (sl, socket, ms, lastcell, 0))
1545 mask |= 0x1; 1295 mask |= 0x1;
1546
1547 if (socket.EMI_smooth)
1548 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1549 emask |= 0x1;
1550 } 1296
1551 1297
1552 /* Check to see if we are in fact sending anything for this 1298 /* Check to see if we are in fact sending anything for this
1553 * space by checking the mask. If so, update the mask. 1299 * space by checking the mask. If so, update the mask.
1554 * if not, reset the len to that from before adding the mask 1300 * if not, reset the len to that from before adding the mask
1555 * value, so we don't send those bits. 1301 * value, so we don't send those bits.
… …
1557 if (mask & 0xf) 1303 if (mask & 0xf)
1558 sl[oldlen + 1] = mask & 0xff; 1304 sl[oldlen + 1] = mask & 0xff;
1559 else 1305 else
1560 sl.reset (oldlen); 1306 sl.reset (oldlen);
1561 1307
1308 if (socket.ext_mapinfos)
1309 esl << uint16 (emask);
1310
1311 if (socket.EMI_smooth)
1312 {
1313 for (int layer = 2+1; layer--; )
1314 {
1315 object *ob = ms.faces_obj [layer];
1316
1317 // If there is no object for this space, or if the face for the object
1318 // is the blank face, set the smoothlevel to zero.
1319 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1320
1321 // We've gotten what face we want to use for the object. Now see if
1322 // if it has changed since we last sent it to the client.
1323 if (lastcell.smooth[layer] != smoothlevel)
1324 {
1325 lastcell.smooth[layer] = smoothlevel;
1326 esl << uint8 (smoothlevel);
1327 emask |= 1 << layer;
1328 }
1329 }
1330
1562 if (emask & 0xf) 1331 if (emask & 0xf)
1563 esl[eoldlen + 1] = emask & 0xff; 1332 esl[eoldlen + 1] = emask & 0xff;
1564 else 1333 else
1565 esl.reset (eoldlen); 1334 esl.reset (eoldlen);
1335 }
1566 } /* else this is a viewable space */ 1336 } /* else this is a viewable space */
1567 } /* for x loop */ 1337 } /* for x loop */
1568 } /* for y loop */ 1338 } /* for y loop */
1339
1340 socket.flush_fx ();
1569 1341
1570 /* Verify that we in fact do need to send this */ 1342 /* Verify that we in fact do need to send this */
1571 if (socket.ext_mapinfos) 1343 if (socket.ext_mapinfos)
1572 { 1344 {
1573 if (!(sl.length () > startlen || socket.sent_scroll)) 1345 if (!(sl.length () > startlen || socket.sent_scroll))

Diff Legend

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